summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-11 16:37:11 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-11 16:37:11 +0000
commitbac1c7b2690e0ce3af94c3475fddb71dfd6d2d6e (patch)
tree2762ca5047913e9fcea7525a3e37daa2a4cedcfb
parent96bd2aef26feb5bfd0fefa2d7d6b815c7906a1d1 (diff)
downloaddrakx-bac1c7b2690e0ce3af94c3475fddb71dfd6d2d6e.tar
drakx-bac1c7b2690e0ce3af94c3475fddb71dfd6d2d6e.tar.gz
drakx-bac1c7b2690e0ce3af94c3475fddb71dfd6d2d6e.tar.bz2
drakx-bac1c7b2690e0ce3af94c3475fddb71dfd6d2d6e.tar.xz
drakx-bac1c7b2690e0ce3af94c3475fddb71dfd6d2d6e.zip
(ask_fromW) fix displaying "Help" Button for HTML help
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/interactive/gtk.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 00f0112e4..5fdf0cdb4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,7 @@
- fix parsing error messages ar markups
- "Help" dialogs:
o add a separator before "Close" button
+ o fix displaying "Help" Button for HTML help
o put "Close" button of help at right end
- services (thanks to spuk):
o list ip6tables in "Internet" category
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index a5b410219..f33295b72 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -829,7 +829,7 @@ sub ask_fromW {
mygtk2::set_main_window_size($mainw->{rwindow}) if $mainw->{pop_it} && !$common->{auto_window_size} && (@$l || $mainw->{box_size} == 200);
my @more_buttons = (
- if_($common->{interactive_help},
+ if_($common->{interactive_help} || $common->{interactive_help_id},
[ gtknew('Install_Button', text => N("Help"),
clicked => sub { display_help($o, $common, $mainw) }), undef, 1 ]),
if_($common->{more_buttons}, @{$common->{more_buttons}}),