From 6ca7d220f9116657035547e814bb039bc63cca2b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 4 Sep 2002 15:44:36 +0000
Subject: fix dialog box asking "Load from floppy" or "Save on floppy" in
 individual package selection

---
 perl-install/install_steps_interactive.pm | 53 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 28 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e4c965f82..866f5891c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -530,36 +530,33 @@ sub choosePackagesTree {
 }
 sub loadSavePackagesOnFloppy {
     my ($o, $packages) = @_;
-    my $choice = $o->ask_from_listf('', 
+    $o->ask_from('', 
 _("Please choose load or save package selection on floppy.
 The format is the same as auto_install generated floppies."),
-				    sub { $_[0]{text} },
-				    [ { text => _("Load from floppy"), code => sub {
-					    while (1) {
-						my $w = $o->wait_message(_("Package selection"), _("Loading from floppy"));
-						log::l("load package selection from floppy");
-						my $O = eval { install_any::loadO(undef, 'floppy') };
-						if ($@) {
-						    $w = undef; #- close wait message.
-						    $o->ask_okcancel('', _("Insert a floppy containing package selection"))
-						      or return;
-						} else {
-						    install_any::unselectMostPackages($o);
-						    foreach (@{$O->{default_packages} || []}) {
-							my $pkg = pkgs::packageByName($packages, $_);
-							pkgs::selectPackage($packages, $pkg) if $pkg;
-						    }
-						    return 1;
-						}
-					    }
-					} },
-				      { text => _("Save on floppy"), code => sub {
-					    log::l("save package selection to floppy");
-					    install_any::g_default_packages($o, 'quiet');
-					} },
-				      { text => _("Cancel") },
-				    ]);
-    $choice->{code} and $choice->{code}();
+		 [ { val => \ (my $choice), list => [ __("Load from floppy"), __("Save on floppy") ], format => \&translate, type => 'list' } ]) or return;
+
+    if ($choice eq 'Load from floppy') {
+	while (1) {
+	    my $w = $o->wait_message(_("Package selection"), _("Loading from floppy"));
+	    log::l("load package selection from floppy");
+	    my $O = eval { install_any::loadO(undef, 'floppy') };
+	    if ($@) {
+		$w = undef;	#- close wait message.
+		$o->ask_okcancel('', _("Insert a floppy containing package selection"))
+		  or return;
+	    } else {
+		install_any::unselectMostPackages($o);
+		foreach (@{$O->{default_packages} || []}) {
+		    my $pkg = pkgs::packageByName($packages, $_);
+		    pkgs::selectPackage($packages, $pkg) if $pkg;
+		}
+		return 1;
+	    }
+	}
+    } else {
+	log::l("save package selection to floppy");
+	install_any::g_default_packages($o, 'quiet');
+    }
 }
 sub chooseGroups {
     my ($o, $packages, $compssUsers, $min_level, $individual, $max_size) = @_;
-- 
cgit v1.2.1