summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/pixmaps/X.pngbin2162 -> 3527 bytes
-rw-r--r--perl-install/pixmaps/bootdisk.pngbin1392 -> 2068 bytes
-rw-r--r--perl-install/pixmaps/bootloader.pngbin1959 -> 2790 bytes
-rw-r--r--perl-install/pixmaps/exit.pngbin0 -> 2117 bytes
-rw-r--r--perl-install/pixmaps/language.pngbin0 -> 3297 bytes
-rw-r--r--perl-install/pixmaps/mouse.pngbin2178 -> 3762 bytes
-rw-r--r--perl-install/pixmaps/network.pngbin1775 -> 2725 bytes
-rw-r--r--perl-install/pixmaps/partition.pngbin0 -> 2473 bytes
-rw-r--r--perl-install/pixmaps/printer.pngbin2326 -> 2902 bytes
-rw-r--r--perl-install/pixmaps/rootpasswd.pngbin1467 -> 2421 bytes
-rw-r--r--perl-install/pixmaps/security.pngbin1467 -> 2421 bytes
-rw-r--r--perl-install/pixmaps/services.pngbin2751 -> 5048 bytes
-rw-r--r--perl-install/pixmaps/summary.pngbin0 -> 1788 bytes
-rw-r--r--perl-install/pixmaps/user.pngbin1937 -> 3254 bytes
-rw-r--r--perl-install/steps.pm12
15 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/pixmaps/X.png b/perl-install/pixmaps/X.png
index 80b08c97f..e5e83250d 100644
--- a/perl-install/pixmaps/X.png
+++ b/perl-install/pixmaps/X.png
Binary files differ
diff --git a/perl-install/pixmaps/bootdisk.png b/perl-install/pixmaps/bootdisk.png
index 22d89c482..4db73af74 100644
--- a/perl-install/pixmaps/bootdisk.png
+++ b/perl-install/pixmaps/bootdisk.png
Binary files differ
diff --git a/perl-install/pixmaps/bootloader.png b/perl-install/pixmaps/bootloader.png
index a4f0e024b..298d9bf64 100644
--- a/perl-install/pixmaps/bootloader.png
+++ b/perl-install/pixmaps/bootloader.png
Binary files differ
diff --git a/perl-install/pixmaps/exit.png b/perl-install/pixmaps/exit.png
new file mode 100644
index 000000000..7e4e1e1d5
--- /dev/null
+++ b/perl-install/pixmaps/exit.png
Binary files differ
diff --git a/perl-install/pixmaps/language.png b/perl-install/pixmaps/language.png
new file mode 100644
index 000000000..0ad06711f
--- /dev/null
+++ b/perl-install/pixmaps/language.png
Binary files differ
diff --git a/perl-install/pixmaps/mouse.png b/perl-install/pixmaps/mouse.png
index 547f4384d..7dae9cc4f 100644
--- a/perl-install/pixmaps/mouse.png
+++ b/perl-install/pixmaps/mouse.png
Binary files differ
diff --git a/perl-install/pixmaps/network.png b/perl-install/pixmaps/network.png
index 42e774006..26d6583da 100644
--- a/perl-install/pixmaps/network.png
+++ b/perl-install/pixmaps/network.png
Binary files differ
diff --git a/perl-install/pixmaps/partition.png b/perl-install/pixmaps/partition.png
new file mode 100644
index 000000000..982fb7681
--- /dev/null
+++ b/perl-install/pixmaps/partition.png
Binary files differ
diff --git a/perl-install/pixmaps/printer.png b/perl-install/pixmaps/printer.png
index 749d0d9ab..ada56f151 100644
--- a/perl-install/pixmaps/printer.png
+++ b/perl-install/pixmaps/printer.png
Binary files differ
diff --git a/perl-install/pixmaps/rootpasswd.png b/perl-install/pixmaps/rootpasswd.png
index ee8ebef8e..47bbb7593 100644
--- a/perl-install/pixmaps/rootpasswd.png
+++ b/perl-install/pixmaps/rootpasswd.png
Binary files differ
diff --git a/perl-install/pixmaps/security.png b/perl-install/pixmaps/security.png
index ee8ebef8e..47bbb7593 100644
--- a/perl-install/pixmaps/security.png
+++ b/perl-install/pixmaps/security.png
Binary files differ
diff --git a/perl-install/pixmaps/services.png b/perl-install/pixmaps/services.png
index 6a1bd1ea3..7cd8b06d6 100644
--- a/perl-install/pixmaps/services.png
+++ b/perl-install/pixmaps/services.png
Binary files differ
diff --git a/perl-install/pixmaps/summary.png b/perl-install/pixmaps/summary.png
new file mode 100644
index 000000000..79a1e0f4f
--- /dev/null
+++ b/perl-install/pixmaps/summary.png
Binary files differ
diff --git a/perl-install/pixmaps/user.png b/perl-install/pixmaps/user.png
index e4aed67c7..a9f7d0eb6 100644
--- a/perl-install/pixmaps/user.png
+++ b/perl-install/pixmaps/user.png
Binary files differ
diff --git a/perl-install/steps.pm b/perl-install/steps.pm
index 07c23bf50..2efaeccf3 100644
--- a/perl-install/steps.pm
+++ b/perl-install/steps.pm
@@ -11,27 +11,27 @@ use common;
my @installStepsFields = qw(text redoable onError hidden needs icon);
#entered reachable toBeDone next done;
my @installSteps = (
- selectLanguage => [ __("Choose your language"), 1, 1, '', '', '' ],
+ selectLanguage => [ __("Choose your language"), 1, 1, '', '', 'language' ],
selectInstallClass => [ __("Select installation class"), 1, 1, '', '', '' ],
setupSCSI => [ __("Hard drive detection"), 1, 0, '', '', 'harddrive' ],
selectMouse => [ __("Configure mouse"), 1, 1, '', "selectInstallClass", 'mouse' ],
selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ],
miscellaneous => [ __("Security"), 1, 1, '!$::expert', '', 'security' ],
- doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass", '' ],
- formatPartitions => [ __("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", '' ],
- choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", '' ],
+ doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass", 'partition' ],
+ formatPartitions => [ __("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'partition' ],
+ choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ],
installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ],
setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ],
addUser => [ __("Add a user"), 1, 1, '', "installPackages", 'user' ],
configureNetwork => [ __("Configure networking"), 1, 1, '', "formatPartitions", 'network' ],
- summary => [ __("Summary"), 1, 0, '', "installPackages", '' ],
+ summary => [ __("Summary"), 1, 0, '', "installPackages", 'summary' ],
configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ],
if_((arch() !~ /alpha/) && (arch() !~ /ppc/),
createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ],
),
setupBootloader => [ __("Install bootloader"), 1, 1, '', "installPackages", 'bootloader' ],
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ],
- exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live', '', '' ],
+ exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live', '', 'exit' ],
);
for (my $i = 0; $i < @installSteps; $i += 2) {
my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] };