diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-22 13:58:39 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-22 13:58:39 +0000 |
| commit | 0f6ebc8f15f4df1ac798dcbcd280fdbaf0f41927 (patch) | |
| tree | 25ccba9a2a4145189c4cba5ac36bb4300028c2f4 | |
| parent | a430d4134a54be1e6305afe8ad177e849f4aaaaa (diff) | |
| download | drakx-0f6ebc8f15f4df1ac798dcbcd280fdbaf0f41927.tar drakx-0f6ebc8f15f4df1ac798dcbcd280fdbaf0f41927.tar.gz drakx-0f6ebc8f15f4df1ac798dcbcd280fdbaf0f41927.tar.bz2 drakx-0f6ebc8f15f4df1ac798dcbcd280fdbaf0f41927.tar.xz drakx-0f6ebc8f15f4df1ac798dcbcd280fdbaf0f41927.zip | |
(acceptLicense): use new "interactive" feature to gray "Next" button until
license is accepted
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1cc1b6642..41abe8653 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -80,14 +80,13 @@ so the messages will be displayed in english during installation") if $ENV{LANGU sub acceptLicense { my ($o) = @_; - my $r = $o->ask_from_list_(N("License agreement"), - formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()), - [ N_("Accept"), N_("Refuse") ], "Refuse") or die 'already displayed'; + my $r = 'Refuse'; - if ($r ne "Accept") { - $o->ask_yesorno('', N("Are you sure you refuse the licence?"), 1) and $o->exit; - acceptLicense($o); - } + $o->ask_from_({ title => N("License agreement"), + messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()), + callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, + }, + [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list' } ]) or die 'already displayed'; } #------------------------------------------------------------------------------ |