summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-08 10:31:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-08 10:31:47 +0000
commit05692781c18db21f639aa5323a066fab118b8dd7 (patch)
treeb07a88a0eca9c4e93269d8aca51520c6c3bf6733
parent773576a13c2dca5a0556b8086c8ffd97f3ad2aa5 (diff)
downloaddrakx-05692781c18db21f639aa5323a066fab118b8dd7.tar
drakx-05692781c18db21f639aa5323a066fab118b8dd7.tar.gz
drakx-05692781c18db21f639aa5323a066fab118b8dd7.tar.bz2
drakx-05692781c18db21f639aa5323a066fab118b8dd7.tar.xz
drakx-05692781c18db21f639aa5323a066fab118b8dd7.zip
- remove the "help" button
- ensure the help box is not created twice (except when changing theme)
-rw-r--r--perl-install/install_gtk.pm10
-rw-r--r--perl-install/install_steps_gtk.pm2
2 files changed, 3 insertions, 9 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 3ffb7991e..9dac51447 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -102,14 +102,8 @@ sub create_help_window {
$w->{rwindow}->set_usize($::helpwidth, $::helpheight);
$w->{rwindow}->set_title('skip');
$w->sync;
- }
- my $pixmap = gtkpng("$ENV{SHARE_PATH}/help.png");
- gtkadd($w->{window},
- gtkpack_(new Gtk::HBox(0,-2),
- 0, gtkadd(gtksignal_connect(new Gtk::Button, clicked => sub { create_big_help($o) }), $pixmap),
- 1, createScrolledWindow($o->{help_window_text} = new Gtk::Text),
- ));
- $o->set_help($o->{step}) if $o->{step};
+ };
+ gtkadd($w->{window}, createScrolledWindow($o->{help_window_text} = new Gtk::Text));
$w->show;
$o->{help_window} = $w;
}
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 42ccb5e71..98928e8a9 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -123,7 +123,7 @@ sub enteringStep {
printf "Entering step `%s'\n", $o->{steps}{$step}{text};
$o->SUPER::enteringStep($step);
install_gtk::create_steps_window($o);
- install_gtk::create_help_window($o);
+ $o->set_help($step);
}
sub leavingStep {
my ($o, $step) = @_;