feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Register 3D edit view actions properly to ActionManager

Browse Source 
Also fix one FormEditor action that specified its shortcut incorrectly.

Change-Id: Ieac988ff17c5ceee07a15ef0a31ab409829609a4
Fixes: QDS-1841
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-03-20 16:27:55 +02:00
parent 7a1974cb34
commit 5e7cd5bf0c
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -33,6 +33,8 @@
#include "qmldesignerconstants.h"
#include "viewmanager.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/icore.h>
#include <toolbox.h>
#include <utils/utilsicons.h>
@@ -62,7 +64,7 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
// Iterate through view actions. A null action indicates a separator and a second null action
// after separator indicates an exclusive group.
auto addActionsToToolBox = [this](const QVector<Edit3DAction *> &actions, bool left) {
auto addActionsToToolBox = [this, &context](const QVector<Edit3DAction *> &actions, bool left) {
bool previousWasSeparator = true;
QActionGroup *group = nullptr;
for (auto action : actions) {
@@ -75,6 +77,14 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
else
m_toolBox->addRightSideAction(action->action());
previousWasSeparator = false;
// Register action as creator command to make it configurable
Core::Command *command = Core::ActionManager::registerAction(
action->action(), action->menuId().data(), context);
command->setDefaultKeySequence(action->action()->shortcut());
command->augmentActionWithShortcutToolTip(action->action());
// Clear action shortcut so it doesn't conflict with command's override action
action->action()->setShortcut({});
} else {
if (previousWasSeparator) {
group = new QActionGroup(this);
@@ -89,7 +99,6 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) :
}
}
}
};
addActionsToToolBox(view->leftActions(), true);
addActionsToToolBox(view->rightActions(), false);