Imp: numbering font preferences

[modules/smesh.git] / src / SMESHGUI / SMESHGUI.cxx

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index b252b541c5d756efe57eead87d9ef3ee05e4bb6d..b509f6ac1a62c6782602a4d9519038adc8d874cf 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -4885,32 +4885,13 @@ void SMESHGUI::createPreferences()
   setPreferenceProperty( shrink, "max", 100 );
 
   int numGroup = addPreference( tr( "PREF_GROUP_NUMBERING" ), meshTab );
-  setPreferenceProperty( numGroup, "columns", 6 );
-  QStringList fonts;
-  fonts << tr( "SMESH_ARIAL" ) << tr( "SMESH_COURIER" ) << tr( "SMESH_TIMES" );
-  indices.clear(); indices << 0 << 1 << 2;
-  // ...
+  setPreferenceProperty( numGroup, "columns", 2 );
+  
   addPreference( tr( "PREF_NUMBERING_NODE" ), numGroup, LightApp_Preferences::Color, "SMESH", "numbering_node_color" );
-  int NumNodeSize = addPreference( tr( "PREF_NUMBERING_SIZE" ), numGroup, LightApp_Preferences::IntSpin, "SMESH", "numbering_node_size" );
-  setPreferenceProperty( NumNodeSize, "min", 1 );
-  setPreferenceProperty( NumNodeSize, "max", 100 );
-  int NumFontNode = addPreference( tr( "PREF_NUMBERING_FONT" ), numGroup, LightApp_Preferences::Selector, "SMESH", "numbering_node_font" );
-  setPreferenceProperty( NumFontNode, "strings", fonts );
-  setPreferenceProperty( NumFontNode, "indexes", indices );
-  addPreference( tr( "PREF_NUMBERING_BOLD" ), numGroup, LightApp_Preferences::Bool, "SMESH", "numbering_node_bold" );
-  addPreference( tr( "PREF_NUMBERING_ITALIC" ), numGroup, LightApp_Preferences::Bool, "SMESH", "numbering_node_italic" );
-  addPreference( tr( "PREF_NUMBERING_SHADOW" ), numGroup, LightApp_Preferences::Bool, "SMESH", "numbering_node_shadow" );
-  // ...
+  addVtkFontPref( tr( "PREF_NUMBERING_FONT" ), numGroup, "numbering_node_font", true );
+
   addPreference( tr( "PREF_NUMBERING_ELEM" ), numGroup, LightApp_Preferences::Color, "SMESH", "numbering_elem_color" );
-  int NumElemSize = addPreference( tr( "PREF_NUMBERING_SIZE" ), numGroup, LightApp_Preferences::IntSpin, "SMESH", "numbering_elem_size" );
-  setPreferenceProperty( NumElemSize, "min", 1 );
-  setPreferenceProperty( NumElemSize, "max", 100 );
-  int NumFontElem = addPreference( tr( "PREF_NUMBERING_FONT" ), numGroup, LightApp_Preferences::Selector, "SMESH", "numbering_elem_font" );
-  setPreferenceProperty( NumFontElem, "strings", fonts );
-  setPreferenceProperty( NumFontElem, "indexes", indices ); 
-  addPreference( tr( "PREF_NUMBERING_BOLD" ), numGroup, LightApp_Preferences::Bool, "SMESH", "numbering_elem_bold" );
-  addPreference( tr( "PREF_NUMBERING_ITALIC" ), numGroup, LightApp_Preferences::Bool, "SMESH", "numbering_elem_italic" );
-  addPreference( tr( "PREF_NUMBERING_SHADOW" ), numGroup, LightApp_Preferences::Bool, "SMESH", "numbering_elem_shadow" );
+  addVtkFontPref( tr( "PREF_NUMBERING_FONT" ), numGroup, "numbering_elem_font", true );
 
   int orientGroup = addPreference( tr( "PREF_GROUP_FACES_ORIENTATION" ), meshTab );
   setPreferenceProperty( orientGroup, "columns", 1 );
@@ -5098,14 +5079,10 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
       QString val = aResourceMgr->stringValue( "SMESH", name );
       myComponentSMESH->SetOption( name.toLatin1().constData(), val.toLatin1().constData() );
     }
-    else if(name ==  QString("numbering_node_color")  || name ==  QString("numbering_node_size") ||
-            name ==  QString("numbering_node_font")   || name ==  QString("numbering_node_bold") ||
-            name ==  QString("numbering_node_italic") || name ==  QString("numbering_node_shadow") ) {
-      SMESH::UpdateFontProp( this );
+    else if ( name == QString( "numbering_node_color" ) || name == QString( "numbering_node_font" ) ) {
+      SMESH::UpdateFontProp( this );    
     }
-    else if(name ==  QString("numbering_elem_color")  || name ==  QString("numbering_elem_size") ||
-            name ==  QString("numbering_elem_font")   || name ==  QString("numbering_elem_bold") ||
-            name ==  QString("numbering_elem_italic") || name ==  QString("numbering_elem_shadow") ) {
+    else if ( name == QString( "numbering_elem_color" ) || name == QString( "numbering_elem_font" ) ) {
       SMESH::UpdateFontProp( this );
     }
 
@@ -6375,7 +6352,7 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
   \param param parameter
   \return identifier of preferences
 */
-int SMESHGUI::addVtkFontPref( const QString& label, const int pId, const QString& param )
+int SMESHGUI::addVtkFontPref( const QString& label, const int pId, const QString& param, const bool needSize )
 {
   int tfont = addPreference( label, pId, LightApp_Preferences::Font, "SMESH", param );
 
@@ -6389,6 +6366,7 @@ int SMESHGUI::addVtkFontPref( const QString& label, const int pId, const QString
   setPreferenceProperty( tfont, "fonts", fam );
 
   int f = QtxFontEdit::Family | QtxFontEdit::Bold | QtxFontEdit::Italic | QtxFontEdit::Shadow;
+  if ( needSize ) f = f | QtxFontEdit::Size;
   setPreferenceProperty( tfont, "features", f );
 
   return tfont;