From a098b07c6f1e330df9e098cbea8237e1f9b4abd4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 19 Apr 2000 23:25:14 +0000
Subject: no_comment

---
 perl-install/install_steps.pm     | 3 ++-
 perl-install/install_steps_gtk.pm | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index dddc0e1bd..60cee8995 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -787,7 +787,8 @@ sub setupXfreeAfter {
 	    Xconfigurator::rewriteInittab(3) unless $::testing; #- disable automatic start-up of X11 on error.
 	}
     }
-    if ($o->{X}{card}{default_depth} >= 16 && $o->{X}{card}{default_wres} >= 1024) {
+    log::l("large icon? $o->{X}{default_depth} >= 16 && $o->{X}{card}{default_wres} >= 1024");
+    if ($o->{X}{default_depth} >= 16 && $o->{X}{card}{default_wres} >= 1024) {
 	log::l("setting large icon style for kde");
 	install_any::kderc_largedisplay($o->{prefix});
     }
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index f5842856c..1b25eb969 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -301,7 +301,7 @@ sub chooseSizeToInstall {
     my $percentage = int 100 * $max_size / $max_size_;
 
     #- don't ask anything if the difference between min and max is too small
-    return $max_size if $min_size && $max_size / $min_size < 1.01;
+    return $max_size if $min_size && $max_size / $min_size < 1.05;
 
     log::l("choosing size to install between $min_size and $max_size");
     my $w = my_gtk->new('');
@@ -326,7 +326,7 @@ A low percentage will install only the most important packages;
 a percentage of %d%% will install as many packages as possible.", $percentage, $percentage))
 . ($individual ? "\n\n" . _("You will be able to choose them more specifically in the next step.") : ''),
 		 create_packtable({},
-				  [ _("Percentage of packages to install") . '  ', $spin, "%", my $mb = new Gtk::Label('xxxx MB') ],
+				  [ _("Percentage of packages to install") . '  ', $spin, "%", my $mb = new Gtk::Label ],
 				  [ undef, new Gtk::HScrollbar($adj) ],
 			       ),
 		 create_okcancel($w)
@@ -334,6 +334,7 @@ a percentage of %d%% will install as many packages as possible.", $percentage, $
 	 );
     $spin->signal_connect(changed => my $changed = sub { 
 	$val = $spin->get_value_as_int / 100 * $max_size;
+	log::l("val $val ", pkgs::correctSize($val / sqr(1024)));
 	$mb->set(sprintf("(%dMB)", pkgs::correctSize($val / sqr(1024)))); 
     }); &$changed();
     $spin->signal_connect(activate => sub { $w->{retval} = 1; Gtk->main_quit });
-- 
cgit v1.2.1