diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-08-04 06:01:44 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-08-04 06:01:44 +0000 |
| commit | 526968b04a707d63a1c85f66c376b154d2b9d468 (patch) | |
| tree | 7bbdd8eddb8436691613375c06f46282ee15565d | |
| parent | 3d4d6cc90e1d7b3c0dfa0f8f52d2985afa979ee5 (diff) | |
| download | drakx-526968b04a707d63a1c85f66c376b154d2b9d468.tar drakx-526968b04a707d63a1c85f66c376b154d2b9d468.tar.gz drakx-526968b04a707d63a1c85f66c376b154d2b9d468.tar.bz2 drakx-526968b04a707d63a1c85f66c376b154d2b9d468.tar.xz drakx-526968b04a707d63a1c85f66c376b154d2b9d468.zip | |
directly use # as color prefix
| -rw-r--r-- | perl-install/bootsplash.pm | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/draksplash | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/bootsplash.pm b/perl-install/bootsplash.pm index 8968f6e45..88da2b058 100644 --- a/perl-install/bootsplash.pm +++ b/perl-install/bootsplash.pm @@ -126,7 +126,6 @@ sub theme_write_config_for_resolution { my ($tb_x1, $tb_x2, $tb_y1, $tb_y2) = ($conf->{tx}, $conf->{tx} + $conf->{tw}, $conf->{ty}, $conf->{ty} + $conf->{th}); my ($ti_x1, $ti_x2, $ti_y1, $ti_y2) = ($tb_x1 + 1, $tb_x2 - 1, $tb_y1 + 1, $tb_y2 - 1); my $pc = $conf->{pc}; - $pc =~ s/^0x/#/; output($config, qq(# This is the configuration file for the $res bootsplash picture diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash index 2cec8f307..a84756e7c 100755 --- a/perl-install/standalone/draksplash +++ b/perl-install/standalone/draksplash @@ -102,7 +102,7 @@ sub read_theme_config() { if (-f $theme{conf}{jpeg}) { load_image($theme{conf}{jpeg}, 1, 1); } - $theme{conf}{pc} ||= '0x21459d'; + $theme{conf}{pc} ||= '#21459d'; update_scale_values_from_conf(); update_rect(); } @@ -173,12 +173,12 @@ sub choose_image { sub choose_color() { my $color = gtkshow(Gtk2::ColorSelectionDialog->new(N("ProgressBar color selection"))); - my @rgb = $theme{conf}{pc} =~ m/0x(.{2})(.{2})(.{2})/ && map { hex($_)/255 } ($1, $2, $3); + my @rgb = $theme{conf}{pc} =~ m/#(.{2})(.{2})(.{2})/ && map { hex($_)/255 } ($1, $2, $3); $color->colorsel->set_current_color(gtkcolor(@rgb)); $color->cancel_button->signal_connect(clicked => sub { $color->destroy }); $color->ok_button->signal_connect(clicked => sub { my $colour = $color->colorsel->get_current_color; - $theme{conf}{pc} = "0x" . join('', map { sprintf("%x", $_/255) } $colour->red, $colour->green, $colour->blue); + $theme{conf}{pc} = "#" . join('', map { sprintf("%x", $_/255) } $colour->red, $colour->green, $colour->blue); $color->destroy; }); } |