summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-13 09:35:32 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-13 09:35:32 +0000
commit21f296aacb5ee8f1f2c743679519ad0f0ed62ffd (patch)
tree1b2d7eda84a3a68e6d239da30edbc636689d99d9
parent5af2bf3c9b873b2bef4a241db7716f9c57105195 (diff)
downloaddrakx-21f296aacb5ee8f1f2c743679519ad0f0ed62ffd.tar
drakx-21f296aacb5ee8f1f2c743679519ad0f0ed62ffd.tar.gz
drakx-21f296aacb5ee8f1f2c743679519ad0f0ed62ffd.tar.bz2
drakx-21f296aacb5ee8f1f2c743679519ad0f0ed62ffd.tar.xz
drakx-21f296aacb5ee8f1f2c743679519ad0f0ed62ffd.zip
(new,wait_messageW) do not use Banners anymore in order to render titles at install time
-rw-r--r--perl-install/interactive/gtk.pm2
-rw-r--r--perl-install/ugtk2.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 8a6b80f2e..46b103807 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -840,7 +840,7 @@ sub wait_messageW {
title => $title,
pop_it => defined $o->{pop_wait_messages} ? $o->{pop_wait_messages} : !$::isInstall,
modal => 1,
- $::isInstall ? (banner => Gtk2::Banner->new('empty-banner', $message)) : (),
+ $::isInstall ? my $w = gtknew('Title1', text => $message, widget_name => 'Banner') : (),
no_Window_Manager => exists $o->{no_Window_Manager} ? $o->{no_Window_Manager} : !$::isStandalone,
if__($::main_window, transient_for => $::main_window),
child => gtknew('VBox', padding => 4, border_width => 10, children => [
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index eef2efb81..d7165e98a 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -732,10 +732,10 @@ sub new {
'MagicWindow',
title => $title || '',
pop_it => $o->{pop_it},
- $::isInstall ? (banner => Gtk2::Banner->new($icon, $title || (get_default_step_items()))) : (),
+ $::isInstall ? (banner => gtknew('Title1', text => $title || get_default_step_items(), widget_name => 'Banner')) : (),
$::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (),
width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height},
- modal => !(!$o->{pop_it} && $::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal},
+ modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal},
no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone,
if_(!$::isInstall, icon_no_error => wm_icon()),
if_($o->{transient}, transient_for => $o->{transient}),