diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-11-18 15:17:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-11-18 15:17:45 +0000 |
| commit | 966e622851ed3d9e30ccec1ac3a0604976adfdca (patch) | |
| tree | 6d82433d520b3ae773fb0bef47765966830a729a | |
| parent | a1440882723046e3dbeb9d73ab4d3d14b6477e1a (diff) | |
| download | drakx-966e622851ed3d9e30ccec1ac3a0604976adfdca.tar drakx-966e622851ed3d9e30ccec1ac3a0604976adfdca.tar.gz drakx-966e622851ed3d9e30ccec1ac3a0604976adfdca.tar.bz2 drakx-966e622851ed3d9e30ccec1ac3a0604976adfdca.tar.xz drakx-966e622851ed3d9e30ccec1ac3a0604976adfdca.zip | |
hide Gtk+ "close" button when displaying first time wizard that now
has a HTML "close" button again
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/display_help | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 096303955..e0c26de15 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -9,6 +9,8 @@ o rework UI layout to account for CONSOLE_LOGO support removal - display_help: o handle window.close() events (#55099) + o hide Gtk+ "close" button when displaying first time wizard that + now has a HTML "close" button again - fix detecting hidden partitions as recovery - diskdrake: o allow to convert ext2/3 to ext4 but do not enable flags diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help index d54946a34..db51ad09c 100755 --- a/perl-install/standalone/display_help +++ b/perl-install/standalone/display_help @@ -58,11 +58,11 @@ gtkadd($w->{rwindow}, 1, create_scrolled_window(gtkset_border_width($view, 5), [ 'never', 'automatic' ]), #1, gtknew('ScrolledWindow', child => $view, border_width => 5, h_policy => 'never'); 0, Gtk2::HSeparator->new, - #if_($is_firstime, # We have JavaScript issues for now, so let's keep the "close" button: + if_(!$is_firstime, 0, gtkpack(create_hbox('end'), gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit }) ), - #), + ), ), ); |