summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-23 17:36:34 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-23 17:36:34 +0000
commit4beca377141304b18706e5554234ddc002c4d7c4 (patch)
treec3d95ce8410087722e34b41fa2658a53a7dc873d
parente2528ed6b564c75e66300a5f6ea155a31e0d76b1 (diff)
downloaddrakx-backup-do-not-use-4beca377141304b18706e5554234ddc002c4d7c4.tar
drakx-backup-do-not-use-4beca377141304b18706e5554234ddc002c4d7c4.tar.gz
drakx-backup-do-not-use-4beca377141304b18706e5554234ddc002c4d7c4.tar.bz2
drakx-backup-do-not-use-4beca377141304b18706e5554234ddc002c4d7c4.tar.xz
drakx-backup-do-not-use-4beca377141304b18706e5554234ddc002c4d7c4.zip
as discussed with david, gc, laurent & pixel early this week, since
gtk+ dialogs are HIG-ed and since most drakxtools' explicit gtk+ windows follow cancel/ok order for now, let implicit windows (that is interactive written ones) follow the same order in standalone mode. after release, we'll have to make ugtk2 handle one more abstractions, that is taking some buttons callbacks, add buttons that have callbacks and pack them in kde or gnome order depending of interface team decision or maybe of runtime detection of desktop.
-rw-r--r--perl-install/ugtk2.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index df201986f..46cef2ec5 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -303,7 +303,7 @@ sub create_box_with_title {
return $box;
}
$o->{box_size} = n_line_size($nbline, 'text', $box);
- if (@_ <= 2 && ($nbline > 4)) {
+ if (@_ <= 2 && $nbline > 4) {
$o->{icon} && !$::isWizard and
eval { gtkpack__($box, gtkset_border_width(gtkpack_(Gtk2::HBox->new(0,0), 1, gtkcreate_img($o->{icon})),5)) };
my $wanted = $o->{box_size};
@@ -487,7 +487,7 @@ sub create_okcancel {
my $b2 = $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 });
gtksignal_connect($w->{wizcancel} = Gtk2::Button->new(N("Cancel")), clicked => sub { die 'wizcancel' }) if $wizard_buttons && !$::isInstall;
my @l = grep { $_ } $wizard_buttons ? (if_(!$::isInstall, $w->{wizcancel}),
- if_(!$::Wizard_no_previous, $b2), $b1) : ($b1, $b2);
+ if_(!$::Wizard_no_previous, $b2), $b1) : ($::isInstall ? ($b1, $b2) : $b2, $b1);
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;