summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-06 14:25:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-06 14:25:49 +0000
commit5ad11e2e83343c6a16f894c0ea598266f9cf9252 (patch)
treecce89ec79fd0a189c4a9986cc133c3e877a383ff
parent706aa6864a6aa8d46c45956046b12b81bd218485 (diff)
downloaddrakx-backup-do-not-use-5ad11e2e83343c6a16f894c0ea598266f9cf9252.tar
drakx-backup-do-not-use-5ad11e2e83343c6a16f894c0ea598266f9cf9252.tar.gz
drakx-backup-do-not-use-5ad11e2e83343c6a16f894c0ea598266f9cf9252.tar.bz2
drakx-backup-do-not-use-5ad11e2e83343c6a16f894c0ea598266f9cf9252.tar.xz
drakx-backup-do-not-use-5ad11e2e83343c6a16f894c0ea598266f9cf9252.zip
add "Help" button
-rw-r--r--perl-install/install_steps_gtk.pm8
-rw-r--r--perl-install/interactive/gtk.pm2
2 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index bb69a8147..7e6d438b3 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -123,6 +123,13 @@ sub new($$) {
install_gtk::install_theme($o, install_gtk::default_theme($o));
install_gtk::create_logo_window($o);
+ $o->{interactive_help} = sub {
+ my $w = ugtk2->new('');
+ $w->{rwindow}->set_size_request($::windowwidth * 0.92, $::windowheight * 0.9);
+ gtkadd($w->{window}, gtkpack__(create_box_with_title($w, $o->{current_help}),
+ $w->create_okcancel(N("Ok"))));
+ $w->main;
+ };
$ugtk2::force_center = [ $::rootwidth - $::windowwidth, $::logoheight, $::windowwidth, $::windowheight ];
$o = (bless {}, ref $type || $type)->SUPER::new($o);
@@ -273,7 +280,6 @@ sub reallyChooseGroups {
1;
}
-
sub choosePackagesTree {
my ($o, $packages, $limit_to_medium) = @_;
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 43fc50282..bb83cfdd5 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -615,7 +615,7 @@ sub ask_fromW {
0, Gtk2::HSeparator->new,
1, $create_widgets->($advanced_total_size, @widgets_advanced));
- my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_(@$l2, $advanced_button));
+ my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_($o->{interactive_help}, [ N("Help"), $o->{interactive_help}, 1 ]), if_(@$l2, $advanced_button));
$pack->pack_start($always_pack, 1, 1, 0); $always_pack->show;
$pack->pack_start($advanced_pack, 1, 1, 0);