diff options
18 files changed, 25 insertions, 23 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 6e1b3c288..c568e59f0 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -584,7 +584,6 @@ sub main { MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) { $o->{steps}{$o->{step}}{entered}++; $o->enteringStep($o->{step}); - if ($o->{steps}{$o->{step}}{icon}) { $o->{icon} = $o->{steps}{$o->{step}}{icon} } else { undef $o->{icon} } eval { &{$install2::{$o->{step}}}($clicked || $o->{steps}{$o->{step}}{noauto}, $o->{steps}{$o->{step}}{entered}, diff --git a/perl-install/pixmaps/X.png b/perl-install/pixmaps/X.png Binary files differdeleted file mode 100644 index 251e6d29a..000000000 --- a/perl-install/pixmaps/X.png +++ /dev/null diff --git a/perl-install/pixmaps/bootdisk.png b/perl-install/pixmaps/bootdisk.png Binary files differdeleted file mode 100644 index 834afea20..000000000 --- a/perl-install/pixmaps/bootdisk.png +++ /dev/null diff --git a/perl-install/pixmaps/bootloader.png b/perl-install/pixmaps/bootloader.png Binary files differdeleted file mode 100644 index 3bfc15724..000000000 --- a/perl-install/pixmaps/bootloader.png +++ /dev/null diff --git a/perl-install/pixmaps/exit.png b/perl-install/pixmaps/exit.png Binary files differdeleted file mode 100644 index 7e4e1e1d5..000000000 --- a/perl-install/pixmaps/exit.png +++ /dev/null diff --git a/perl-install/pixmaps/harddrive.png b/perl-install/pixmaps/harddrive.png Binary files differdeleted file mode 100644 index f674eec9f..000000000 --- a/perl-install/pixmaps/harddrive.png +++ /dev/null diff --git a/perl-install/pixmaps/keyboard.png b/perl-install/pixmaps/keyboard.png Binary files differdeleted file mode 100644 index 0f21371e7..000000000 --- a/perl-install/pixmaps/keyboard.png +++ /dev/null diff --git a/perl-install/pixmaps/language.png b/perl-install/pixmaps/language.png Binary files differdeleted file mode 100644 index 4cf17a1f7..000000000 --- a/perl-install/pixmaps/language.png +++ /dev/null diff --git a/perl-install/pixmaps/mouse.png b/perl-install/pixmaps/mouse.png Binary files differdeleted file mode 100644 index 9a5913f91..000000000 --- a/perl-install/pixmaps/mouse.png +++ /dev/null diff --git a/perl-install/pixmaps/network.png b/perl-install/pixmaps/network.png Binary files differdeleted file mode 100644 index 75e4ab19f..000000000 --- a/perl-install/pixmaps/network.png +++ /dev/null diff --git a/perl-install/pixmaps/partition.png b/perl-install/pixmaps/partition.png Binary files differdeleted file mode 100644 index bf0b2bc58..000000000 --- a/perl-install/pixmaps/partition.png +++ /dev/null diff --git a/perl-install/pixmaps/rootpasswd.png b/perl-install/pixmaps/rootpasswd.png Binary files differdeleted file mode 100644 index 07041c48e..000000000 --- a/perl-install/pixmaps/rootpasswd.png +++ /dev/null diff --git a/perl-install/pixmaps/security.png b/perl-install/pixmaps/security.png Binary files differdeleted file mode 100644 index 8e982fb40..000000000 --- a/perl-install/pixmaps/security.png +++ /dev/null diff --git a/perl-install/pixmaps/services.png b/perl-install/pixmaps/services.png Binary files differdeleted file mode 100644 index 70138507b..000000000 --- a/perl-install/pixmaps/services.png +++ /dev/null diff --git a/perl-install/pixmaps/summary.png b/perl-install/pixmaps/summary.png Binary files differdeleted file mode 100644 index d055bf654..000000000 --- a/perl-install/pixmaps/summary.png +++ /dev/null diff --git a/perl-install/pixmaps/user.png b/perl-install/pixmaps/user.png Binary files differdeleted file mode 100644 index f7b1631b0..000000000 --- a/perl-install/pixmaps/user.png +++ /dev/null diff --git a/perl-install/steps.pm b/perl-install/steps.pm index 87f937f21..e33df20a9 100644 --- a/perl-install/steps.pm +++ b/perl-install/steps.pm @@ -8,29 +8,29 @@ use common; #- Steps table #-###################################################################################### { - my @installStepsFields = qw(text redoable onError hidden needs icon); + my @installStepsFields = qw(text redoable onError hidden needs); #entered reachable toBeDone next done; my @installSteps = ( - selectLanguage => [ N_("Choose your language"), 1, 1, '', '', 'language' ], - acceptLicense => [ N_("License"), 1, -1, '', '', '' ], - selectMouse => [ N_("Configure mouse"), 1, 1, '1', '', 'mouse' ], - setupSCSI => [ N_("Hard drive detection"), 1, 0, '1', '', 'harddrive' ], - selectInstallClass => [ N_("Select installation class"), 1, 1, '1', '', '' ], - selectKeyboard => [ N_("Choose your keyboard"), 1, 1, '1', "selectInstallClass", 'keyboard' ], - miscellaneous => [ N_("Security"), 1, 1, '', '', 'security' ], - doPartitionDisks => [ N_("Partitioning"), 1, 0, '', "selectInstallClass", 'partition' ], - formatPartitions => [ N_("Format partitions"), 1, -1, '1', "doPartitionDisks", 'partition' ], - choosePackages => [ N_("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ], - installPackages => [ N_("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], - setRootPassword => [ N_("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], - addUser => [ N_("Add a user"), 1, 1, '', "installPackages", 'user' ], - configureNetwork => [ N_("Configure networking"), 1, 1, '1', "formatPartitions", 'network' ], - setupBootloader => [ N_("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ], - configureX => [ N_("Configure X"), 1, 1, '1', ["formatPartitions", "setupBootloader"], 'X' ], - summary => [ N_("Summary"), 1, 0, '', "installPackages", 'summary' ], - configureServices => [ N_("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], - installUpdates => [ N_("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"], '' ], - exitInstall => [ N_("Exit install"), 0, 0, '', '', 'exit' ], + selectLanguage => [ N_("Choose your language"), 1, 1, '', '' ], + acceptLicense => [ N_("License"), 1, -1, '', '' ], + selectMouse => [ N_("Configure mouse"), 1, 1, '1', '' ], + setupSCSI => [ N_("Hard drive detection"), 1, 0, '1', '' ], + selectInstallClass => [ N_("Select installation class"), 1, 1, '1', '' ], + selectKeyboard => [ N_("Choose your keyboard"), 1, 1, '1' ], + miscellaneous => [ N_("Security"), 1, 1, '', '' ], + doPartitionDisks => [ N_("Partitioning"), 1, 0, '', "selectInstallClass" ], + formatPartitions => [ N_("Format partitions"), 1, -1, '1', "doPartitionDisks" ], + choosePackages => [ N_("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions" ], + installPackages => [ N_("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ], + setRootPassword => [ N_("Set root password"), 1, 1, '', "installPackages" ], + addUser => [ N_("Add a user"), 1, 1, '', "installPackages" ], + configureNetwork => [ N_("Configure networking"), 1, 1, '1', "formatPartitions" ], + setupBootloader => [ N_("Install bootloader"), 1, 0, '', "installPackages" ], + configureX => [ N_("Configure X"), 1, 1, '1', ["formatPartitions", "setupBootloader"] ], + summary => [ N_("Summary"), 1, 0, '', "installPackages" ], + configureServices => [ N_("Configure services"), 1, 1, '!$::expert', "installPackages" ], + installUpdates => [ N_("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"] ], + exitInstall => [ N_("Exit install"), 0, 0, '', '' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 9f969ccb6..2c30c213d 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -347,11 +347,14 @@ sub create_box_with_title { ) } else { gtkpack__($box, + if_($::isWizard, gtkset_size_request(Gtk2::Label->new, 0, 10)), (map { my $w = ref($_) ? $_ : Gtk2::Label->new($_); - $::isWizard and $w->set_justify("left"); gtkset_name($w, "Title"); + $::isWizard ? (gtkpack__(Gtk2::HBox->new(0,0), gtkset_size_request(Gtk2::Label->new, 20, 0), $w)) + : $w } map { ref($_) ? $_ : warp_text($_) } @_), + if_($::isWizard, gtkset_size_request(Gtk2::Label->new, 0, 15)), if_($a, Gtk2::HSeparator->new) ) } |
