summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-08-04 06:10:18 +0000
committerOlivier Blin <oblin@mandriva.org>2005-08-04 06:10:18 +0000
commitc61aba8530f966055caef64322fa1ee5e1591c5a (patch)
tree71d4f700f926fc0f3e1fb0bbf32e7e963cda7fb2
parent526968b04a707d63a1c85f66c376b154d2b9d468 (diff)
downloaddrakx-c61aba8530f966055caef64322fa1ee5e1591c5a.tar
drakx-c61aba8530f966055caef64322fa1ee5e1591c5a.tar.gz
drakx-c61aba8530f966055caef64322fa1ee5e1591c5a.tar.bz2
drakx-c61aba8530f966055caef64322fa1ee5e1591c5a.tar.xz
drakx-c61aba8530f966055caef64322fa1ee5e1591c5a.zip
load progress bar color from config file
-rw-r--r--perl-install/bootsplash.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/bootsplash.pm b/perl-install/bootsplash.pm
index 88da2b058..72168f5f2 100644
--- a/perl-install/bootsplash.pm
+++ b/perl-install/bootsplash.pm
@@ -109,8 +109,10 @@ sub theme_set_image_for_resolution {
sub theme_read_config_for_resolution {
my ($theme, $res) = @_;
my $file = theme_get_config_for_resolution($theme, $res);
- my ($pb_x1, $pb_y1, $pb_x2, $pb_y2) = cat_($file) =~ /^box silent noover (\d+) (\d+) (\d+) (\d+)/m;
- { px => $pb_x1, pw => $pb_x2 - $pb_x1, py => $pb_y1, ph => $pb_y2 - $pb_y1, getVarsFromSh($file) };
+ my $contents = cat_($file);
+ my ($pb_x1, $pb_y1, $pb_x2, $pb_y2) = $contents =~ /^box\s+silent\s+noover\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/m;
+ my ($pc) = $contents =~ /^box\s+silent\s+inter\s+\d+\s+\d+\s+\d+\s+\d+\s+(#\w+)/m;
+ { pc => $pc, px => $pb_x1, pw => $pb_x2 - $pb_x1, py => $pb_y1, ph => $pb_y2 - $pb_y1, getVarsFromSh($file) };
}
sub theme_write_config_for_resolution {