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

QmlDesigner: Add unique ids for the toolbar action of TransitionEditor

Browse Source 
Change-Id: Ibb73da4655f55023c7e1e61226d33c586d9a9099
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2020-09-15 17:52:01 +02:00
parent e12aefa33a
commit 3ca54e7da7
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/transitioneditor/transitioneditorconstants.h
View File

@@ -30,8 +30,17 @@
namespace QmlDesigner { namespace QmlDesigner {
namespace TransitionEditorConstants { namespace TransitionEditorConstants {
const int sectionWidth = 200;
const int transitionEditorSectionItemUserType = QGraphicsItem::UserType + 6; const int transitionEditorSectionItemUserType = QGraphicsItem::UserType + 6;
const int transitionEditorPropertyItemUserType = QGraphicsItem::UserType + 7; const int transitionEditorPropertyItemUserType = QGraphicsItem::UserType + 7;
const char C_QMLTRANSITIONS[] = "QmlDesigner::Transitions";
const char C_SETTINGS[] = "QmlDesigner.SettingsTransitions";
const char C_CURVE_PICKER[] = "QmlDesigner.CurvePickerTransitions";
const char C_ZOOM_IN[] = "QmlDesigner.ZoomInTransition";
const char C_ZOOM_OUT[] = "QmlDesigner.ZoomOutTransitions";
} // namespace TransitionEditorConstants } // namespace TransitionEditorConstants
} // namespace QmlDesigner } // namespace QmlDesigner

14
src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp
View File

@@ -26,7 +26,7 @@
#include "transitioneditortoolbar.h" #include "transitioneditortoolbar.h"
#include "transitioneditorgraphicsscene.h" #include "transitioneditorgraphicsscene.h"
#include "timelineconstants.h" #include "transitioneditorconstants.h"
#include "timelineicons.h" #include "timelineicons.h"
@@ -92,7 +92,7 @@ static QAction *createAction(const Utils::Id &id,
{ {
QString text = QString("%1 (%2)").arg(name).arg(shortcut.toString()); QString text = QString("%1 (%2)").arg(name).arg(shortcut.toString());
Core::Context context(TimelineConstants::C_QMLTIMELINE); Core::Context context(TransitionEditorConstants::C_QMLTRANSITIONS);
auto *action = new QAction(icon, text); auto *action = new QAction(icon, text);
auto *command = Core::ActionManager::registerAction(action, id, context); auto *command = Core::ActionManager::registerAction(action, id, context);
@@ -188,7 +188,7 @@ void TransitionEditorToolBar::createLeftControls()
addSpacingToGroup(5); addSpacingToGroup(5);
auto *settingsAction = createAction(TimelineConstants::C_SETTINGS, auto *settingsAction = createAction(TransitionEditorConstants::C_SETTINGS,
TimelineIcons::ANIMATION.icon(), TimelineIcons::ANIMATION.icon(),
tr("Transition Settings"), tr("Transition Settings"),
QKeySequence(Qt::Key_S)); QKeySequence(Qt::Key_S));
@@ -229,7 +229,7 @@ void TransitionEditorToolBar::createCenterControls()
{ {
addSpacing(10); addSpacing(10);
auto *curvePicker = createAction(TimelineConstants::C_CURVE_PICKER, auto *curvePicker = createAction(TransitionEditorConstants::C_CURVE_PICKER,
TimelineIcons::CURVE_EDITOR.icon(), TimelineIcons::CURVE_EDITOR.icon(),
tr("Easing Curve Editor"), tr("Easing Curve Editor"),
QKeySequence(Qt::Key_C)); QKeySequence(Qt::Key_C));
@@ -259,7 +259,7 @@ void TransitionEditorToolBar::createRightControls()
addSeparator(); addSeparator();
addSpacing(10); addSpacing(10);
auto *zoomOut = createAction(TimelineConstants::C_ZOOM_OUT, auto *zoomOut = createAction(TransitionEditorConstants::C_ZOOM_OUT,
TimelineIcons::ZOOM_SMALL.icon(), TimelineIcons::ZOOM_SMALL.icon(),
tr("Zoom Out"), tr("Zoom Out"),
QKeySequence(QKeySequence::ZoomOut)); QKeySequence(QKeySequence::ZoomOut));
@@ -284,7 +284,7 @@ void TransitionEditorToolBar::createRightControls()
addSpacing(10); addSpacing(10);
auto *zoomIn = createAction(TimelineConstants::C_ZOOM_IN, auto *zoomIn = createAction(TransitionEditorConstants::C_ZOOM_IN,
TimelineIcons::ZOOM_BIG.icon(), TimelineIcons::ZOOM_BIG.icon(),
tr("Zoom In"), tr("Zoom In"),
QKeySequence(QKeySequence::ZoomIn)); QKeySequence(QKeySequence::ZoomIn));
@@ -326,7 +326,7 @@ void TransitionEditorToolBar::resizeEvent(QResizeEvent *event)
} }
if (spacer) { if (spacer) {
int spacerWidth = TimelineConstants::sectionWidth - width - 12; int spacerWidth = TransitionEditorConstants::sectionWidth - width - 12;
spacer->setFixedWidth(spacerWidth > 0 ? spacerWidth : 0); spacer->setFixedWidth(spacerWidth > 0 ? spacerWidth : 0);
} }
} }