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

QmlDesigner: Raise and Lower should be ModelNodeContextMenuAction

Browse Source 
Otherwise the action shows up in the form editor.

Change-Id: If61fbeb8fefe2f7db1ab9cb5cdd5756b3bcaa9de
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2018-08-30 14:46:49 +02:00
parent 693c6dcc0b
commit cfab83d9fe
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -196,7 +196,7 @@ public:
SelectionContextOperation action,
SelectionContextPredicate enabled = &SelectionContextFunctors::always,
SelectionContextPredicate visibility = &SelectionContextFunctors::always) :
ModelNodeContextMenuAction(id, description, category, key, priority, action, enabled, visibility)
ModelNodeContextMenuAction(id, description, {}, category, key, priority, action, enabled, visibility)
{}
void updateContext() override
@@ -223,7 +223,7 @@ public:
SelectionContextOperation action,
SelectionContextPredicate enabled = &SelectionContextFunctors::always,
SelectionContextPredicate visibility = &SelectionContextFunctors::always) :
ModelNodeContextMenuAction(id, description, category, key, priority, action, enabled, visibility)
ModelNodeContextMenuAction(id, description, {}, category, key, priority, action, enabled, visibility)
{}
void updateContext() override
{
@@ -657,6 +657,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
toFrontCommandId,
toFrontDisplayName,
{},
stackCategory,
QKeySequence(),
200,
@@ -666,27 +667,26 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
toBackCommandId,
toBackDisplayName,
{},
stackCategory,
QKeySequence(),
180,
&toBack,
&singleSelection));
addDesignerAction(new ModelNodeFormEditorAction(
addDesignerAction(new ModelNodeContextMenuAction(
raiseCommandId, raiseDisplayName,
Utils::Icon({{":/qmldesigner/icon/designeractions/images/raise.png", Utils::Theme::IconsBaseColor}}).icon(),
raiseToolTip,
stackCategory,
QKeySequence(),
160,
&raise,
&raiseAvailable));
addDesignerAction(new ModelNodeFormEditorAction(
addDesignerAction(new ModelNodeContextMenuAction(
lowerCommandId,
lowerDisplayName,
Utils::Icon({{":/qmldesigner/icon/designeractions/images/lower.png", Utils::Theme::IconsBaseColor}}).icon(),
lowerToolTip,
stackCategory,
QKeySequence(),
140,
@@ -698,6 +698,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
resetZCommandId,
resetZDisplayName,
{},
stackCategory,
QKeySequence(),
100,
@@ -793,6 +794,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
removePositionerCommandId,
removePositionerDisplayName,
{},
positionCategory,
QKeySequence("Ctrl+Shift+p"),
210,
@@ -803,6 +805,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
layoutRowPositionerCommandId,
layoutRowPositionerDisplayName,
{},
positionCategory,
QKeySequence(),
200,
@@ -813,6 +816,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
layoutColumnPositionerCommandId,
layoutColumnPositionerDisplayName,
{},
positionCategory,
QKeySequence(),
180,
@@ -823,6 +827,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
layoutGridPositionerCommandId,
layoutGridPositionerDisplayName,
{},
positionCategory,
QKeySequence(),
160,
@@ -833,6 +838,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
layoutFlowPositionerCommandId,
layoutFlowPositionerDisplayName,
{},
positionCategory,
QKeySequence("Ctrl+m"),
140,
@@ -845,6 +851,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
removeLayoutCommandId,
removeLayoutDisplayName,
{},
layoutCategory,
QKeySequence(),
110,
@@ -867,6 +874,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
addTabBarToStackedContainerCommandId,
addTabBarToStackedContainerDisplayName,
{},
stackedContainerCategory,
QKeySequence("Ctrl+Shift+t"),
100,
@@ -958,6 +966,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
goIntoComponentCommandId,
goIntoComponentDisplayName,
{},
rootCategory,
QKeySequence(Qt::Key_F2),
priorityGoIntoComponent,
@@ -967,6 +976,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
goToImplementationCommandId,
goToImplementationDisplayName,
{},
rootCategory,
QKeySequence(),
42,
@@ -977,6 +987,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
addSignalHandlerCommandId,
addSignalHandlerDisplayName,
{},
rootCategory, QKeySequence(),
42, &addNewSignalHandler,
&singleSelectedAndUiFile,
@@ -985,6 +996,7 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeContextMenuAction(
moveToComponentCommandId,
moveToComponentDisplayName,
{},
rootCategory,
QKeySequence(),
44,

7
src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
View File

@@ -192,7 +192,7 @@ private:
class ModelNodeContextMenuAction : public AbstractAction
{
public:
ModelNodeContextMenuAction(const QByteArray &id, const QString &description, const QByteArray &category, const QKeySequence &key, int priority,
ModelNodeContextMenuAction(const QByteArray &id, const QString &description, const QIcon &icon, const QByteArray &category, const QKeySequence &key, int priority,
SelectionContextOperation selectionAction,
SelectionContextPredicate enabled = &SelectionContextFunctors::always,
SelectionContextPredicate visibility = &SelectionContextFunctors::always) :
@@ -204,6 +204,7 @@ public:
m_visibility(visibility)
{
action()->setShortcut(key);
action()->setIcon(icon);
}
bool isVisible(const SelectionContext &selectionState) const override { return m_visibility(selectionState); }
@@ -233,7 +234,7 @@ public:
int priority,
SelectionContextOperation selectionAction,
SelectionContextPredicate enabled = &SelectionContextFunctors::always) :
ModelNodeContextMenuAction(id, description, category, key, priority, selectionAction, enabled, &SelectionContextFunctors::always)
ModelNodeContextMenuAction(id, description, icon, category, key, priority, selectionAction, enabled, &SelectionContextFunctors::always)
{
action()->setIcon(icon);
action()->setToolTip(tooltip);
@@ -255,7 +256,7 @@ public:
SelectionContextOperation selectionAction,
SelectionContextPredicate enabled = &SelectionContextFunctors::always,
SelectionContextPredicate visible = &SelectionContextFunctors::always) :
ModelNodeContextMenuAction(id, description, category, key, priority, selectionAction, enabled, visible)
ModelNodeContextMenuAction(id, description, icon, category, key, priority, selectionAction, enabled, visible)
{
action()->setIcon(icon);
action()->setToolTip(tooltip);