diff options
| -rw-r--r-- | perl-install/Xconfigurator.pm | 5 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 1 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 15 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 1 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 7 |
6 files changed, 16 insertions, 15 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 69d08a5d2..5ec9400eb 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -332,9 +332,8 @@ sub testFinalConfig($;$$) { open STDERR, ">$f_err"; chroot $prefix if $prefix; exec $o->{card}{prog}, - ($o->{card}{prog} !~ /Xsun/ ? ("-xf86config", ($::testing ? $tmpconfig : $f) . ($::xf4 && $o->{card}{driver} && "-4")) : - ())), - ":9" or c::_exit(0); + ($o->{card}{prog} !~ /Xsun/ ? ("-xf86config", ($::testing ? $tmpconfig : $f) . ($::xf4 && $o->{card}{driver} && "-4")) : ()), + ":9" or c::_exit(0); } do { sleep 1 } until c::Xtest(":9") || waitpid($pid, c::WNOHANG()); diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 5045387f3..6cf4bd17b 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -40,6 +40,7 @@ my @suggestions_mntpoints = qw(/mnt/windows); my @partitions_signatures = ( [ 0x83, 0x438, "\x53\xEF" ], + [ 0x183, 0x10034, "ReIsErFs" ], [ 0x82, 4086, "SWAP-SPACE" ], [ 0x7, 0x1FE, "\x55\xAA", 0x3, "NTFS" ], [ 0xc, 0x1FE, "\x55\xAA", 0x52, "FAT32" ], diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 12fb6e877..e92035880 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -348,7 +348,7 @@ sub choosePackages { if ($_[1] > 1 || !$o->{isUpgrade} || $::expert) { if ($_[1] == 1) { $o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous'; - $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better +# $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better } $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1); diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 13d83a316..a96f9b151 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -409,14 +409,14 @@ sub choosePackagesTree { gtkadd(gtkset_usize(new Gtk::Frame(_("Info")), 150, 0), createScrolledWindow($info_widget = new Gtk::Text), )), - 0, my $l = new Gtk::HBox(0,0), + 0, my $l = new Gtk::HBox(0,15), 0, gtkpack(new Gtk::HBox(0,10), $go = gtksignal_connect(new Gtk::Button(_("Install")), "clicked" => sub { $w->{retval} = 1; Gtk->main_quit }), ) )); - gtkpack__($l, $w_size = new Gtk::Label('')); - $l->pack_end(my $toolbar = new Gtk::Toolbar('horizontal', 'icons'), 0, 1, 0); - $l->pack_end(gtksignal_connect(new Gtk::CheckButton(_("Automatic dependencies")), clicked => sub { invbool \$auto_deps }), 0, 1, 0); + gtkpack__($l, my $toolbar = new Gtk::Toolbar('horizontal', 'icons')); + gtkpack__($l, gtksignal_connect(new Gtk::CheckButton(_("Automatic dependencies")), clicked => sub { invbool \$auto_deps })); + $l->pack_end($w_size = new Gtk::Label(''), 0, 1, 20); $w->{window}->set_usize(map { $_ - 2 * $my_gtk::border - 4 } $::windowwidth, $::windowheight); $go->grab_focus; @@ -552,12 +552,11 @@ sub installPackages { my ($current_total_size, $last_size, $nb, $total_size, $start_time, $last_dtime, $trans_progress_total); my $w = my_gtk->new(_("Installing"), grab => 1); - $w->{window}->set_usize($::windowwidth * 0.8, 280); + $w->{window}->set_usize($::windowwidth * 0.8, 260); my $text = new Gtk::Label; my ($msg, $msg_time_remaining, $msg_time_total) = map { new Gtk::Label($_) } '', (_("Estimating")) x 2; my ($progress, $progress_total) = map { new Gtk::ProgressBar } (1..2); - gtkadd($w->{window}, gtkadd(new Gtk::EventBox, - gtkpack(new Gtk::VBox(0,10), + gtkadd($w->{window}, gtkpack(new Gtk::VBox(0,10), _("Please wait, "), $msg, $progress, create_packtable({}, [_("Time remaining "), $msg_time_remaining], @@ -569,7 +568,7 @@ sub installPackages { gtkadd(create_hbox(), gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { $pkgs::cancel_install = 1 })), - ))); + )); $msg->set(_("Preparing installation")); $w->sync; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1a76e2972..5304ea647 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -308,6 +308,7 @@ sub choosePackagesTree {} sub chooseGroups { my ($o, $packages, $compssUsers, $compssUsersSorted) = @_; + add2hash_($o->{compssUsersChoice}, { Individual => $::expert }); $o->ask_many_from_list_ref('', _("Package Group Selection"), [ @$compssUsersSorted, _("Miscellaneous"), _("Individual package selection") ], diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index e4c2579e1..04813bd8c 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -34,6 +34,7 @@ use c; -20 => __("i18n (very nice)"), #- every beginner/custom install in the corresponding lang have theses packages -30 => __("i18n (nice)"), ); +#- HACK: rating += 50 for some packages (like kapm, cf install_any::setPackages) #- HACK: rating += 10 if the group is selected and it is not a kde package (aka name !~ /^k/) @@ -494,11 +495,11 @@ sub setSelectedFromCompssList { #- determine the packages that will be selected when #- selecting $p. the packages are not selected. my %newSelection; - selectPackage($packages, $p, \%newSelection); + selectPackage($packages, $p, 0, \%newSelection); #- this enable an incremental total size. - foreach (values %newSelection) { - $nb += packageSize($_); + foreach (grep { $newSelection{$_} } keys %newSelection) { + $nb += packageSize($packages->[0]{$_}); } if ($max_size && $nb > $max_size) { $min_level = $p->{values}[$ind]; |