From 3e0d8ba724bd6f97a85d5960be6a864be5cd04d1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 24 Jul 2008 17:33:36 +0000
Subject: stop set icons for banners

---
 perl-install/install/steps_gtk.pm         | 6 +++---
 perl-install/install/steps_interactive.pm | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index a7807e036..140257649 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -257,7 +257,7 @@ sub reallyChooseDesktop {
 sub reallyChooseGroups {
     my ($o, $size_to_display, $individual, $_compssUsers) = @_;
 
-    my $w = ugtk2->new(N("Package Group Selection"), icon => 'banner-sys');
+    my $w = ugtk2->new(N("Package Group Selection"));
     my $w_size = gtknew('Label', text => &$size_to_display);
 
     my $entry = sub {
@@ -474,7 +474,7 @@ sub installPackages {
     my ($current_total_size, $last_size, $nb, $total_size, $last_dtime, $_trans_progress_total);
 
     local $::noborderWhenEmbedded = 1;
-    my $w = ugtk2->new(N("Installing"), icon => 'banner-sys');
+    my $w = ugtk2->new(N("Installing"));
     state $show_advertising;
 
     my $pkg_log_widget = gtknew('TextView', editable => 0);
@@ -589,7 +589,7 @@ sub installPackages {
 sub summary_prompt {
     my ($o, $l, $check_complete) = @_;
 
-    my $w = ugtk2->new(N("Summary"), icon => 'banner-summary');
+    my $w = ugtk2->new(N("Summary"));
 
     my $set_entry_labels;
     my (@table, @widget_list);
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 073fd1d6b..329765161 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -93,7 +93,6 @@ sub selectKeyboard {
 	my $ext_keyboard = my $KEYBOARD = $o->{keyboard}{KEYBOARD};
 	$o->ask_from_(
 		      { title => N("Keyboard"), 
-			icon => 'banner-languages',
 			messages => N("Please choose your keyboard layout."),
 			interactive_help_id => 'selectKeyboard',
 			advanced_messages => N("Here is the full list of available keyboards"),
@@ -743,7 +742,7 @@ sub installUpdates {
 	return;
     }
 
-    $o->ask_yesorno_({ title => N("Updates"), icon => 'banner-update', messages => formatAlaTeX(
+    $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
 N("You now have the opportunity to download updated packages. These packages
 have been updated after the distribution was released. They may
 contain security or bug fixes.
@@ -851,7 +850,6 @@ sub summary {
     push @l, {
 	group => N("System"),
 	label => N("Timezone"),
-	banner_icon => 'banner-languages',
 	val => sub { $o->{timezone}{timezone} },
 	clicked => sub { $timezone_manually_set = $o->configureTimezone(1) || $timezone_manually_set },
     };
@@ -899,7 +897,6 @@ sub summary {
     push @l, {
 	group => N("System"),
 	label => N("Services"),
-	banner_icon => 'banner-generic-ad',
 	val => sub {
 	    require services;
 	    my ($l, $activated) = services::services();
@@ -921,7 +918,6 @@ sub summary {
     push @l, {
 	group => N("Hardware"),
 	label => N("Mouse"),
-	banner_icon => 'banner-bootL',
 	val => sub { translate($o->{mouse}{type}) . ' ' . translate($o->{mouse}{name}) },
 	clicked => sub { selectMouse($o, 1); mouse::write($o->do_pkgs, $o->{mouse}) },
     };
@@ -935,7 +931,6 @@ sub summary {
 	push @l, {
 	    group => N("Hardware"),
 	    label => N("Sound card"),
-	    banner_icon => 'banner-generic-ad',
 	    val => sub { 
 		$device->{driver} && modules::module2description($device->{driver}) || $device->{description};
 	    },
@@ -968,7 +963,6 @@ sub summary {
     push @l, {
 	group => N("Hardware"),
 	label => N("Graphical interface"),
-	banner_icon => 'banner-bootL',
 	val => sub { $o->{raw_X} ? Xconfig::various::to_string($o->{raw_X}) : '' },
 	clicked => sub { configureX($o, 'expert') }, 
     };
@@ -1148,7 +1142,6 @@ Do you really want to quit now?"), 0);
     $o->ask_from_no_check(
 	{
 	 title => N("Congratulations"),
-	 icon => 'banner-exit',
 	 messages => formatAlaTeX(messages::install_completed()),
 	 interactive_help_id => 'exitInstall',
 	 ok => $::local_install ? N("Quit") : N("Reboot"),
-- 
cgit v1.2.1