summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-26 19:20:32 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-26 19:20:32 +0000
commit33efe168ffed70ebda4da6a8a7cccaed26a277e4 (patch)
tree43f2401cb29054defc67944887995e0658786786
parent48c0991c67d756e3382d5ce98db5ac55a74ffe14 (diff)
downloaddrakx-net-33efe168ffed70ebda4da6a8a7cccaed26a277e4.tar
drakx-net-33efe168ffed70ebda4da6a8a7cccaed26a277e4.tar.gz
drakx-net-33efe168ffed70ebda4da6a8a7cccaed26a277e4.tar.bz2
drakx-net-33efe168ffed70ebda4da6a8a7cccaed26a277e4.tar.xz
drakx-net-33efe168ffed70ebda4da6a8a7cccaed26a277e4.zip
add title in wait messages
-rwxr-xr-xbin/drakvpn-old4
-rw-r--r--lib/network/connection_manager.pm4
-rw-r--r--lib/network/drakvpn.pm2
-rw-r--r--lib/network/netconnect.pm6
-rw-r--r--lib/network/thirdparty.pm4
5 files changed, 10 insertions, 10 deletions
diff --git a/bin/drakvpn-old b/bin/drakvpn-old
index de096a2..3f247a9 100755
--- a/bin/drakvpn-old
+++ b/bin/drakvpn-old
@@ -94,7 +94,7 @@ What would you like to do?"),
# FIXME: reconfigure is not handled
if ($r eq "disable") {
if (!$::testing) {
- my $_wait_disabl = $in->wait_message('', N("Disabling VPN..."));
+ my $_wait_disabl = $in->wait_message(N("Please wait"), N("Disabling VPN..."));
network::ipsec::stop_daemons();
}
foreach ($ipsec_conf, $tunnels_file) {
@@ -124,7 +124,7 @@ What would you like to do?"),
rename("$_.drakvpndisable", $_) or die "Could not find configuration. Please reconfigure.";
}
{
- my $_wait_enabl = $in->wait_message('', N("Enabling VPN..."));
+ my $_wait_enabl = $in->wait_message(N("Please wait"), N("Enabling VPN..."));
network::ipsec::start_daemons();
}
log::l("[drakvpn] Enabled");
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index fae09c3..53a0312 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -66,7 +66,7 @@ sub setup_connection {
}, $cmanager->{connection}->get_hardware_settings) or return;
}
if ($cmanager->{connection}->can('check_hardware')) {
- my $wait = $cmanager->{in}->wait_message('', N("Configuring device..."));
+ my $wait = $cmanager->{in}->wait_message(N("Please wait"), N("Configuring device..."));
if (!$cmanager->{connection}->check_hardware) {
undef $wait;
$cmanager->{in}->ask_warn(N("Error"), $cmanager->{connection}{hardware}{error}) if $cmanager->{connection}{hardware}{error};
@@ -272,7 +272,7 @@ sub update_networks {
@{$cmanager->{gui}{networks_list}{data}} = ();
if ($cmanager->{connection}) {
- my $wait = $cmanager->{connection}->network_scan_is_slow && $cmanager->{in}->wait_message('', N("Scanning for networks..."));
+ my $wait = $cmanager->{connection}->network_scan_is_slow && $cmanager->{in}->wait_message(N("Please wait"), N("Scanning for networks..."));
$cmanager->{connection}{networks} = $cmanager->{connection}->get_networks;
$cmanager->{connection}{network} ||= find { $cmanager->{connection}{networks}{$_}{current} } keys %{$cmanager->{connection}{networks}};
diff --git a/lib/network/drakvpn.pm b/lib/network/drakvpn.pm
index 158b40c..c68127d 100644
--- a/lib/network/drakvpn.pm
+++ b/lib/network/drakvpn.pm
@@ -46,7 +46,7 @@ sub create_connection {
return 1;
}
if ($vpn_type->can('prepare')) {
- my $wait = $in->wait_message('', N("Initializing tools and detecting devices for %s...", $vpn_type->get_type));
+ my $wait = $in->wait_message(N("Please wait"), N("Initializing tools and detecting devices for %s...", $vpn_type->get_type));
if (!$vpn_type->prepare) {
undef $wait;
$in->ask_warn(N("Error"), N("Unable to initialize %s connection type!", $vpn_type->get_type));
diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm
index 5a8e861..dc50da6 100644
--- a/lib/network/netconnect.pm
+++ b/lib/network/netconnect.pm
@@ -174,7 +174,7 @@ sub real_main {
data => sub { $hardware_settings },
complete => sub {
if ($connection->can('check_hardware')) {
- my $_w = $in->wait_message('', N("Configuring device..."));
+ my $_w = $in->wait_message(N("Please wait"), N("Configuring device..."));
if (!$connection->check_hardware) {
$in->ask_warn(N("Error"), $connection->{hardware}{error}) if $connection->{hardware}{error};
return 1;
@@ -207,7 +207,7 @@ sub real_main {
select_network => {
pre => sub {
- my $_w = $in->wait_message('', N("Scanning for networks..."));
+ my $_w = $in->wait_message(N("Please wait"), N("Scanning for networks..."));
$connection->get_networks;
},
name => sub { $net->{type}->get_type_name . "\n\n" . N("Please select your network:") },
@@ -710,7 +710,7 @@ Take a look at http://www.linmodems.org"),
$up = 1;
if ($a) {
# local $::isWizard = 0;
- my $_w = $in->wait_message('', N("Testing your connection..."), 1);
+ my $_w = $in->wait_message(N("Please wait"), N("Testing your connection..."), 1);
network::tools::stop_net_interface($net, 0);
sleep 1;
network::tools::start_net_interface($net, 1);
diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm
index 2f7952b..5740604 100644
--- a/lib/network/thirdparty.pm
+++ b/lib/network/thirdparty.pm
@@ -329,7 +329,7 @@ sub apply_settings {
if ($settings) {
log::explanations(qq(Found settings for driver "$driver" in category "$category"));
- my $wait = $in->wait_message('', N("Looking for required software and drivers..."));
+ my $wait = $in->wait_message(N("Please wait"), N("Looking for required software and drivers..."));
install_packages($in, $settings, $driver, @thirdparty_types) or return;
@@ -344,7 +344,7 @@ sub apply_settings {
}
undef $wait;
- $wait = $in->wait_message('', N("Please wait, running device configuration commands..."));
+ $wait = $in->wait_message(N("Please wait"), N("Please wait, running device configuration commands..."));
device_run_command($settings, $driver, 'post');
if (my $service = device_get_option($settings, 'restart_service')) {