summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-09-16 12:58:32 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-09-16 12:58:32 +0000
commite2cd603ed6f57da573b16bb9a0d1c446f1893c24 (patch)
tree2ecfb645a9f08b0f558ad10b3a93fff820f74cc1
parent7602c774470639f2d40059268897a2806e595a75 (diff)
downloaddrakx-e2cd603ed6f57da573b16bb9a0d1c446f1893c24.tar
drakx-e2cd603ed6f57da573b16bb9a0d1c446f1893c24.tar.gz
drakx-e2cd603ed6f57da573b16bb9a0d1c446f1893c24.tar.bz2
drakx-e2cd603ed6f57da573b16bb9a0d1c446f1893c24.tar.xz
drakx-e2cd603ed6f57da573b16bb9a0d1c446f1893c24.zip
fix expert mode resulting in advanced setting being displayed by
default but label still being "advanced" instead of "basic"
-rw-r--r--perl-install/interactive/gtk.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 7b8b486c4..fa78bb364 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -653,6 +653,10 @@ sub ask_fromW {
my $message = $common->{interactive_help}->() or return;
$o->ask_warn(N("Help"), $message);
}, 1 ]);
+ if ($::isStandalone && $::expert) {
+ $common->{advanced_state} = 1;
+ $advanced_button->[0] = $common->{advanced_label_close};
+ }
my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @help, if_(@$l2, $advanced_button));
$pack->pack_start(gtkshow($always_pack), 1, 1, 0);
@@ -668,7 +672,6 @@ sub ask_fromW {
gtkadd($mainw->{window}, $pack);
$set_default_size->() if $has_scroll_always;
$set_advanced->($common->{advanced_state});
- $set_advanced_raw->($::expert) if $::isStandalone;
my $widget_to_focus =
$common->{focus_cancel} ? $mainw->{cancel} :