From 84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 10 Sep 2008 15:12:09 +0000
Subject: (create_widget,create_widgets_block,create_widgets) make advanced
 popup display the same title as their parents

---
 perl-install/interactive/gtk.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/interactive/gtk.pm')

diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 1b19aa2b8..20cbdb6d9 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -363,7 +363,7 @@ sub add_padding {
 }  
 
 sub create_widget {
-    my ($o, $e, $onchange_f, $update, $ignore_ref) = @_;
+    my ($o, $common, $e, $onchange_f, $update, $ignore_ref) = @_;
 
     my $onchange = sub {
 	my ($f) = @_;
@@ -431,11 +431,11 @@ sub create_widget {
     } elsif ($e->{type} eq 'expander') {
 	$e->{grow} = 'fill';
 	my $children = [ if_($e->{message}, { type => 'only_label', no_indent => 1, val => \$e->{message} }), @{$e->{children}} ];
-	create_widgets_block($o, $children, $update, $ignore_ref);
+	create_widgets_block($o, $common, $children, $update, $ignore_ref);
 	$w = gtknew('HBox', children_tight => [
             gtknew('Install_Button', text => $e->{text},
                    clicked => sub {
-                       ask_fromW($o, { title => N("Advanced") }, $children) }
+                       ask_fromW($o, { title => $common->{title} || N("Advanced") }, $children) }
                )
         ]);
     } elsif ($e->{type} =~ /list/) {
@@ -610,7 +610,7 @@ sub all_title_entries {
 }
 
 sub create_widgets_block {
-    my ($o, $l, $update, $ignore_ref) = @_;
+    my ($o, $common, $l, $update, $ignore_ref) = @_;
 
     my $label_sizegrp = Gtk2::SizeGroup->new('horizontal');
     my $realw_sizegrp = Gtk2::SizeGroup->new('horizontal');
@@ -631,7 +631,7 @@ sub create_widgets_block {
 	    $update->($e->{changed});
 	};
 
-	create_widget($o, $e, $onchange_f, $update, $ignore_ref);
+	create_widget($o, $common, $e, $onchange_f, $update, $ignore_ref);
 
 	my $label_w;
 	if ($e->{label} || !$e->{no_indent}) {
@@ -728,7 +728,7 @@ sub create_widgets {
         ${$_->{val}} = mygtk2::asteriskize(${$_->{val}}) foreach @all_titles;
     }
 
-    my $box = create_widgets_block($o, $l, $update, \$ignore);
+    my $box = create_widgets_block($o, $common, $l, $update, \$ignore);
 
     my $tooltips = Gtk2::Tooltips->new;
     foreach my $e (@all) {
-- 
cgit v1.2.1