summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennael <ennael@mageia.org>2013-09-04 21:13:51 +0200
committerennael <ennael@mageia.org>2013-09-04 21:13:51 +0200
commit90a211849bad01493dce7875c901205a41023486 (patch)
treef0b0a6012fc345bd16aa7d00a1f712ba8879f0a2
parent21e111d3ac710368c63485f8c4b37509212b825c (diff)
downloaddrakx-90a211849bad01493dce7875c901205a41023486.tar
drakx-90a211849bad01493dce7875c901205a41023486.tar.gz
drakx-90a211849bad01493dce7875c901205a41023486.tar.bz2
drakx-90a211849bad01493dce7875c901205a41023486.tar.xz
drakx-90a211849bad01493dce7875c901205a41023486.zip
Revert "- stage2: add cinnamon to desktop selection"
This reverts commit 6b1bd5a9a8771625a783fb1ff794ba06caac0e70. Conflicts: perl-install/install/NEWS
-rw-r--r--perl-install/install/pixmaps/desktop-CINNAMON-big.pngbin261343 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-CINNAMON.pngbin15211 -> 0 bytes
-rw-r--r--perl-install/install/steps_gtk.pm16
-rw-r--r--perl-install/install/steps_interactive.pm3
4 files changed, 8 insertions, 11 deletions
diff --git a/perl-install/install/pixmaps/desktop-CINNAMON-big.png b/perl-install/install/pixmaps/desktop-CINNAMON-big.png
deleted file mode 100644
index 17af1acea..000000000
--- a/perl-install/install/pixmaps/desktop-CINNAMON-big.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-CINNAMON.png b/perl-install/install/pixmaps/desktop-CINNAMON.png
deleted file mode 100644
index efe411cf0..000000000
--- a/perl-install/install/pixmaps/desktop-CINNAMON.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 253ea2541..eeaa3b42f 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -252,7 +252,6 @@ 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")),
@@ -260,16 +259,18 @@ sub reallyChooseDesktop {
Custom => N("Custom install"),
);
my $prev;
+ my $default_set = 0;
my @l = map {
my $val = $_;
my $sensitive = grep { $_->[0] =~ /$val->[0]/ or $val->[0] eq 'Custom' } map { $_->{flags} } grep { $_->{path} eq 'Graphical Environment' } map { @$_ } $o->{compssUsers};
+ $default_set++ if $sensitive;
$choice{$val->[0]} = '0';
$prev = gtknew('CheckButton',
text => $val->[1],
tip => $tips{$val->[0]},
sensitive => $sensitive ? '1' : '0',
toggled => sub { $choice{$val->[0]} = $_[0]->get_active },
- active => $sensitive ? ($default_choice == $_) : '0',
+ active => $default_set == 1 && $sensitive ? ($choice{$val->[0]} = '1') : '0',
);
@@ -280,13 +281,12 @@ sub reallyChooseDesktop {
}
});
my $img = gtksignal_connect(
- gtkadd(Gtk2::EventBox->new, gtknew('Image', sensitive => $sensitive ? '1' : '0', file => $val->[0] eq 'Custom' ? "" : "desktop-$val->[0]")),
+ gtkadd(Gtk2::EventBox->new, gtknew('Image', sensitive => $sensitive ? '1' : '0', file => "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,14 +313,13 @@ sub reallyChooseDesktop {
$wp->{real_window}->show_all;
$wp->main;
});
- gtknew('VBox', border_width => 5, spacing => 5, children_tight => [
+ gtknew('VBox', border_width => 5, spacing => 10, children_tight => [
$img,
$prev,
]);
} @$choices;
-my @l1 = @l[0..3];
-my @l2 = @l[4..7];
-my @l3 = @l[8];
+my @l1 = grep { !($n++ % 2) } @l;
+my @l2 = grep { !(++$n % 2) } @l;
ugtk2::gtkadd($w->{window},
gtknew('VBox', children => [
0, gtknew('Title2',
@@ -331,7 +330,6 @@ my @l3 = @l[8];
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 898cf975c..e458c1648 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -483,7 +483,6 @@ sub _chooseDesktop {
KDE => N("KDE"),
GNOME => N("GNOME"),
MATE => N("MATE"),
- CINNAMON => N("CINNAMON"),
XFCE => N("XFCE"),
LXDE => N("LXDE"),
RAZOR => N("RAZOR"),
@@ -492,7 +491,7 @@ sub _chooseDesktop {
);
my $title = N("Desktop Selection");
- my $message = N("You can choose your workstation desktop profile.\nSelect 'Custom' for more choices.");
+ my $message = N("You can choose your workstation desktop profile.\nSelect 'Custom' for multiple desktops or package selection.");
my $default_choice = (find { $rpmsrate_flags_chosen->{"CAT_" . $_->[0]} } @l) || $l[0];
my $choose = $default_choice;