diff options
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1ee727dc1..8b982c88d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- "choose desktop" step: + o put images along labels in RadioButtons (HIG) - summary screen: o add spacing around separators o fix not displaying the security group diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 7ba1be3d4..cca9a1d95 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -223,7 +223,11 @@ sub reallyChooseDesktop { my $prev; my @l = map { my $val = $_; - $prev = gtknew('RadioButton', text => $val->[1], + $prev = gtknew('RadioButton', child => + gtknew('HBox', border_width => 15, spacing => 10, children => [ + 0, gtknew('Image', file => "desktop-$val->[0]", size_group => $sizegrp), + 1, gtknew('Label', text => $val->[1]), + ]), toggled => sub { $choice = $val if $_[0]->get_active }, $prev ? (group => $prev->get_group) : ()); $prev->signal_connect(key_press_event => sub { @@ -232,10 +236,7 @@ sub reallyChooseDesktop { Gtk2->main_quit; } }); - gtknew('HBox', border_width => 15, spacing => 10, children => [ - 0, gtknew('Image', file => "desktop-$val->[0]", size_group => $sizegrp), - 1, $prev, - ]); + $prev } @$choices; ugtk2::gtkadd($w->{window}, |