From 12861bf7f86a4b766b5f0d3d0b5984d0548555cd Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 18 Sep 2018 12:18:26 +0300 Subject: Fix Go To Time shortcut key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-2353 Change-Id: Ifed80d23e64a49dc64ba40f8738151b1ae73efa8 Reviewed-by: Tomi Korpipää Reviewed-by: Mahmoud Badri --- .../Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 #include #include +#include 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)); -- cgit v1.2.3