- set_help is deprecated

- it is replaced by interactive_help_id on each ask_*
- many set_help do not have any correspondance in help.pm (drakxid-*),
  those are commented for now

7 files changed, 21 insertions, 18 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 4819bb2a6..37f3520e5 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -13,7 +13,7 @@ use MDK::Common::Globals "network", qw($in $prefix);
 
 sub configure {
     my ($netcnx, $netc, $intf, $first_time) = @_;
-    $::isInstall and $in->set_help('configureNetworkADSL');
+#    $::isInstall and $in->set_help('configureNetworkADSL');
 
   conf_adsl_step1:
     my $l = [ N_("use pppoe"),
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index fc87f5b3a..0d62c68ba 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -17,7 +17,7 @@ use MDK::Common::Globals "network", qw($in $prefix);
 
 sub configure_cable {
     my ($netcnx, $netc, $intf, $first_time) = @_;
-    $::isInstall and $in->set_help('configureNetworkCable');
+#    $::isInstall and $in->set_help('configureNetworkCable');
     $netcnx->{type} = 'cable';
 
     if ($::expert) {
@@ -54,7 +54,7 @@ qq(
 
 sub configure_lan {
     my ($netcnx, $netc, $intf, $first_time) = @_;
-    $::isInstall and $in->set_help('configureNetworkIP');
+#    $::isInstall and $in->set_help('configureNetworkIP');
     configureNetwork($netc, $intf, $first_time) or return;
     configureNetwork2($in, $prefix, $netc, $intf);
     $netc->{NETWORKING} = "yes";
@@ -183,7 +183,7 @@ sub configureNetwork {
     
     if ($last->{BOOTPROTO} !~ /static/) {
 	$netc->{minus_one} = 1;
-	$::isInstall and $in->set_help('configureNetworkHostDHCP');
+#	$::isInstall and $in->set_help('configureNetworkHostDHCP');
 	$in->ask_from(N("Configuring network"),
 N("Please enter your host name if you know it.
 Some DHCP servers require the hostname to work.
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index a5666bed3..2c218621b 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -18,7 +18,7 @@ sub configure {
     my ($netcnx, $netc, $isdn) = @_;
   isdn_step_1:
     defined $netc->{autodetect}{isdn}{id} and goto intern_pci;
-    $::isInstall and $in->set_help('configureNetworkISDN');
+#    $::isInstall and $in->set_help('configureNetworkISDN');
     my $e = $in->ask_from_list_(N("Network Configuration Wizard"),
 				N("Which ISDN configuration do you prefer?
 
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 011ee9054..050743794 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -218,8 +218,9 @@ sub ppp_choose {
     $mouse ||= {};
 
     $mouse->{device} ||= readlink "$::prefix/dev/mouse";
-    $::isInstall and $in->set_help('selectSerialPort');
-    $modem->{device} ||= $in->ask_from_listf('', N("Please choose which serial port your modem is connected to."),
+    $modem->{device} ||= $in->ask_from_listf_raw({ messsages => N("Please choose which serial port your modem is connected to."),
+						   interactive_help_id => 'selectSerialPort',
+						 },
 					     \&mouse::serial_port2text,
 					     [ grep { $_ ne $mouse->{device} } (mouse::serial_ports(), if_(-e '/dev/modem', '/dev/modem')) ]) || return;
 
@@ -228,7 +229,7 @@ sub ppp_choose {
     foreach (@$secret) {
 	push @cnx_list, $_->{server};
     }
-    $::isStandalone || $in->set_help('configureNetworkISP');
+#    $::isStandalone || $in->set_help('configureNetworkISP');
     $in->ask_from('', N("Dialup options"), [
 { label => N("Connection name"), val => \$modem->{connection} },
 { label => N("Phone number"), val => \$modem->{phone} },
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e38e419cf..85bf8dd74 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -118,7 +118,6 @@ sub main {
     my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $first_time, $_direct_fr, $noauto) = @_;
     init_globals($in, $prefix);
     $netc->{minus_one} = 0; #When one configure an eth in dhcp without gateway
-    $::isInstall and $in->set_help('configureNetwork');
     $::isStandalone and read_net_conf($prefix, $netcnx, $netc); # REDONDANCE with intro. FIXME
     $netc->{NET_DEVICE} = $netcnx->{NET_DEVICE} if $netcnx->{NET_DEVICE}; # REDONDANCE with read_conf. FIXME
     $netc->{NET_INTERFACE} = $netcnx->{NET_INTERFACE} if $netcnx->{NET_INTERFACE}; # REDONDANCE with read_conf. FIXME
@@ -152,12 +151,14 @@ ifdown eth0
   step_1:
     $::Wizard_no_previous = 1;
     my @profiles = get_profiles();
-    eval { $in->ask_from(N("Network Configuration Wizard"),
-			 N("Welcome to The Network Configuration Wizard.
+    eval { $in->ask_from_({ title => N("Network Configuration Wizard"),
+			    messages => N("Welcome to The Network Configuration Wizard.
 
 We are about to configure your internet/network connection.
 If you don't want to use the auto detection, deselect the checkbox.
 "),
+			    interactive_help_id => 'configureNetwork',
+			    },
 			 [
 			  if_(@profiles > 1, { label => N("Choose the profile to configure"), val => \$netcnx->{PROFILE}, list => \@profiles }),
 			  { label => N("Use auto detection"), val => \$netc->{autodetection}, type => 'bool' },
@@ -175,7 +176,6 @@ If you don't want to use the auto detection, deselect the checkbox.
     $conf{$_} = $netc->{autodetect}{$_} ? 1 : 0 foreach 'modem', 'winmodem', 'adsl', 'cable', 'lan';
     $conf{isdn} = $netc->{autodetect}{isdn}{description} ? 1 : 0;
 
-    $::isInstall and $in->set_help('configureNetwork');
     my @l = (
 	  [N("Normal modem connection") . if_($netc->{autodetect}{modem}, " - " . N("detected on port %s", $netc->{autodetect}{modem})), \$conf{modem}],
 	  [N("Winmodem connection") . if_($netc->{autodetect}{winmodem}, " - " . N("detected")), \$conf{winmodem}],
@@ -184,8 +184,10 @@ If you don't want to use the auto detection, deselect the checkbox.
 	  [N("Cable connection") . if_($netc->{autodetect}{cable}, " - " . N("cable connection detected")), \$conf{cable}],
 	  [N("LAN connection") . if_($netc->{autodetect}{lan}, " - " . N("ethernet card(s) detected")), \$conf{lan}]
 	 );
-    $::isInstall and $in->set_help('configureNetwork');
-    eval { $in->ask_from(N("Network Configuration Wizard"), N("Choose the connection you want to configure"),
+    eval { $in->ask_from_({ title => N("Network Configuration Wizard"),
+			    messages => N("Choose the connection you want to configure"),
+			    interactive_help_id => 'configureNetwork',
+			  },
 			 [ map { { label => $_->[0], val => $_->[1], type => 'bool' } } @l ],
 			 changed => sub {
 			     return if !$netc->{autodetection};
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index beb0bf441..e41f9f593 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -326,7 +326,7 @@ notation (for example, 1.2.3.4).");
     delete $intf->{NETWORK};
     delete $intf->{BROADCAST};
     my @fields = qw(IPADDR NETMASK);
-    $::isStandalone or $in->set_help('configureNetworkIP');
+#    $::isStandalone or $in->set_help('configureNetworkIP');
     $in->ask_from(N("Configuring network device %s", $intf->{DEVICE}),
   	          (N("Configuring network device %s", $intf->{DEVICE}) . ($module ? N(" (driver %s)", $module) : '') . "\n\n") .
 	          $text,
@@ -389,7 +389,7 @@ sub configureNetworkNet {
     my $gateway_ex = gateway($intf->{IPADDR});
 #-    $netc->{GATEWAY}   ||= gateway($intf->{IPADDR});
 
-    $::isInstall and $in->set_help('configureNetworkHost');
+#    $::isInstall and $in->set_help('configureNetworkHost');
     $in->ask_from(N("Configuring network"),
 N("Please enter your host name.
 Your host name should be a fully-qualified host name,
@@ -426,7 +426,7 @@ want to use the default host name."),
 
 sub miscellaneous_choose {
     my ($in, $u, $clicked, $no_track_net) = @_;
-    $in->set_help('configureNetworkProxy') if $::isInstall;
+#    $in->set_help('configureNetworkProxy') if $::isInstall;
 
     $in->ask_from('',
        N("Proxies configuration"),
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 6b7db7c63..d1c533a2f 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -112,7 +112,7 @@ sub read_providers_backend { my ($file) = @_; map { /(.*?)=>/ } catMaybeCompress
 sub ask_info2 {
     my ($cnx, $netc) = @_;
     
-    $::isInstall and $in->set_help('configureNetworkDNS');
+#    $::isInstall and $in->set_help('configureNetworkDNS');
     $in->ask_from(N("Connection Configuration"),
 		  N("Please fill or check the field below"),
 		  [