summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-11-23 16:14:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-11-23 16:14:10 +0000
commitfea097738931a740b9c944faff21fc1d9cb38e8b (patch)
tree7306ab7a4d9859d8a5a738644262333f59e25b01
parent3f01b48af73dcf40e0e6fd3cf62242bce4863422 (diff)
downloaddrakx-backup-do-not-use-fea097738931a740b9c944faff21fc1d9cb38e8b.tar
drakx-backup-do-not-use-fea097738931a740b9c944faff21fc1d9cb38e8b.tar.gz
drakx-backup-do-not-use-fea097738931a740b9c944faff21fc1d9cb38e8b.tar.bz2
drakx-backup-do-not-use-fea097738931a740b9c944faff21fc1d9cb38e8b.tar.xz
drakx-backup-do-not-use-fea097738931a740b9c944faff21fc1d9cb38e8b.zip
add ask_keyboard step
-rwxr-xr-xperl-install/standalone/finish-install20
1 files changed, 19 insertions, 1 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index e938416b7..aba841110 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -14,6 +14,7 @@ $ENV{SHARE_PATH} ||= "/usr/share";
my $authentication = authentication::get();
my $security = security::level::get();
my $net = {};
+my $locale;
network::network::read_net_conf($net);
$::isWizard = 1;
@@ -21,13 +22,29 @@ my $in = 'interactive'->vnew;
sub ask_language() {
require lang;
- my $locale = lang::read();
+ $locale = lang::read();
any::selectLanguage_and_more_standalone($in, $locale);
lang::write_and_install($locale, $in->do_pkgs);
lang::set($locale);
Gtk2->set_locale;
}
+sub ask_keyboard() {
+ require keyboard;
+ my $keyboard = $locale ? keyboard::lang2keyboard($locale->{lang}) : keyboard::read_or_default();
+
+ choose:
+ $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"),
+ N("Please, choose your keyboard layout."),
+ sub { translate(keyboard::KEYBOARD2text($_[0])) },
+ [ keyboard::KEYBOARDs() ],
+ $keyboard->{KEYBOARD}) or return;
+
+ keyboard::group_toggle_choose($in, $keyboard) or goto choose;
+
+ keyboard::configure_and_set_standalone($keyboard);
+}
+
sub ask_network() {
my $modules_conf = modules::any_conf->read;
require network::netconnect;
@@ -66,6 +83,7 @@ sub call {
}
call('ask_language');
+call('ask_keyboard');
call('ask_network');
$::WizardWindow->destroy; undef $::WizardWindow;
$::Wizard_pix_up = 'redhat-config-users';