X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ContextMenuMgr.cpp;h=e1b8584766d9865eb70e67d9ee6c6de6354c2363;hb=220bd2b37119be1c65abf88a88792445cb9d99f8;hp=7e7b904465e4d809d9bd5d8fb447b62797fb2f86;hpb=6184808bb36e2b78623c300b30306ebb697f4ebb;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp index 7e7b90446..e1b858476 100644 --- a/src/XGUI/XGUI_ContextMenuMgr.cpp +++ b/src/XGUI/XGUI_ContextMenuMgr.cpp @@ -8,8 +8,13 @@ #include "XGUI_ViewerProxy.h" #include "XGUI_Selection.h" #include "XGUI_SalomeConnector.h" +#include "XGUI_DataModel.h" +#include "XGUI_OperationMgr.h" +#include "XGUI_Tools.h" +#ifndef HAVE_SALOME #include +#endif //#include "PartSetPlugin_Part.h" @@ -21,14 +26,17 @@ #include #include #include +#include #include #include +#include #include #include #include #include +#include XGUI_ContextMenuMgr::XGUI_ContextMenuMgr(XGUI_Workshop* theParent) @@ -44,19 +52,28 @@ XGUI_ContextMenuMgr::~XGUI_ContextMenuMgr() void XGUI_ContextMenuMgr::createActions() { - QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this); +#ifdef HAVE_SALOME + QMainWindow* aDesktop = myWorkshop->salomeConnector()->desktop(); +#else QMainWindow* aDesktop = myWorkshop->mainWindow(); - if (!aDesktop) - aDesktop = myWorkshop->salomeConnector()->desktop(); +#endif + + QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this); aDesktop->addAction(aAction); addAction("DELETE_CMD", aAction); - aAction->setShortcut(Qt::Key_Delete); aAction->setShortcutContext(Qt::ApplicationShortcut); - aAction = new QAction(QIcon(":pictures/move.png"), tr("Move..."), this); + aAction = new QAction(QIcon(":pictures/rename_edit.png"), tr("Rename"), this); + addAction("RENAME_CMD", aAction); + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRename())); + + aAction = new QAction(QIcon(":pictures/move.png"), XGUI_Workshop::MOVE_TO_END_COMMAND, this); addAction("MOVE_CMD", aAction); + aAction = new QAction(QIcon(":pictures/clean_history.png"), tr("Clean history"), this); + addAction("CLEAN_HISTORY_CMD", aAction); + aAction = new QAction(QIcon(":pictures/color.png"), tr("Color..."), this); addAction("COLOR_CMD", aAction); @@ -170,25 +187,48 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() if (aSelected == 1) { ObjectPtr aObject = aObjects.first(); if (aObject) { + if (hasResult && myWorkshop->canBeShaded(aObject)) { + XGUI_Displayer::DisplayMode aMode = aDisplayer->displayMode(aObject); + if (aMode != XGUI_Displayer::NoMode) { + action("WIREFRAME_CMD")->setEnabled(aMode == XGUI_Displayer::Shading); + action("SHADING_CMD")->setEnabled(aMode == XGUI_Displayer::Wireframe); + } else { + action("WIREFRAME_CMD")->setEnabled(true); + action("SHADING_CMD")->setEnabled(true); + } + } if (!hasFeature) { - if (aObject->isDisplayed()) { - if (aDisplayer->canBeShaded(aObject)) { - action("WIREFRAME_CMD")->setEnabled(true); - action("SHADING_CMD")->setEnabled(true); - } + bool aHasSubResults = ModelAPI_Tools::hasSubResults( + std::dynamic_pointer_cast(aObject)); + if (aHasSubResults) { action("HIDE_CMD")->setEnabled(true); - } else if (hasResult && (!hasParameter)) { action("SHOW_CMD")->setEnabled(true); } - + else { + if (aObject->isDisplayed()) { + action("HIDE_CMD")->setEnabled(true); + } else if (hasResult && (!hasParameter)) { + action("SHOW_CMD")->setEnabled(true); + } + } if (!(hasParameter || hasFeature)) action("SHOW_ONLY_CMD")->setEnabled(true); } else if (hasFeature && myWorkshop->canMoveFeature()) action("MOVE_CMD")->setEnabled(true); + + else if (hasFeature || hasParameter) + action("CLEAN_HISTORY_CMD")->setEnabled(true); + + if( aMgr->activeDocument() == aObject->document() ) + { + action("RENAME_CMD")->setEnabled(true); + action("DELETE_CMD")->setEnabled(!hasSubFeature); + } } } else { - if (hasResult && (!hasParameter)) { + // parameter is commented because the actions are not in the list of result parameter actions + if (hasResult /*&& (!hasParameter)*/) { action("SHOW_CMD")->setEnabled(true); action("HIDE_CMD")->setEnabled(true); action("SHOW_ONLY_CMD")->setEnabled(true); @@ -196,11 +236,38 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu() action("WIREFRAME_CMD")->setEnabled(true); } } - if (!hasSubFeature) { + bool allActive = true; + foreach( ObjectPtr aObject, aObjects ) + if( aMgr->activeDocument() != aObject->document() ) { + allActive = false; + break; + } + if (!hasSubFeature && allActive ) { if (hasFeature || hasParameter) action("DELETE_CMD")->setEnabled(true); } + if (allActive && (hasFeature|| hasParameter)) + action("CLEAN_HISTORY_CMD")->setEnabled(true); + } + + // Show/Hide command has to be disabled for objects from non active document + bool aDeactivate = false; + foreach (ObjectPtr aObj, aObjects) { + if (!aObj->document()->isActive()) { + if ((aObj->document() != ModelAPI_Session::get()->moduleDocument()) || + aObj->groupName() == ModelAPI_ResultPart::group()) { + aDeactivate = true; + break; + } + } + } + if (aDeactivate) { + // If at leas a one objec can not be edited then Show/Hide has to be disabled + action("SHOW_CMD")->setEnabled(false); + action("HIDE_CMD")->setEnabled(false); + action("SHOW_ONLY_CMD")->setEnabled(false); } + if (myWorkshop->canChangeColor()) action("COLOR_CMD")->setEnabled(true); @@ -233,8 +300,15 @@ void XGUI_ContextMenuMgr::updateViewerMenu() } if (isVisible) { if (canBeShaded) { - action("WIREFRAME_CMD")->setEnabled(true); - action("SHADING_CMD")->setEnabled(true); + XGUI_Displayer* aDisplayer = myWorkshop->displayer(); + XGUI_Displayer::DisplayMode aMode = aDisplayer->displayMode(aObject); + if (aMode != XGUI_Displayer::NoMode) { + action("WIREFRAME_CMD")->setEnabled(aMode == XGUI_Displayer::Shading); + action("SHADING_CMD")->setEnabled(aMode == XGUI_Displayer::Wireframe); + } else { + action("WIREFRAME_CMD")->setEnabled(true); + action("SHADING_CMD")->setEnabled(true); + } } action("SHOW_ONLY_CMD")->setEnabled(true); action("HIDE_CMD")->setEnabled(true); @@ -278,6 +352,8 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); aList.append(action("COLOR_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList; //------------------------------------- // Result body menu @@ -289,6 +365,8 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.append(action("SHOW_CMD")); aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList; // Group menu myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList; @@ -299,10 +377,16 @@ void XGUI_ContextMenuMgr::buildObjBrowserMenu() aList.clear(); aList.append(action("DELETE_CMD")); aList.append(action("MOVE_CMD")); + aList.append(action("CLEAN_HISTORY_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_Feature::group()] = aList; aList.clear(); aList.append(action("DELETE_CMD")); + aList.append(action("CLEAN_HISTORY_CMD")); + aList.append(mySeparator); + aList.append(action("RENAME_CMD")); myObjBrowserMenus[ModelAPI_ResultParameter::group()] = aList; //------------------------------------- } @@ -313,7 +397,6 @@ void XGUI_ContextMenuMgr::buildViewerMenu() // Result construction menu aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); - aList.append(action("HIDEALL_CMD")); aList.append(action("COLOR_CMD")); myViewerMenu[ModelAPI_ResultConstruction::group()] = aList; // Result part menu @@ -327,7 +410,6 @@ void XGUI_ContextMenuMgr::buildViewerMenu() aList.append(mySeparator); aList.append(action("HIDE_CMD")); aList.append(action("SHOW_ONLY_CMD")); - aList.append(action("HIDEALL_CMD")); myViewerMenu[ModelAPI_ResultBody::group()] = aList; // Group menu myViewerMenu[ModelAPI_ResultGroup::group()] = aList; @@ -357,6 +439,8 @@ void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const aActions.append(mySeparator); aActions.append(action("DELETE_CMD")); //aActions.append(action("MOVE_CMD")); + aActions.append(action("CLEAN_HISTORY_CMD")); + aActions.append(action("COLOR_CMD")); } theMenu->addActions(aActions); @@ -382,22 +466,28 @@ void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const QActionsList aActions; if (aSelected == 1) { ObjectPtr aObject = aPrsList.first().object(); - std::string aName = aObject->groupName(); - if (myViewerMenu.contains(aName)) - aActions = myViewerMenu[aName]; + if (aObject.get() != NULL) { + std::string aName = aObject->groupName(); + if (myViewerMenu.contains(aName)) + aActions = myViewerMenu[aName]; + } + aActions.append(action("COLOR_CMD")); } else if (aSelected > 1) { aActions.append(action("HIDE_CMD")); + aActions.append(action("COLOR_CMD")); } + // hide all is shown always even if selection in the viewer is empty + aActions.append(action("HIDEALL_CMD")); theMenu->addActions(aActions); - if (!myWorkshop->isSalomeMode()) { - theMenu->addSeparator(); - QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea(); - if (aMDI->actions().size() > 0) { - QMenu* aSubMenu = theMenu->addMenu(tr("Windows")); - aSubMenu->addActions(aMDI->actions()); - } +#ifndef HAVE_SALOME + theMenu->addSeparator(); + QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea(); + if (aMDI->actions().size() > 0) { + QMenu* aSubMenu = theMenu->addMenu(tr("Windows")); + aSubMenu->addActions(aMDI->actions()); } +#endif } QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName) @@ -420,3 +510,13 @@ QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName) } return aGroups; } + +void XGUI_ContextMenuMgr::onRename() +{ + QObjectPtrList anObjects = myWorkshop->selector()->selection()->selectedObjects(); + if (!myWorkshop->abortAllOperations()) + return; + // restore selection in case if dialog box was shown + myWorkshop->objectBrowser()->setObjectsSelected(anObjects); + myWorkshop->objectBrowser()->onEditItem(); +}