summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-07-29 11:55:58 +0000
committerThierry Vignaud <tv@mandriva.org>2008-07-29 11:55:58 +0000
commit2704cd9b6ea074388947c18a35ea6f9c6c76caf5 (patch)
tree4308e39c41354e8aeb3d881e3c2b98d642a43159
parente535d293612f518ee785035617af09a31e77789e (diff)
downloaddrakx-backup-do-not-use-2704cd9b6ea074388947c18a35ea6f9c6c76caf5.tar
drakx-backup-do-not-use-2704cd9b6ea074388947c18a35ea6f9c6c76caf5.tar.gz
drakx-backup-do-not-use-2704cd9b6ea074388947c18a35ea6f9c6c76caf5.tar.bz2
drakx-backup-do-not-use-2704cd9b6ea074388947c18a35ea6f9c6c76caf5.tar.xz
drakx-backup-do-not-use-2704cd9b6ea074388947c18a35ea6f9c6c76caf5.zip
stop setting banner icon now we do not display them anymore
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/diskdrake/smbnfs_gtk.pm2
-rw-r--r--perl-install/fs/mount_point.pm1
-rw-r--r--perl-install/fs/partitioning.pm1
-rw-r--r--perl-install/fs/partitioning_wizard.pm9
-rw-r--r--perl-install/security/level.pm1
7 files changed, 6 insertions, 12 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 340592822..fab65884b 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -50,7 +50,7 @@ sub main {
local $in->{grab} = 1;
- $w = ugtk2->new(N("Partitioning"), icon => 'banner-part');
+ $w = ugtk2->new(N("Partitioning"));
$::main_window = $w->{real_window} if !$::isEmbedded && !$::isInstall;
my $rc = "/usr/share/libDrakX/diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc";
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index f61f8d316..5cc892a76 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -281,7 +281,7 @@ sub Done {
update_bootloader_for_renumbered_partitions($in, $all_hds);
if (any { $_->{rebootNeeded} } @{$all_hds->{hds}}) {
- $in->ask_warn(N("Partitioning"), N("You need to reboot for the partition table modifications to take place"), icon => 'banner-part');
+ $in->ask_warn(N("Partitioning"), N("You need to reboot for the partition table modifications to take place"));
tell_wm_and_reboot();
}
}
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index dcb6e6c40..f7e064b00 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -19,7 +19,7 @@ sub main {
my ($kind) = $type eq 'smb' ? smb2kind() : nfs2kind();
$kind->check($in) or return;
- my $w = ugtk2->new(N("Partitioning"), icon => 'banner-part');
+ my $w = ugtk2->new(N("Partitioning"));
add_smbnfs($w->{window}, $kind);
$w->{rwindow}->set_default_size(400, 300) if $w->{rwindow}->can('set_default_size');
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index 608e3062e..4d4880f5d 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -104,7 +104,6 @@ sub ask_mount_points {
} else {
$in->ask_from_({ messages => N("Choose the mount points"),
title => N("Partitioning"),
- icon => 'banner-part',
interactive_help_id => 'ask_mntpoint_s',
callbacks => {
complete => sub {
diff --git a/perl-install/fs/partitioning.pm b/perl-install/fs/partitioning.pm
index e09b3e235..ab2b6733a 100644
--- a/perl-install/fs/partitioning.pm
+++ b/perl-install/fs/partitioning.pm
@@ -44,7 +44,6 @@ sub choose_partitions_to_format {
$in->ask_from_(
{ messages => N("Choose the partitions you want to format"),
- icon => 'banner-part',
interactive_help_id => 'formatPartitions',
advanced_messages => N("Check bad blocks?"),
},
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 56e620b47..31ca06784 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -50,7 +50,7 @@ sub partition_with_diskdrake {
$ok = 0;
$in->ask_okcancel(N("Partitioning"), N("You must have a root partition.
For this, create a partition (or click on an existing one).
-Then choose action ``Mount point'' and set it to `/'"), 1, 'banner-part') or return;
+Then choose action ``Mount point'' and set it to `/'"), 1) or return;
}
if (!any { isSwap($_) } @fstab) {
$ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?"));
@@ -204,13 +204,11 @@ filesystem checks will be run on your next boot into Microsoft Windows®")) if $
sub {
my $hd = $in->ask_from_listf_raw({ messages => N("You have more than one hard drive, which one do you install linux on?"),
title => N("Partitioning"),
- icon => 'banner-part',
interactive_help_id => 'takeOverHdChoose',
},
\&partition_table::description, \@hds_rw) or return;
$in->ask_okcancel_({ messages => N("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd)),
title => N("Partitioning"),
- icon => 'banner-part',
interactive_help_id => 'takeOverHdConfirm' }) or return;
fsedit::partition_table_clear_and_initialize($all_hds->{lvms}, $hd, $in);
fsedit::auto_allocate($all_hds, $partitions);
@@ -249,7 +247,7 @@ When you are done, do not forget to save using `w'", partition_table::descriptio
sub warn_reboot_needed {
my ($in) = @_;
- $in->ask_warn(N("Partitioning"), N("You need to reboot for the partition table modifications to take place"), icon => 'banner-part');
+ $in->ask_warn(N("Partitioning"), N("You need to reboot for the partition table modifications to take place"));
}
sub main {
@@ -268,13 +266,12 @@ sub main {
@solutions = @sol if @sol > 1;
log::l("solutions: ", int @solutions);
- @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing"), icon => 'banner-part'), die 'already displayed';
+ @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing")), die 'already displayed';
log::l('HERE: ', join(',', map { $_->[1] } @solutions));
my $sol;
$o->ask_from_({ messages => N("The DrakX Partitioning wizard found the following solutions:"),
title => N("Partitioning"),
- icon => 'banner-part',
interactive_help_id => 'doPartitionDisks',
},
[ { val => \$sol, list => \@solutions, format => sub { $_[0][1] }, type => 'list' } ]);
diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm
index 0c05eb1e4..198427eff 100644
--- a/perl-install/security/level.pm
+++ b/perl-install/security/level.pm
@@ -53,7 +53,6 @@ connections from many clients. Note: if your machine is only a client on the Int
my @l = 2 .. 5;
$in->ask_from_({ title => $::isInstall ? N("Security") : N("DrakSec Basic Options"),
- icon => 'banner-security',
messages => N("Please choose the desired security level") . "\n\n" .
join('', map { to_string($_) . ": " . formatAlaTeX($help{$_}) . "\n\n" } @l),
interactive_help_id => 'miscellaneous',