-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SHAPERGUI.h"
#include "SHAPERGUI_DataModel.h"
#include "SHAPERGUI_OCCSelector.h"
-#include <SHAPERGUI_NestedButton.h>
+#include "SHAPERGUI_NestedButton.h"
+#include "SHAPERGUI_ToolbarsMgr.h"
#include <XGUI_Workshop.h>
#include <XGUI_PropertyPanel.h>
#include <QAction>
#include <QTimer>
#include <QMenu>
+#include <QToolBar>
#define SALOME_PATCH_FOR_CTRL_WHEEL
}
} // extern "C"
+
+static const QString ToolbarsSection("SHAPER_Toolbars");
+static const QString FreeCommandsParam("OutOFToolbars");
+
+
/**
* Class for preferences management
*/
//******************************************************
SHAPERGUI::SHAPERGUI()
: LightApp_Module("SHAPER"),
- mySelector(0), myIsOpened(0), myPopupMgr(0)
+ mySelector(0), myIsOpened(0), myPopupMgr(0), myIsInspectionVisible(false),
+ myInspectionPanel(0), myIsToolbarsModified(false)
{
myWorkshop = new XGUI_Workshop(this);
connect(myWorkshop, SIGNAL(commandStatusUpdated()),
//******************************************************
SHAPERGUI::~SHAPERGUI()
{
+ delete myWorkshop;
+ delete myProxyViewer;
}
//******************************************************
{
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
}
+
+ int aMenu = createMenu(tr("Inspection"), -1, -1, 30);
+ int aSubMenu = createMenu(tr("Information"), aMenu);
+
+ int aId = getNextCommandId();
+ myActionsList.append(aId);
+ SUIT_Desktop* aDesk = application()->desktop();
+ QString aTip = tr("Show inspection window");
+ myWhatIsAction = createAction(aId, aTip, QIcon(":pictures/whatis.png"), tr("What Is"),
+ aTip, QKeySequence(), aDesk, true, this, SLOT(onWhatIs(bool)));
+ myWhatIsAction->setStatusTip(aTip);
+ myWhatIsAction->setData("INSPECTION_CMD");
+ createMenu(aId, aSubMenu, 0);
+
+ QString aToolName = tr("Inspection tool");
+ int aTool = createTool(aToolName);
+ int aToolId = createTool(myWhatIsAction, aTool);
+ registerCommandToolbar(aToolName, aId);
+
+ // Define Edit toolbars command
+ aId = getNextCommandId();
+ //myActionsList.append(aId); Do not use it for editing of toolbars
+ aTip = tr("Edit toolbars of the module");
+ QAction* aAction = createAction(aId, aTip, QIcon(":pictures/configure_toolbars.png"),
+ tr("Edit toolbars..."), aTip, QKeySequence(), aDesk, false, this, SLOT(onEditToolbars()));
+ int aEditMenu = createMenu(tr("MEN_DESK_EDIT"), -1, -1, 30);
+ int aEditItem = createMenu(aId, aEditMenu);
}
//******************************************************
bool SHAPERGUI::activateModule(SUIT_Study* theStudy)
{
bool isDone = LightApp_Module::activateModule(theStudy);
+ loadToolbarsConfig();
+
SHAPERGUI_DataModel* aDataModel = dynamic_cast<SHAPERGUI_DataModel*>(dataModel());
aDataModel->initRootObject();
desktop()->tabifyDockWidget(aObjDoc, myWorkshop->propertyPanel());
}
- QDockWidget* aInspection = myWorkshop->inspectionPanel();
- if (aInspection) {
- QAction* aViewAct = aInspection->toggleViewAction();
- aViewAct->setEnabled(true);
+ if (!myInspectionPanel) {
+ myInspectionPanel = myWorkshop->inspectionPanel();
+ QAction* aViewAct = myInspectionPanel->toggleViewAction();
+ connect(aViewAct, SIGNAL(toggled(bool)), this, SLOT(onWhatIs(bool)));
}
+ myInspectionPanel->toggleViewAction()->setEnabled(true);
if (!mySelector) {
ViewManagerList OCCViewManagers;
//******************************************************
bool SHAPERGUI::deactivateModule(SUIT_Study* theStudy)
{
+ saveToolbarsConfig();
+
myProxyViewer->activateViewer(false);
setMenuShown(false);
setToolShown(false);
QAction* aViewAct = aObjDoc->toggleViewAction();
aViewAct->setEnabled(false);
}
- QDockWidget* aInspection = myWorkshop->inspectionPanel();
- if (aInspection) {
- aInspection->setVisible(false);
- QAction* aViewAct = aInspection->toggleViewAction();
- aViewAct->setEnabled(false);
- }
+
+ myIsInspectionVisible = myInspectionPanel->isVisible();
+ myInspectionPanel->hide();
+ QAction* aViewAct = myInspectionPanel->toggleViewAction();
+ aViewAct->setEnabled(false);
// the active operation should be stopped for the next activation.
// There should not be active operation and visualized preview.
connect(getApp()->action(LightApp_Application::FileSaveAsId), SIGNAL(triggered(bool)),
getApp(), SLOT(onSaveAsDoc()));
-
return LightApp_Module::deactivateModule(theStudy);
}
}
aNb++;
- int aId = myActionsList.size();
- myActionsList.append(theId);
+ int aId = getNextCommandId();
+ myActionsList.append(aId);
SUIT_Desktop* aDesk = application()->desktop();
int aKeys = 0;
for (int i = 0; i < theKeys.count(); i++)
int aWBTool = createTool(theTBName, theTBName);
int aToolId = createTool(aId, aWBTool);
- if (isAddSeparator)
+ registerCommandToolbar(theTBName, aId);
+ if (isAddSeparator) {
createTool(separator(), aWBTool);
-
+ registerCommandToolbar(theTBName, -1);
+ }
return aAction;
}
const ActionInfo& theInfo,
const QList<QAction*>& theNestedActions)
{
- myActionsList.append(theInfo.id);
SUIT_Desktop* aDesk = application()->desktop();
SHAPERGUI_NestedButton* anAction = new SHAPERGUI_NestedButton(aDesk, theNestedActions);
anAction->setData(theInfo.id);
int aWBMenu = createMenu(theWBName, -1, -1, 30);
int aItemId = createMenu(anAction, aWBMenu);
+ myActionsList.append(aItemId);
createMenu(separator(), aWBMenu); /// nested action is always separated of others
int aWBTool = createTool(theWBName, theWBName);
int aToolId = createTool(anAction, aWBTool);
+ registerCommandToolbar(theWBName, aItemId);
createTool(separator(), aWBTool); /// nested action is always separated of others
+ registerCommandToolbar(theWBName, -1);
return anAction;
}
{
int aMenu = createMenu(tr(theMenuSourceText), -1, -1);
- int aId = myActionsList.size();
- myActionsList.append(theId);
+ int aId = getNextCommandId();
+ myActionsList.append(aId);
SUIT_Desktop* aDesk = application()->desktop();
int aKeys = 0;
for (int i = 0; i < theKeys.count(); i++)
createMenu(separator(), aMenu, -1, theMenuPosition);
}
+//******************************************************
bool SHAPERGUI::addActionInToolbar( QAction* theAction, const QString& theToolBarTitle )
{
if( !theAction )
QList<QAction*> SHAPERGUI::commandList() const
{
QList<QAction*> aActions;
- for (int i = 0; i < myActionsList.size(); i++) {
- QAction* aCmd = action(i);
- if (aCmd && myActionsList.contains(aCmd->data().toString()))
+ foreach (int aId, myActionsList) {
+ QAction* aCmd = action(aId);
+ if (aCmd)
aActions.append(aCmd);
}
{
myWorkshop->menuMgr()->createFeatureActions();
}
+
+void SHAPERGUI::onWhatIs(bool isToggled)
+{
+ if (sender() == myWhatIsAction) {
+ QAction* aViewAct = myInspectionPanel->toggleViewAction();
+ aViewAct->blockSignals(true);
+ aViewAct->setChecked(isToggled);
+ aViewAct->blockSignals(false);
+ myInspectionPanel->setVisible(isToggled);
+ }
+ else {
+ myWhatIsAction->blockSignals(true);
+ myWhatIsAction->setChecked(isToggled);
+ myWhatIsAction->blockSignals(false);
+ myInspectionPanel->setVisible(isToggled);
+ }
+}
+
+void SHAPERGUI::updateModuleVisibilityState()
+{
+ LightApp_Module::updateModuleVisibilityState();
+ onWhatIs(myIsInspectionVisible);
+}
+
+void SHAPERGUI::onEditToolbars()
+{
+ SHAPERGUI_ToolbarsDlg aDlg(this);
+ if (aDlg.exec() == QDialog::Accepted) {
+ if (aDlg.isReset())
+ resetToolbars();
+ else
+ updateToolbars(aDlg.result());
+ }
+}
+
+void SHAPERGUI::registerCommandToolbar(const QString& theToolName, int theCommandId)
+{
+ if (!myToolbars.contains(theToolName))
+ myToolbars[theToolName] = QList<int>();
+ myToolbars[theToolName].append(theCommandId);
+}
+
+int SHAPERGUI::getNextCommandId() const
+{
+ QtxActionMenuMgr* aMenuMgr = menuMgr();
+ QIntList aIds = aMenuMgr->idList();
+ int aId = aIds.count();
+ while (action(aId) || myActionsList.contains(aId))
+ aId++;
+ return aId;
+}
+
+void SHAPERGUI::updateToolbars(const QMap<QString, QIntList>& theNewToolbars)
+{
+ // Store default toolbars
+ if (myDefaultToolbars.size() == 0)
+ myDefaultToolbars = myToolbars;
+
+ QtxActionToolMgr* aMgr = toolMgr();
+ QStringList aToolbars = theNewToolbars.keys();
+ QIntList aCommands, aOldCmd;
+ int aToolbarId;
+ QAction* aAction;
+ int aActionId;
+ foreach(QString aName, aToolbars) {
+ aCommands = theNewToolbars[aName];
+ // Find or create toolbar
+ if (aMgr->hasToolBar(aName)) {
+ aToolbarId = aMgr->find(aMgr->toolBar(aName));
+ aOldCmd = myToolbars[aName];
+ }
+ else {
+ aToolbarId = aMgr->createToolBar(aName);
+ }
+ int aPos = 0;
+ foreach(int aCmd, aCommands) {
+ // Find action
+ if (aCmd == -1)
+ aAction = separator();
+ else
+ aAction = action(aCmd);
+ aActionId = aMgr->actionId(aAction);
+ if (aActionId == -1) {
+ // Add new action
+ aMgr->insert(aAction, aToolbarId, aPos);
+ }
+ else {
+ // Change position of action
+ if (aMgr->index(aActionId, aToolbarId) != aPos) {
+ if (aMgr->containsAction(aActionId, aToolbarId))
+ aMgr->remove(aActionId, aToolbarId);
+ aMgr->insert(aActionId, aToolbarId, aPos);
+ }
+ }
+ aOldCmd.removeAll(aCmd);
+ aPos++;
+ }
+ // remove extra actions
+ foreach(int aCmd, aOldCmd) {
+ aAction = action(aCmd);
+ aActionId = aMgr->actionId(aAction);
+ aMgr->remove(aActionId, aToolbarId);
+ }
+ myToolbars.remove(aName);
+ }
+ // Remove extra toolbars
+ aToolbars = myToolbars.keys();
+ foreach(QString aName, aToolbars) {
+ aMgr->removeToolBar(aName);
+ }
+ // Set new toolbars structure
+ myToolbars = theNewToolbars;
+ myIsToolbarsModified = true;
+}
+
+void SHAPERGUI::saveToolbarsConfig()
+{
+ if (!myIsToolbarsModified)
+ return;
+ // Save toolbars config into map
+ QMap<QString, QStringList> aToolbarsConfig;
+ QtxActionToolMgr* aMgr = toolMgr();
+ QStringList aToolbars = myToolbars.keys();
+ QIntList aActionsIds;
+ foreach(QString aName, aToolbars) {
+ aActionsIds = myToolbars[aName];
+ QStringList aContent;
+ foreach(int aId, aActionsIds) {
+ if (aId == -1)
+ aContent.append("");
+ else
+ aContent.append(action(aId)->data().toString());
+ }
+ aToolbarsConfig[aName] = aContent;
+ }
+ // Store the config into resources
+ SUIT_ResourceMgr* aResMgr = application()->resourceMgr();
+ QStringList aNames = aToolbarsConfig.keys();
+ QStringList aValues;
+ foreach(QString aToolbar, aNames) {
+ aResMgr->setValue(ToolbarsSection, aToolbar, aToolbarsConfig[aToolbar].join(","));
+ }
+ // Remove obsolete parameters from resources
+ QStringList aOldParams = aResMgr->parameters(ToolbarsSection);
+ foreach(QString aName, aOldParams) {
+ if (!aToolbars.contains(aName))
+ aResMgr->remove(ToolbarsSection, aName);
+ }
+ // Store current list of free commands
+ QIntList aFreeCommands = getFreeCommands();
+ QStringList aFreeList;
+ foreach(int aId, aFreeCommands) {
+ aFreeList.append(action(aId)->data().toString());
+ }
+ if (aFreeList.size() > 0)
+ aResMgr->setValue(ToolbarsSection, FreeCommandsParam, aFreeList.join(","));
+
+ myIsToolbarsModified = false;
+}
+
+void SHAPERGUI::loadToolbarsConfig()
+{
+ SUIT_ResourceMgr* aResMgr = application()->resourceMgr();
+ QStringList aToolbarNames = aResMgr->parameters(ToolbarsSection);
+ if (aToolbarNames.size() == 0)
+ return;
+
+ // Create commands map
+ QMap<QString, int> aCommandsMap;
+ QString aCmdIdStr;
+ foreach(int aId, myActionsList) {
+ aCmdIdStr = action(aId)->data().toString();
+ aCommandsMap[aCmdIdStr] = aId;
+ }
+
+ // Create new toolbars structure
+ QMap<QString, QIntList> aToolbars;
+ QStringList aCommands;
+ QIntList aKnownCommands;
+ QList<QAction*> aActions;
+ foreach(QString aName, aToolbarNames) {
+ aCommands = aResMgr->stringValue(ToolbarsSection, aName).split(",");
+ if (aName == FreeCommandsParam) {
+ // The value is a list of free commands
+ foreach(QString aCommand, aCommands) {
+ aKnownCommands.append(aCommandsMap[aCommand]);
+ }
+ }
+ else {
+ aToolbars[aName] = QIntList();
+ if (aCommands.size() > 0) {
+ foreach(QString aCommand, aCommands) {
+ if (aCommand.isEmpty())
+ aToolbars[aName].append(-1);
+ else if (aCommandsMap.contains(aCommand)) {
+ int aId = aCommandsMap[aCommand];
+ aToolbars[aName].append(aId);
+ aKnownCommands.append(aId);
+ }
+ }
+ }
+ }
+ }
+ // Find new and obsolete commands
+ QIntList aNewCommands = myActionsList;
+ foreach(int aId, myActionsList) {
+ if (aKnownCommands.contains(aId)) {
+ aKnownCommands.removeAll(aId);
+ aNewCommands.removeAll(aId);
+ }
+ }
+ if (aNewCommands.size() > 0) {
+ // Add new commands to toolbars structure
+ QStringList aKeys = myToolbars.keys();
+ foreach(int aNewId, aNewCommands) {
+ foreach(QString aName, aKeys) {
+ if (myToolbars[aName].contains(aNewId)) {
+ if (!aToolbars.contains(aName)) {
+ aToolbars[aName] = QIntList();
+ }
+ aToolbars[aName].append(aNewId);
+ }
+ }
+ }
+ }
+ if (aKnownCommands.size() > 0) {
+ // Remove obsolete commands from the toolbars structure
+ QStringList aKeys = aToolbars.keys();
+ foreach(int aOldId, aKnownCommands) {
+ foreach(QString aName, aKeys) {
+ if (aToolbars[aName].contains(aOldId)) {
+ aToolbars[aName].removeAll(aOldId);
+ if (aToolbars[aName].size() == 0)
+ aToolbars.remove(aName);
+ }
+ }
+ }
+ }
+ updateToolbars(aToolbars);
+ myIsToolbarsModified = false;
+}
+
+
+QIntList SHAPERGUI::getFreeCommands() const
+{
+ QIntList aFreeCommands;
+ QtxActionToolMgr* aMgr = toolMgr();
+ QAction* anAction;
+ int aId;
+ QMap<QString, QIntList>::const_iterator aIt;
+ QIntList aShaperActions = shaperActions();
+ foreach(int aCmd, aShaperActions) {
+ anAction = action(aCmd);
+ aId = aMgr->actionId(anAction);
+ if (!aMgr->containsAction(aId))
+ aFreeCommands.append(aCmd);
+ }
+ return aFreeCommands;
+}
+
+void SHAPERGUI::resetToolbars()
+{
+ if (!myDefaultToolbars.isEmpty())
+ updateToolbars(myDefaultToolbars);
+ myIsToolbarsModified = false;
+ SUIT_ResourceMgr* aResMgr = application()->resourceMgr();
+ aResMgr->remove(ToolbarsSection);
+}
