diff options
| author | Derek Jennings <derekjenn@gmail.com> | 2013-08-23 16:58:47 +0100 |
|---|---|---|
| committer | Derek Jennings <derekjenn@gmail.com> | 2013-08-23 16:58:47 +0100 |
| commit | e9e84db0c3d2a056f1c190a4f052588c61a0261b (patch) | |
| tree | 08f04ec37bae3543fd3ec67aba1f575ddd650947 | |
| parent | 0487147a653f5f0b86b93af58d305d8f3b52c780 (diff) | |
| download | drakx-backup-do-not-use-e9e84db0c3d2a056f1c190a4f052588c61a0261b.tar drakx-backup-do-not-use-e9e84db0c3d2a056f1c190a4f052588c61a0261b.tar.gz drakx-backup-do-not-use-e9e84db0c3d2a056f1c190a4f052588c61a0261b.tar.bz2 drakx-backup-do-not-use-e9e84db0c3d2a056f1c190a4f052588c61a0261b.tar.xz drakx-backup-do-not-use-e9e84db0c3d2a056f1c190a4f052588c61a0261b.zip | |
- stage2: add cinnamon to desktop selection
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-CINNAMON-big.png | bin | 0 -> 261343 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-CINNAMON.png | bin | 0 -> 15211 bytes | |||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 12 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 3 |
5 files changed, 12 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f6176e204..444f92331 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- add Independently install Desktop environments + Version 15.61 - 8 August 2013 - include network interface name udev rule (mga#10947) diff --git a/perl-install/install/pixmaps/desktop-CINNAMON-big.png b/perl-install/install/pixmaps/desktop-CINNAMON-big.png Binary files differnew file mode 100644 index 000000000..17af1acea --- /dev/null +++ b/perl-install/install/pixmaps/desktop-CINNAMON-big.png diff --git a/perl-install/install/pixmaps/desktop-CINNAMON.png b/perl-install/install/pixmaps/desktop-CINNAMON.png Binary files differnew file mode 100644 index 000000000..efe411cf0 --- /dev/null +++ b/perl-install/install/pixmaps/desktop-CINNAMON.png 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), ] ), ), diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index e458c1648..898cf975c 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -483,6 +483,7 @@ sub _chooseDesktop { KDE => N("KDE"), GNOME => N("GNOME"), MATE => N("MATE"), + CINNAMON => N("CINNAMON"), XFCE => N("XFCE"), LXDE => N("LXDE"), RAZOR => N("RAZOR"), @@ -491,7 +492,7 @@ sub _chooseDesktop { ); my $title = N("Desktop Selection"); - my $message = N("You can choose your workstation desktop profile.\nSelect 'Custom' for multiple desktops or package selection."); + my $message = N("You can choose your workstation desktop profile.\nSelect 'Custom' for more choices."); my $default_choice = (find { $rpmsrate_flags_chosen->{"CAT_" . $_->[0]} } @l) || $l[0]; my $choose = $default_choice; |
