diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-13 17:51:33 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-13 17:51:33 +0000 |
| commit | 21afb921cd71327cae09ec568f11e6f020a93229 (patch) | |
| tree | 0aaa2f80616b0c50ac3999977ea070a09e0100ed | |
| parent | 2a709512915ed65978ec6d28c25f2de87c246cc1 (diff) | |
| download | drakx-backup-do-not-use-21afb921cd71327cae09ec568f11e6f020a93229.tar drakx-backup-do-not-use-21afb921cd71327cae09ec568f11e6f020a93229.tar.gz drakx-backup-do-not-use-21afb921cd71327cae09ec568f11e6f020a93229.tar.bz2 drakx-backup-do-not-use-21afb921cd71327cae09ec568f11e6f020a93229.tar.xz drakx-backup-do-not-use-21afb921cd71327cae09ec568f11e6f020a93229.zip | |
no_comment
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/share/themes-mdk.rc | 13 |
2 files changed, 18 insertions, 3 deletions
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 @@ -62,6 +62,17 @@ style "button" 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 + recolorable = TRUE + state = NORMAL shadow = OUT file = "mdk-button1.png" border = { 7, 7, 7, 7 } @@ -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" |