Add Use Salome Style check box into SALOME preferences.

diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml
index 73a095e368d5264c2fc053b03e9cf60f64f4697c..9fe7a3b57685cf62a00bada077d6f8fa43d77a51 100644 (file)
--- a/src/LightApp/resources/LightApp.xml
+++ b/src/LightApp/resources/LightApp.xml
@@ -56,6 +56,10 @@
     <parameter name="font"                value="Helvetic,12" />
     <parameter name="additional_families" value="Helvetic;Helvetica;Helvetica[Adobe];Times;Times[Adobe];Sans Serif;Serif;Monospace;Lucida"/>
   </section>
+  <section name="Style">
+    <!-- Style and theme preferences -->
+    <parameter name="use_salome_style" value="true" />
+  </section>
   <section name="ObjectBrowser" >
     <!-- Object Browser preferences -->
     <parameter name="auto_hide_search_tool" value="true" />

diff --git a/src/LightApp/resources/LightApp_msg_en.po b/src/LightApp/resources/LightApp_msg_en.po
index cd3cd7df37b5577fcc660a23339ef73379afb061..e380b68699014a3435892248cd6541c97c57be0b 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.po
+++ b/src/LightApp/resources/LightApp_msg_en.po
@@ -162,6 +162,12 @@ msgstr "Python console properties"
 msgid "LightApp_Application::PREF_FONT"
 msgstr "Font"
 
+msgid "LightApp_Application::PREF_GROUP_STYLE"
+msgstr "Salome style"
+
+msgid "LightApp_Application::PREF_USE_SALOME_STYLE"
+msgstr "Use Salome style"
+
 msgid "LightApp_Application::PREF_TAB_OBJBROWSER"
 msgstr "Object browser"
 

diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index e1cd3741524875c8b6f66ef8549a2ffe74140b9a..e9df1e1993c9298ec3249a34b38f106cdc393f4f 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -157,6 +157,14 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
         <source>PREF_GROUP_PY_CONSOLE</source>
         <translation>Python console properties</translation>
     </message>
+    <message>
+        <source>PREF_GROUP_STYLE</source>
+        <translation>Salome style</translation>
+    </message>
+    <message>
+        <source>PREF_USE_SALOME_STYLE</source>
+        <translation>Use Salome style</translation>
+    </message>
     <message>
         <source>PREF_MARKER_SIZE</source>
         <translation>Marker size:</translation>

diff --git a/src/SUITApp/SUITApp.cxx b/src/SUITApp/SUITApp.cxx
index 7f29296a7f4de66569ad069d00a2605ed91cac43..3e0f483d6edd33272e569faf8cad3baab58344b4 100644 (file)
--- a/src/SUITApp/SUITApp.cxx
+++ b/src/SUITApp/SUITApp.cxx
@@ -186,9 +186,9 @@ int main( int args, char* argv[] )
   {
     SUITApp_Session* aSession = new SUITApp_Session( iniFormat );
     QtxSplash* splash = 0;
+    SUIT_ResourceMgr* resMgr = aSession->createResourceMgr( argList.first() );
     if ( !noSplash ) 
     {
-      SUIT_ResourceMgr* resMgr = aSession->createResourceMgr( argList.first() );
       if ( resMgr )
       {
        resMgr->loadLanguage( false );
@@ -222,9 +222,12 @@ int main( int args, char* argv[] )
     SUIT_Application* theApp = aSession->startApplication( argList.first() );
     if ( theApp )
     {
-      Style_Salome* aStyle = new Style_Salome();
-      aStyle->getModel()->initFromResource( theApp->resourceMgr() );
-      app.setStyle( aStyle );
+      if ( resMgr && resMgr->booleanValue( "Style", "use_salome_style", true ) )
+      {
+       Style_Salome* aStyle = new Style_Salome();
+       aStyle->getModel()->initFromResource( theApp->resourceMgr() );
+       app.setStyle( aStyle );
+      }
        
       if ( !noExceptHandling )
         app.setHandler( aSession->handler() );

diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml
index c85f4fd8522fdece19c8bae6d9d28d052ff2193f..fe7e5a04de91afba9049c94bc6dc6e3c115d7fc4 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp.xml
+++ b/src/SalomeApp/resources/SalomeApp.xml
@@ -73,7 +73,11 @@
   <section name="desktop" >
     <!-- Default GUI desktop state, position, size -->
     <parameter name="geometry"  value="80%%x80%%+10%%+10%%"/>
- </section>
+  </section>
+  <section name="Style">
+    <!-- Style and theme preferences -->
+    <parameter name="use_salome_style" value="true" />
+  </section>
   <section name="ObjectBrowser" >
     <!-- Object Browser preferences -->
     <parameter name="auto_hide_search_tool" value="true" />

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 6d93c5098726b8191417722bef27354c35f7f181..322341418791b9e7b01025d3c29d08cfb00bc9f5 100755 (executable)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -622,9 +622,13 @@ int main( int argc, char **argv )
       if ( aGUIApp )
       {
         // Set SALOME style to the application
-        Style_Salome* aStyle = new Style_Salome();
-        aStyle->getModel()->initFromResource( aGUIApp->resourceMgr() );
-        _qappl.setStyle( aStyle );
+       SUIT_ResourceMgr resMgr( "SalomeApp", QString( "%1Config" ) );
+       if ( bool isSSUse = resMgr.booleanValue( "Style", "use_salome_style", true ) )
+       {
+         Style_Salome* aStyle = new Style_Salome();
+         aStyle->getModel()->initFromResource( aGUIApp->resourceMgr() );
+         _qappl.setStyle( aStyle );
+       }
 
        if ( !isFound( "noexcepthandler", argc, argv ) )
          _qappl.setHandler( aGUISession->handler() ); // after loading SalomeApp application