diff options
| -rw-r--r-- | perl-install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/themes-marble3d.rc | 16 |
3 files changed, 18 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index bb90b8dce..0b5b3c09c 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -334,12 +334,10 @@ sub formatPartitions { #------------------------------------------------------------------------------ sub choosePackages { - my ($clicked) = $_[0]; - require pkgs; $o->setPackages if $_[1] == 1; $o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1; - if ($clicked || !$o->{isUpgrade}) { + if ($_[1] > 1 || !$o->{isUpgrade}) { $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1); pkgs::unselect($o->{packages}, $o->{packages}{kdesu}) if $o->{packages}{kdesu} && $o->{security} > 3; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 8bfa04dd5..9cd90bc9d 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -499,7 +499,7 @@ sub selectPackagesToUpgrade($$$;$$) { c::headerGetEntry($header, 'version'). '-' . c::headerGetEntry($header, 'release')); if ($toRemove{$otherPackage}) { - if ($otherPackage =~ /^libtermcap/) { + if (c::headerGetEntry($header, 'name') eq 'libtermcap') { delete $toRemove{$otherPackage}; #- keep it selected, but force upgrade. } else { my @files = c::headerGetEntry($header, 'filenames'); diff --git a/perl-install/share/themes-marble3d.rc b/perl-install/share/themes-marble3d.rc index ea9bc22d5..b09e4eba9 100644 --- a/perl-install/share/themes-marble3d.rc +++ b/perl-install/share/themes-marble3d.rc @@ -18,6 +18,22 @@ style "checkradiobutton" { } image { + function = OPTION + recolorable = TRUE + shadow = OUT + overlay_file = "marble3d-check1.png" + overlay_stretch = FALSE + } + image + { + function = OPTION + recolorable = TRUE + shadow = IN + overlay_file = "marble3d-check2.png" + overlay_stretch = FALSE + } + image + { function = FOCUS recolorable = TRUE overlay_file = "focus.png" |