summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-20 11:51:39 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-20 11:51:39 +0000
commit0f986518b9f5330e20db5ed63cb05afdf2ac4d3f (patch)
tree2b02567c050f2e17d1ab2a418a8ee1b73d29c143
parent41b4f7aad68daceb8ddf3aae270f416d610b58e1 (diff)
downloaddrakx-0f986518b9f5330e20db5ed63cb05afdf2ac4d3f.tar
drakx-0f986518b9f5330e20db5ed63cb05afdf2ac4d3f.tar.gz
drakx-0f986518b9f5330e20db5ed63cb05afdf2ac4d3f.tar.bz2
drakx-0f986518b9f5330e20db5ed63cb05afdf2ac4d3f.tar.xz
drakx-0f986518b9f5330e20db5ed63cb05afdf2ac4d3f.zip
use new help scheme just added to msec (this *does* need a newer msec
package!!)
-rwxr-xr-xperl-install/standalone/draksec10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 012c26711..23fa9c78c 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -27,6 +27,7 @@ use ugtk2 qw(:helpers :wrappers :ask :create);
use run_program;
use security::level;
use security::msec;
+use security::help qw(help);
$MODE = 'basic';
$0 =~ /draksec-firewall$/ and $MODE = 'firewall';
@@ -98,8 +99,9 @@ sub new_editable_combo {
}
sub set_default_tip {
- my ($entry, $default) = @_;
- gtkset_tip(new Gtk2::Tooltips, $entry, N(" (default value: %s)", $default));
+ my ($entry, $default, $opt) = @_;
+ my $help = $security::help::help{$opt};
+ gtkset_tip(new Gtk2::Tooltips, $entry, join("\n", if_($help, $help), N("(default value: %s)", $default)));
}
my $msec = new security::msec;
@@ -173,7 +175,7 @@ foreach ([ 'network', N("Network Options") ], [ 'system', N("System Options") ])
$entry = $values{$i};
}
$entry->set_text($msec->get_function_value($i));
- set_default_tip($entry, $default);
+ set_default_tip($entry, $default, $i);
[ new Gtk2::Label($i), $values{$i} ];
} $msec->get_functions($domain))))),
new Gtk2::Label($label));
@@ -191,7 +193,7 @@ $notebook->append_page(gtkshow(create_scrolled_window(gtkpack(new Gtk2::VBox(0,
my $i = $_;
$security_checks_value{$i} = new_editable_combo();
my $entry = $security_checks_value{$i}->entry;
- set_default_tip($entry, $msec->get_check_default);
+ set_default_tip($entry, $msec->get_check_default, $i);
$security_checks_value{$i}->set_popdown_strings(qw(yes no default));
$entry->set_text($msec->get_check_value($i));
[ gtkshow(new Gtk2::Label(translate($i))), $security_checks_value{$i} ];