summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install_steps_gtk.pm16
-rw-r--r--perl-install/install_steps_interactive.pm8
-rw-r--r--perl-install/interactive.pm4
-rw-r--r--perl-install/services.pm2
-rw-r--r--perl-install/share/logo-mandrake.pngbin10996 -> 12097 bytes
5 files changed, 15 insertions, 15 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 28fba7aa6..cdf4cd940 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -218,7 +218,7 @@ sub reallyChooseGroups {
$check->set_active($val->{$e});
$check->signal_connect(clicked => sub {
$val->{$e} = $check->get_active;
- $w_size->set(&$size_to_display);
+ $w_size->set_label(&$size_to_display);
});
gtkset_tip($tips, $check, $help);
#gtkpack_(Gtk2::HBox->new(0, 0), 0, gtkpng($file), 1, $check);
@@ -460,7 +460,7 @@ sub installPackages {
)), 0, 1, 0);
$details->hide if !@install_any::advertising_images;
$w->sync;
- $msg->set(N("Please wait, preparing installation..."));
+ $msg->set_label(N("Please wait, preparing installation..."));
gtkset_mousecursor_normal($cancel->window);
gtkset_mousecursor_normal($details->window);
my $advertize = sub {
@@ -546,15 +546,15 @@ sub installPackages {
$nb = $amount;
$total_size = $total; $current_total_size = 0;
$start_time = time();
- $msg->set(N("%d packages", $nb));
+ $msg->set_label(N("%d packages", $nb));
$w->flush;
} elsif ($type eq 'inst' && $subtype eq 'start') {
$progress->set_fraction(0);
my $p = $data->{depslist}[$id];
- $msg->set(N("Installing package %s", $p->name));
+ $msg->set_label(N("Installing package %s", $p->name));
$current_total_size += $last_size;
$last_size = $p->size;
- $text->set((split /\n/, c::from_utf8($p->summary))[0] || '');
+ $text->set_label((split /\n/, c::from_utf8($p->summary))[0] || '');
$advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20;
$w->flush;
} elsif ($type eq 'inst' && $subtype eq 'progress') {
@@ -569,9 +569,9 @@ sub installPackages {
$progress_total->set_fraction($ratio);
if ($dtime != $last_dtime && $current_total_size > 80_000_000) {
- $msg_time_total->set(formatTime(10 * round($total_time / 10) + 10));
-#- $msg_time_total->set(formatTimeRaw($total_time) . " " . formatTimeRaw($dtime / $ratio2));
- $msg_time_remaining->set(formatTime(10 * round(max($total_time - $dtime, 0) / 10) + 10));
+ $msg_time_total->set_label(formatTime(10 * round($total_time / 10) + 10));
+#- $msg_time_total->set_label(formatTimeRaw($total_time) . " " . formatTimeRaw($dtime / $ratio2));
+ $msg_time_remaining->set_label(formatTime(10 * round(max($total_time - $dtime, 0) / 10) + 10));
$last_dtime = $dtime;
}
$w->flush;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d9cb3f54f..ce5a4833d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -340,7 +340,7 @@ sub formatMountPartitions {
fs::formatMount_all($o->{all_hds}{raids}, $o->{fstab}, $o->{prefix}, sub {
my ($msg) = @_;
$w ||= $o->wait_message('', $msg);
- $w->set($msg);
+ $w->set_label($msg);
});
} sub {
$@ =~ /fsck failed on (\S+)/ or return;
@@ -358,11 +358,11 @@ sub setPackages {
N("Looking for available packages..."));
install_any::setPackages($o, $rebuild_needed);
- $w->set(N("Looking at packages already installed..."));
+ $w->set_label(N("Looking at packages already installed..."));
pkgs::selectPackagesAlreadyInstalled($o->{packages}, $o->{prefix});
if ($rebuild_needed) {
- $w->set(N("Finding packages to upgrade..."));
+ $w->set_label(N("Finding packages to upgrade..."));
pkgs::selectPackagesToUpgrade($o->{packages}, $o->{prefix});
}
}
@@ -655,7 +655,7 @@ sub installPackages {
$total = $total_;
} elsif ($type eq 'inst' && $subtype eq 'start') {
my $p = $data->{depslist}[$id];
- $w->set(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total));
+ $w->set_label(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total));
$current += $p->size;
} else { goto $old }
};
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index b06ebdee2..503269535 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -437,8 +437,8 @@ sub wait_message {
push @tempory::objects, $w if $temp;
my $b = before_leaving { $o->wait_message_endW($w) };
- #- enable access through set
- MDK::Common::Func::add_f4before_leaving(sub { $o->wait_message_nextW([ deref($_[1]) ], $w) }, $b, 'set');
+ #- enable access through set_label
+ MDK::Common::Func::add_f4before_leaving(sub { $o->wait_message_nextW([ deref($_[1]) ], $w) }, $b, 'set_label');
$b;
}
diff --git a/perl-install/services.pm b/perl-install/services.pm
index d25855102..cfc560605 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -201,7 +201,7 @@ sub ask_standalone_gtk {
my $update_service = sub {
my $started = -e "/var/lock/subsys/$_[0]";
my $action = $started ? "stop" : "start";
- $_[1]->set($started ? N("running") : N("stopped"));
+ $_[1]->set_label($started ? N("running") : N("stopped"));
$started, $action;
};
my $b = Gtk2::EventBox->new;
diff --git a/perl-install/share/logo-mandrake.png b/perl-install/share/logo-mandrake.png
index f05848e63..3ed9ba0fc 100644
--- a/perl-install/share/logo-mandrake.png
+++ b/perl-install/share/logo-mandrake.png
Binary files differ