summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-27 10:29:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-27 10:29:14 +0000
commit8dde3efdac1b068c68c4e68cab5ac9bb307da2a9 (patch)
treefc5f3db4fe0b21bf66f02a59083e7ae24266dd14 /perl-install
parent6a66c03e186fa398c9ebb18c59fea39dc8c3e7f0 (diff)
downloaddrakx-8dde3efdac1b068c68c4e68cab5ac9bb307da2a9.tar
drakx-8dde3efdac1b068c68c4e68cab5ac9bb307da2a9.tar.gz
drakx-8dde3efdac1b068c68c4e68cab5ac9bb307da2a9.tar.bz2
drakx-8dde3efdac1b068c68c4e68cab5ac9bb307da2a9.tar.xz
drakx-8dde3efdac1b068c68c4e68cab5ac9bb307da2a9.zip
- diskdrake
o fix coloring "Other" partitions (#32845)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/hd_gtk.pm7
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/share/diskdrake.rc19
3 files changed, 13 insertions, 14 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 64a2b9a48..a2c7f5589 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -314,7 +314,10 @@ sub create_buttons4partitions {
last;
}
});
- $w->set_name("PART_" . fs::type::part2type_name($entry));
+ my @colorized_fs_types = qw(ext3 xfs swap vfat ntfs ntfs-3g);
+ $w->set_name("PART_" . (isEmpty($entry) ? 'empty' :
+ $entry->{fs_type} && member($entry->{fs_type}, @colorized_fs_types) ? $entry->{fs_type} :
+ 'other'));
$w->set_size_request($entry->{size} * $ratio + $minwidth, 0);
gtkpack__($kind->{display_box}, $w);
if ($current_entry && fsedit::are_same_partitions($current_entry, $entry)) {
@@ -358,7 +361,7 @@ sub filesystems_button_box() {
my $t = $name2fs_type{$_};
$w->signal_connect(clicked => sub { try_('', \&createOrChangeType, $t, current_hd(), current_part()) });
$w->can_focus(0);
- $w->set_name($_);
+ $w->set_name("PART_$t");
$w;
} @types);
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 687d127bc..3c4795ea3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
(after rename raid5&raid6 -> raid456)
- diskdrake
o fix action "Type" on a software raid (eg: dm0)
+ o fix coloring "Other" partitions (#32845)
Version 10.4.179 - 24 August 2007, by Thierry Vignaud
diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc
index f90b5397b..1e9e0803f 100644
--- a/perl-install/share/diskdrake.rc
+++ b/perl-install/share/diskdrake.rc
@@ -45,15 +45,10 @@ style "gray" = "font"
fg[NORMAL] = { 0, 0, 0 }
}
-widget "*Ext3*" style "red"
-widget "*ext3*" style "red"
-widget "*XFS*" style "orange"
-widget "*xfs*" style "orange"
-widget "*Linux swap*" style "green"
-widget "*Swap*" style "green"
-widget "*FAT*" style "blue"
-widget "*Windows*" style "blue"
-widget "*SunOS*" style "blue"
-widget "*NTFS*" style "blue"
-widget "*Empty*" style "white"
-widget "*Other*" style "gray"
+widget "*PART_ext3" style "red"
+widget "*PART_xfs" style "orange"
+widget "*PART_swap" style "green"
+widget "*PART_vfat" style "blue"
+widget "*PART_ntfs*" style "blue"
+widget "*PART_empty" style "white"
+widget "*PART_other" style "gray"