summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-07 14:54:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-07 14:54:45 +0000
commit3a0ee190ff53ea2c8a6ded28662edc84258f3d10 (patch)
treeb4a449c8934939de94a81d7e7169ca12d2c3f199
parent3fd97a31c99dd704c052ef5ffbedbb1ea84861e9 (diff)
downloaddrakx-backup-do-not-use-3a0ee190ff53ea2c8a6ded28662edc84258f3d10.tar
drakx-backup-do-not-use-3a0ee190ff53ea2c8a6ded28662edc84258f3d10.tar.gz
drakx-backup-do-not-use-3a0ee190ff53ea2c8a6ded28662edc84258f3d10.tar.bz2
drakx-backup-do-not-use-3a0ee190ff53ea2c8a6ded28662edc84258f3d10.tar.xz
drakx-backup-do-not-use-3a0ee190ff53ea2c8a6ded28662edc84258f3d10.zip
(selectLanguage, selectKeyboard): use ask_from_entries_refH instead of
ask_from_listf_, it enables the use of advanced
-rw-r--r--perl-install/install_steps_interactive.pm21
1 files changed, 11 insertions, 10 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 768f6674d..2c3ec982a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -50,11 +50,11 @@ sub kill_action {
sub selectLanguage($) {
my ($o) = @_;
- $o->{lang} = $o->ask_from_listf("Language",
- _("Please, choose a language to use."),
- \&lang::lang2text,
- [ lang::list() ],
- $o->{lang});
+ $o->ask_from_entries_refH("Language",
+ _("Please, choose a language to use."),
+ [ { val => \$o->{lang}, type => 'list',
+ format => \&lang::lang2text, list => [ lang::list() ] } ]);
+
install_steps::selectLanguage($o);
$o->ask_warn('',
@@ -151,11 +151,12 @@ For any question on this document, please contact MandrakeSoft S.A.
sub selectKeyboard($) {
my ($o, $clicked) = @_;
- $o->{keyboard} = $o->ask_from_listf_(_("Keyboard"),
- _("Please, choose your keyboard layout."),
- \&keyboard::keyboard2text,
- [ keyboard::xmodmaps() ],
- $o->{keyboard});
+ $o->ask_from_entries_refH(
+ _("Keyboard"),
+ _("Please, choose your keyboard layout."),
+ [ { val => \$o->{keyboard}, type => 'list',
+ format => sub { translate(keyboard::keyboard2text($_[0])) },
+ list => [ keyboard::xmodmaps() ] } ]);
delete $o->{keyboard_unsafe};
if ($::expert && ref($o) !~ /newt/) { #- newt is buggy with big windows :-(