summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-07-30 10:31:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-07-30 10:31:09 +0000
commit9ef4e7bfab02659851da4d104d15a67d4b8aaaf9 (patch)
tree5242bb1ee00f71305a2121d3048f61989218c87a
parentb719a3d0e4e107afd52a438a50c34f52393e5a28 (diff)
downloaddrakx-9ef4e7bfab02659851da4d104d15a67d4b8aaaf9.tar
drakx-9ef4e7bfab02659851da4d104d15a67d4b8aaaf9.tar.gz
drakx-9ef4e7bfab02659851da4d104d15a67d4b8aaaf9.tar.bz2
drakx-9ef4e7bfab02659851da4d104d15a67d4b8aaaf9.tar.xz
drakx-9ef4e7bfab02659851da4d104d15a67d4b8aaaf9.zip
ensure "No details" is displayed instead of "Details" when beginning a new
package installation round and "No details" was pressed in previous round
-rw-r--r--perl-install/install_steps_gtk.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 503528388..f25bc3879 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -460,6 +460,7 @@ sub installPackages {
my ($advertising, $change_time, $i);
my $show_advertising if 0;
$show_advertising = to_bool(@install_any::advertising_images) if !defined $show_advertising;
+ my $detail_or_not = sub { $show_advertising ? N("Details") : N("No details") };
my ($msg, $msg_time_remaining, $msg_time_total) = map { Gtk2::Label->new($_) } '', (N("Estimating")) x 2;
my ($progress, $progress_total) = map { Gtk2::ProgressBar->new } (1..2);
gtkadd($w->{window}, my $box = Gtk2::VBox->new(0,10));
@@ -473,7 +474,7 @@ sub installPackages {
$progress_total,
gtkadd(create_hbox(),
my $cancel = Gtk2::Button->new(N("Cancel")),
- my $details = Gtk2::Button->new(N("Details")),
+ my $details = Gtk2::Button->new($detail_or_not->()),
),
)), 0, 1, 0);
$details->hide if !@install_any::advertising_images;
@@ -531,7 +532,7 @@ sub installPackages {
$cancel->signal_connect(clicked => sub { $pkgs::cancel_install = 1 });
$details->signal_connect(clicked => sub {
invbool \$show_advertising;
- $details->set_label($show_advertising ? N("Details") : N("No details"));
+ $details->set_label($detail_or_not->());
$advertize->(1);
});
$advertize->();