summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-14 14:05:11 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-14 14:05:11 +0000
commit6cd3ed67905e431eacce3572a685f21132568afb (patch)
tree2ee58893f27a22a9691df0b664019da311f18333
parent70da5f76fd0375a4405252660319eef5d434ae35 (diff)
downloaddrakx-6cd3ed67905e431eacce3572a685f21132568afb.tar
drakx-6cd3ed67905e431eacce3572a685f21132568afb.tar.gz
drakx-6cd3ed67905e431eacce3572a685f21132568afb.tar.bz2
drakx-6cd3ed67905e431eacce3572a685f21132568afb.tar.xz
drakx-6cd3ed67905e431eacce3572a685f21132568afb.zip
(setPackages) fix dialogs title
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_gtk.pm9
2 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c28c7e7fe..decb34549 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- time steps in logs
- media step:
+ o fix dialogs title
o show which media are disabled when offering to pick supplementary ones
Version 15.11 - 13 December 2012
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index a8f998f7a..24588cbc6 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -234,6 +234,14 @@ sub selectMouse {
}
}
+sub setPackages {
+ my ($o) = @_;
+ my (undef, $old_title) = get_default_step_items();
+ set_default_step_items(N("Media Selection") || $old_title);
+ install::any::setPackages($o);
+ set_default_step_items($old_title);
+}
+
sub reallyChooseDesktop {
my ($o, $title, $message, $choices, $choice) = @_;
@@ -794,4 +802,5 @@ It will then continue from the hard disk drive and the packages will remain avai
log::l("keeping media " . join ',', map { $_->{rpmsdir} } grep { !$_->{ignore} } @$hdlists);
}
+
1;