1 files changed, 14 insertions, 12 deletions

diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
index 2bdeb2c5..0fa1e28b 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp
@@ -43,6 +43,8 @@
 #include <QtWidgets/qslider.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qtimer.h>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qshortcut.h>
 
 TimelineToolbar::TimelineToolbar() : QToolBar()
 {
@@ -56,8 +58,8 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     static const QIcon iconLast = QIcon(":/images/playback_tools_low-04.png");
     static const QIcon iconZoomIn = QIcon(":/images/zoom_in.png");
     static const QIcon iconZoomOut = QIcon(":/images/zoom_out.png");
-    m_iconDiActive = QIcon(":/images/Objects-DataInput-Normal.png");
-    m_iconDiInactive = QIcon(":/images/Objects-DataInput-Disabled.png");
+    m_iconDiActive = QIcon(":/images/Objects-DataInput-Active.png");
+    m_iconDiInactive = QIcon(":/images/Objects-DataInput-Inactive.png");
     m_iconStop = QIcon(":/images/playback_tools_low-01.png");
     m_iconPlay = QIcon(":/images/playback_tools_low-02.png");
 
@@ -75,11 +77,10 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     m_actionDataInput = new QAction(m_iconDiInactive, tr("No Controller"), this);
     m_actionDeleteRow = new QAction(iconDelete, tr("Delete Selected Object (Del)"), this);
     m_actionPlayStop = new QAction(this);
-    m_timeLabel = new TimelineToolbarLabel(this);
+    m_timeLabel = new QPushButton({}, this);
     m_diLabel = new QLabel();
     m_actionZoomIn = new QAction(iconZoomIn, tr("Zoom In"), this);
     m_actionZoomOut = new QAction(iconZoomOut, tr("Zoom Out"), this);
-    QAction *actionGoToTime = new QAction(this);
 
     m_scaleSlider = new QSlider();
     m_scaleSlider->setOrientation(Qt::Horizontal);
@@ -88,7 +89,8 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     m_scaleSlider->setMaximum(22);
     m_scaleSlider->setValue(2);
 
-    m_timeLabel->setText(tr("0:00.000"));
+    m_timeLabel->setObjectName(QLatin1String("timelineButton"));
+    m_timeLabel->setFlat(true);
     m_timeLabel->setMinimumWidth(80);
     m_timeLabel->setToolTip(tr("Go To Time (%1%2T)").arg(ctrlKey).arg(altKey));
 
@@ -104,7 +106,7 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     // connections
     connect(m_actionNewLayer, &QAction::triggered, this, &TimelineToolbar::newLayerTriggered);
     connect(m_actionDeleteRow, &QAction::triggered, this, &TimelineToolbar::deleteLayerTriggered);
-    connect(m_timeLabel, &TimelineToolbarLabel::clicked, this, &TimelineToolbar::gotoTimeTriggered);
+    connect(m_timeLabel, &QPushButton::clicked, this, &TimelineToolbar::gotoTimeTriggered);
     connect(actionFirst, &QAction::triggered, this, &TimelineToolbar::firstFrameTriggered);
     connect(m_actionPlayStop, &QAction::triggered, this, &TimelineToolbar::onPlayButtonClicked);
     connect(actionLast, &QAction::triggered, this, &TimelineToolbar::lastFrameTriggered);
@@ -112,12 +114,12 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     connect(m_actionZoomIn, &QAction::triggered, this, &TimelineToolbar::onZoomInButtonClicked);
     connect(m_actionZoomOut, &QAction::triggered, this, &TimelineToolbar::onZoomOutButtonClicked);
     connect(m_actionDataInput, &QAction::triggered, this, &TimelineToolbar::onDiButtonClicked);
-    connect(actionGoToTime, &QAction::triggered, this, &TimelineToolbar::gotoTimeTriggered);
 
     // add actions
     addAction(m_actionNewLayer);
     addAction(m_actionDeleteRow);
     addAction(m_actionDataInput);
+    addSpacing(2);
     addWidget(m_diLabel);
     addSpacing(20);
     addWidget(m_timeLabel);
@@ -130,19 +132,19 @@ TimelineToolbar::TimelineToolbar() : QToolBar()
     addWidget(m_scaleSlider);
     addAction(m_actionZoomIn);
 
-    // child-action, not visible in UI
-    m_timeLabel->addAction(actionGoToTime);
-
     // add keyboard shortcuts
     m_actionZoomOut->setShortcut(Qt::Key_Minus);
     m_actionZoomOut->setShortcutContext(Qt::ApplicationShortcut);
     m_actionZoomIn->setShortcut(Qt::Key_Plus);
     m_actionZoomIn->setShortcutContext(Qt::ApplicationShortcut);
-    actionGoToTime->setShortcut(QKeySequence(Qt::ControlModifier | Qt::AltModifier | Qt::Key_T));
-    actionGoToTime->setShortcutContext(Qt::ApplicationShortcut);
     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));