diff options
| author | damien <damien@mandriva.com> | 2001-02-21 07:00:45 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-02-21 07:00:45 +0000 |
| commit | 2dafba03eb96967ae1179a099febe966305038dd (patch) | |
| tree | bf261cfa300bcea736fc3208b5d0adb1f9583ff8 | |
| parent | c6fa524d837275a6d8480f3afdcbf45f7bbb5632 (diff) | |
| download | drakx-backup-do-not-use-2dafba03eb96967ae1179a099febe966305038dd.tar drakx-backup-do-not-use-2dafba03eb96967ae1179a099febe966305038dd.tar.gz drakx-backup-do-not-use-2dafba03eb96967ae1179a099febe966305038dd.tar.bz2 drakx-backup-do-not-use-2dafba03eb96967ae1179a099febe966305038dd.tar.xz drakx-backup-do-not-use-2dafba03eb96967ae1179a099febe966305038dd.zip | |
corrected wizard mode.
| -rw-r--r-- | perl-install/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 1d4dd0c68..162c7301b 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -236,7 +236,7 @@ sub ask_from_entries_refH_powered_normalize { $common->{advanced_label} ||= _("Advanced"); $common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages); - add2hash_($common, { ok => _("Ok"), cancel => _("Cancel") }) if !exists $common->{ok}; + add2hash_($common, { ok => _("Ok"), cancel => _("Cancel") }) if !exists $common->{ok} && !$::isWizard; add2hash_($common->{callbacks} ||= {}, { changed => sub {}, focus_out => sub {}, complete => sub { 0 }, canceled => sub { 0 } }); } diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index b0a09ff78..749ae9aa4 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -289,11 +289,11 @@ sub create_okcancel { my $one = ($ok xor $cancel); $spread ||= $::isWizard ? "end" : "spread"; $ok ||= $::isWizard ? _("Next ->") : _("Ok"); - $cancel ||= $::isWizard ? _("Previous") : _("Cancel"); + $cancel ||= $::isWizard ? _("<- Previous") : _("Cancel"); my $b1 = gtksignal_connect($w->{ok} = new Gtk::Button($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk->main_quit }); my $b2 = !$one && gtksignal_connect($w->{cancel} = new Gtk::Button($cancel), clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk->main_quit }); $::isWizard and gtksignal_connect($w->{wizcancel} = new Gtk::Button(_("Cancel")), clicked => sub { die 'wizcancel' }); - my @l = grep { $_ } $::isWizard ? ($b2, $w->{wizcancel}, $b1): ($b1, $b2); + my @l = grep { $_ } $::isWizard ? ($w->{wizcancel}, $::Wizard_no_previous ? () : $b2, $b1): ($b1, $b2); push @l, map { gtksignal_connect(new Gtk::Button($_->[0]), clicked => $_->[1]) } @other; $_->can_default($::isWizard) foreach @l; |