diff options
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 8 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 2 |
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); |