diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-11-03 15:22:36 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-11-06 07:59:39 +0000 |
| commit | 77ee3b8190ecd90638dc9ca0e64191330a792e33 (patch) | |
| tree | f029b7b2a63ed8a331c31f12efff463fc4a78262 /src/Authoring/Studio/MainFrm.cpp | |
| parent | 695581edd285a1df336140d46787f325469a0c5c (diff) | |
Improve hotkeys handling
Intercepting global hotkeys when focus is on a control that consumes
keypresses is made more robust and explicitly controllable by
introducing ignoreHotkeys property for QML items. If the property
value is true, then most global shortcuts will be ignored when the
keyboard focus is in that control.
Added up/down arrow value adjusting for float fields.
Added CTRL-SHIFT-Z shortcut for undo.
Task-number: QT3DS-343
Change-Id: I7275b1e1ed7f6b106789cb566d6ac98cbd647aff
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.cpp')
| -rw-r--r-- | src/Authoring/Studio/MainFrm.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index b99af326..f4882f8a 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -1124,6 +1124,11 @@ void CMainFrame::RegisterGlobalKeyboardShortcuts(CHotKeys *inHotKeys, QWidget *a ADD_GLOBAL_SHORTCUT(actionParent, QKeySequence(Qt::Key_F3), CMainFrame::HandleEditViewFillModeKey); + // Default undo shortcut is Ctrl-Y, which is specified in main form. Let's add the common + // alternate shortcut for redo, CTRL-SHIFT-Z + ADD_GLOBAL_SHORTCUT(actionParent, + QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Z), + CMainFrame::OnEditRedo); #endif m_SceneView->RegisterGlobalKeyboardShortcuts(inHotKeys); |