summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-02 14:06:48 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-02 14:06:48 +0000
commitb915ae63d096652366b9e9d0fc88e58c68cce131 (patch)
treef985a6cb8b5ae473f054ca0cc70dbf46e5bdfb3d
parent45326822b579acf7d72d45c6c685360a927df78e (diff)
downloaddrakx-b915ae63d096652366b9e9d0fc88e58c68cce131.tar
drakx-b915ae63d096652366b9e9d0fc88e58c68cce131.tar.gz
drakx-b915ae63d096652366b9e9d0fc88e58c68cce131.tar.bz2
drakx-b915ae63d096652366b9e9d0fc88e58c68cce131.tar.xz
drakx-b915ae63d096652366b9e9d0fc88e58c68cce131.zip
(ask_deselect_media__copy_on_disk) fix layout of media selection step by preventing button & checkboxes to be too big
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_gtk.pm16
2 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8f722799b..699501c7d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- fix buggy blocking wait_message occuring in summary (#42062)
+- fix layout of media selection step
Version 11.31.2 - 2 September 2008
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index b8e5b46f1..c7e60febf 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -695,25 +695,25 @@ sub ask_deselect_media__copy_on_disk {
$w->sync;
ugtk2::gtkadd(
$w->{window},
- create_scrolled_window(gtkpack(
+ create_scrolled_window(gtkpack_(
Gtk2::VBox->new(0, 5),
@names > 1 ? (
- Gtk2::WrappedLabel->new(formatAlaTeX(N("The following installation media have been found.
+ 0, Gtk2::WrappedLabel->new(formatAlaTeX(N("The following installation media have been found.
If you want to skip some of them, you can unselect them now."))),
(map {
my $b = gtknew('CheckButton', text => $_, active_ref => \$selection{$_});
$b->set_sensitive(0) if $_ eq $names[0];
- $b;
+ (0, $b);
} @names),
- gtknew('HSeparator'),
+ 0, gtknew('HSeparator'),
) : (),
if_($o_copy_rpms_on_disk,
- Gtk2::WrappedLabel->new(formatAlaTeX(N("You have the option to copy the contents of the CDs onto the hard drive before installation.
+ 0, Gtk2::WrappedLabel->new(formatAlaTeX(N("You have the option to copy the contents of the CDs onto the hard drive before installation.
It will then continue from the hard drive and the packages will remain available once the system is fully installed."))),
- gtknew('CheckButton', text => N("Copy whole CDs"), active_ref => $o_copy_rpms_on_disk),
- gtknew('HSeparator'),
+ 0, gtknew('CheckButton', text => N("Copy whole CDs"), active_ref => $o_copy_rpms_on_disk),
+ 0, gtknew('HSeparator'),
),
- gtknew('HBox', children_tight => [
+ 0, gtknew('HBox', children_tight => [
gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
]),
)),