From 966e622851ed3d9e30ccec1ac3a0604976adfdca Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 18 Nov 2009 15:17:45 +0000 Subject: hide Gtk+ "close" button when displaying first time wizard that now has a HTML "close" button again --- perl-install/NEWS | 2 ++ perl-install/standalone/display_help | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'perl-install') 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 }) ), - #), + ), ), ); -- cgit v1.2.1