diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-10-17 19:51:44 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-10-17 19:51:44 +0000 |
| commit | fad0259fb304e54cedebb7f389d5cd99f643d0db (patch) | |
| tree | 6dc35128059d38931aef442b09f9d1fe2a9e225f | |
| parent | 3b2ca31618e79683ddce30cde61e3b77fab73dfd (diff) | |
| download | drakx-fad0259fb304e54cedebb7f389d5cd99f643d0db.tar drakx-fad0259fb304e54cedebb7f389d5cd99f643d0db.tar.gz drakx-fad0259fb304e54cedebb7f389d5cd99f643d0db.tar.bz2 drakx-fad0259fb304e54cedebb7f389d5cd99f643d0db.tar.xz drakx-fad0259fb304e54cedebb7f389d5cd99f643d0db.zip | |
- partitioning wizard:
o add legend for the colors
o display mount point if known
o display ext2 like ext3/4
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 18 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/share/diskdrake.rc | 1 |
4 files changed, 23 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 451cfe209..32a913161 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,9 @@ RESOLUTION_WANTED=XxY in /etc/sysconfig/harddrake2/service.conf - partitioning wizard: o use a different color for newly created partition + o add legend for the colors + o display mount point if known + o display ext2 like ext3/4 Version 12.66 - 15 October 2009 diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 43d648edf..99c04acc5 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -301,9 +301,9 @@ sub create_display_box { $last = $resize->[-1] if $resize; foreach my $entry (@parts) { - my $info = $entry->{device_LABEL}; + my $info = $entry->{mntpoint} || $entry->{device_LABEL}; my $w = Gtk2::Label->new($info); - my @colorized_fs_types = qw(ext3 ext4 xfs swap vfat ntfs ntfs-3g); + my @colorized_fs_types = qw(ext2 ext3 ext4 xfs swap vfat ntfs ntfs-3g); $ev = Gtk2::EventBox->new; $ev->add($w); my $part; @@ -391,6 +391,20 @@ sub create_display_box { ugtk2::gtkpack__($display_box, $ev); } $display_box->remove($ev); + unless($resize || $fill_empty) { + my @types = (N_("Ext2/3/4"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"), + N_("Other"), N_("Empty")); + my %name2fs_type = ('Ext2/3/4' => 'ext3', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); + $desc = ugtk2::gtkpack(Gtk2::HBox->new(), + map { + my $t = $name2fs_type{$_}; + my $ev = Gtk2::EventBox->new; + my $w = Gtk2::Label->new(translate($_)); + $ev->add($w); + $ev->set_name('PART_' . ($t || 'empty')); + $ev; + } @types); + } $vbox->add($display_box); $vbox->add($desc) if $desc; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index bdcecbabc..2011bef33 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,8 @@ - partitioning wizard: o use a different color for newly created partition + o add legend for the colors + o display mount point if known + o display ext2 like ext3/4 Version 12.66 - 15 October 2009 diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc index 9efd83d2e..b42702502 100644 --- a/perl-install/share/diskdrake.rc +++ b/perl-install/share/diskdrake.rc @@ -52,6 +52,7 @@ style "yellow" = "font" fg[NORMAL] = { 0, 0, 0 } } +widget "*PART_ext2" style "red" widget "*PART_ext3" style "red" widget "*PART_ext4" style "red" widget "*PART_xfs" style "orange" |