diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-01-07 19:04:26 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-01-07 19:04:26 +0000 |
| commit | 12eb78bd3f6574ec2cb30f1bda04915f50b51d2f (patch) | |
| tree | b1480ed1a7161948a869b2296f8d411015a4ade1 | |
| parent | c8ffc4071565d78a349d03da4d2eb48e390f86d3 (diff) | |
| download | drakx-12eb78bd3f6574ec2cb30f1bda04915f50b51d2f.tar drakx-12eb78bd3f6574ec2cb30f1bda04915f50b51d2f.tar.gz drakx-12eb78bd3f6574ec2cb30f1bda04915f50b51d2f.tar.bz2 drakx-12eb78bd3f6574ec2cb30f1bda04915f50b51d2f.tar.xz drakx-12eb78bd3f6574ec2cb30f1bda04915f50b51d2f.zip | |
allow showing Skip button instead of Cancel in wizards (initially for finish-install in Gdium)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index d7528d7cb..771e56f6b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -50,6 +50,8 @@ Version 11.72 - 9 December 2008 * list PC Speaker as sound card * track duplicated input devices * try harder to find duplicates +- ugtk2: + o allow showing Skip button instead of Cancel in wizards Version 11.71 - 6 November 2008 diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 04a4786f1..200e7a188 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -523,7 +523,7 @@ sub create_okcancel { $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); } - $w->{wizcancel} = gtknew('Button', text => N("Cancel"), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel;; + $w->{wizcancel} = gtknew('Button', text => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel;; if (!defined $wm_is_kde) { require any; my $wm = any::running_window_manager(); |