From 023c7061355fff8cd6eacbfb7e1e8c1cf9bb56e0 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 27 Sep 2012 08:22:16 +0000
Subject: [PATCH] 0021882: [CEA 673] Add preference for default color for mesh
 groups

---
 resources/SalomeApp.xml.in         | 1 +
 src/SMESHGUI/SMESHGUI.cxx          | 1 +
 src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 2 +-
 src/SMESHGUI/SMESH_msg_en.ts       | 4 ++++
 src/SMESHGUI/SMESH_msg_fr.ts       | 4 ++++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 0dbcc2e88..72e45fc0b 100644
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -28,6 +28,7 @@
     <parameter name="icon" value="ModuleMesh.png"/>
     <parameter name="version" value="@VERSION@"/>
     <!-- Other module preferences -->
+    <parameter name="default_grp_color"            value="255, 170, 0"/>
     <parameter name="node_color"                   value="255, 0,   0"/>
     <parameter name="fill_color"                   value="0, 170, 255|-100"/>
     <parameter name="wireframe_color"              value="0, 170, 255"/>
diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 8849df32c..bbb3276a4 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -4827,6 +4827,7 @@ void SMESHGUI::createPreferences()
   setPreferenceProperty( grpGroup, "columns", 2 );
 
   addPreference( tr( "PREF_GRP_NAMES" ), grpGroup, LightApp_Preferences::Color, "SMESH", "group_name_color" );
+  addPreference( tr( "PREF_GRP_DEF_COLOR" ), grpGroup, LightApp_Preferences::Color, "SMESH", "default_grp_color" );
 
   int size0d = addPreference(tr("PREF_SIZE_0D"), elemGroup,
                              LightApp_Preferences::IntSpin, "SMESH", "elem0d_size");
diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 10995de19..1b6f8cda7 100644
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -2438,7 +2438,7 @@ void SMESHGUI_GroupDlg::setDefaultGroupColor()
   if( !isAutoColor )
   {
     int r = 0, g = 0, b = 0;
-    SMESH::GetColor( "SMESH", "fill_color", r, g, b, QColor( 0, 170, 255 ) );
+    SMESH::GetColor( "SMESH", "default_grp_color", r, g, b, QColor( 255, 170, 0 ) );
     aQColor.setRgb( r, g, b );
   }
   else
diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 9dea5f2a1..584f9424f 100644
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -4187,6 +4187,10 @@ Please, create VTK viewer and try again</translation>
         <source>PREF_GRP_NAMES</source>
         <translation>Names color</translation>
     </message>
+    <message>
+        <source>PREF_GRP_DEF_COLOR</source>
+        <translation>Default color</translation>
+    </message>
     <message>
         <source>PREF_GROUP_PRECISION</source>
         <translation>Precision</translation>
diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 1672f6fbc..8d5abcce0 100755
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -4155,6 +4155,10 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
         <source>PREF_GRP_NAMES</source>
         <translation>Couleur des noms</translation>
     </message>
+    <message>
+        <source>PREF_GRP_DEF_COLOR</source>
+        <translation>Couleur par défaut</translation>
+    </message>
     <message>
         <source>PREF_GROUP_PRECISION</source>
         <translation>Précision</translation>
-- 
2.30.2