summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-15 21:34:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-15 21:34:08 +0000
commitbd30c2f68c8a6bb2a690354998748fb4e1bf2b05 (patch)
tree1b54897e73546511a3923be39f07c1071b42b7f2
parentdb9344149320870fd92d24b704f673e4880b2b6a (diff)
downloaddrakx-bd30c2f68c8a6bb2a690354998748fb4e1bf2b05.tar
drakx-bd30c2f68c8a6bb2a690354998748fb4e1bf2b05.tar.gz
drakx-bd30c2f68c8a6bb2a690354998748fb4e1bf2b05.tar.bz2
drakx-bd30c2f68c8a6bb2a690354998748fb4e1bf2b05.tar.xz
drakx-bd30c2f68c8a6bb2a690354998748fb4e1bf2b05.zip
no_comment
-rw-r--r--perl-install/ChangeLog8
-rw-r--r--perl-install/install_gtk.pm9
-rw-r--r--perl-install/install_steps_gtk.pm5
-rw-r--r--perl-install/my_gtk.pm2
4 files changed, 12 insertions, 12 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 0fbf73a8c..482625928 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,9 +1,11 @@
2000-09-15 Pixel <pixel@mandrakesoft.com>
- * mouse.pm: reworked quite a lot. Now sorts/categorize nicely the mice.
-
- * install_steps_interactive.pm (selectMouse): adapted for reworked mouse.pm
+ * install_steps_gtk.pm (set_help): save the help message displayed
+ in $o->{current_help}
+ * install_gtk.pm (create_big_help): display $o->{current_help}
+ * mouse.pm: reworked quite a lot. Now sorts/categorize nicely the mice.
+ * install_steps_interactive.pm (selectMouse): adapted for reworked mouse.pm
* install2.pm (selectMouse): adapted for mouse::read now returning
an hash ref
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 53a18e444..92b1ef797 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -71,12 +71,12 @@ widget "*Steps*" style "small-font"
#------------------------------------------------------------------------------
sub create_big_help {
+ my ($o) = @_;
my $w = my_gtk->new('', grab => 1, force_position => [ $::stepswidth, $::logoheight ]);
$w->{rwindow}->set_usize($::logowidth, $::rootheight - $::logoheight);
gtkadd($w->{window},
gtkpack_(new Gtk::VBox(0,0),
- 1, createScrolledWindow(gtktext_insert(new Gtk::Text,
- formatAlaTeX(_ deref($help::steps{$::o->{step}})))),
+ 1, createScrolledWindow(gtktext_insert(new Gtk::Text, $o->{current_help})),
0, gtksignal_connect(my $ok = new Gtk::Button(_("Ok")), "clicked" => sub { Gtk->main_quit }),
));
$ok->grab_focus;
@@ -102,11 +102,10 @@ sub create_help_window {
my $pixmap = new Gtk::Pixmap(gtkcreate_xpm($w->{window}, "$ENV{SHARE_PATH}/help.xpm"));
gtkadd($w->{window},
gtkpack_(new Gtk::HBox(0,-2),
- 0, gtkadd(gtksignal_connect(new Gtk::Button, clicked => \&create_big_help), $pixmap),
+ 0, gtkadd(gtksignal_connect(new Gtk::Button, clicked => sub { create_big_help($o) }), $pixmap),
1, createScrolledWindow($o->{help_window_text} = new Gtk::Text),
));
- gtktext_insert($o->{help_window_text}, $o->{step} ? formatAlaTeX(_ deref($help::steps{$o->{step}})) : '');
-
+ $o->set_help($o->{step}) if $o->{step};
$w->show;
$o->{help_window} = $w;
}
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 06777fd12..6e36560c9 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -558,9 +558,8 @@ sub set_help {
my ($o, @l) = @_;
$::live and return 1;
- gtktext_insert($o->{help_window_text},
- formatAlaTeX(join "\n",
- map { _ deref($help::steps{$_}) } @l));
+ $o->{current_help} = formatAlaTeX(join "\n", map { _ deref($help::steps{$_}) } @l);
+ gtktext_insert($o->{help_window_text}, $o->{current_help});
1;
}
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 6d16bae56..b90feb3ef 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -380,7 +380,7 @@ sub _create_window($$) {
if ($d eq "help" && !$::isStandalone) {
require install_gtk;
- install_gtk::create_big_help();
+ install_gtk::create_big_help($::o);
} else {
my $s = $::o->{step};
do { $s = $::o->{steps}{$s}{$d} } until !$s || $::o->{steps}{$s}{reachable};