From 976c84da2fec4cc43ac3973dda51aa77ce924639 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 24 Jul 2008 17:33:20 +0000 Subject: stop defining per step banner icon now we do not display them --- perl-install/install/steps_list.pm | 41 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/perl-install/install/steps_list.pm b/perl-install/install/steps_list.pm index 67b544284..143ffc354 100644 --- a/perl-install/install/steps_list.pm +++ b/perl-install/install/steps_list.pm @@ -8,48 +8,47 @@ use common; #- Steps table #-###################################################################################### { - my @installStepsFields = qw(text redoable onError hidden needs banner_icon banner_title); + my @installStepsFields = qw(text redoable onError hidden needs banner_title); #entered reachable toBeDone next done; my @installSteps = ( selectLanguage => [ #-PO: please keep the following messages very short: they must fit in the left list of the installer!!! - N_("_: Keep these entry short\nLanguage"), 1, 1, '', '', 'banner-languages', N_("Localization") ], - acceptLicense => [ N_("_: Keep these entry short\nLicense"), 1, -1, '', '', 'banner-license', N_("License agreement") ], - selectMouse => [ N_("_: Keep these entry short\nMouse"), 1, 1, '1', '', 'banner-sys', N_("Mouse") ], + N_("_: Keep these entry short\nLanguage"), 1, 1, '', '', N_("Localization") ], + acceptLicense => [ N_("_: Keep these entry short\nLicense"), 1, -1, '', '', N_("License agreement") ], + selectMouse => [ N_("_: Keep these entry short\nMouse"), 1, 1, '1', '', N_("Mouse") ], setupSCSI => [ N_("_: Keep these entry short\nHard drive detection"), 1, 0, '1', '', - 'banner-sys', N_("_: Keep these entry short\nHard drive detection") ], + N_("_: Keep these entry short\nHard drive detection") ], selectInstallClass => [ N_("_: Keep these entry short\nInstallation class"), 1, 1, '1', '', - 'banner-sys', N_("_: Keep these entry short\nInstallation class") ], - selectKeyboard => [ N_("_: Keep these entry short\nKeyboard"), 1, 1, '1', '', 'banner-languages', N_("Localization") ], - miscellaneous => [ N_("_: Keep these entry short\nSecurity"), 1, 1, '1', '', 'banner-security', N_("Security") ], + N_("_: Keep these entry short\nInstallation class") ], + selectKeyboard => [ N_("_: Keep these entry short\nKeyboard"), 1, 1, '1', '', N_("Localization") ], + miscellaneous => [ N_("_: Keep these entry short\nSecurity"), 1, 1, '1', '', N_("Security") ], doPartitionDisks => [ N_("_: Keep these entry short\nPartitioning"), 1, 0, '', "selectInstallClass", - 'banner-part', N_("Partitioning") ], + N_("Partitioning") ], formatPartitions => [ N_("_: Keep these entry short\nFormatting"), 1, -1, '1', "doPartitionDisks", - 'banner-part', N_("_: Keep these entry short\nFormatting") ], + N_("_: Keep these entry short\nFormatting") ], choosePackages => [ N_("_: Keep these entry short\nChoosing packages"), 1, -2, '1', "formatPartitions", - 'banner-sys', N_("Package Group Selection") ], + N_("Package Group Selection") ], installPackages => [ N_("_: Keep these entry short\nInstalling"), 1, -1, '', ["formatPartitions", "selectInstallClass"], - 'banner-sys', N_("Installing") ], + N_("Installing") ], setRootPassword_addUser => [ N_("_: Keep these entry short\nUsers"), 1, 1, '', "installPackages", - 'banner-pw', N_("User management") ], + N_("User management") ], configureNetwork => [ N_("_: Keep these entry short\nNetworking"), 1, 1, '1', "formatPartitions", - 'banner-bootL', N_("_: Keep these entry short\nNetworking") ], + N_("_: Keep these entry short\nNetworking") ], setupBootloader => [ N_("_: Keep these entry short\nBootloader"), 1, 0, '', "installPackages", - 'banner-bootL', N_("_: Keep these entry short\nBootloader") ], + N_("_: Keep these entry short\nBootloader") ], configureX => [ N_("_: Keep these entry short\nConfigure X"), 1, 1, '1', ["formatPartitions", "setupBootloader"], - 'banner-bootL', N_("_: Keep these entry short\nConfigure X") ], + N_("_: Keep these entry short\nConfigure X") ], summary => [ N_("_: Keep these entry short\nSummary"), 1, 0, '', "installPackages", - 'banner-summary', N_("Summary") ], + N_("Summary") ], configureServices => [ N_("_: Keep these entry short\nServices"), 1, 1, '1', "installPackages", - 'banner-summary', N_("_: Keep these entry short\nServices") ], + N_("_: Keep these entry short\nServices") ], installUpdates => [ N_("_: Keep these entry short\nUpdates"), 1, 1, '', - ["installPackages", "configureNetwork", "summary"], 'banner-update', N_("Updates") ], - exitInstall => [ N_("_: Keep these entry short\nExit"), 0, 0, '', '', 'banner-exit', N_("Exit") ], + ["installPackages", "configureNetwork", "summary"], N_("Updates") ], + exitInstall => [ N_("_: Keep these entry short\nExit"), 0, 0, '', '', N_("Exit") ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; - !$h{banner_icon} || $h{banner_icon} =~ /^banner/ or internal_error("bad banner_icon for step $installSteps[$i]"); $h{entered} = 0; $h{onError} = $installSteps[$i + 2 * $h{onError}]; $h{reachable} = !$h{needs}; -- cgit v1.2.1