diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-25 17:31:11 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-27 09:42:09 +0000 |
commit | 35684c6dd7dec1b902218e2b134e427305e234e4 (patch) | |
tree | 71ba71619329a84ac6e600d8ec3a645adeaaba97 /src/Authoring/Studio/MainFrm.h | |
parent | b1a5c793e31aa68e5f33ed7b64e0b1563d5efc0a (diff) |
Fix edit menu items
- Show what is about to be deleted/duplicated
- Properly enable delete/duplicate items
- Action delete/copy/cut/paste is now fully contained in action view
- Every view and player window indicates when they are activated
(i.e. mouse is pressed on them) so we can track the context reliably
even when menu steals the focus. Required for slide duplicate/delete
enabling in edit menu.
Task-number: QT3DS-1911
Task-number: QT3DS-1958
Change-Id: Icf0bb173809740dd709b9e0525735de7aecba617
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.h')
-rw-r--r-- | src/Authoring/Studio/MainFrm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/Authoring/Studio/MainFrm.h b/src/Authoring/Studio/MainFrm.h index bed7e105..bf71bf1b 100644 --- a/src/Authoring/Studio/MainFrm.h +++ b/src/Authoring/Studio/MainFrm.h @@ -126,7 +126,6 @@ public: void OnUpdateEditPaste(); void OnEditDuplicate(); void onEditDelete(); - void OnUpdateEditDuplicate(); void timerEvent(QTimerEvent *event) override; void showEvent(QShowEvent *event) override; @@ -241,9 +240,7 @@ public: void initializeGeometryAndState(); void toggleSelectMode(); - void onActionActive(bool active); void showScene(); - void onSlideActive(bool active); Q_SIGNALS: void playStateChanged(bool started); @@ -263,8 +260,6 @@ protected: QScopedPointer<CStudioPreferencesPropSheet> m_propSheet; bool m_playbackFlag = false; - bool m_actionActive = false; - bool m_slideActive = false; bool m_resettingLayout = false; }; |