diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-09-10 15:12:09 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-09-10 15:12:09 +0000 |
| commit | 84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e (patch) | |
| tree | 48db6beac95146d9851e8eeb287c9281b8a5e808 | |
| parent | 2bad2dcfdfd95a5672342d5e416b2f507eab029f (diff) | |
| download | drakx-84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e.tar drakx-84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e.tar.gz drakx-84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e.tar.bz2 drakx-84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e.tar.xz drakx-84b4ebcea85fddcf4d788ecb6b29c9b2d708df4e.zip | |
(create_widget,create_widgets_block,create_widgets) make advanced popup display the same title as their parents
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 12 |
3 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index e85fadb95..905990cfa 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- libdrakX: + o make advanced popup display the same title as their parents - drakboot o fix nolapic/lapic logic due to altered kernel settings - fix input devices detection in rpmsrate (broken for 3 years, #43721) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 74baab45a..2f3aa0aed 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - libdrakX: o fix position of cancel button in popups + o make advanced popup display the same title as their parents - drakboot o fix nolapic/lapic logic due to altered kernel settings - fix input devices detection in rpmsrate (broken for 3 years, #43721) 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) { |