Fix hotkey handling

Now we use QAction for most hotkey handling. The old handling is still
used for press-and-hold style hotkeys.

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

1 files changed, 51 insertions, 27 deletions

diff --git a/src/Authoring/Studio/MainFrm.ui b/src/Authoring/Studio/MainFrm.ui
index dc589aa6..d2a4613f 100644
--- a/src/Authoring/Studio/MainFrm.ui
+++ b/src/Authoring/Studio/MainFrm.ui
@@ -14,7 +14,7 @@
    <string>Qt 3D Studio</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="MainFrm.qrc">
+   <iconset>
     <normaloff>:/images/icon_256x256</normaloff>:/images/icon_256x256</iconset>
   </property>
   <widget class="QWidget" name="centralwidget"/>
@@ -259,7 +259,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-06.png</normaloff>:/images/client_tools_hi_color-06.png</iconset>
    </property>
    <property name="text">
@@ -268,6 +268,9 @@
    <property name="toolTip">
     <string>Toggle autoset keyframes</string>
    </property>
+   <property name="shortcut">
+    <string>K</string>
+   </property>
   </action>
   <action name="actionAction">
    <property name="checkable">
@@ -362,7 +365,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/editcamera_tools_hi-05.png</normaloff>
      <disabledoff>:/images/editcamera_tools_hi-05_disabled.png</disabledoff>:/images/editcamera_tools_hi-05.png</iconset>
    </property>
@@ -410,7 +413,7 @@
   </action>
   <action name="action_Undo">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-06.png</normaloff>:/images/Toolbar-06.png</iconset>
    </property>
    <property name="text">
@@ -422,7 +425,7 @@
   </action>
   <action name="action_Redo">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-07.png</normaloff>:/images/Toolbar-07.png</iconset>
    </property>
    <property name="text">
@@ -434,7 +437,7 @@
   </action>
   <action name="action_Cut">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-03.png</normaloff>:/images/Toolbar-03.png</iconset>
    </property>
    <property name="text">
@@ -446,7 +449,7 @@
   </action>
   <action name="action_Copy">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-04.png</normaloff>:/images/Toolbar-04.png</iconset>
    </property>
    <property name="text">
@@ -458,7 +461,7 @@
   </action>
   <action name="action_Paste">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-05.png</normaloff>:/images/Toolbar-05.png</iconset>
    </property>
    <property name="text">
@@ -494,7 +497,7 @@
   </action>
   <action name="action_New">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-00.png</normaloff>:/images/Toolbar-00.png</iconset>
    </property>
    <property name="text">
@@ -506,7 +509,7 @@
   </action>
   <action name="action_Open">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-01.png</normaloff>:/images/Toolbar-01.png</iconset>
    </property>
    <property name="text">
@@ -518,7 +521,7 @@
   </action>
   <action name="action_Save">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/Toolbar-02.png</normaloff>:/images/Toolbar-02.png</iconset>
    </property>
    <property name="text">
@@ -572,7 +575,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-00.png</normaloff>:/images/client_tools_hi_color-00.png</iconset>
    </property>
    <property name="text">
@@ -581,13 +584,16 @@
    <property name="toolTip">
     <string>Group Select</string>
    </property>
+   <property name="shortcut">
+    <string>A</string>
+   </property>
   </action>
   <action name="actionItem_Select_Tool">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-01.png</normaloff>:/images/client_tools_hi_color-01.png</iconset>
    </property>
    <property name="text">
@@ -596,13 +602,16 @@
    <property name="toolTip">
     <string>Select Item</string>
    </property>
+   <property name="shortcut">
+    <string>V</string>
+   </property>
   </action>
   <action name="actionRotation_Tool">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-04.png</normaloff>:/images/client_tools_hi_color-04.png</iconset>
    </property>
    <property name="text">
@@ -611,13 +620,16 @@
    <property name="toolTip">
     <string>Rotate current selection</string>
    </property>
+   <property name="shortcut">
+    <string>R</string>
+   </property>
   </action>
   <action name="actionPosition_Tool">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-02.png</normaloff>:/images/client_tools_hi_color-02.png</iconset>
    </property>
    <property name="text">
@@ -626,13 +638,16 @@
    <property name="toolTip">
     <string>Move current selection</string>
    </property>
+   <property name="shortcut">
+    <string>W</string>
+   </property>
   </action>
   <action name="actionScale_Tool">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-03.png</normaloff>:/images/client_tools_hi_color-03.png</iconset>
    </property>
    <property name="text">
@@ -641,13 +656,16 @@
    <property name="toolTip">
     <string>Scale current selection</string>
    </property>
+   <property name="shortcut">
+    <string>E</string>
+   </property>
   </action>
   <action name="actionLocal_Global_Manipulators">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/client_tools_hi_color-05.png</normaloff>:/images/client_tools_hi_color-05.png</iconset>
    </property>
    <property name="text">
@@ -662,7 +680,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/editcamera_tools_hi-00.png</normaloff>
      <disabledoff>:/images/editcamera_tools_hi-00_disabled.png</disabledoff>:/images/editcamera_tools_hi-00.png</iconset>
    </property>
@@ -672,13 +690,16 @@
    <property name="toolTip">
     <string>Fit Selected</string>
    </property>
+   <property name="shortcut">
+    <string>F</string>
+   </property>
   </action>
   <action name="actionPan_Tool">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/editcamera_tools_hi-01.png</normaloff>
      <disabledoff>:/images/editcamera_tools_hi-01_disabled.png</disabledoff>:/images/editcamera_tools_hi-01.png</iconset>
    </property>
@@ -694,7 +715,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/editcamera_tools_hi-02.png</normaloff>
      <disabledoff>:/images/editcamera_tools_hi-02_disabled.png</disabledoff>:/images/editcamera_tools_hi-02.png</iconset>
    </property>
@@ -710,7 +731,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/editcamera_tools_hi-03.png</normaloff>
      <disabledoff>:/images/editcamera_tools_hi-03_disabled.png</disabledoff>:/images/editcamera_tools_hi-03.png</iconset>
    </property>
@@ -726,7 +747,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/editcamera_tools_hi-04.png</normaloff>
      <disabledoff>:/images/editcamera_tools_hi-04_disabled.png</disabledoff>:/images/editcamera_tools_hi-04.png</iconset>
    </property>
@@ -742,7 +763,7 @@
   </action>
   <action name="actionRewind">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/playback_tools_low-00.png</normaloff>:/images/playback_tools_low-00.png</iconset>
    </property>
    <property name="text">
@@ -751,7 +772,7 @@
   </action>
   <action name="actionStop">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/playback_tools_low-01.png</normaloff>:/images/playback_tools_low-01.png</iconset>
    </property>
    <property name="text">
@@ -763,7 +784,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/playback_tools_low-02.png</normaloff>:/images/playback_tools_low-02.png</iconset>
    </property>
    <property name="text">
@@ -772,12 +793,15 @@
   </action>
   <action name="actionPreview">
    <property name="icon">
-    <iconset resource="MainFrm.qrc">
+    <iconset resource="images.qrc">
      <normaloff>:/images/playback_tools_low-03.png</normaloff>:/images/playback_tools_low-03.png</iconset>
    </property>
    <property name="text">
     <string>Preview</string>
    </property>
+   <property name="shortcut">
+    <string>F5</string>
+   </property>
   </action>
   <action name="actionSubpresentations">
    <property name="text">
@@ -793,7 +817,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="MainFrm.qrc"/>
+  <include location="images.qrc"/>
  </resources>
  <connections/>
 </ui>