fill in missing titles for banners and specify icons

8 files changed, 22 insertions, 9 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3afd3275e..a30487992 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -267,6 +267,8 @@ sub setupBootloader__general {
     $::Wizard_title = N("Boot Style Configuration");
     if (arch() !~ /ppc/) {
 	$in->ask_from_({ messages => N("Bootloader main options"),
+			 title => N("Bootloader main options"),
+			 icon => 'banner-bootL',
 			 interactive_help_id => 'setupBootloader',
 			 callbacks => {
 			     complete => sub {
@@ -299,6 +301,8 @@ sub setupBootloader__general {
     } else {
 	$b->{boot} = $partition_table::mac::bootstrap_part;	
 	$in->ask_from_({ messages => N("Bootloader main options"),
+			 title => N("Bootloader main options"),
+			 icon => 'banner-bootL',
 			 interactive_help_id => 'setupYabootGeneral',
 		       }, [
             { label => N("Bootloader to use"), val => \$b->{method}, list => \@method_choices, format => \&bootloader::method2text },
@@ -623,6 +627,7 @@ sub ask_user_one {
     };
     my $ret = $in->ask_from_(
         { title => N("Add user"),
+          icon => 'banner-adduser',
           messages => N("Enter a user\n%s", $options{additional_msg} || $names),
           interactive_help_id => 'addUser',
           focus_first => 1,
@@ -711,6 +716,7 @@ sub selectLanguage_install {
 
     my $common = { messages => N("Please choose a language to use."),
 		   title => N("Language choice"),
+		   icon => 'banner-languages.png',
 		   interactive_help_id => 'selectLanguage' };
 
     my $lang = $locale->{lang};
@@ -830,6 +836,7 @@ sub selectCountry {
 
     $in->ask_from_(
 		  { title => N("Country / Region"), 
+		    icon => 'banner-languages',
 		    messages => N("Please choose your country."),
 		    interactive_help_id => 'selectCountry',
 		    if_(@best, advanced_messages => N("Here is the full list of available countries")),
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 84af83648..64996b9d9 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -596,7 +596,7 @@ N("There was an error installing packages:"), $1, N("Go on anyway?") ], 1) and r
 sub summary_prompt {
     my ($o, $l, $check_complete) = @_;
 
-    my $w = ugtk2->new(N("Summary"));
+    my $w = ugtk2->new(N("Summary"), icon => 'banner-summary');
 
     my $set_entry_labels;
     my @table;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 575c467ab..49fbcdca9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -82,6 +82,7 @@ sub acceptLicense {
     my $r = $::testing ? 'Accept' : 'Refuse';
 
     $o->ask_from_({ title => N("License agreement"), 
+                    icon => 'banner-license',
 		     cancel => N("Quit"),
 		     messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()),
 		     interactive_help_id => 'acceptLicense',
@@ -184,6 +185,7 @@ sub selectMouse {
 	my $prev = $o->{mouse}{type} . '|' . $o->{mouse}{name};
 
 	$o->ask_from_({ messages => N("Please choose your type of mouse."),
+			title => N("Mouse choice"),
 			interactive_help_id => 'selectMouse',
 		      },
 		     [ { list => [ mouse::fullnames() ], separator => '|', val => \$prev, format => sub { join('|', map { translate($_) } split('\|', $_[0])) } } ]);
@@ -766,7 +768,7 @@ N("There was an error installing packages:"), $1, N("Go on anyway?") ], 1) and r
 
 sub afterInstallPackages($) {
     my ($o) = @_;
-    my $_w = $o->wait_message('', N("Post-install configuration"));
+    my $_w = $o->wait_message('toto', N("Post-install configuration"));
     $o->SUPER::afterInstallPackages;
 }
 
@@ -801,7 +803,7 @@ sub installUpdates {
     $o->hasNetwork or return;
 
     if (is_empty_hash_ref($u)) {
-	$o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
+	$o->ask_yesorno_({ title => N("Updates"), icon => 'banner-update', 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.
@@ -873,7 +875,7 @@ sub configureTimezone {
     my ($o, $clicked) = @_;
 
     require timezone;
-    $o->{timezone}{timezone} = $o->ask_from_treelist('', N("Which is your timezone?"), '/', [ timezone::getTimeZones() ], $o->{timezone}{timezone}) || return;
+    $o->{timezone}{timezone} = $o->ask_from_treelist(N("Timezone"), N("Which is your timezone?"), '/', [ timezone::getTimeZones() ], $o->{timezone}{timezone}) || return;
 
     my $ntp = to_bool($o->{timezone}{ntp});
     $o->ask_from_({ interactive_help_id => 'configureTimezoneGMT' }, [
@@ -1316,6 +1318,7 @@ Do you really want to quit now?"), 0);
     $o->ask_from_no_check(
 	{
 	 title => N("Congratulations"),
+	 icon => 'banner-exit',
 	 messages => formatAlaTeX(install_messages::install_completed()),
 	 interactive_help_id => 'exitInstall',
 	 ok => $::local_install ? N("Quit") : N("Reboot"),
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 1242b6387..cf252c0bc 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -398,7 +398,7 @@ sub ask_fromW {
     my ($o, $common, $l, $l2) = @_;
     my $ignore = 0; #-to handle recursivity
 
-    my $mainw = ugtk2->new($common->{title}, %$o, modal => 1, if__($::main_window, transient => $::main_window));
+    my $mainw = ugtk2->new($common->{title}, %$o, modal => 1, if__($::main_window, transient => $::main_window), if_($common->{icon}, icon => $common->{icon}));
  
     #-the widgets
     my (@widgets, @widgets_always, @widgets_advanced, $advanced);
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index bc66408fa..9e9367369 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -179,6 +179,8 @@ sub choose {
 
     $in->ask_from_({
 		    messages => N("Which services would you like to allow the Internet to connect to?"),
+		    title => N("Firewall"),
+		    icon => 'banner-security',
 		    advanced_messages => N("You can enter miscellaneous ports. 
 Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.
 Have a look at /etc/services for information."),
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index c781ca53c..afce07917 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -393,7 +393,7 @@ sub netprofile_read {
 sub miscellaneous_choose {
     my ($in, $u) = @_;
 
-    $in->ask_from('',
+    $in->ask_from(N("Proxies configuration"),
        N("Proxies configuration"),
        [ { label => N("HTTP proxy"), val => \$u->{http_proxy} },
          { label => N("FTP proxy"),  val => \$u->{ftp_proxy} },
diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm
index c8974f3bf..0c05eb1e4 100644
--- a/perl-install/security/level.pm
+++ b/perl-install/security/level.pm
@@ -52,7 +52,8 @@ connections from many clients. Note: if your machine is only a client on the Int
 
     my @l = 2 .. 5;
 
-    $in->ask_from_({ title => N("DrakSec Basic Options"),
+    $in->ask_from_({ title => $::isInstall ? N("Security") : N("DrakSec Basic Options"),
+		     icon => 'banner-security',
 		     messages => N("Please choose the desired security level") . "\n\n" .
 		                 join('', map { to_string($_) . ": " . formatAlaTeX($help{$_}) . "\n\n" } @l),
 		     interactive_help_id => 'miscellaneous',
diff --git a/perl-install/services.pm b/perl-install/services.pm
index e6a6c8542..e539e1cfd 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -111,7 +111,7 @@ xfs => N_("Starts the X Font Server (this is mandatory for Xorg to run)."),
 sub ask_install_simple {
     my ($in) = @_;
     my ($l, $on_services) = services();
-    $in->ask_many_from_list("drakxservices",
+    $in->ask_many_from_list(N("Services"),
 			    N("Choose which services should be automatically started at boot time"),
 			    {
 			     list => $l,
@@ -154,7 +154,7 @@ sub ask_install {
     $services{$_} = 0 foreach @{$l || []};
     $services{$_} = 1 foreach @{$on_services || []};
 
-    $in->ask_browse_tree_info('drakxservices', N("Choose which services should be automatically started at boot time"),
+    $in->ask_browse_tree_info(N("Services"), N("Choose which services should be automatically started at boot time"),
 			      {
 			       node_state => sub { $services{$_[0]} ? 'selected' : 'unselected' },
 			       build_tree => sub {