diff options
| -rw-r--r-- | perl-install/install2.pm | 7 | ||||
| -rw-r--r-- | perl-install/share/install.rc | 6 | ||||
| -rw-r--r-- | perl-install/share/themes-marble3d.rc | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index d4a167bbc..09e4a17fd 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -44,8 +44,8 @@ my @installSteps = ( selectKeyboard => [ __("Choose your keyboard"), 1, 1, 1, "selectPath" ], partitionDisks => [ __("Setup filesystems"), 1, 0, 0, "selectPath" ], formatPartitions => [ __("Format partitions"), 1, -1, 0, "partitionDisks" ], - choosePackages => [ __("Choose packages to install"), 1, 1, 0, "selectPath" ], - doInstallStep => [ __("Install system"), 1, -1, 0 ], + choosePackages => [ __("Choose packages to install"), 1, 1, 1, "selectPath" ], + doInstallStep => [ __("Install system"), 1, -1, 0, ["formatPartitions", "selectPath"] ], miscellaneous => [ __("Miscellaneous"), 1, 1, 1 ], configureNetwork => [ __("Configure networking"), 1, 1, 1, "formatPartitions" ], configureTimezone => [ __("Configure timezone"), 1, 1, 0, "doInstallStep" ], @@ -87,11 +87,12 @@ my @install_classes = (__("beginner"), __("developer"), __("server"), __("expert #-##################################################################################### #- partition layout my %suggestedPartitions = ( - beginner => [ + beginner => my $b = [ { mntpoint => "/", size => 700 << 11, type => 0x83 }, { mntpoint => "swap", size => 128 << 11, type => 0x82 }, { mntpoint => "/home", size => 300 << 11, type => 0x83 }, ], + normal => $b, developer => [ { mntpoint => "/boot", size => 16 << 11, type => 0x83 }, { mntpoint => "swap", size => 128 << 11, type => 0x82 }, diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc index 882f093ab..520bffc89 100644 --- a/perl-install/share/install.rc +++ b/perl-install/share/install.rc @@ -46,7 +46,11 @@ style "logo" bg[NORMAL] = { 1.0, 1.0, 1.0 } } +style "stepsReachable" +{ +} + widget "*" style "default-font" widget "*Steps*" style "steps" +widget "*StepsReachable*" style "stepsReachable" widget "*logo*" style "logo" - diff --git a/perl-install/share/themes-marble3d.rc b/perl-install/share/themes-marble3d.rc index fd2b48b74..2199b2b75 100644 --- a/perl-install/share/themes-marble3d.rc +++ b/perl-install/share/themes-marble3d.rc @@ -129,6 +129,11 @@ style "steps" fg[NORMAL] = { 0.40, 0.30, 0.20 } } +style "stepsReachable" +{ + fg[NORMAL] = { 0.25, 0.15, 0.05 } +} + widget_class "GtkWindow" style "window" widget_class "*" style "any" widget_class "*GtkSpin*" style "entry" |