X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=20f4e47c7bc6e25184a512f58fdd12f54bfc6543;hb=80a21be87c81ef61f0842b32e8b2ac7d4359acb4;hp=02a02ec868276213c3114f6f0e49207787a96b63;hpb=1b6e67870beeeb667864eaff5b1bb9c1570b7259;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 02a02ec86..20f4e47c7 100644
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -8,18 +8,34 @@
 #include "XGUI_Workbench.h"
 #include "XGUI_Workshop.h"
 #include "XGUI_Viewer.h"
-#include "XGUI_WidgetFactory.h"
+#include "ModuleBase_WidgetFactory.h"
 #include "XGUI_SelectionMgr.h"
-
+#include "XGUI_ObjectsBrowser.h"
+#include "XGUI_Displayer.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_SalomeConnector.h"
+#include "XGUI_SalomeViewer.h"
+#include "XGUI_ActionsMgr.h"
+#include "XGUI_ErrorDialog.h"
+#include "XGUI_ViewerProxy.h"
+#include "XGUI_PropertyPanel.h"
+#include "XGUI_ContextMenuMgr.h"
+
+#include <Model_Events.h>
 #include <ModelAPI_PluginManager.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_AttributeDocRef.h>
 
-#include <Event_Loop.h>
+#include <Events_Loop.h>
+#include <Events_Error.h>
+#include <ModuleBase_Operation.h>
 #include <ModuleBase_Operation.h>
+#include <ModuleBase_OperationDescription.h>
+#include <Config_Common.h>
 #include <Config_FeatureMessage.h>
 #include <Config_PointerMessage.h>
+#include <Config_ModuleReader.h>
 
 #include <QApplication>
 #include <QFileDialog>
@@ -27,6 +43,7 @@
 #include <QMdiSubWindow>
 #include <QPushButton>
 #include <QDockWidget>
+#include <QLayout>
 
 #ifdef _DEBUG
 #include <QDebug>
@@ -38,13 +55,43 @@
 #include <dlfcn.h>
 #endif
 
-XGUI_Workshop::XGUI_Workshop()
-  : QObject(), 
-  myCurrentOperation(NULL),
-  myPartSetModule(NULL)
+
+QMap<QString, QString> XGUI_Workshop::myIcons;
+
+QString XGUI_Workshop::featureIcon(const std::string& theId)
 {
-  myMainWindow = new XGUI_MainWindow();
+  QString aId(theId.c_str());
+  if (myIcons.contains(aId))
+    return myIcons[aId];
+  return QString();
+}
+
+XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
+  : QObject(),
+  myCurrentFile(QString()),
+  myPartSetModule(NULL),
+  mySalomeConnector(theConnector),
+  myPropertyPanel(0),
+  myObjectBrowser(0),
+  myDisplayer(0)
+{
+  myMainWindow = mySalomeConnector? 0 : new XGUI_MainWindow();
+
+  myDisplayer = new XGUI_Displayer(this);
+
   mySelector = new XGUI_SelectionMgr(this);
+
+  myOperationMgr = new XGUI_OperationMgr(this);
+  myActionsMgr = new XGUI_ActionsMgr(this);
+  myErrorDlg = new XGUI_ErrorDialog(myMainWindow);
+  myContextMenuMgr = new XGUI_ContextMenuMgr(this);
+
+  myViewerProxy = new XGUI_ViewerProxy(this);
+
+  connect(myOperationMgr, SIGNAL(operationStarted()),  this, SLOT(onOperationStarted()));
+  connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
+          this, SLOT(onOperationStopped(ModuleBase_Operation*)));
+  connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
 }
 
 //******************************************************
@@ -57,32 +104,41 @@ void XGUI_Workshop::startApplication()
 {
   initMenu();
   //Initialize event listening
-  Event_Loop* aLoop = Event_Loop::loop();
+  Events_Loop* aLoop = Events_Loop::loop();
+  aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors.
   //TODO(sbh): Implement static method to extract event id [SEID]
-  Event_ID aFeatureId = aLoop->eventByName("FeatureEvent");
+  Events_ID aFeatureId = aLoop->eventByName(EVENT_FEATURE_LOADED);
   aLoop->registerListener(this, aFeatureId);
-  Event_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
+  Events_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
   aLoop->registerListener(this, aPartSetId);
+  Events_ID aFeatureUpdatedId = aLoop->eventByName(EVENT_FEATURE_UPDATED);
+  aLoop->registerListener(this, aFeatureUpdatedId);
   activateModule();
-  myMainWindow->show();
-
-  updateCommandStatus();
-  // Testing of document creation
-  //std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
-  //std::shared_ptr<ModelAPI_Feature> aPoint1 = aMgr->rootDocument()->addFeature("Point");
-  //std::shared_ptr<ModelAPI_Feature> aPart = aMgr->rootDocument()->addFeature("Part");
-  //aPart->execute();
-  //aMgr->setCurrentDocument(aPart->data()->docRef("PartDocument")->value());
-  //std::shared_ptr<ModelAPI_Feature> aPoint2 = aMgr->rootDocument()->addFeature("Point");
-  //aPoint2 = aMgr->rootDocument()->addFeature("Point");
-
-  //aPart = aMgr->rootDocument()->addFeature("Part");
-  //aPart->execute();
+  if (myMainWindow) {
+    myMainWindow->show();
+    updateCommandStatus();
+  }
+  onNew();
 }
 
 //******************************************************
 void XGUI_Workshop::initMenu()
 {
+  if (isSalomeMode()) {
+    // Create only Undo, Redo commands
+    salomeConnector()->addEditCommand("UNDO_CMD", 
+                                      tr("Undo"), tr("Undo last command"),
+                                      QIcon(":pictures/undo.png"), 
+                                      false, this, SLOT(onUndo()),
+                                      QKeySequence::Undo);
+    salomeConnector()->addEditCommand("REDO_CMD", 
+                                      tr("Redo"), tr("Redo last command"),
+                                      QIcon(":pictures/redo.png"), 
+                                      false, this, SLOT(onRedo()),
+                                      QKeySequence::Redo);
+    salomeConnector()->addEditMenuSeparator();
+    return;
+  }
   XGUI_Workbench* aPage = myMainWindow->menuObject()->generalPage();
 
   // File commands group
@@ -115,14 +171,15 @@ void XGUI_Workshop::initMenu()
                                 QIcon(":pictures/open.png"), QKeySequence::Open);
   aCommand->connectTo(this, SLOT(onOpen()));
 
-  aCommand = aGroup->addFeature("NEW_CMD", tr("New"), tr("Create a new document"),
-                                QIcon(":pictures/new.png"), QKeySequence::New);
-  aCommand->connectTo(this, SLOT(onNew()));
+  //aCommand = aGroup->addFeature("NEW_CMD", tr("New"), tr("Create a new document"),
+  //                              QIcon(":pictures/new.png"), QKeySequence::New);
+  //aCommand->connectTo(this, SLOT(onNew()));
 
   aCommand = aGroup->addFeature("EXIT_CMD", tr("Exit"), tr("Exit application"),
                                 QIcon(":pictures/close.png"), QKeySequence::Close);
   aCommand->connectTo(this, SLOT(onExit()));
 
+  myContextMenuMgr->createActions();
 }
 
 //******************************************************
@@ -133,35 +190,88 @@ XGUI_Workbench* XGUI_Workshop::addWorkbench(const QString& theName)
 }
 
 //******************************************************
-void XGUI_Workshop::processEvent(const Event_Message* theMessage)
+void XGUI_Workshop::processEvent(const Events_Message* theMessage)
 {
-  static Event_ID aFeatureId = Event_Loop::loop()->eventByName("FeatureEvent");
-  if (theMessage->eventID() == aFeatureId) {
-    const Config_FeatureMessage* aFeatureMsg =
-        dynamic_cast<const Config_FeatureMessage*>(theMessage);
+  //A message to start feature creation received.
+  static Events_ID aFeatureLoadedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_LOADED);
+  if (theMessage->eventID() == aFeatureLoadedId) {
+    const Config_FeatureMessage* aFeatureMsg = dynamic_cast<const Config_FeatureMessage*>(theMessage);
     addFeature(aFeatureMsg);
     return;
   }
-  const Config_PointerMessage* aPartSetMsg =
-      dynamic_cast<const Config_PointerMessage*>(theMessage);
+  //Update property panel on corresponding message. If there is no current operation (no
+  //property panel), or received message has different feature to the current - do nothing.
+  static Events_ID aFeatureUpdatedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED);
+  if (theMessage->eventID() == aFeatureUpdatedId && myOperationMgr->hasOperation())
+  {
+    const Model_FeatureUpdatedMessage* anUpdateMsg =
+        dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+    boost::shared_ptr<ModelAPI_Feature> aNewFeature = anUpdateMsg->feature();
+    boost::shared_ptr<ModelAPI_Feature> aCurrentFeature = myOperationMgr->currentOperation()->feature();
+    if(aNewFeature == aCurrentFeature) {
+      myPropertyPanel->updateContentWidget(aCurrentFeature);
+    }
+  }
+  //An operation passed by message. Start it, process and commit.
+  const Config_PointerMessage* aPartSetMsg = dynamic_cast<const Config_PointerMessage*>(theMessage);
   if (aPartSetMsg) {
-    ModuleBase_Operation* aOperation = (ModuleBase_Operation*)(aPartSetMsg->pointer());
-    setCurrentOperation(aOperation);
-    if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
-      myCurrentOperation->start();
-      myCurrentOperation->commit();
-      updateCommandStatus();
-    } else {
-      fillPropertyPanel(aOperation);
+    ModuleBase_Operation* anOperation =
+        (ModuleBase_Operation*)(aPartSetMsg->pointer());
+
+    if (myOperationMgr->startOperation(anOperation)) {
+      myPropertyPanel->updateContentWidget(anOperation->feature());
+      if (anOperation->getDescription()->xmlRepresentation().isEmpty()) {
+        anOperation->commit();
+        updateCommandStatus();
+      }
     }
     return;
   }
+  //Show error dialog if error message received.
+  const Events_Error* anAppError = dynamic_cast<const Events_Error*>(theMessage);
+  if (anAppError) {
+    emit errorOccurred(QString::fromLatin1(anAppError->description()));
+    myErrorDlg->show();
+    myErrorDlg->raise();
+    myErrorDlg->activateWindow();
+  }
 
-#ifdef _DEBUG
-  qDebug() << "XGUI_Workshop::ProcessEvent: "
-  << "Catch message, but it can not be processed.";
-#endif
+}
+
+//******************************************************
+void XGUI_Workshop::onOperationStarted()
+{
+  ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+
+  if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) { //!< No need for property panel
+    connectWithOperation(aOperation);
+
+    showPropertyPanel();
+
+    ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
+    QWidget* aContent = myPropertyPanel->contentWidget();
+    qDeleteAll(aContent->children());
+    aFactory.createWidget(aContent);
+    myPropertyPanel->setModelWidgets(aFactory.getModelWidgets());
+    myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
+  }
+}
 
+//******************************************************
+void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
+{
+  ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+
+  //!< No need for property panel
+  updateCommandStatus();
+  hidePropertyPanel();
+  if(myOperationMgr->operationsCount() > 1) {
+    myActionsMgr->updateAction(theOperation->getDescription()->operationId());
+    return;
+  }
+  if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) { 
+    myActionsMgr->restoreCommandState();
+  }
 }
 
 /*
@@ -175,54 +285,48 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage)
 #endif
     return;
   }
+  // Remember features icons
+  myIcons[QString::fromStdString(theMessage->id())] = QString::fromStdString(theMessage->icon());
+
   //Find or create Workbench
-  XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
   QString aWchName = QString::fromStdString(theMessage->workbenchId());
-  XGUI_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
-  if (!aPage) {
-    aPage = addWorkbench(aWchName);
-  }
-  //Find or create Group
-  QString aGroupName = QString::fromStdString(theMessage->groupId());
-  XGUI_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
-  if (!aGroup) {
-    aGroup = aPage->addGroup(aGroupName);
-  }
-  //Create feature...
-  QString aFeatureId = QString::fromStdString(theMessage->id());
-  XGUI_Command* aCommand = aGroup->addFeature(QString::fromStdString(theMessage->id()),
-                                              QString::fromStdString(theMessage->text()),
-                                              QString::fromStdString(theMessage->tooltip()),
-                                              QIcon(theMessage->icon().c_str())
-                                              //TODO(sbh): QKeySequence
-                                                  );
-  myPartSetModule->featureCreated(aCommand);
-}
-
-/*
- *
- */
-void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation)
-{
-  connectToPropertyPanel(theOperation);
-  QWidget* aPropWidget = myMainWindow->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
-  qDeleteAll(aPropWidget->children());
-  theOperation->start();
-  XGUI_WidgetFactory aFactory = XGUI_WidgetFactory(theOperation);
-  aFactory.fillWidget(aPropWidget);
-}
+  QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures());
+  bool isUsePropPanel = theMessage->isUseInput();
+  if (isSalomeMode()) {
+    QString aId = QString::fromStdString(theMessage->id());
+    salomeConnector()->addFeature(aWchName,
+                                  QString::fromStdString(theMessage->id()),
+                                  aId,
+                                  QString::fromStdString(theMessage->tooltip()),
+                                  QIcon(theMessage->icon().c_str()),
+                                  isUsePropPanel, this, 
+                                  SLOT(onFeatureTriggered()), QKeySequence());
+    myActionsMgr->addCommand(aId, salomeConnector()->command(aId));
+    salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" "));
 
-void XGUI_Workshop::setCurrentOperation(ModuleBase_Operation* theOperation)
-{
-  //FIXME: Ask user about aborting of current operation?
-  if (myCurrentOperation) {
-    //TODO get isOperation from document
-    if (myCurrentOperation->isRunning())
-      myCurrentOperation->abort();
+  } else {
 
-    myCurrentOperation->deleteLater();
+    XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
+    XGUI_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
+    if (!aPage) {
+      aPage = addWorkbench(aWchName);
+    }
+    //Find or create Group
+    QString aGroupName = QString::fromStdString(theMessage->groupId());
+    XGUI_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
+    if (!aGroup) {
+      aGroup = aPage->addGroup(aGroupName);
+    }
+    //Create feature...
+    XGUI_Command* aCommand = aGroup->addFeature(QString::fromStdString(theMessage->id()),
+                                                QString::fromStdString(theMessage->text()),
+                                                QString::fromStdString(theMessage->tooltip()),
+                                                QIcon(theMessage->icon().c_str()),
+                                                QKeySequence(), isUsePropPanel);
+    aCommand->setUnblockableCommands(aNestedFeatures.split(" "));
+    myActionsMgr->addCommand(aCommand);
+    myPartSetModule->featureCreated(aCommand);
   }
-  myCurrentOperation = theOperation;
 }
 
 /*
@@ -230,22 +334,52 @@ void XGUI_Workshop::setCurrentOperation(ModuleBase_Operation* theOperation)
  * and given operation. The given operation becomes a
  * current operation and previous operation if exists
  */
-void XGUI_Workshop::connectToPropertyPanel(ModuleBase_Operation* theOperation)
+void XGUI_Workshop::connectWithOperation(ModuleBase_Operation* theOperation)
 {
-  QDockWidget* aPanel = myMainWindow->findChild<QDockWidget*>(XGUI::PROP_PANEL);
-  QPushButton* aOkBtn = aPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+  QPushButton* aOkBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
   connect(aOkBtn, SIGNAL(clicked()), theOperation, SLOT(commit()));
-  QPushButton* aCancelBtn = aPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+  QPushButton* aCancelBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
   connect(aCancelBtn, SIGNAL(clicked()), theOperation, SLOT(abort()));
 
-  connect(theOperation, SIGNAL(started()), myMainWindow, SLOT(showPropertyPanel()));
-  connect(theOperation, SIGNAL(stopped()), myMainWindow, SLOT(hidePropertyPanel()));
-  connect(theOperation, SIGNAL(stopped()), this, SLOT(updateCommandStatus()));
+  QAction* aCommand = 0;
+  if (isSalomeMode()) {
+    aCommand = salomeConnector()->command(theOperation->getDescription()->operationId());
+  } else {
+    XGUI_MainMenu* aMenu = myMainWindow->menuObject();
+    aCommand = aMenu->feature(theOperation->getDescription()->operationId());
+  }
+  //Abort operation on uncheck the command
+  connect(aCommand, SIGNAL(triggered(bool)), theOperation, SLOT(setRunning(bool)));
+}
+
+/*
+ * Saves document with given name.
+ */
+void XGUI_Workshop::saveDocument(QString theName)
+{
+  QApplication::restoreOverrideCursor();
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+  aDoc->save(theName.toLatin1().constData());
+  QApplication::restoreOverrideCursor();
 }
 
 //******************************************************
 void XGUI_Workshop::onExit()
 {
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+  if(aDoc->isModified()) {
+    int anAnswer = QMessageBox::question(
+        myMainWindow, tr("Save current file"),
+        tr("The document is modified, save before exit?"),
+        QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
+    if(anAnswer == QMessageBox::Save) {
+      onSave();
+    } else if (anAnswer == QMessageBox::Cancel) {
+      return;
+    }
+  }
   qApp->exit();
 }
 
@@ -253,43 +387,95 @@ void XGUI_Workshop::onExit()
 void XGUI_Workshop::onNew()
 {
   QApplication::setOverrideCursor(Qt::WaitCursor);
-  if (myMainWindow->objectBrowser() == 0) {
-    myMainWindow->createDockWidgets();
-    mySelector->connectObjectBrowser(myMainWindow->objectBrowser());
+  if (objectBrowser() == 0) {
+    createDockWidgets();
+    mySelector->connectViewers();
+  }
+  myViewerProxy->connectToViewer();
+  showObjectBrowser();
+  if (!isSalomeMode()) {
+    myMainWindow->showPythonConsole();
+    QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
+    aWnd->showMaximized();
+    updateCommandStatus();
   }
-  myMainWindow->showObjectBrowser();
-  myMainWindow->showPythonConsole();
-  QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
-  aWnd->showMaximized();
-  updateCommandStatus();
   QApplication::restoreOverrideCursor();
 }
 
 //******************************************************
 void XGUI_Workshop::onOpen()
 {
-  //QString aFileName = QFileDialog::getOpenFileName(mainWindow());
+  //save current file before close if modified
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+  if(aDoc->isModified()) {
+    //TODO(sbh): re-launch the app?
+    int anAnswer = QMessageBox::question(
+        myMainWindow, tr("Save current file"),
+        tr("The document is modified, save before opening another?"),
+        QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
+    if(anAnswer == QMessageBox::Save) {
+      onSave();
+    } else if (anAnswer == QMessageBox::Cancel) {
+      return;
+    }
+    aDoc->close();
+    myCurrentFile = "";
+  }
+
+  //show file dialog, check if readable and open
+  myCurrentFile = QFileDialog::getExistingDirectory(mainWindow());
+  if(myCurrentFile.isEmpty())
+    return;
+  QFileInfo aFileInfo(myCurrentFile);
+  if(!aFileInfo.exists() || !aFileInfo.isReadable()) {
+    QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to open the file."));
+    myCurrentFile = "";
+    return;
+  }
+  QApplication::setOverrideCursor(Qt::WaitCursor);
+  aDoc->load(myCurrentFile.toLatin1().constData());
+  QApplication::restoreOverrideCursor();
   updateCommandStatus();
 }
 
 //******************************************************
 void XGUI_Workshop::onSave()
 {
+  if(myCurrentFile.isEmpty()) {
+    onSaveAs();
+    return;
+  }
+  saveDocument(myCurrentFile);
   updateCommandStatus();
 }
 
 //******************************************************
 void XGUI_Workshop::onSaveAs()
 {
-  //QString aFileName = QFileDialog::getSaveFileName(mainWindow());
-  updateCommandStatus();
+  QString aTemp = myCurrentFile;
+  myCurrentFile = QFileDialog::getSaveFileName(mainWindow());
+  if(myCurrentFile.isEmpty()) {
+    myCurrentFile = aTemp;
+    return;
+  }
+  QFileInfo aFileInfo(myCurrentFile);
+  if(aFileInfo.exists() && !aFileInfo.isWritable()) {
+    QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to save the file."));
+    return;
+  }
+  onSave();
 }
 
 //******************************************************
 void XGUI_Workshop::onUndo()
 {
-  std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
-  std::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+  objectBrowser()->setCurrentIndex(QModelIndex());
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+  //if (!operationMgr()->abortOperation())
+  //  return;
+  operationMgr()->abortOperation();
   aDoc->undo();
   updateCommandStatus();
 }
@@ -297,17 +483,18 @@ void XGUI_Workshop::onUndo()
 //******************************************************
 void XGUI_Workshop::onRedo()
 {
-  std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
-  std::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+  objectBrowser()->setCurrentIndex(QModelIndex());
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
   aDoc->redo();
   updateCommandStatus();
 }
 
-
 //******************************************************
 XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
 {
-  QString libName = library(theModule);
+  QString libName =
+      QString::fromStdString(library(theModule.toStdString()));
   if (libName.isEmpty()) {
     qWarning(
     qPrintable( tr( "Information about module \"%1\" doesn't exist." ).arg( theModule ) ));
@@ -318,7 +505,6 @@ XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
   CREATE_FUNC crtInst = 0;
 
 #ifdef WIN32
-
   HINSTANCE modLib = ::LoadLibrary((LPTSTR) qPrintable(libName));
   if (!modLib) {
     LPVOID lpMsgBuf;
@@ -343,23 +529,24 @@ XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
   }
 #else
   void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY );
-  if ( !modLib )
-  err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
-  else
-  {
+  if ( !modLib ) {
+    err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
+  } else {
     crtInst = (CREATE_FUNC)dlsym( modLib, CREATE_MODULE );
-    if ( !crtInst )
-    err = QString( "Failed to find function %1. %2" ).arg( CREATE_MODULE ).arg( dlerror() );
+    if ( !crtInst ) {
+      err = QString( "Failed to find function %1. %2" ).arg( CREATE_MODULE ).arg( dlerror() );
+    }
   }
 #endif
 
   XGUI_Module* aModule = crtInst ? crtInst(this) : 0;
 
   if (!err.isEmpty()) {
-    if (mainWindow() && mainWindow()->isVisible())
+    if (mainWindow()) {
       QMessageBox::warning(mainWindow(), tr("Error"), err);
-    else
+    } else {
       qWarning( qPrintable( err ));
+    }
   }
   return aModule;
 }
@@ -367,7 +554,9 @@ XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
 //******************************************************
 bool XGUI_Workshop::activateModule()
 {
-  myPartSetModule = loadModule("PartSet");
+  Config_ModuleReader aModuleReader;
+  QString moduleName = QString::fromStdString(aModuleReader.getModuleName());
+  myPartSetModule = loadModule(moduleName);
   if (!myPartSetModule)
     return false;
   myPartSetModule->createFeatures();
@@ -377,34 +566,136 @@ bool XGUI_Workshop::activateModule()
 //******************************************************
 void XGUI_Workshop::updateCommandStatus()
 {
+  if (isSalomeMode()) // TODO: update commands in SALOME
+    return;
   XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
 
   QList<XGUI_Command*> aCommands = aMenuBar->features();
   QList<XGUI_Command*>::const_iterator aIt;
 
-  std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
   if (aMgr->hasRootDocument()) {
     XGUI_Command* aUndoCmd;
     XGUI_Command* aRedoCmd;
-    for (aIt = aCommands.constBegin(); aIt != aCommands.constEnd(); ++aIt) {
-      if ((*aIt)->id() == "UNDO_CMD")
-        aUndoCmd = (*aIt);
-      else if ((*aIt)->id() == "REDO_CMD")
-        aRedoCmd = (*aIt);
+    foreach(XGUI_Command* aCmd, aCommands) {
+      if (aCmd->id() == "UNDO_CMD")
+        aUndoCmd = aCmd;
+      else if (aCmd->id() == "REDO_CMD")
+        aRedoCmd = aCmd;
       else // Enable all commands
-        (*aIt)->enable();
+        aCmd->enable();
     }
-    std::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+    boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
     aUndoCmd->setEnabled(aDoc->canUndo());
     aRedoCmd->setEnabled(aDoc->canRedo());
   } else {
-    for (aIt = aCommands.constBegin(); aIt != aCommands.constEnd(); ++aIt) {
-      if ((*aIt)->id() == "NEW_CMD")
-        (*aIt)->enable();
-      else if ((*aIt)->id() == "EXIT_CMD")
-        (*aIt)->enable();
+    foreach(XGUI_Command* aCmd, aCommands) {
+      if (aCmd->id() == "NEW_CMD")
+        aCmd->enable();
+      else if (aCmd->id() == "EXIT_CMD")
+        aCmd->enable();
       else 
-        (*aIt)->disable();
+        aCmd->disable();
     }
   }
 }
+
+//******************************************************
+QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
+{
+  QDockWidget* aObjDock = new QDockWidget(theParent);
+  aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+  aObjDock->setWindowTitle(tr("Object browser"));
+  myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
+  connect(myObjectBrowser, SIGNAL(activePartChanged(FeaturePtr)), this, SLOT(changeCurrentDocument(FeaturePtr)));
+  aObjDock->setWidget(myObjectBrowser);
+
+  myContextMenuMgr->connectObjectBrowser();
+  return aObjDock;
+}
+
+//******************************************************
+/*
+ * Creates dock widgets, places them in corresponding area
+ * and tabifies if necessary.
+ */
+void XGUI_Workshop::createDockWidgets()
+{
+  QMainWindow* aDesktop = isSalomeMode()? salomeConnector()->desktop() :
+                                          myMainWindow;
+  QDockWidget* aObjDock = createObjectBrowser(aDesktop);
+  aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
+  myPropertyPanel = new XGUI_PropertyPanel(aDesktop);
+  aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
+  hidePropertyPanel(); //<! Invisible by default
+  hideObjectBrowser();
+  aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel);
+}
+
+//******************************************************
+void XGUI_Workshop::showPropertyPanel()
+{
+  QAction* aViewAct = myPropertyPanel->toggleViewAction();
+  //<! Restore ability to close panel from the window's menu
+  aViewAct->setEnabled(true);
+  myPropertyPanel->show();
+  myPropertyPanel->raise();
+}
+
+//******************************************************
+void XGUI_Workshop::hidePropertyPanel()
+{
+  QAction* aViewAct = myPropertyPanel->toggleViewAction();
+  //<! Do not allow to show empty property panel
+  aViewAct->setEnabled(false);
+  myPropertyPanel->hide();
+}
+
+//******************************************************
+void XGUI_Workshop::showObjectBrowser()
+{
+  myObjectBrowser->parentWidget()->show();
+}
+
+//******************************************************
+void XGUI_Workshop::hideObjectBrowser()
+{
+  myObjectBrowser->parentWidget()->hide();
+}
+
+//******************************************************
+void XGUI_Workshop::onFeatureTriggered()
+{
+  QAction* aCmd = dynamic_cast<QAction*>(sender());
+  if (aCmd) {
+    QString aId = salomeConnector()->commandId(aCmd);
+    if (!aId.isNull())
+      myPartSetModule->launchOperation(aId);
+  }
+}
+
+//******************************************************
+void XGUI_Workshop::changeCurrentDocument(FeaturePtr thePart)
+{
+  boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  if (thePart) {
+    boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = thePart->data()->docRef("PartDocument");
+    if (aDocRef)
+      aMgr->setCurrentDocument(aDocRef->value());
+  } else {
+    aMgr->setCurrentDocument(aMgr->rootDocument());
+  }
+}
+
+//******************************************************
+void XGUI_Workshop::salomeViewerSelectionChanged()
+{
+  emit salomeViewerSelection();
+}
+
+
+//**************************************************************
+XGUI_SalomeViewer* XGUI_Workshop::salomeViewer() const 
+{ 
+  return mySalomeConnector->viewer(); 
+}