summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-22 13:45:31 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-22 13:45:31 +0000
commitaeb3d3d73bdd0c098fd4011bd2be3907341a94a4 (patch)
treead63f20bb52b9c6d8cbabb44fc94a7557d8d9235
parent5da246b16f2e787beba4433f9296c3caf9ba21b4 (diff)
downloaddrakx-aeb3d3d73bdd0c098fd4011bd2be3907341a94a4.tar
drakx-aeb3d3d73bdd0c098fd4011bd2be3907341a94a4.tar.gz
drakx-aeb3d3d73bdd0c098fd4011bd2be3907341a94a4.tar.bz2
drakx-aeb3d3d73bdd0c098fd4011bd2be3907341a94a4.tar.xz
drakx-aeb3d3d73bdd0c098fd4011bd2be3907341a94a4.zip
(create_widgets_block) add support for new 'alignment' parameter (only 'right' value is supported for now)
-rw-r--r--perl-install/interactive.pm1
-rw-r--r--perl-install/interactive/gtk.pm5
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index d8014f679..f6bf95127 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -45,6 +45,7 @@ use do_pkgs;
#- validate => function called when "Ok" is pressed. If it returns false, this entry is focused, otherwise it quits
#- disabled => function returning wether it should be disabled (grayed)
#- focus => function returning wether it should be focused
+#- alignment => preferred alignment
#- do_not_expand => do not eat all horizontal space
#- install_button => if possible, use improved graphical style
#- gtk => gtk preferences
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index f3240474b..1330fb0dd 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -622,10 +622,13 @@ sub create_widgets_block {
]);
}
+ my $eater = gtknew('Label') if $e->{alignment} eq 'right';
+
$e->{real_w} = gtkpack_(Gtk2::HBox->new,
if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
if_($label_w, 0, $label_w),
- (1, $e->{real_w}),
+ if_($eater, 1, $eater),
+ (!$eater, $e->{real_w}),
);
}
gtknew('VBox', children => [ map { $_->{grow} || 0, $_->{real_w} } @$l ]);