diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-13 23:09:41 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-13 23:09:41 +0000 |
| commit | b06c0f4ad36facc4399b77d8fcb534843040be1e (patch) | |
| tree | ae7cb2a3091c4e8b9e2fffdd978fe4b0d8b8f688 | |
| parent | 36fcbe644847e3c0d3ffed3c16545fd9f89e2a18 (diff) | |
| download | drakx-b06c0f4ad36facc4399b77d8fcb534843040be1e.tar drakx-b06c0f4ad36facc4399b77d8fcb534843040be1e.tar.gz drakx-b06c0f4ad36facc4399b77d8fcb534843040be1e.tar.bz2 drakx-b06c0f4ad36facc4399b77d8fcb534843040be1e.tar.xz drakx-b06c0f4ad36facc4399b77d8fcb534843040be1e.zip | |
use interactive->ask_okcancel in order to not have spurious field in
text mode (#7593)
| -rw-r--r-- | perl-install/wizards.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/wizards.pm b/perl-install/wizards.pm index 9fdc33a1e..0c1ff4917 100644 --- a/perl-install/wizards.pm +++ b/perl-install/wizards.pm @@ -155,11 +155,16 @@ sub process { my %yesno = (yes => N("Yes"), no => N("No")); my $yes; $data2 = [ { val => \$yes, type => 'list', list => [ values %yesno ], gtk => { use_boxradio => 1 } } ] if $page->{type} eq "yesorno"; - my $a = $in->ask_from_({ title => $o->{name}, + my $a; + if (ref $data2 eq 'ARRAY' && @$data2) { + $a = $in->ask_from_({ title => $o->{name}, messages => $name, callbacks => { map { $_ => $page->{$_} || $default_callback{$_} } qw(focus_out complete) }, if_($page->{interactive_help_id}, interactive_help_id => $page->{interactive_help_id}), }, $data2); + } else { + $a = $in->ask_okcancel($o->{name}, $name); + } # interactive->ask_yesorno does not support stepping forward or backward: $a = $yes if $a && $page->{type} eq "yesorno"; if ($a) { |