Some slight improvements and bugs fixing.

[modules/shaper.git] / src / XGUI / XGUI_Workshop.cpp

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 408497da87ff710de4b59c0241d7663edc58c9be..ee311ff8f6bc943b96cf651331f1a684b8968511 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1,4 +1,4 @@
-#include "XGUI_Module.h"
+#include "ModuleBase_IModule.h"
 #include "XGUI_Constants.h"
 #include "XGUI_Command.h"
 #include "XGUI_MainMenu.h"
@@ -85,6 +85,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
   myDisplayer = new XGUI_Displayer(this);
 
   mySelector = new XGUI_SelectionMgr(this);
+  connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands()));
 
   myOperationMgr = new XGUI_OperationMgr(this);
   myActionsMgr = new XGUI_ActionsMgr(this);
@@ -575,7 +576,7 @@ void XGUI_Workshop::onRedo()
 }
 
 //******************************************************
-XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
+ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
 {
   QString libName =
       QString::fromStdString(library(theModule.toStdString()));
@@ -623,7 +624,7 @@ XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
   }
 #endif
 
-  XGUI_Module* aModule = crtInst ? crtInst(this) : 0;
+  ModuleBase_IModule* aModule = crtInst ? crtInst(this) : 0;
 
   if (!err.isEmpty()) {
     if (mainWindow()) {
@@ -689,6 +690,26 @@ void XGUI_Workshop::updateCommandStatus()
   myActionsMgr->update();
 }
 
+//******************************************************
+void XGUI_Workshop::updateModuleCommands()
+{
+  QList<QAction*> aCommands;
+  if (isSalomeMode()) { // update commands in SALOME mode
+    aCommands = salomeConnector()->commandList();
+  } else {
+    XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
+    foreach (XGUI_Workbench* aWb, aMenuBar->workbenches()) {
+      if (aWb != aMenuBar->generalPage()) {
+        foreach(XGUI_Command* aCmd, aWb->features())
+          aCommands.append(aCmd);
+      }
+    }
+  }
+  foreach(QAction* aCmd, aCommands) {
+    aCmd->setEnabled(myPartSetModule->isFeatureEnabled(aCmd->data().toString()));
+  }
+}
+
 //******************************************************
 QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
 {