summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-23 09:45:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-23 09:45:06 +0000
commitc326b0a5d64b3dda6a81de2315eb4474510930ae (patch)
tree8ce137ea9a8e7e006871013459e4a3798d06cd5f
parent045d9264479a5db4596ce74cc33e2283379c96b9 (diff)
downloaddrakx-c326b0a5d64b3dda6a81de2315eb4474510930ae.tar
drakx-c326b0a5d64b3dda6a81de2315eb4474510930ae.tar.gz
drakx-c326b0a5d64b3dda6a81de2315eb4474510930ae.tar.bz2
drakx-c326b0a5d64b3dda6a81de2315eb4474510930ae.tar.xz
drakx-c326b0a5d64b3dda6a81de2315eb4474510930ae.zip
- diskdrake:
o change the legend and the colors per partition (may change a little more...)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/hd_gtk.pm4
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/share/diskdrake.rc36
4 files changed, 28 insertions, 16 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b291989f5..3aba9de4a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,7 @@
o fix displaying umount error message (#32273)
o write mdadm.conf when it is modified (#32360)
(a nicer fix would be to write it when needed, not so soon, but it's harder)
+ o change the legend and the colors per partition
Version 10.4.172 - 21 August 2007, by Olivier "blino" Blin
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index a54fa6d74..984b32c2b 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -348,9 +348,9 @@ sub hd2kind {
}
sub filesystems_button_box() {
- my @types = (N_("Ext2"), N_("Journalised FS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"),
+ my @types = (N_("Ext3"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"),
N_("Other"), N_("Empty"));
- my %name2fs_type = (Ext2 => 'ext2', 'Journalised FS' => 'ext3', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs');
+ my %name2fs_type = (Ext3 => 'ext3', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs');
gtkpack(Gtk2::HBox->new(0,0),
N("Filesystem types:"),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 32150d91d..213cc21fb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o change the legend and the colors per partition
+
Version 10.4.174 - 21 August 2007, by Olivier "blino" Blin
- set default per step banner title & icon for all steps
diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc
index dfd58c5c8..f90b5397b 100644
--- a/perl-install/share/diskdrake.rc
+++ b/perl-install/share/diskdrake.rc
@@ -11,24 +11,24 @@ style "red" = "font"
bg[ACTIVE] = { 0.9, 0, 0 }
bg[PRELIGHT] = { 0.9, 0, 0 }
}
-style "darkred" = "font"
+style "orange" = "font"
{
- bg[NORMAL] = { 0.7, 0, 0 }
- bg[ACTIVE] = { 0.6, 0, 0 }
- bg[PRELIGHT] = { 0.6, 0, 0 }
+ bg[NORMAL] = { 1.0, 0.6, 0 }
+ bg[ACTIVE] = { 0.9, 0.6, 0 }
+ bg[PRELIGHT] = { 0.9, 0.4, 0 }
}
style "green" = "font"
{
- bg[NORMAL] = { 0, 1.0, 0 }
- bg[ACTIVE] = { 0, 0.9, 0 }
- bg[PRELIGHT] = { 0, 0.9, 0 }
+ bg[NORMAL] = { 0.4, 0.8, 0 }
+ bg[ACTIVE] = { 0.4, 0.7, 0 }
+ bg[PRELIGHT] = { 0.4, 0.7, 0 }
fg[NORMAL] = { 0, 0, 0 }
}
style "blue" = "font"
{
- bg[NORMAL] = { 0, 0, 1.0 }
- bg[ACTIVE] = { 0, 0, 0.9 }
- bg[PRELIGHT] = { 0, 0, 0.9 }
+ bg[NORMAL] = { 0, 0.7, 1.0 }
+ bg[ACTIVE] = { 0, 0.6, 0.9 }
+ bg[PRELIGHT] = { 0, 0.6, 0.9 }
}
style "white" = "font"
{
@@ -37,10 +37,18 @@ style "white" = "font"
bg[PRELIGHT] = { 0.9, 0.9, 0.9 }
fg[NORMAL] = { 0, 0, 0 }
}
+style "gray" = "font"
+{
+ bg[NORMAL] = { 0.57, 0.62, 0.67 }
+ bg[ACTIVE] = { 0.57, 0.62, 0.57 }
+ bg[PRELIGHT] = { 0.57, 0.62, 0.57 }
+ fg[NORMAL] = { 0, 0, 0 }
+}
-widget "*Linux*" style "red"
-widget "*Ext2*" style "red"
-widget "*Journalised FS*" style "darkred"
+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"
@@ -48,4 +56,4 @@ widget "*Windows*" style "blue"
widget "*SunOS*" style "blue"
widget "*NTFS*" style "blue"
widget "*Empty*" style "white"
-widget "*Other*" style "font"
+widget "*Other*" style "gray"