Desktop title in case of several modules

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 72bcad18a89c4cd2ed589d7610b4b483b3251fc0..73d7ef7877482af3ebf359325295632bff7a3575 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -394,6 +394,7 @@ bool CAM_Application::activateModule( CAM_Module* mod )
     }
   }
 
+  updateDesktopTitle();
   updateCommandsStatus();
 
   return true;

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 98770356af659d74f89d339e092bd9eeeb67c503..deb77a7435a4342309cbafef47c0eb0e6633ebdb 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -2531,9 +2531,17 @@ void LightApp_Application::updateDesktopTitle()
   QStringList anInfoList;
   modules( anInfoList, false );
 
-  LightApp_Module* aModule = ( LightApp_Module* )activeModule();
-  if( aModule && anInfoList.count() == 1 ) // to avoid a conflict between different modules
-    aTitle = aModule->updateDesktopTitle( aTitle );
+  //LightApp_Module* aModule = ( LightApp_Module* )activeModule();
+  //if( aModule && anInfoList.count() == 1 ) // to avoid a conflict between different modules
+  //  aTitle = aModule->updateDesktopTitle( aTitle );
+
+  QStringList::iterator anIter;
+  for ( anIter = anInfoList.begin(); anIter != anInfoList.end(); ++anIter )
+  {
+    LightApp_Module* aModule = dynamic_cast<LightApp_Module*>( module( *anIter ) );
+    if ( aModule )
+      aTitle = aModule->updateDesktopTitle( aTitle );
+  }
  
   desktop()->setWindowTitle( aTitle );
 }