0021882: [CEA 673] Add preference for default color for mesh groups

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 0dbcc2e8839737648fb994390381f4cee3ab2368..72e45fc0b4b4e78ffc603e36ca3cafd0d70be015 100644 (file)
--- 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 8849df32c2b1c3b8247ea07115d86d0524bf6e2d..bbb3276a46b5e66e7ec9142160398672a43e3119 100644 (file)
--- 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 10995de1942a6c74074942ad7e8ebf7c27e5fddd..1b6f8cda7e53d72ea5041f8fed4eb00ecc9deb45 100644 (file)
--- 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 9dea5f2a1bc387118308fe849b7d43e4d4979069..584f9424fa0dab3b900fe9efa1b1422ee7d312ce 100644 (file)
--- 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 1672f6fbc1ac57ac42fade9df38e46c727af198a..8d5abcce0dcd55b41dfadf1805951225ec9b1f93 100755 (executable)
--- 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>