summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-13 16:31:38 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-13 16:31:38 +0000
commitec9fdca8b6d7008ad051f01658e85607cb2e26a3 (patch)
tree2c9d97160490e85adcbdcfc56d8ccb30fddbbf12 /perl-install
parent497308fac6a2cf9ea0c477d0b9afe14718ec45c9 (diff)
downloaddrakx-backup-do-not-use-ec9fdca8b6d7008ad051f01658e85607cb2e26a3.tar
drakx-backup-do-not-use-ec9fdca8b6d7008ad051f01658e85607cb2e26a3.tar.gz
drakx-backup-do-not-use-ec9fdca8b6d7008ad051f01658e85607cb2e26a3.tar.bz2
drakx-backup-do-not-use-ec9fdca8b6d7008ad051f01658e85607cb2e26a3.tar.xz
drakx-backup-do-not-use-ec9fdca8b6d7008ad051f01658e85607cb2e26a3.zip
do not pack empty label before extra buttons if there'll be no button
before it rationale: when there's no cancel button, packing an empty label instead of the cancel button results in extra buttons (eg: help, advanced) to be shifted with a space before;
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ugtk2.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index e1e3d5847..cf1ae7fb3 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -497,8 +497,6 @@ sub create_okcancel {
if ($cancel) {
$bprev = gtksignal_connect($w->{cancel} = Gtk2::Button->new($cancel), clicked => $w->{cancel_clicked} ||
sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit });
- } elsif($::Wizard_no_previous) { # prevent one button to be centered (eg: "finish" in wizards)
- $bprev = Gtk2::Label->new;
}
$w->{wizcancel} = gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall;
if (!defined $wm_is_kde) {
@@ -510,6 +508,7 @@ sub create_okcancel {
# we put space to group buttons in two packs (but if there's only one when not in wizard mode)
# but in the installer where all windows run in wizard mode because of design even when not in a wizard step
my @extras = (@l2, @r2);
+ $bprev = Gtk2::Label->new if !$cancel && $::Wizard_no_previous && !@extras;
my (@first, @last); # buttons lists
if ($::isWizard) {
# wizard mode: order is cancel/extras/white/prev/next