summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install_steps_interactive.pm72
1 files changed, 37 insertions, 35 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2001fc83e..40129a1bf 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -845,17 +845,6 @@ sub summary {
my ($o) = @_;
my @l;
-
- push @l, {
- label => N("Keyboard"),
- val => sub { $o->{keyboard} && translate(keyboard::keyboard2text($o->{keyboard})) },
- clicked => sub { $o->selectKeyboard(1) },
- };
- push @l, {
- label => N("Mouse"),
- val => sub { translate($o->{mouse}{type}) . ' ' . translate($o->{mouse}{name}) },
- clicked => sub { $o->selectMouse(1); mouse::write($o, $o->{mouse}) },
- };
my $timezone_manually_set;
push @l, {
@@ -876,6 +865,17 @@ sub summary {
clicked => sub { $timezone_manually_set = $o->configureTimezone(1) || $timezone_manually_set },
};
+ push @l, {
+ label => N("Keyboard"),
+ val => sub { $o->{keyboard} && translate(keyboard::keyboard2text($o->{keyboard})) },
+ clicked => sub { $o->selectKeyboard(1) },
+ };
+ push @l, {
+ label => N("Mouse"),
+ val => sub { translate($o->{mouse}{type}) . ' ' . translate($o->{mouse}{name}) },
+ clicked => sub { $o->selectMouse(1); mouse::write($o, $o->{mouse}) },
+ };
+
push @l, {
label => N("Printer"),
val => sub {
@@ -907,19 +907,33 @@ sub summary {
};
}
- #- if no sound card are detected AND the user selected things needing a sound card,
- #- propose a special case for ISA cards
- push @l, {
- label => N("Sound card"),
- clicked => sub {
- if ($o->ask_yesorno('', N("Do you have an ISA sound card?"))) {
- $o->do_pkgs->install('sndconfig');
- $o->ask_warn('', N("Run \"sndconfig\" after installation to configure your sound card"));
- } else {
- $o->ask_warn('', N("No sound card detected. Try \"harddrake\" after installation"));
+ if (!@sound_cards && ($o->{compssUsersChoice}{GAMES} || $o->{compssUsersChoice}{AUDIO})) {
+ #- if no sound card are detected AND the user selected things needing a sound card,
+ #- propose a special case for ISA cards
+ push @l, {
+ label => N("Sound card"),
+ clicked => sub {
+ if ($o->ask_yesorno('', N("Do you have an ISA sound card?"))) {
+ $o->do_pkgs->install('sndconfig');
+ $o->ask_warn('', N("Run \"sndconfig\" after installation to configure your sound card"));
+ } else {
+ $o->ask_warn('', N("No sound card detected. Try \"harddrake\" after installation"));
+ }
+ },
+ };
+ }
+
+ foreach (grep { $_->{driver} =~ /(bttv|saa7134)/ } detect_devices::probeall()) {
+ my $driver = $_->{driver};
+ push @l, {
+ label => N("TV card"),
+ val => sub { $_->{description} },
+ clicked => sub {
+ require harddrake::v4l;
+ harddrake::v4l::config($o, $driver);
}
- },
- } if !@sound_cards && ($o->{compssUsersChoice}{GAMES} || $o->{compssUsersChoice}{AUDIO});
+ };
+ }
push @l, {
label => N("Bootloader"),
@@ -942,18 +956,6 @@ sub summary {
},
};
- foreach (grep { $_->{driver} =~ /(bttv|saa7134)/ } detect_devices::probeall()) {
- my $driver = $_->{driver};
- push @l, {
- label => N("TV card"),
- val => sub { $_->{description} },
- clicked => sub {
- require harddrake::v4l;
- harddrake::v4l::config($o, $driver);
- }
- };
- }
-
while (1) {
$o->summary_prompt(\@l);