diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-17 09:28:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-17 09:28:00 +0000 |
| commit | 755df002ff6e794dd19bbb5d32906bc4305a8c21 (patch) | |
| tree | 6445bc65dac7e0ead5c4d6b6c4a9fc5fb8a7d5e4 | |
| parent | 02d308c52735fdfa9c03563147be562febfc1a3c (diff) | |
| download | drakx-755df002ff6e794dd19bbb5d32906bc4305a8c21.tar drakx-755df002ff6e794dd19bbb5d32906bc4305a8c21.tar.gz drakx-755df002ff6e794dd19bbb5d32906bc4305a8c21.tar.bz2 drakx-755df002ff6e794dd19bbb5d32906bc4305a8c21.tar.xz drakx-755df002ff6e794dd19bbb5d32906bc4305a8c21.zip | |
- advertising: restore support for $title in .pl files (wrongly dropped in 10.4.195)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 8 |
3 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b297cb884..2255a8b28 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- advertising: restore support for $title in .pl files (wrongly dropped in 10.4.195) + Version 10.4.199 - 17 September 2007, by Olivier "blino" Blin - fix loading of tifm_sd module diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 82d7048a5..15e58d428 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -1293,6 +1293,8 @@ sub copy_advertising { foreach (@files) { chomp; install::media::getAndSaveFile_($o->{stage2_phys_medium}, "$source_dir/$_", "$dir/$_"); + (my $pl = $_) =~ s/\.png/.pl/; + install::media::getAndSaveFile_($o->{stage2_phys_medium}, "$source_dir/$pl", "$dir/$pl"); } @advertising_images = map { "$dir/$_" } @files; } diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 3501b7f73..dd3a96d8d 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -484,6 +484,14 @@ sub installPackages { my $f = $install::any::advertising_images[$i++ % @install::any::advertising_images]; log::l("advertising $f"); gtkval_modify(\$advertising_image, $f); + + if (my $banner = $w->{window}{banner}) { + my ($title); + my $pl = $f; $pl =~ s/\.png$/.pl/; + eval(cat_($pl)) if -e $pl; + $banner->{text} = $title; + Gtk2::Banner::set_pixmap($banner); + } }; my $cancel = gtknew('Button', text => N("Cancel"), clicked => sub { $install::pkgs::cancel_install = 1 }); |