diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-12 14:47:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-12 14:47:56 +0000 |
| commit | 44ad39864c7ff77921cf18a8e22d0e1bee5ae2b9 (patch) | |
| tree | cdcd8b2987ef877da973269ae3d66751a7e73a55 | |
| parent | d41c3387fb7ff4c9d75e616fa1bf0dadf42879cf (diff) | |
| download | drakx-backup-do-not-use-44ad39864c7ff77921cf18a8e22d0e1bee5ae2b9.tar drakx-backup-do-not-use-44ad39864c7ff77921cf18a8e22d0e1bee5ae2b9.tar.gz drakx-backup-do-not-use-44ad39864c7ff77921cf18a8e22d0e1bee5ae2b9.tar.bz2 drakx-backup-do-not-use-44ad39864c7ff77921cf18a8e22d0e1bee5ae2b9.tar.xz drakx-backup-do-not-use-44ad39864c7ff77921cf18a8e22d0e1bee5ae2b9.zip | |
allow {interactive_help} per dialog boxes instead of global
| -rw-r--r-- | perl-install/interactive.pm | 3 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 55c1d5c45..26cfa8135 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -294,7 +294,7 @@ sub ask_from { sub ask_from_normalize { - my ($_o, $common, $l) = @_; + my ($o, $common, $l) = @_; ref($l) eq 'ARRAY' or internal_error('ask_from_normalize'); foreach my $e (@$l) { @@ -350,6 +350,7 @@ sub ask_from_normalize { if (!$common->{title} && $::isStandalone) { ($common->{title} = $0) =~ s|.*/||; } + $common->{interactive_help} ||= $o->{interactive_help}; $common->{advanced_label} ||= N("Advanced"); $common->{advanced_label_close} ||= N("Basic"); $common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages); diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index cc065ec01..be7d634c5 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -637,7 +637,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_($o->{interactive_help}, [ N("Help"), $o->{interactive_help}, 1 ]), if_(@$l2, $advanced_button)); + my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_($common->{interactive_help}, [ N("Help"), $common->{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); |