no_comment

12 files changed, 77 insertions, 30 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 1d4a90aa1..905a282b4 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,40 @@
+2000-09-28  Pixel  <pixel@mandrakesoft.com>
+
+	* install_interactive.pm (partitionWizardSolutions): fix the limit
+	cases for lnx4win	
+
+	* share/po/Makefile ($(PMSCFILES)): fix the DrakX.pot generation	
+
+2000-09-27  Pixel  <pixel@mandrakesoft.com>
+
+	* install_steps_interactive.pm (choosePackages): set $size2install
+	to $availableC in desktop install, as it should be
+
+	* install2.pm (choosePackages): remove the code for removing kdesu
+	in high security...
+
+	* install_steps_interactive.pm (createBootdisk): format more
+	nicely the text
+
+	* install_steps_gtk.pm (installPackages): add 10 seconds to have a
+	better estimation
+
+	* install_steps_interactive.pm (chooseGroups): now returns a boolean
+	(choosePackages): use chooseGroups return value to redo
+	choosePackages	
+
+	* install_steps_gtk.pm (selectMouse): if mouse type is none, then
+	don't test!
+
+	* Xconfigurator.pm (monitorConfiguration): rename Unlisted to Custom
+
+	* various: replace all Rescue by Update
+
+	* pkgs.pm (readCompssUsers): read description for groups
+	
+	* install_steps_interactive.pm (chooseGroups): add description for
+	groups	
+
 2000-09-27  Guillaume Cottenceau  <gc@mandrakesoft.com>
 
 	* share/compssUsers.desktop: added description
@@ -9,6 +46,10 @@
 
 	* share/compssUsers: reordered, renamed
 
+2000-09-27  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
 2000-09-27  Pixel  <pixel@mandrakesoft.com>
 
 	* install_steps_interactive.pm (selectLanguage): intregrate
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 418360946..84e5f7867 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -351,8 +351,8 @@ sub monitorConfiguration(;$$) {
 
     readMonitorsDB("/usr/X11R6/lib/X11/MonitorsDB");
 
-    add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], 'Generic|' . translate($default_monitor)) }) unless $monitor->{type};
-    if ($monitor->{type} eq 'Unlisted') {
+    add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Custom', keys %monitors], 'Generic|' . translate($default_monitor)) }) unless $monitor->{type};
+    if ($monitor->{type} eq 'Custom') {
 	$in->ask_from_entries_ref('',
 _("The two critical parameters are the vertical refresh rate, which is the rate
 at which the whole screen is refreshed, and most importantly the horizontal
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e3b70cfff..4c9360d8e 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -184,7 +184,7 @@ sub matching_desc {
     grep { $_->{description} =~ /$regexp/i } probeall();
 }
 sub stringlist { 
-    map { " $_->{description} ($_->{type} $_->{driver})" } probeall(1); 
+    map { " $_->{description} ($_->{type} $_->{driver})" . ($_->{subid} ? sprintf(" SubVendor=0x%04x SubDevice=0x%04x", $_->{subvendor}, $_->{subid}) : '') } probeall(1); 
 }
 sub check {
     my ($l) = @_;
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 4d36caafc..f2af7d9c0 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -31,10 +31,10 @@ selectInstallClass =>
 installed or if you wish to use several operating systems.
 
 
-Please choose \"Rescue\" if you wish to rescue an already installed version of Linux-Mandrake.
+Please choose \"Update\" if you wish to update an already installed version of Linux-Mandrake.
 
 
-Depend of your knowledge in GNU/Linux, you can choose one of the following levels to install or rescue your
+Depend of your knowledge in GNU/Linux, you can choose one of the following levels to install or update your
 Linux-Mandrake operating system:
 
 	* Recommanded: if you have never installed a GNU/Linux operating system choose this. Installation will be
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 015d1bc37..5e6340f3f 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -316,8 +316,6 @@ sub choosePackages {
     }
 
     $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $_[1] == 1);
-    my $pkg = pkgs::packageByName($o->{packages}, 'kdesu');
-    pkgs::unselectPackage($o->{packages}, $pkg) if $pkg && $o->{security} > 3;
 
     #- check pre-condition where base backage has to be selected.
     pkgs::packageFlagSelected(pkgs::packageByName($o->{packages}, 'basesystem')) or die "basesystem package not selected";
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2b5703711..3331c9e6e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -303,7 +303,7 @@ sub setPackages($) {
 	$o->{compss} = pkgs::readCompss($o->{prefix}, $o->{packages});
 	#- must be done after getProvides
 	$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, lang::get_langs());
-	($o->{compssUsers}, $o->{compssUsersSorted}, $o->{compssUsersIcons}) = 
+	($o->{compssUsers}, $o->{compssUsersSorted}, $o->{compssUsersIcons}, $o->{compssUsersDescr}) = 
 	  pkgs::readCompssUsers($o->{packages}, $o->{compss}, $o->{meta_class});
 
 	my @l = ();
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index da5939c34..b59e50ebd 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -82,15 +82,16 @@ sub partitionWizardSolutions {
 
     my @fats = grep { isFat($_) } @$fstab;
     fs::df($_) foreach @fats;
-    if (my @ok_forloopback = sort { $b->{free} <=> $a->{free} } grep { $_->{free} > $min_linux + $min_freewin } @fats) {
+    if (my @ok_forloopback = sort { $b->{free} <=> $a->{free} } grep { $_->{free} > $min_linux + $min_swap + $min_freewin } @fats) {
 	$solutions{loopback} = 
 	  [ -10 - @fats, _("Use the Windows partition for loopback"), 
 	    sub { 
 		my ($s_root, $s_swap);
-		my $part = $o->ask_from_listf('', _("Which partition do you want to use to put Linux4Win?"), \&partition_table_raw::description, \@ok_forloopback) or return;
+		my $part = $o->ask_from_listf('', _("Which partition do you want to use for Linux4Win?"), \&partition_table_raw::description, \@ok_forloopback) or return;
+		$max_swap = $min_swap + 1 if $part->{free} - $max_swap < $min_linux;
 		$o->ask_from_entries_refH('', _("Choose the sizes"), [ 
-		   _("Root partition size in MB: ") => { val => \$s_root, min => 1 + ($min_linux >> 11), max => min($part->{free} - $max_swap - $min_freewin, $max_linux) >> 11, type => 'range' },
-		   _("Swap partition size in MB: ") => { val => \$s_swap, min => 1 + ($min_swap >> 11),  max => $max_swap >> 11, type => 'range' },
+		   _("Root partition size in MB: ") => { val => \$s_root, min => $min_linux >> 11, max => min($part->{free} - $max_swap, $max_linux) >> 11, type => 'range' },
+		   _("Swap partition size in MB: ") => { val => \$s_swap, min => $min_swap >> 11,  max => $max_swap >> 11, type => 'range' },
 		]) or return;
 		push @{$part->{loopback}}, 
 		  { type => 0x83, loopback_file => '/lnx4win/linuxsys.img', mntpoint => '/',    size => $s_root << 11, device => $part, notFormatted => 1 },
@@ -108,7 +109,7 @@ sub partitionWizardSolutions {
 		$@ and die _("The FAT resizer is unable to handle your partition, 
 the following error occured: %s", $@);
 		my $min_win = $resize_fat->min_size;
-		$part->{size} > $min_linux + $min_freewin + $min_win or die _("Your Windows partition is too fragmented, please run ``defrag'' first");
+		$part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die _("Your Windows partition is too fragmented, please run ``defrag'' first");
 		$o->ask_okcancel('', _("WARNING!
 
 DrakX will now resize your Windows partition. Be careful: this operation is
@@ -119,7 +120,7 @@ When sure, press Ok.")) or return;
 
 		my $size = $part->{size};
 		$o->ask_from_entries_refH('', _("Which size do you want to keep for windows on"), [
-                   _("partition %s", partition_table_raw::description($part)) => { val => \$size, min => 1 + ($min_win >> 11), max => ($part->{size} - $min_linux) >> 11, type => 'range' },
+                   _("partition %s", partition_table_raw::description($part)) => { val => \$size, min => $min_win >> 11, max => ($part->{size} - $min_linux - $min_swap) >> 11, type => 'range' },
                 ]) or return;
 		$size <<= 11;
 
@@ -140,7 +141,8 @@ When sure, press Ok.")) or return;
 		1;
 	    } ] if !$readonly;
     } else {
-	push @wizlog, _("There is no FAT partitions to resize or to use as loopback (or not enough space left)");
+	push @wizlog, _("There is no FAT partitions to resize or to use as loopback (or not enough space left)") .
+	  @fats ? "\nFAT partitions:" . join('', map { "\n  $_->{device} $_->{free} (" . ($min_linux + $min_swap + $min_freewin) . ")" } @fats) : '';
     }
 
     if (@$fstab && !$readonly) {
@@ -197,6 +199,7 @@ sub partitionWizard {
     log::l("solutions found: " . join('', map {$_->[1]} @sol) . " (all solutions found: " . join('', map {$_->[1]} @solutions) . ")");
 
     @solutions = @sol if @sol > 1;
+    @solutions or $o->ask_warn('', _("I can't find any room for installing")), die 'already displayed';
 
     my $ok; while (!$ok) {
 	my $sol = $o->ask_from_listf('', _("The DrakX Partitioning wizard found the following solutions:"), sub { $_->[1] }, \@solutions) or redo;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 1281e3a47..2ea992470 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -172,8 +172,9 @@ sub selectMouse {
     my %old = %{$o->{mouse}};
     $o->SUPER::selectMouse($force);
     my $mouse = $o->{mouse};
-    $old{type} eq $mouse->{type} && 
-      $old{name} eq $mouse->{name} &&
+    $mouse->{type} eq 'none' ||
+      $old{type}   eq $mouse->{type}   && 
+      $old{name}   eq $mouse->{name}   &&
       $old{device} eq $mouse->{device} && !$force and return;
 
     local $my_gtk::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere
@@ -510,8 +511,8 @@ sub installPackages {
 
 	    $progress_total->update($ratio);
 	    if ($dtime != $last_dtime && $current_total_size > 10 * 1024 * 1024) {
-		$msg_time_total->set(formatTime(10 * round($total_time / 10)));
-		$msg_time_remaining->set(formatTime(10 * round(max($total_time - $dtime, 0) / 10)));
+		$msg_time_total->set(formatTime(10 * round($total_time / 10) + 10));
+		$msg_time_remaining->set(formatTime(10 * round(max($total_time - $dtime, 0) / 10) + 10));
 		$last_dtime = $dtime;
 	    }
 	    $w->flush;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6af11f58b..b39c09e2e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -201,7 +201,7 @@ sub selectInstallClass1 {
     my ($o, $verif, $l, $def, $l2, $def2) = @_;
     $verif->($o->ask_from_list(_("Install Class"), _("Which installation class do you want?"), $l, $def));
 
-    $::live ? 'Rescue' : $o->ask_from_list_(_("Install/Rescue"), _("Is this an install or a rescue?"), $l2, $def2);
+    $::live ? 'Update' : $o->ask_from_list_(_("Install/Update"), _("Is this an install or an update?"), $l2, $def2);
 }
 
 #------------------------------------------------------------------------------
@@ -234,7 +234,7 @@ are you ready to answer that kind of questions?"),
 
     $o->{isUpgrade} = $o->selectInstallClass1($verifInstallClass,
 					      first(list2kv(@c)), ${{reverse %c}}{$::beginner ? "beginner" : $::expert ? "expert" : "specific"},
-					      [ __("Install"), __("Rescue") ], $o->{isUpgrade} ? "Rescue" : "Install") eq "Rescue";
+					      [ __("Install"), __("Update") ], $o->{isUpgrade} ? "Update" : "Install") eq "Update";
 
     if ($::corporate || $::beginner) {
 	delete $o->{installClass};
@@ -489,7 +489,8 @@ sub choosePackages {
 	    }
 	});
 	if (!$size2install) { #- special case for desktop
-	    $o->chooseGroups($packages, $compssUsers);
+	    $o->chooseGroups($packages, $compssUsers) or goto &choosePackages;
+	    $size2install = $availableC;
 	}
 	($o->{packages_}{ind}) =
 	  pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass});
@@ -519,13 +520,14 @@ sub chooseGroups {
     my $all;
     $o->ask_many_from_list('', _("Package Group Selection"),
 			   { list => \@groups, 
+			     help => sub { $o->{compssUsersDescr}{$_} },
 			     ref => sub { \$o->{compssUsersChoice}{$_} },
 			     icon2f => sub { "/usr/share/icons/" . ($o->{compssUsersIcons}{$_} || 'default') . "_section.xpm" },
 			     label => sub { $size{$_} ? sprintf "$_ (%d%s)", round_down($size{$_} / sqr(1024), 10), _("MB") : translate($_) }, 
 			   },
 			   $o->{meta_class} eq 'desktop' ? { list => [ _("All") ], ref => sub { \$all }, shadow => 0 } : (),
 			   $individual ? { list => [ _("Individual package selection") ], ref => sub { $individual } } : (),
-			  ) or goto &chooseGroups;
+			  ) or return;
     if ($all) {
 	$o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, "Miscellaneous";
     }
@@ -543,6 +545,7 @@ sub chooseGroups {
 	    pkgs::packageSetFlagSkip($_, 0);
 	}
     }
+    1;
 }
 
 sub chooseCD {
@@ -876,13 +879,13 @@ drive and press \"Ok\"."),
 		 );
 
 	if ($first_time || @l == 1) {
-	    $o->ask_yesorno('',
+	    $o->ask_yesorno('', formatAlaTeX(
 			    _("A custom bootdisk provides a way of booting into your Linux system without
 depending on the normal bootloader. This is useful if you don't want to install
 LILO (or grub) on your system, or another operating system removes LILO, or LILO doesn't
 work with your hardware configuration. A custom bootdisk can also be used with
 the Mandrake rescue image, making it much easier to recover from severe system
-failures. Would you like to create a bootdisk for your system?"), 
+failures. Would you like to create a bootdisk for your system?")), 
 			    $o->{mkbootdisk}) or return $o->{mkbootdisk} = '';
 	    $o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
 	} else {
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index e78eb2e8a..1de89e42a 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -257,7 +257,7 @@ sub ask_from_entries_ref($$$$;$%) {
 		add2hash_($_, { not_edit => 1, type => 'list' });
 		${$_->{val}} = $_->{list}[0] if $_->{not_edit} && !member(${$_->{val}}, @{$_->{list}});
 	    } elsif ($_->{type} eq 'range') {
-		$_->{min} <= $_->{max} or die "bad range (called from " . caller() . ")";
+		$_->{min} <= $_->{max} or die "bad range min $_->{min} > max $_->{max} (called from " . join(':', caller()) . ")";
 		${$_->{val}} = max($_->{min}, min(${$_->{val}}, $_->{max}));
 	    }
 	    $_;
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 3f74bc618..bed4eb581 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -191,7 +191,7 @@ sub keyboard2kmap { $keyboards{$_[0]} && $keyboards{$_[0]}[1] }
 sub keyboard2xkb  { $keyboards{$_[0]} && $keyboards{$_[0]}[2] }
 
 sub loadkeys_files {
-    my $archkbd = arch() =~ /^sparc/ ? "sun" : arch() =~ /^i\d/ ? "i386" : arch();
+    my $archkbd = arch() =~ /^sparc/ ? "sun" : arch() =~ /i.86/ ? "i386" : arch();
     my $p = "/usr/lib/kbd/keymaps/$archkbd";
     my $post = ".kmap.gz";
     my %trans = ("cz-latin2" => "cz-lat2");
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index d0d4954da..846f4330e 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -664,7 +664,7 @@ sub readCompssList {
 
 sub readCompssUsers {
     my ($packages, $compss, $meta_class) = @_;
-    my (%compssUsers, %compssUsersIcons, @sorted, $l);
+    my (%compssUsers, %compssUsersIcons, , %compssUsersDescr, @sorted, $l);
     my (%compss); 
     foreach (@$compss) {
 	local ($_, $a) = m|(.*)/(.*)|;
@@ -683,7 +683,8 @@ sub readCompssUsers {
 
 	if (/^(\S.*)/) {
 	    &$map;
-	    /^(.*?)\s*\[icon=(.*?)\]/ and $_ = $1, $compssUsersIcons{$_} = $2;
+	    /^(.*?)\s*\[icon=(.*?)\]/  and $_ = $1, $compssUsersIcons{$_} = $2;
+	    /^(.*?)\s*\[descr=(.*?)\]/ and $_ = $1, $compssUsersDescr{$_} = $2;
 	    push @sorted, $_;
 	    $compssUsers{$_} = $l = [];
 	} elsif (/\s+\+(\S+)/) {
@@ -693,7 +694,7 @@ sub readCompssUsers {
 	}
     }
     &$map;
-    \%compssUsers, \@sorted, \%compssUsersIcons;
+    \%compssUsers, \@sorted, \%compssUsersIcons, \%compssUsersDescr;
 }
 
 sub setSelectedFromCompssList {