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

QmlDesigner: Fix shortcuts and tooltips for transition editor

Browse Source 
Creating the correct tooltip and managing the shortcut is managed by
the command. We need a context for the shortcuts.
Applying similar fixes to the timeline.

Task-number: QDS-6539
Change-Id: If9a92c64508a6d3ff0754522e311ca0ce422dda1
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
This commit is contained in:
Thomas Hartmann
2022-03-30 14:57:21 +02:00
parent 3fa560aeb0
commit b2a34f3fcf
6 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
View File

@@ -103,13 +103,12 @@ static QAction *createAction(const Utils::Id &id,
const QString &name,
const QKeySequence &shortcut)
{
QString text = QString("%1 (%2)").arg(name).arg(shortcut.toString());
Core::Context context(TimelineConstants::C_QMLTIMELINE);
auto *action = new QAction(icon, text);
auto *action = new QAction(icon, name);
auto *command = Core::ActionManager::registerAction(action, id, context);
command->setDefaultKeySequence(shortcut);
command->augmentActionWithShortcutToolTip(action);
return action;
}

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

@@ -37,10 +37,10 @@ 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";
const char C_SETTINGS[] = "QmlDesigner.Transitions.Settings";
const char C_CURVE_PICKER[] = "QmlDesigner.Transitions.CurvePicker";
const char C_ZOOM_IN[] = "QmlDesigner.Transitions.ZoomIn";
const char C_ZOOM_OUT[] = "QmlDesigner.Transitions.ZoomOut";
} // namespace TransitionEditorConstants
} // namespace QmlDesigner

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

@@ -90,13 +90,13 @@ static QAction *createAction(const Utils::Id &id,
const QString &name,
const QKeySequence &shortcut)
{
QString text = QString("%1 (%2)").arg(name).arg(shortcut.toString());
Core::Context context(TransitionEditorConstants::C_QMLTRANSITIONS);
auto *action = new QAction(icon, text);
auto *action = new QAction(icon, name);
auto *command = Core::ActionManager::registerAction(action, id, context);
command->setDefaultKeySequence(shortcut);
command->augmentActionWithShortcutToolTip(action);
return action;
}

3
src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp
View File

@@ -319,6 +319,9 @@ TransitionEditorWidget *TransitionEditorView::createWidget()
if (!m_transitionEditorWidget)
m_transitionEditorWidget = new TransitionEditorWidget(this);
auto *transitionContext = new TransitionContext(m_transitionEditorWidget);
Core::ICore::addContextObject(transitionContext);
return m_transitionEditorWidget;
}

13
src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.cpp
View File

@@ -68,6 +68,19 @@
namespace QmlDesigner {
TransitionContext::TransitionContext(QWidget *widget)
: IContext(widget)
{
setWidget(widget);
setContext(Core::Context(TransitionEditorConstants::C_QMLTRANSITIONS));
}
void TransitionContext::contextHelp(const Core::IContext::HelpCallback &callback) const
{
if (auto *widget = qobject_cast<TransitionEditorWidget *>(m_widget))
widget->contextHelp(callback);
}
class Eventfilter : public QObject
{
public:

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

@@ -49,6 +49,15 @@ class TransitionEditorToolBar;
class TransitionEditorGraphicsScene;
class ModelNode;
class TransitionContext : public Core::IContext
{
Q_OBJECT
public:
explicit TransitionContext(QWidget *widget);
void contextHelp(const HelpCallback &callback) const override;
};
class TransitionEditorWidget : public QWidget
{
Q_OBJECT