summaryrefslogtreecommitdiffstats
path: root/perl-install/install
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 /perl-install/install
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
Diffstat (limited to 'perl-install/install')
-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;
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-07 01:27:08 +0000
/span> qw(interactive); use interactive; use common; use log; use Newt::Newt; #- !! provides Newt and not Newt::Newt my ($width, $height) = (80, 25); my @wait_messages; sub new { Newt::Init(); Newt::Cls(); Newt::SetSuspendCallback(); ($width, $height) = Newt::GetScreenSize(); open STDERR, ">/dev/null" if $::isStandalone && !$::testing; bless {}, $_[0]; } sub enter_console { Newt::Suspend() } sub leave_console { Newt::Resume() } sub suspend { Newt::Suspend() } sub resume { Newt::Resume() } sub end { Newt::Finished() } sub exit { end(); exit($_[1]) } END { end() } sub messages { my ($width, @messages) = @_; warp_text(join("\n", @messages), $width - 9); } sub myTextbox { my ($allow_scroll, $free_height, @messages) = @_; my @l = messages($width, @messages); my $h = min($free_height - 13, int @l); my $want_scroll; if ($h < @l) { if ($allow_scroll) { $want_scroll = 1; } else { # remove the text, no other way! @l = @l[0 .. $h-1]; } } my $mess = Newt::Component::Textbox(1, 0, my $w = max(map { length } @l) + 1, $h, $want_scroll); $mess->TextboxSetText(join("\n", @l)); $mess, $w + 1, $h; } sub separator { my $blank = Newt::Component::Form(\undef, '', 0); $blank->FormSetWidth($_[0]); $blank->FormSetHeight($_[1]); $blank; } sub checkval { $_[0] && $_[0] ne ' ' ? '*' : ' ' } sub ask_fromW { my ($o, $common, $l, $l2) = @_; if (@$l == 1 && $l->[0]{list} && @{$l->[0]{list}} == 2 && listlength(map { split "\n" } @{$common->{messages}}) > 20) { #- special ugly case, esp. for license agreement my $e = $l->[0]; my $ok_disabled = $common->{callbacks} && delete $common->{callbacks}{ok_disabled}; ($common->{ok}, $common->{cancel}) = map { may_apply($e->{format}, $_) } @{$e->{list}}; do { ${$e->{val}} = ask_fromW_real($o, $common, [], $l2) ? $e->{list}[0] : $e->{list}[1]; } while $ok_disabled && $ok_disabled->(); 1; } elsif ((any { $_->{type} ne 'button' } @$l) || @$l < 5) { &ask_fromW_real; } else { $common->{cancel} = N("Do") if $common->{cancel} eq ''; my $r; do { my @choices = map { my $s = simplify_string(may_apply($_->{format}, ${$_->{val}})); $s = "$_->{label}: $s" if $_->{label}; { label => $s, clicked_may_quit => $_->{clicked_may_quit} } } @$l; #- replace many buttons with a list my $new_l = [ { val => \$r, type => 'list', list => \@choices, format => sub { $_[0]{label} }, sort => 0 } ]; ask_fromW_real($o, $common, $new_l, $l2) and return; } until $r->{clicked_may_quit}->(); 1; } } sub ask_fromW_real { my ($o, $common, $l, $l2) = @_; my $ignore; #-to handle recursivity my $old_focus = -2; my @l = $common->{advanced_state} ? @$l2 : @$l; my @messages = (@{$common->{messages}}, if_($common->{advanced_state}, @{$common->{advanced_messages}})); #-the widgets my (@widgets, $total_size, $has_scroll); my $label_width; my $get_label_width = sub { $label_width ||= max(map { length($_->{label}) } @l); }; my $set_all = sub { $ignore = 1; $_->{set}->(${$_->{e}{val}}) foreach @widgets; # $_->{w}->set_sensitive(!$_->{e}{disabled}()) foreach @widgets; $ignore = 0; }; my $get_all = sub { ${$_->{e}{val}} = $_->{get}->() foreach @widgets; }; my $create_widget = sub { my ($e, $ind) = @_; $e->{type} = 'list' if $e->{type} =~ /iconlist/; #- combo doesn't exist, fallback to a sensible default $e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo'; my $changed = sub { return if $ignore; return $old_focus++ if $old_focus == -2; #- handle special first case $get_all->(); #- TODO: this is very rough :( $common->{callbacks}{$old_focus == $ind ? 'changed' : 'focus_out'}->($ind); $set_all->(); $old_focus = $ind; }; my ($w, $real_w, $set, $get, $expand, $size, $invalid_choice, $extra_text); if ($e->{type} eq 'bool') { my $subwidth = $width - $get_label_width->() - 9; my @text = messages($subwidth, $e->{text} || ''); $size = @text; $w = Newt::Component::Checkbox(shift(@text), checkval(${$e->{val}}), " *"); if (@text) { $extra_text = Newt::Component::Textbox(-1, -1, $subwidth, $size - 1, 0); $extra_text->TextboxSetText(join("\n", @text)); } $set = sub { $w->CheckboxSetValue(checkval($_[0])) }; $get = sub { $w->CheckboxGetValue == ord '*' }; } elsif ($e->{type} eq 'button') { $w = Newt::Component::Button(simplify_string(may_apply($e->{format}, ${$e->{val}}))); } elsif ($e->{type} eq 'treelist') { $e->{formatted_list} = [ map { may_apply($e->{format}, $_) } @{$e->{list}} ]; my $data_tree = interactive::helper_separator_tree_to_tree($e->{separator}, $e->{list}, $e->{formatted_list}); my $count; $count = sub { my ($t) = @_; 1 + ($t->{_leaves_} ? int @{$t->{_leaves_}} : 0) + ($t->{_order_} ? sum(map { $count->($t->{$_}) } @{$t->{_order_}}) : 0); }; $size = $count->($data_tree); my $prefered_size = @l == 1 && $height > 30 ? 10 : 5; my $scroll; if ($size > $prefered_size && !$o->{no_individual_scroll}) { $has_scroll = $scroll = 1; $size = $prefered_size; } $w = Newt::Component::Tree($size, $scroll); my $wi; my $add_item = sub { my ($text, $index, $parents) = @_; $text = simplify_string($text, $width - 10); $wi = max($wi, length($text) + 3 * @$parents + 4); $w->TreeAdd($text, $index, $parents); }; my @data = ''; my $populate; $populate = sub { my ($node, $parents) = @_; if (my $l = $node->{_order_}) { each_index { $add_item->($_, 0, $parents); $populate->($node->{$_}, [ @$parents, $::i ]); } @$l; } if (my $l = $node->{_leaves_}) { foreach (@$l) { my ($leaf, $data) = @$_; $add_item->($leaf, int(@data), $parents); push @data, $data; } } }; $populate->($data_tree, []); $w->TreeSetWidth($wi + 1); $get = sub {