summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-28 18:13:23 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-28 18:13:23 +0000
commit774d576c82134db3b2fe80960ca12ada1dde94a4 (patch)
tree9836a850ba7528be6b57fddae12c57c734e6a348 /perl-install
parente7888c97761ddd35844afa2769b799de2f7e1420 (diff)
downloaddrakx-774d576c82134db3b2fe80960ca12ada1dde94a4.tar
drakx-774d576c82134db3b2fe80960ca12ada1dde94a4.tar.gz
drakx-774d576c82134db3b2fe80960ca12ada1dde94a4.tar.bz2
drakx-774d576c82134db3b2fe80960ca12ada1dde94a4.tar.xz
drakx-774d576c82134db3b2fe80960ca12ada1dde94a4.zip
(create_okcancel) try to better fit both install teams needs and
interface team one's: - in the installer, all windows run under $::isWizard due to design stuff (wizard aspect and wizard mode should really be really two differents options for cleanity but that's postponed); o so to prevent ok/cancel buttons to be pushed at the right edge when we're asking a question instead of being in a wizard step, we add an empty label between the ok and cancel o we still put an empty label in wizard mode when not in the installer so that help/cancel and next/previous buttons packs get separated as requested by interface team - we add an empty field when cancel/previous button does not exists so that when there's only one button, we prevent it to be centered (eg: "finish" in wizards); note that if $::Wizard_no_previous is not set, the button is still centered so that we keep some flexibility
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ugtk2.pm15
1 files changed, 11 insertions, 4 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 7c2ed376f..b13ab7514 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -487,7 +487,13 @@ sub create_okcancel {
my $cancel = defined $o_cancel || defined $o_ok ? $o_cancel : $::isWizard ? N("<- Previous") : N("Cancel");
my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok");
my $bok = $ok && gtksignal_connect($w->{ok} = Gtk2::Button->new($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit });
- my $bprev = $cancel && gtksignal_connect($w->{cancel} = Gtk2::Button->new($cancel), clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit });
+ my $bprev;
+ 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) {
require any;
@@ -496,14 +502,15 @@ sub create_okcancel {
my @l2 = map { gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[1]) } grep { $_->[2] } @other;
my @r2 = map { gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[1]) } grep { !$_->[2] } @other;
# we put space to group buttons in two packs (but if there's only one when not in wizard mode)
- my @extras = (@l2, @r2, if_($::isWizard || $ok && $cancel, Gtk2::Label->new));
+ # 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, if_(!$::isInstall && ($::isWizard || $ok && $cancel), Gtk2::Label->new));
my @l; # buttons list
if ($::isWizard) {
# wizard mode: order is cancel/extras/white/prev/next
- push @l, if_(!$::isInstall, $w->{wizcancel}), @extras, if_(!$::Wizard_no_previous, $bprev), $bok;
+ push @l, if_(!$::isInstall, $w->{wizcancel}), @extras, $bprev, if_($::isInstall, Gtk2::Label->new), $bok;
} else {
# normal mode: cancel/ok button follow current desktop's HIG
- my @extras = (@l2, @r2, if_($ok && $cancel, Gtk2::Label->new)); # space buttons but if there's only one
+ my @extras = (@l2, @r2, if_($ok && $cancel, Gtk2::Label->new)); # space buttons but if there's only one
push @l, $wm_is_kde ? ($bok, @extras, $bprev) : ($bprev, @extras, $bok);
}