From 08bc82916cc01cd8dbd4b551748207c906fb4e09 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Aug 2008 13:49:54 +0000 Subject: (_gtk__Install_Title) factorize installer titles creation --- perl-install/interactive/gtk.pm | 2 +- perl-install/mygtk2.pm | 6 ++++++ perl-install/ugtk2.pm | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index bb2013ed4..94e941448 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 => gtknew('Title2', text => $message, widget_name => 'Banner')) : (), + $::isInstall ? (banner => gtknew('Install_Title', text => $message)) : (), no_Window_Manager => exists $o->{no_Window_Manager} ? $o->{no_Window_Manager} : !$::isStandalone, child => gtknew('VBox', padding => 4, border_width => 10, children => [ 1, $to_modify, diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index 184dc1312..dc45a4a82 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -385,6 +385,12 @@ sub title1_to_markup { : '' . $label . ''; } +sub _gtk__Install_Title { + my ($w, $opts) = @_; + $opts->{widget_name} = 'Banner'; + _gtk__Title2($w, $opts); +} + sub _gtk__Title1 { my ($w, $opts) = @_; $opts ||= {}; diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 39e0e5658..3c7dbc2ba 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -735,7 +735,7 @@ sub new { 'MagicWindow', title => $title || '', pop_it => $o->{pop_it}, - $::isInstall ? (banner => gtknew('Title2', text => $title || get_default_step_items(), widget_name => 'Banner')) : (), + $::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (), $::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}, -- cgit v1.2.1