Assign Ctrl+1 to Ctrl+9 to switch camera

Task-number: QT3DS-691
Task-number: QT3DS-692
Change-Id: Iec00f065e85403dbf854a73787e53ab4e202091e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

4 files changed, 38 insertions, 0 deletions

diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index 7a6ef638..3cc34da4 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -749,6 +749,29 @@ void CMainFrame::OnFileNew()
     g_StudioApp.OnFileNew();
 }
 
+void CMainFrame::onCtrlNPressed()
+{
+    static QMap<int, int> key2index {
+        {1, 9},         // Scene Camera View
+        {2, 0}, {3, 1}, // Perspective & Orthographic
+        {4, 2}, {5, 3}, // Top & Bottom
+        {6, 4}, {7, 5}, // Left & Right
+        {8, 6}, {9, 7}, // Front & Back
+    };
+
+    QAction *action = qobject_cast<QAction *>(sender());
+    Q_ASSERT(action);
+    QKeySequence shortcut = action->shortcut();
+    QMapIterator<int, int> i(key2index);
+    while (i.hasNext()) {
+        i.next();
+        QKeySequence keySequence(Qt::CTRL | static_cast<Qt::Key>(Qt::Key_0 + i.key()));
+        if (shortcut.matches(keySequence) == QKeySequence::ExactMatch) {
+            m_ui->m_EditCamerasBar->setCameraIndex(i.value());
+            break;
+        }
+    }
+}
 
 //==============================================================================
 /**
@@ -1082,6 +1105,12 @@ void CMainFrame::RegisterGlobalKeyboardShortcuts(CHotKeys *inHotKeys, QWidget *a
                         QKeySequence(Qt::Key_Q),
                         CMainFrame::toggleSelectMode);
 
+    for (int keyN = Qt::Key_1; keyN <= Qt::Key_9; keyN++) {
+        ADD_GLOBAL_SHORTCUT(actionParent,
+                            QKeySequence(Qt::CTRL | static_cast<Qt::Key>(keyN)),
+                            CMainFrame::onCtrlNPressed);
+    }
+
     CTimelineControl *theTimelineControl = GetTimelineControl();
     if (theTimelineControl)
         theTimelineControl->RegisterGlobalKeyboardShortcuts(inHotKeys, actionParent);
diff --git a/src/Authoring/Studio/MainFrm.h b/src/Authoring/Studio/MainFrm.h
index 43e673f3..eab8e9b8 100644
--- a/src/Authoring/Studio/MainFrm.h
+++ b/src/Authoring/Studio/MainFrm.h
@@ -225,6 +225,8 @@ public:
 
     void OnTimeBarColorChanged(const QColor &color);
 
+    void onCtrlNPressed();
+
     CTimelineControl *GetTimelineControl();
     ITimelineTimebar *GetSelectedTimelineTimebar();
 
diff --git a/src/Authoring/Studio/_Win/UI/EditCameraBar.cpp b/src/Authoring/Studio/_Win/UI/EditCameraBar.cpp
index cf4bec7f..840b1107 100644
--- a/src/Authoring/Studio/_Win/UI/EditCameraBar.cpp
+++ b/src/Authoring/Studio/_Win/UI/EditCameraBar.cpp
@@ -120,6 +120,12 @@ void CEditCameraBar::OnCameraChanged()
     HandleCameraChanged(m_CameraSelector->currentIndex());
 }
 
+void CEditCameraBar::setCameraIndex(int inIndex)
+{
+    m_CameraSelector->setCurrentIndex(inIndex);
+    OnCameraChanged();
+}
+
 //==============================================================================
 /**
  *	Handle the switching of the current edit camera
diff --git a/src/Authoring/Studio/_Win/UI/EditCameraBar.h b/src/Authoring/Studio/_Win/UI/EditCameraBar.h
index 55db93fe..3f46bdb5 100644
--- a/src/Authoring/Studio/_Win/UI/EditCameraBar.h
+++ b/src/Authoring/Studio/_Win/UI/EditCameraBar.h
@@ -75,6 +75,7 @@ public:
     void SetupCameras();
     void SetSceneView(CSceneView *inSceneView);
     void Enable(bool inFlag);
+    void setCameraIndex(int inIndex);
     void HandleCameraChanged(int inIndex);
 
     // CEditCameraChangeListener