From 906d09feee7055c411790bb62ef839c43ba5fe0f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 13 Feb 2003 17:53:59 +0000 Subject: fix and some more Help --- perl-install/Xconfig/card.pm | 24 ++++++++++++++---------- perl-install/Xconfig/main.pm | 3 ++- perl-install/Xconfig/monitor.pm | 5 ++++- perl-install/Xconfig/resolution_and_depth.pm | 10 +++++++--- perl-install/Xconfig/various.pm | 9 ++++++--- perl-install/any.pm | 1 + perl-install/install_interactive.pm | 2 +- 7 files changed, 35 insertions(+), 19 deletions(-) (limited to 'perl-install') diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 82bd85f19..4195c325d 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -199,12 +199,14 @@ sub card_config__not_listed { (map { 'XFree 4|' . $_ } @xf4), ); - my $r = $in->ask_from_treelistf( - N("X server"), N("Choose an X server"), '|', - sub { $_[0] =~ /^Vendor\|($vendors_regexp)\s*-?(.*)/ ? "Vendor|$1|$2" : - $_[0] =~ /^Vendor\|(.*)/ ? "Vendor|Other|$1" : $_[0] }, - \@list, - exists $cards->{$card->{BoardName}} ? "Vendor|$card->{BoardName}" : 'XFree 4|vesa') or return; + my $r = exists $cards->{$card->{BoardName}} ? "Vendor|$card->{BoardName}" : 'XFree 4|vesa'; + $in->ask_from_({ title => N("X server"), + messages => N("Choose an X server"), + interactive_help_id => 'configureX_card_list', + }, + [ { val => \$r, separator => '|', list => \@list, sort => 1, + format => sub { $_[0] =~ /^Vendor\|($vendors_regexp)\s*-?(.*)/ ? "Vendor|$1|$2" : + $_[0] =~ /^Vendor\|(.*)/ ? "Vendor|Other|$1" : $_[0] } } ]) or return; $r eq "Vendor|$card->{BoardName}" and return 1; #- it is unchanged, don't modify $card @@ -352,10 +354,12 @@ sub xfree_and_glx_choose { my $tc = $auto ? $choices[0] : - $in->ask_from_listf(N("XFree configuration"), - formatAlaTeX(join("\n\n\n", (grep { $_ } map { $_->{more_messages} } @choices), - N("Which configuration of XFree do you want to have?"))), - sub { $_[0]{text} }, \@choices) or return; + $in->ask_from_listf_raw({ title => N("XFree configuration"), + messages => formatAlaTeX(join("\n\n\n", (grep { $_ } map { $_->{more_messages} } @choices), + N("Which configuration of XFree do you want to have?"))), + interactive_help_id => 'configureX_xfree_and_glx', + }, + sub { $_[0]{text} }, \@choices) or return; log::l("Using $tc->{text}"); $tc->{code}(); set_glx_restrictions($card); diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm index 4122fd098..4f57244b6 100644 --- a/perl-install/Xconfig/main.pm +++ b/perl-install/Xconfig/main.pm @@ -98,7 +98,8 @@ sub configure_chooser_raw { }; my $ok; - $in->ask_from_({ if_($::isStandalone, ok => N("Quit")) }, + $in->ask_from_({ interactive_help_id => 'configureX_chooser', + if_($::isStandalone, ok => N("Quit")) }, [ { label => N("Graphic Card"), val => \$texts{card}, icon => "eth_card_mini", clicked => sub { $may_set->('card', Xconfig::card::configure($in, $raw_X, $do_pkgs, 0, $options)); diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm index c46e5e25a..db0d72c3e 100644 --- a/perl-install/Xconfig/monitor.pm +++ b/perl-install/Xconfig/monitor.pm @@ -91,7 +91,10 @@ sub choose { } }; - $in->ask_from(N("Monitor"), N("Choose a monitor"), + $in->ask_from_({ title => N("Monitor"), + messages => N("Choose a monitor"), + interactive_help_id => 'configureX_monitor' + }, [ { val => \$merged_name, separator => '|', list => ['Custom', "Plug'n Play", sort keys %h_monitors], format => sub { $_[0] eq 'Custom' ? N("Custom") : diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm index 6972e1518..0efdc6671 100644 --- a/perl-install/Xconfig/resolution_and_depth.pm +++ b/perl-install/Xconfig/resolution_and_depth.pm @@ -176,7 +176,7 @@ sub configure { if ($auto) { #- use $default_resolution } elsif ($in->isa('interactive::gtk')) { - $default_resolution = choose_gtk($card, $default_resolution, @resolutions) or return; + $default_resolution = choose_gtk($in, $card, $default_resolution, @resolutions) or return; } else { $default_resolution = choose($in, $default_resolution, @resolutions) or return; } @@ -199,7 +199,7 @@ sub configure_auto_install { } sub choose_gtk { - my ($card, $default_resolution, @resolutions) = @_; + my ($in, $card, $default_resolution, @resolutions) = @_; my ($chosen_x_res, $chosen_y_res, $chosen_Depth) = @$default_resolution{'X', 'Y', 'Depth'}; $chosen_x_res ||= 640; @@ -268,7 +268,11 @@ sub choose_gtk { ), ), ), - 0, gtkadd($W->create_okcancel(N("Ok"), N("Cancel"))), + 0, gtkadd($W->create_okcancel(N("Ok"), N("Cancel"), '', + [ N("Help"), sub { + my $message = $in->interactive_help_get_id('configureX_resolution') or return; + $in->ask_warn(N("Help"), $message); + }, 1 ])), )); $depth_combo->disable_activate; $depth_combo->set_use_arrows_always(1); diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index 8fd1bf68b..daa8d27f9 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -67,10 +67,13 @@ sub choose_xdm { my $xdm = $::isStandalone ? runlevel() == 5 : 1; if (!$auto || $::isStandalone) { - $xdm = $in->ask_yesorno_({ interactive_help_id => 'configureXxdm' }, - N("Graphical interface at startup"), + $xdm = $in->ask_yesorno_({ + title => N("Graphical interface at startup"), + messages => N("I can setup your computer to automatically start the graphical interface (XFree) upon booting. -Would you like XFree to start when you reboot?"), $xdm) or return; +Would you like XFree to start when you reboot?"), + interactive_help_id => 'configureXxdm', + }, $xdm) or return; } runlevel($xdm ? 5 : 3); } diff --git a/perl-install/any.pm b/perl-install/any.pm index 27c914edd..bddd4b67a 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -663,6 +663,7 @@ sub selectCountry { $o->ask_from_( { title => N("Country"), messages => N("Please choose your country."), + interactive_help_id => 'selectCountry', advanced_messages => N("Here is the full list of available countries"), advanced_label => N("More"), advanced_state => $ext_country && scalar(@best), diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index cad2f74c5..f543b502d 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -49,7 +49,7 @@ sub partition_with_diskdrake { require diskdrake::interactive; { local $::expert = $::expert; - diskdrake::interactive::main($o, $all_hds, $nowizard, $do_force_reload, sub { $o->interactive_help_get_id('choosePackages') }); + diskdrake::interactive::main($o, $all_hds, $nowizard, $do_force_reload, sub { $o->interactive_help_get_id('partition_with_diskdrake') }); } if (delete $o->{wizard}) { partitionWizard($o, 'nodiskdrake') or redo; -- cgit v1.2.1