From 8b8f76c3180b839a958c7cdf69cd2d9796aa36b3 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 28 Dec 2004 15:28:29 +0000 Subject: re-organize steps display as requested by ergonomic team --- perl-install/install_gtk.pm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 28256021d..7321c5432 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -145,23 +145,28 @@ sub create_steps_window { $o->{steps_window} and $o->{steps_window}->destroy; $steps{$_} ||= gtknew('Pixbuf', file => "steps_$_") foreach qw(on off); - my $category = sub { gtknew('Label', text => $_[0], widget_name => 'Step-categories') }; + my $category = sub { + gtknew('HBox', children_tight => [ + gtknew('Label', text => $_[0], widget_name => 'Step-categories') + ]); + }; - my @l = ($category->(N("System installation")), ''); + my @l = $category->(N("System installation")); foreach (grep { !eval $o->{steps}{$_}{hidden} } @{$o->{orderedSteps}}) { if ($_ eq 'setRootPassword') { - push @l, '', '', $category->(N("System configuration")), ''; + push @l, '', $category->(N("System configuration")); } my $img = gtknew('Image', file => 'steps_off.png'); $steps{steps}{$_}{img} = $img; - push @l, gtknew('HBox', spacing => 7, children_tight => [ $img, translate($o->{steps}{$_}{text}) ]); + push @l, gtknew('HBox', spacing => 7, children_tight => [ '', '', $img, translate($o->{steps}{$_}{text}) ]); } my $w = bless {}, 'ugtk2'; + my $offset = 20; $w->{rwindow} = $w->{window} = gtknew('Window', width => $::stepswidth, widget_name => 'Steps', title => 'skip', - position => [ lang::text_direction_rtl() ? ($::rootwidth - $::stepswidth - 8) : 8, 150 ], - child => gtknew('VBox', spacing => 3, children_tight => \@l)); + position => [ lang::text_direction_rtl() ? ($::rootwidth - $::stepswidth - $offset) : $offset, 150 ], + child => gtknew('VBox', spacing => 6, children_tight => \@l)); $w->show; $o->{steps_window} = $w; } -- cgit v1.2.1