summaryrefslogtreecommitdiffstats
path: root/perl-install/install/steps_gtk.pm
diff options
context:
space:
mode:
authorDerek Jennings <derekjenn@gmail.com>2013-08-23 16:58:47 +0100
committerDerek Jennings <derekjenn@gmail.com>2013-08-23 16:58:47 +0100
commit6b1bd5a9a8771625a783fb1ff794ba06caac0e70 (patch)
tree08f04ec37bae3543fd3ec67aba1f575ddd650947 /perl-install/install/steps_gtk.pm
parent331e242249bec7f80b303c1d37f3c9c8829988f5 (diff)
downloaddrakx-6b1bd5a9a8771625a783fb1ff794ba06caac0e70.tar
drakx-6b1bd5a9a8771625a783fb1ff794ba06caac0e70.tar.gz
drakx-6b1bd5a9a8771625a783fb1ff794ba06caac0e70.tar.bz2
drakx-6b1bd5a9a8771625a783fb1ff794ba06caac0e70.tar.xz
drakx-6b1bd5a9a8771625a783fb1ff794ba06caac0e70.zip
- stage2: add cinnamon to desktop selection
Diffstat (limited to 'perl-install/install/steps_gtk.pm')
-rw-r--r--perl-install/install/steps_gtk.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index eeaa3b42f..e27426298 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -252,6 +252,7 @@ sub reallyChooseDesktop {
KDE => N("Install %s KDE Desktop", N("Mageia")),
GNOME => N("Install %s GNOME Desktop", N("Mageia")),
MATE => N("Install %s MATE Desktop", N("Mageia")),
+ CINNAMON => N("Install %s Cinnamon Desktop", N("Mageia")),
XFCE => N("Install %s XFCE Desktop", N("Mageia")),
LXDE => N("Install %s LXDE Desktop", N("Mageia")),
RAZOR => N("Install %s RazorQT Desktop", N("Mageia")),
@@ -281,12 +282,13 @@ sub reallyChooseDesktop {
}
});
my $img = gtksignal_connect(
- gtkadd(Gtk2::EventBox->new, gtknew('Image', sensitive => $sensitive ? '1' : '0', file => "desktop-$val->[0]")),
+ gtkadd(Gtk2::EventBox->new, gtknew('Image', sensitive => $sensitive ? '1' : '0', file => $val->[0] eq 'Custom' ? "" : "desktop-$val->[0]")),
'button-press-event' => sub {
my %title = (
KDE => N("KDE Desktop"),
GNOME => N("GNOME Desktop"),
MATE => N("MATE Desktop"),
+ CINNAMON => N("Cinnamon Desktop"),
XFCE => N("XFCE Desktop"),
LXDE => N("LXDE Desktop"),
RAZOR => N("RazorQT Desktop"),
@@ -313,13 +315,14 @@ sub reallyChooseDesktop {
$wp->{real_window}->show_all;
$wp->main;
});
- gtknew('VBox', border_width => 5, spacing => 10, children_tight => [
+ gtknew('VBox', border_width => 5, spacing => 5, children_tight => [
$img,
$prev,
]);
} @$choices;
-my @l1 = grep { !($n++ % 2) } @l;
-my @l2 = grep { !(++$n % 2) } @l;
+my @l1 = @l[0..3];
+my @l2 = @l[4..7];
+my @l3 = @l[8];
ugtk2::gtkadd($w->{window},
gtknew('VBox', children => [
0, gtknew('Title2',
@@ -330,6 +333,7 @@ my @l2 = grep { !(++$n % 2) } @l;
gtknew('VBox', children => [
1, gtknew('HButtonBox', spacing => 5, layout => 'edge', children_loose => \@l1),
1, gtknew('HButtonBox', spacing => 5, layout => 'edge', children_loose => \@l2),
+ 1, gtknew('HButtonBox', spacing => 5, layout => 'edge', children_loose => \@l3),
]
),
),