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

QmlDesigner: Making adding signal handlers more user friendly

Browse Source 
The "Go to implementation" context menu was adding a new signal
handler if no signal handler was already present.
This does not change, but I add "Add new Signal Handler" that always
adds a new signal handler, even if one already exists.

Change-Id: I7d1f012fda114d22598a9dd650ee14d97d48cd1d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2016-06-28 13:31:04 +02:00
committed by Tim Jenssen
parent a63c431916
commit ebffc0555e
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
View File

@@ -72,6 +72,7 @@ const char resetPositionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMen
const char goIntoComponentDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Go into Component");
const char goToImplementationDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Go to Implementation");
const char addSignalHandlerDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Add New Signal Handler");
const char moveToComponentDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Move to Component");
const char setIdDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Set Id");

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

@@ -509,10 +509,11 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new ModelNodeAction
(goIntoComponentDisplayName, rootCategory, priorityGoIntoComponent, &goIntoComponent, &selectionIsComponent));
addDesignerAction(new ModelNodeAction
(goToImplementationDisplayName, rootCategory, 42, &gotoImplementation, &singleSelectedAndUiFile, &singleSelectedAndUiFile));
(goToImplementationDisplayName, rootCategory, 42, &goImplementation, &singleSelectedAndUiFile, &singleSelectedAndUiFile));
addDesignerAction(new ModelNodeAction
(addSignalHandlerDisplayName, rootCategory, 42, &addNewSignalHandler, &singleSelectedAndUiFile, &singleSelectedAndUiFile));
addDesignerAction(new ModelNodeAction
(moveToComponentDisplayName, rootCategory, 44, &moveToComponent, &singleSelection, &singleSelection));
}
void DesignerActionManager::addDesignerAction(ActionInterface *newAction)

14
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -637,7 +637,7 @@ static QStringList getSortedSignalNameList(const ModelNode &modelNode)
return signalNames;
}
void gotoImplementation(const SelectionContext &selectionState)
void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState, bool addAlwaysNewSlot)
{
ModelNode modelNode;
if (selectionState.singleNodeIsSelected())
@@ -687,7 +687,7 @@ void gotoImplementation(const SelectionContext &selectionState)
Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
if (usages.count() == 1) {
if (usages.count() > 0 && (addAlwaysNewSlot || usages.count()< 2)) {
Core::EditorManager::openEditorAt(usages.first().path, usages.first().line, usages.first().col);
if (!signalNames.isEmpty()) {
@@ -782,6 +782,16 @@ void moveToComponent(const SelectionContext &selectionContext)
selectionContext.view()->model()->rewriterView()->moveToComponent(modelNode);
}
void goImplementation(const SelectionContext &selectionState)
{
addSignalHandlerOrGotoImplementation(selectionState, false);
}
void addNewSignalHandler(const SelectionContext &selectionState)
{
addSignalHandlerOrGotoImplementation(selectionState, true);
}
} // namespace Mode
} //QmlDesigner

4
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h
View File

@@ -63,7 +63,9 @@ void layoutFlowPositioner(const SelectionContext &selectionState);
void layoutRowLayout(const SelectionContext &selectionState);
void layoutColumnLayout(const SelectionContext &selectionState);
void layoutGridLayout(const SelectionContext &selectionState);
void gotoImplementation(const SelectionContext &selectionState);
void goImplementation(const SelectionContext &selectionState);
void addNewSignalHandler(const SelectionContext &selectionState);
void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState, bool addAlwaysNewSlot);
void removeLayout(const SelectionContext &selectionContext);
void removePositioner(const SelectionContext &selectionContext);
void moveToComponent(const SelectionContext &selectionContext);