diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-11-06 13:38:17 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-11-07 09:00:28 +0000 |
| commit | 370b0cb1a914900a87b3f8d32ac1e007552db566 (patch) | |
| tree | f794aecc2e9e316475cc827a96f16b62f20debce /src/Authoring/Studio/MainFrm.ui | |
| parent | a0b19762e6416f04374654a2798c96072dbb3df1 (diff) | |
Fix togglable menu items for actions that also have toolbar button
Separated togglable actions that were added to both menu and toolbar
into two separate actions, as the toolbar icon hid the toggle checkmark
in the menu.
Task-number: QT3DS-306
Change-Id: I9a6b86e4c5e599e563a85811abab939510356bbe
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.ui')
| -rw-r--r-- | src/Authoring/Studio/MainFrm.ui | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/src/Authoring/Studio/MainFrm.ui b/src/Authoring/Studio/MainFrm.ui index d2a4613f..e809e838 100644 --- a/src/Authoring/Studio/MainFrm.ui +++ b/src/Authoring/Studio/MainFrm.ui @@ -162,7 +162,7 @@ <addaction name="actionRotation_Tool"/> <addaction name="actionLocal_Global_Manipulators"/> <addaction name="separator"/> - <addaction name="actionAutoset_Keyframes"/> + <addaction name="actionToolbarAutoset_Keyframes"/> </widget> <widget class="CEditCameraBar" name="m_EditCamerasBar"> <property name="windowTitle"> @@ -187,7 +187,7 @@ <addaction name="actionOrbit_Tool"/> <addaction name="separator"/> <addaction name="actionShading_Mode"/> - <addaction name="actionWireframe"/> + <addaction name="actionToolbarWireframe"/> </widget> <widget class="QToolBar" name="m_PlaybackToolbar"> <property name="windowTitle"> @@ -258,10 +258,6 @@ <property name="checkable"> <bool>true</bool> </property> - <property name="icon"> - <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"> <string>Autoset Keyframes</string> </property> @@ -364,11 +360,6 @@ <property name="checkable"> <bool>true</bool> </property> - <property name="icon"> - <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> <property name="text"> <string>Wireframe</string> </property> @@ -808,6 +799,37 @@ <string>Sub-presentations...</string> </property> </action> + <action name="actionToolbarWireframe"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="icon"> + <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> + <property name="text"> + <string>Wireframe</string> + </property> + <property name="toolTip"> + <string>Show or Hide Wireframe</string> + </property> + </action> + <action name="actionToolbarAutoset_Keyframes"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="icon"> + <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"> + <string>Autoset Keyframes</string> + </property> + <property name="toolTip"> + <string>Toggle autoset keyframes</string> + </property> + </action> </widget> <customwidgets> <customwidget> |