diff options
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 22 | ||||
| -rw-r--r-- | perl-install/install/steps_list.pm | 31 |
2 files changed, 22 insertions, 31 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index f9c508ba5..4c56d012b 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -149,29 +149,13 @@ sub new($$) { $o; } -# (icon, title) -my %default_step_items = ( - acceptLicense => [ 'banner-license', N("License agreement") ], - selectLanguage => [ 'banner-languages', N("Localization") ], - selectKeyboard => [ 'banner-languages', N("Localization") ], - doPartitionDisksBefore => [ 'banner-part', N("Partitioning") ], - doPartitionDisks => [ 'banner-part', N("Partitioning") ], - selectInstallClass => [ 'banner-sys', N("_: Keep these entry short\nInstallation class") ], - chooseGroups => [ 'banner-sys', N("Package Group Selection") ], - installPackages => [ 'banner-sys', N("Installing") ], - summary => [ 'banner-summary', N("Summary") ], - auth => [ 'banner-pw', N("Authentication") ], - setupBootloaderBefore => [ 'banner-bootL', N("_: Keep these entry short\nBootloader") ], - setupBootloader => [ 'banner-bootL', N("_: Keep these entry short\nBootloader") ], - installUpdates => [ 'banner-update', N("Updates") ], - exitInstall => [ 'banner-exit', N("Exit") ], -); - sub enteringStep { my ($o, $step) = @_; printf "Entering step `%s'\n", common::remove_translate_context($o->{steps}{$step}{text}); - ugtk2::set_default_step_items(@{$default_step_items{$step}}) if $default_step_items{$step}; + if (my @banner_elts = @{$o->{steps}{$step}}{qw(banner_icon banner_title)}) { + ugtk2::set_default_step_items(@banner_elts); + } $o->SUPER::enteringStep($step); install::gtk::update_steps_position($o); } diff --git a/perl-install/install/steps_list.pm b/perl-install/install/steps_list.pm index 03cfdc182..efe5e6128 100644 --- a/perl-install/install/steps_list.pm +++ b/perl-install/install/steps_list.pm @@ -8,31 +8,38 @@ use common; #- Steps table #-###################################################################################### { - my @installStepsFields = qw(text redoable onError hidden needs); + my @installStepsFields = qw(text redoable onError hidden needs banner_icon 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, '', '' ], - acceptLicense => [ N_("_: Keep these entry short\nLicense"), 1, -1, '', '' ], + 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', '' ], setupSCSI => [ N_("_: Keep these entry short\nHard drive detection"), 1, 0, '1', '' ], - selectInstallClass => [ N_("_: Keep these entry short\nInstallation class"), 1, 1, '1', '' ], - selectKeyboard => [ N_("_: Keep these entry short\nKeyboard"), 1, 1, '1' ], + 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', '' ], - doPartitionDisks => [ N_("_: Keep these entry short\nPartitioning"), 1, 0, '', "selectInstallClass" ], + doPartitionDisks => [ N_("_: Keep these entry short\nPartitioning"), 1, 0, '', "selectInstallClass", + 'banner-part', N("Partitioning") ], formatPartitions => [ N_("_: Keep these entry short\nFormatting"), 1, -1, '1', "doPartitionDisks" ], - choosePackages => [ N_("_: Keep these entry short\nChoosing packages"), 1, -2, '1', "formatPartitions" ], - installPackages => [ N_("_: Keep these entry short\nInstalling"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ], + choosePackages => [ N_("_: Keep these entry short\nChoosing packages"), 1, -2, '1', "formatPartitions", + 'banner-sys', N("Package Group Selection") ], + installPackages => [ N_("_: Keep these entry short\nInstalling"), 1, -1, '', ["formatPartitions", "selectInstallClass"], + 'banner-sys', N("Installing") ], setRootPassword_addUser => [ N_("_: Keep these entry short\nUsers"), 1, 1, '', "installPackages" ], configureNetwork => [ N_("_: Keep these entry short\nNetworking"), 1, 1, '1', "formatPartitions" ], - setupBootloader => [ N_("_: Keep these entry short\nBootloader"), 1, 0, '', "installPackages" ], + setupBootloader => [ N_("_: Keep these entry short\nBootloader"), 1, 0, '', "installPackages", + 'banner-bootL', N("_: Keep these entry short\nBootloader") ], configureX => [ N_("_: Keep these entry short\nConfigure X"), 1, 1, '1', ["formatPartitions", "setupBootloader"] ], - summary => [ N_("_: Keep these entry short\nSummary"), 1, 0, '', "installPackages" ], + summary => [ N_("_: Keep these entry short\nSummary"), 1, 0, '', "installPackages", + 'banner-summary', N("Summary") ], configureServices => [ N_("_: Keep these entry short\nServices"), 1, 1, '1', "installPackages" ], - installUpdates => [ N_("_: Keep these entry short\nUpdates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"] ], - exitInstall => [ N_("_: Keep these entry short\nExit"), 0, 0, '', '' ], + 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") ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; |