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

QmlDesigner: Move global annotations to edit mode

Browse Source 
Task-number: QDS-9194
Change-Id: Iadba8028e5c4c91195413094086ec5c87329dff3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2023-02-17 14:49:02 +01:00
committed by Tim Jenssen
parent 9b06fa46fb
commit 1cbbcea8cc
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/toolbar/Main.qml
View File

@@ -245,12 +245,13 @@ Rectangle {
ToolbarButton {
id: annotations
visible: false
anchors.verticalCenter: parent.verticalCenter
anchors.right: shareButton.left
anchors.rightMargin: 10
tooltip: qsTr("Edit Annotations")
buttonIcon: StudioTheme.Constants.annotations_large
visible: !root.flyoutEnabled
//visible: !root.flyoutEnabled
onClicked: backend.editGlobalAnnoation()
}
@@ -358,6 +359,7 @@ Rectangle {
}
ToolbarButton {
visible: false
style: StudioTheme.Values.statusbarButtonStyle
anchors.verticalCenter: parent.verticalCenter
tooltip: qsTr("Edit Annotations")

19
src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
View File

@@ -159,13 +159,7 @@ void ToolBarBackend::setCurrentWorkspace(const QString &workspace)
void ToolBarBackend::editGlobalAnnoation()
{
QmlDesignerPlugin::emitUsageStatistics(Constants::EVENT_TOOLBAR_EDIT_GLOBAL_ANNOTATION);
ModelNode node = currentDesignDocument()->rewriterView()->rootModelNode();
if (node.isValid()) {
designModeWidget()->globalAnnotationEditor().setModelNode(node);
designModeWidget()->globalAnnotationEditor().showWidget();
}
launchGlobalAnnotations();
}
void ToolBarBackend::showZoomMenu(int x, int y)
@@ -415,6 +409,17 @@ bool ToolBarBackend::isInEditMode() const
return Core::ModeManager::currentModeId() == Core::Constants::MODE_EDIT;
}
void ToolBarBackend::launchGlobalAnnotations()
{
QmlDesignerPlugin::emitUsageStatistics(Constants::EVENT_TOOLBAR_EDIT_GLOBAL_ANNOTATION);
ModelNode node = currentDesignDocument()->rewriterView()->rootModelNode();
if (node.isValid()) {
designModeWidget()->globalAnnotationEditor().setModelNode(node);
designModeWidget()->globalAnnotationEditor().showWidget();
}
}
bool ToolBarBackend::isDesignModeEnabled() const
{
if (Core::DesignMode::instance())

2
src/plugins/qmldesigner/components/toolbar/toolbarbackend.h
View File

@@ -129,6 +129,8 @@ public:
bool isInEditMode() const;
static void launchGlobalAnnotations();
signals:
void navigationHistoryChanged();
void openDocumentsChanged();

9
src/plugins/qmldesigner/shortcutmanager.cpp
View File

@@ -5,6 +5,8 @@
#include <designersettings.h>
#include <toolbarbackend.h>
#include <viewmanager.h>
#include <designeractionmanagerview.h>
#include <componentcore_constants.h>
@@ -107,6 +109,13 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
QmlDesignerPlugin::instance()->viewManager().exportAsImage();
});
QAction *action = new QAction(tr("Edit Global Annotations..."), this);
command = Core::ActionManager::registerAction(action, "Edit.Annotations", qmlDesignerMainContext);
Core::ActionManager::actionContainer(Core::Constants::M_EDIT)
->addAction(command, Core::Constants::G_EDIT_OTHER);
connect(action, &QAction::triggered, this, [] { ToolBarBackend::launchGlobalAnnotations(); });
Core::ActionContainer *exportMenu = Core::ActionManager::actionContainer(
QmlProjectManager::Constants::EXPORT_MENU);