summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-18 12:18:26 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-18 09:26:31 +0000
commit12861bf7f86a4b766b5f0d3d0b5984d0548555cd (patch)
tree9cda8ae31645d9846cd2e16e3410383dd40befba
parentefb662522ab15b09f1d85f58c1077f4fdfc6d50d (diff)
Fix Go To Time shortcut key
Task-number: QT3DS-2353 Change-Id: Ifed80d23e64a49dc64ba40f8738151b1ae73efa8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
index d7cbc10a..0fa1e28b 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
@@ -44,6 +44,7 @@
#include <QtCore/qdatetime.h>
#include <QtCore/qtimer.h>
#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qshortcut.h>
TimelineToolbar::TimelineToolbar() : QToolBar()
{
@@ -136,10 +137,14 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
m_actionZoomOut->setShortcutContext(Qt::ApplicationShortcut);
m_actionZoomIn->setShortcut(Qt::Key_Plus);
m_actionZoomIn->setShortcutContext(Qt::ApplicationShortcut);
- m_timeLabel->setShortcut(QKeySequence(Qt::ControlModifier | Qt::AltModifier | Qt::Key_T));
m_actionNewLayer->setShortcut(QKeySequence(Qt::ControlModifier | Qt::Key_L));
m_actionNewLayer->setShortcutContext(Qt::ApplicationShortcut);
+ QShortcut *gotoTimeShortcut = new QShortcut(this);
+ gotoTimeShortcut->setKey(QKeySequence(Qt::ControlModifier | Qt::AltModifier | Qt::Key_T));
+ gotoTimeShortcut->setContext(Qt::ApplicationShortcut);
+ connect(gotoTimeShortcut, &QShortcut::activated, this, &TimelineToolbar::gotoTimeTriggered);
+
m_connectSelectionChange = g_StudioApp.GetCore()->GetDispatch()->ConnectSelectionChange(
std::bind(&TimelineToolbar::onSelectionChange, this, std::placeholders::_1));