X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=60bad111dbc77e1b051e2f6df8c41965a11821cc;hb=d86c77d1c6210bbe04fbc3e5b00f9e212e1ec930;hp=51bc022d5b58210b620cb1434d4b8de9decf2336;hpb=af3e1c3206761f41cbdf56b5ca4da2ac20c62193;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 51bc022d5..60bad111d 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -14,6 +14,8 @@ #include "XGUI_Displayer.h" #include "XGUI_OperationMgr.h" #include "XGUI_SalomeConnector.h" +#include "XGUI_ActionsMgr.h" +#include "XGUI_ErrorDialog.h" #include #include @@ -21,6 +23,7 @@ #include #include +#include #include #include #include @@ -45,7 +48,8 @@ #endif XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) - : QObject(), + : QObject(), + myCurrentFile(QString()), myPartSetModule(NULL), mySalomeConnector(theConnector), myPropertyPanelDock(0), @@ -61,9 +65,13 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) mySelector = new XGUI_SelectionMgr(this); connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(changeCurrentDocument())); myOperationMgr = new XGUI_OperationMgr(this); + myActionsMgr = new XGUI_ActionsMgr(this); + myErrorDlg = new XGUI_ErrorDialog(myMainWindow); + 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&))); } //****************************************************** @@ -77,6 +85,7 @@ void XGUI_Workshop::startApplication() initMenu(); //Initialize event listening 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] Events_ID aFeatureId = aLoop->eventByName("FeatureEvent"); aLoop->registerListener(this, aFeatureId); @@ -173,13 +182,11 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage) { static Events_ID aFeatureId = Events_Loop::loop()->eventByName("FeatureEvent"); if (theMessage->eventID() == aFeatureId) { - const Config_FeatureMessage* aFeatureMsg = - dynamic_cast(theMessage); + const Config_FeatureMessage* aFeatureMsg = dynamic_cast(theMessage); addFeature(aFeatureMsg); return; } - const Config_PointerMessage* aPartSetMsg = - dynamic_cast(theMessage); + const Config_PointerMessage* aPartSetMsg = dynamic_cast(theMessage); if (aPartSetMsg) { ModuleBase_PropPanelOperation* anOperation = (ModuleBase_PropPanelOperation*)(aPartSetMsg->pointer()); @@ -192,6 +199,13 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage) } return; } + const Events_Error* anAppError = dynamic_cast(theMessage); + if (anAppError) { + emit errorOccurred(QString::fromLatin1(anAppError->description())); + myErrorDlg->show(); + myErrorDlg->raise(); + myErrorDlg->activateWindow(); + } #ifdef _DEBUG qDebug() << "XGUI_Workshop::ProcessEvent: " @@ -231,10 +245,9 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) hidePropertyPanel(); updateCommandStatus(); - if (myMainWindow) { - XGUI_MainMenu* aMenu = myMainWindow->menuObject(); - aMenu->restoreCommandState(); - } + if (myMainWindow) { + myActionsMgr->restoreCommandState(); + } } } @@ -278,9 +291,9 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage) QString::fromStdString(theMessage->tooltip()), QIcon(theMessage->icon().c_str()), QKeySequence(), isUsePropPanel); - - connect(aCommand, SIGNAL(toggled(bool)), - myMainWindow->menuObject(), SLOT(onFeatureChecked(bool))); + QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures()); + aCommand->setUnblockableCommands(aNestedFeatures.split(" ")); + myActionsMgr->addCommand(aCommand); myPartSetModule->featureCreated(aCommand); } } @@ -305,12 +318,37 @@ void XGUI_Workshop::connectWithOperation(ModuleBase_Operation* theOperation) aCommand = aMenu->feature(theOperation->operationId()); } //Abort operation on uncheck the command - connect(aCommand, SIGNAL(toggled(bool)), theOperation, SLOT(setRunning(bool))); + 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 aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr aDoc = aMgr->rootDocument(); + aDoc->save(theName.toLatin1().constData()); + QApplication::restoreOverrideCursor(); } //****************************************************** void XGUI_Workshop::onExit() { + boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr 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(); } @@ -335,21 +373,66 @@ void XGUI_Workshop::onNew() //****************************************************** void XGUI_Workshop::onOpen() { - //QString aFileName = QFileDialog::getOpenFileName(mainWindow()); + //save current file before close if modified + boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr 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::getOpenFileName(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(); } //****************************************************** @@ -631,4 +714,4 @@ void XGUI_Workshop::changeCurrentDocument() void XGUI_Workshop::salomeViewerSelectionChanged() { emit salomeViewerSelection(); -} \ No newline at end of file +}