diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/smbnfs_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_interactive.pm | 12 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
5 files changed, 15 insertions, 7 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 7de290b89..5d8864cab 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -49,7 +49,7 @@ sub main { local $in->{grab} = 1; - $w = ugtk2->new('DiskDrake'); + $w = ugtk2->new(N("Partitionning"), icon => 'banner-part'); $::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 b4200d7f4..1dd58bd20 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -289,7 +289,7 @@ sub Done { update_bootloader_for_renumbered_partitions($in, $all_hds); if (any { $_->{rebootNeeded} } @{$all_hds->{hds}}) { - $in->ask_warn('', N("You need to reboot for the partition table modifications to take place")); + $in->ask_warn(N("Partitionning"), N("You need to reboot for the partition table modifications to take place"), icon => 'banner-part'); tell_wm_and_reboot(); } } diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index 0cabb06f5..5dd63ef8d 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -18,7 +18,7 @@ sub main { my ($kind) = $type eq 'smb' ? smb2kind() : nfs2kind(); $kind->check($in) or return; - my $w = ugtk2->new('DiskDrake'); + my $w = ugtk2->new(N("Partitionning"), icon => 'banner-part'); add_smbnfs($w->{window}, $kind); $w->{rwindow}->set_default_size(400, 300) if $w->{rwindow}->can('set_default_size'); diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 738739a55..303788fc4 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -59,9 +59,9 @@ sub partition_with_diskdrake { unless (fs::get::root_(\@fstab)) { $ok = 0; - $o->ask_okcancel('', N("You must have a root partition. + $o->ask_okcancel(N("Partitionning"), 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) or return; +Then choose action ``Mount point'' and set it to `/'"), 1, 'banner-part') or return; } if (!any { isSwap($_) } @fstab) { $ok &&= $o->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?")); @@ -213,10 +213,14 @@ filesystem checks will be run on your next boot into Windows(TM)")) if $part->{f [ 10, fsedit::is_one_big_fat_or_NT($hds) ? N("Remove Windows(TM)") : N("Erase and use entire disk"), sub { my $hd = $o->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; $o->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; partition_table::raw::zero_MBR($hd); fsedit::auto_allocate($all_hds, $o->{partitions}); @@ -268,11 +272,13 @@ sub partitionWizard { @solutions = @sol if @sol > 1; log::l("solutions: ", int @solutions); - @solutions or $o->ask_warn('', N("I can not find any room for installing")), die 'already displayed'; + @solutions or $o->ask_warn(N("Partitioning"), N("I can not find any room for installing"), icon => 'banner-part'), 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/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ec0b47af0..cfb10ef2f 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -275,6 +275,8 @@ sub ask_mntpoint_s { #- }{} $fstab[0]{mntpoint} = '/'; } else { $o->ask_from_({ messages => N("Choose the mount points"), + title => N("Partitioning"), + icon => 'banner-part', interactive_help_id => 'ask_mntpoint_s', callbacks => { complete => sub { @@ -337,7 +339,7 @@ sub doPartitionDisks { #------------------------------------------------------------------------------ sub rebootNeeded { my ($o) = @_; - $o->ask_warn('', N("You need to reboot for the partition table modifications to take place")); + $o->ask_warn(N("Partitionning"), N("You need to reboot for the partition table modifications to take place"), icon => 'banner-part'); install_steps::rebootNeeded($o); } |