diff options
Diffstat (limited to 'src/Authoring/Studio/Palettes/Slide/SlideView.h')
-rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideView.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h index 18c4d1d7..eed79655 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.h +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h @@ -38,9 +38,12 @@ #include "Qt3DSDMSignals.h" #include "DispatchListeners.h" #include "Dispatch.h" + class CClientDataModelBridge; class CDoc; +QT_FORWARD_DECLARE_CLASS(QLabel); + namespace qt3dsdm { class ISlideSystem; } @@ -78,6 +81,8 @@ public: Q_INVOKABLE void finishSlideRearrange(bool commit); Q_INVOKABLE void showContextMenu(int x, int y, int row); Q_INVOKABLE void showControllerDialog(const QPoint &point); + Q_INVOKABLE void showVariantsTooltip(int row, const QPoint &point); + Q_INVOKABLE void hideVariantsTooltip(); Q_INVOKABLE bool toolTipsEnabled(); // Presentation Change Listener @@ -121,6 +126,8 @@ private: long GetSlideIndex(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle); bool isMaster(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle); void rebuildSlideList(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle); + void onAssetCreated(qt3dsdm::Qt3DSDMInstanceHandle inInstance); + void onAssetDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance); void onPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMPropertyHandle inProperty); @@ -128,17 +135,18 @@ private: SlideModel *m_SlidesModel = nullptr; SlideModel *m_CurrentModel = nullptr; DataInputSelectView *m_dataInputSelector = nullptr; + QLabel *m_variantsToolTip = nullptr; QColor m_BaseColor = QColor::fromRgb(75, 75, 75); - std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>> - m_Connections; /// connections to the DataModel + std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>> m_Connections; typedef QHash<int, int> TIntIntMap; // We need to remember which slide we were on when we entered the master slide. // Then, when the users leave the master slide we can go back to roughly the same // state. TIntIntMap m_MasterSlideReturnPointers; - qt3dsdm::Qt3DSDMInstanceHandle m_ActiveRoot; ///< the object containing the slides to be inspected. - qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlideHandle; ///< the active slide handle + // the object containing the slides to be inspected. + qt3dsdm::Qt3DSDMInstanceHandle m_ActiveRoot = 0; + qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlideHandle; // the active slide handle bool m_controlled = false; // Are slides in this slide set controlled by datainput? QString m_currentController; QString m_toolTip; |