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/Palettes/Slide | |
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/Palettes/Slide')
-rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideView.cpp | 12 | ||||
-rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideView.h | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp index 431282d7..cd56029e 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp @@ -214,16 +214,10 @@ void SlideView::OnClosingPresentation() clearSlideList(); } -void SlideView::focusInEvent(QFocusEvent *event) +void SlideView::mousePressEvent(QMouseEvent *event) { - Q_UNUSED(event) - Q_EMIT slideFocused(true); -} - -void SlideView::focusOutEvent(QFocusEvent *event) -{ - Q_UNUSED(event) - Q_EMIT slideFocused(false); + g_StudioApp.setLastActiveView(this); + QQuickWidget::mousePressEvent(event); } void SlideView::OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex, diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h index 5034c035..e5f04eb5 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.h +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h @@ -91,11 +91,9 @@ Q_SIGNALS: void currentModelChanged(); void showMasterSlideChanged(); void controlledChanged(); - void slideFocused(bool); protected: - void focusInEvent(QFocusEvent *event) override; - void focusOutEvent(QFocusEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; // DataModel callbacks virtual void OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex, |