From 21afb921cd71327cae09ec568f11e6f020a93229 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 13 Apr 2000 17:51:33 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm |  8 ++++++--
 perl-install/share/themes-mdk.rc          | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 770758d2a..d62253590 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -285,7 +285,11 @@ sub choosePackages {
 
 	$o->chooseGroups($packages, $compssUsers, $compssUsersSorted);
 
-	my $max_size = int (sum map { pkgs::packageSize($_) } values %{$packages->[0]});
+	my $min_mark = 1;
+
+	my $ind = $o->{compssListLevels}{$o->{install_class}};
+	my $max_size = int (sum map { pkgs::packageSize($_) } 
+			        grep { $_->{values}[$ind] >= $min_mark } values %{$packages->[0]});
 
 	 if (!$::beginner && $max_size > $available) {
 	     $o->ask_okcancel('', 
@@ -296,7 +300,7 @@ You can go on anyway, but be warned that you won't get all packages", $max_size
 	 my $size2install = $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
 
 	 ($o->{packages_}{ind}) = 
-	   pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, $size2install, $o->{installClass});
+	   pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass});
     }
     $o->choosePackagesTree($packages, $compss) if $o->{compssUsersChoice}{Individual} || $::expert && $o->{isUpgrade};
 }
diff --git a/perl-install/share/themes-mdk.rc b/perl-install/share/themes-mdk.rc
index 3f45770bb..020b6389c 100644
--- a/perl-install/share/themes-mdk.rc
+++ b/perl-install/share/themes-mdk.rc
@@ -57,6 +57,17 @@ style "button"
 	overlay_border  = { 4, 4, 4, 4 }
 	overlay_stretch = TRUE
       }
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = NORMAL
+	detail          = "buttondefault"
+	shadow          = IN
+	file            = "blueHeart-button_def.png"
+	border          = { 9, 9, 9, 9 }
+	stretch         = TRUE
+      }
     image 
       {
         function        = BOX
@@ -185,7 +196,7 @@ widget_class "*GtkEntry*" style "entry"
 widget_class "*Gtk*List*" style "entry"
 widget_class "*GtkCTree*" style "entry"
 widget_class "*GtkNotebook*" style "notebook"
-widget "*GtkButton*" style "button"
+widget "*GtkButton" style "button"
 widget "*background*" style "background"
 widget "*Steps*" style "steps"
 
-- 
cgit v1.2.1