diff options
author | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-06-04 10:32:57 +0300 |
---|---|---|
committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-07-29 14:44:50 +0300 |
commit | e6fa198b89409acb5c39af28d0fbd374e6d4f3c2 (patch) | |
tree | 43280ed92c1a51a425a4d840be8626c0f427ab99 /src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView | |
parent | 0721dcdc532befcd95c93740e539f94b6800daed (diff) |
Add close project into menu
Add option to close the current project into file menu. When project
is closed, reset the UI into initial state and show startup dialog.
Task-number: QT3DS-3549
Change-Id: Icd8f477189a9f89b84d3c8abe75bd26df7fbde8f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView')
-rw-r--r-- | src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/TimelineWidget.cpp | 6 | ||||
-rw-r--r-- | src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/TimelineWidget.cpp b/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/TimelineWidget.cpp index d37825cb..967da5cb 100644 --- a/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/TimelineWidget.cpp +++ b/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/TimelineWidget.cpp @@ -418,12 +418,18 @@ void TimelineWidget::OnNewPresentation() // Reset timeline time OnTimeChanged(0); + + // Show timeline widget when presentation is available + setVisible(true); } void TimelineWidget::OnClosingPresentation() { m_connections.clear(); m_graphicsScene->expandMap().clear(); + + // Hide timeline widget when presentation is closed + setVisible(false); } void TimelineWidget::OnTimeChanged(long inTime) diff --git a/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp b/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp index 05d24fa6..a4f41026 100644 --- a/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp +++ b/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/TimelineToolbar.cpp @@ -283,6 +283,8 @@ bool TimelineToolbar::isVariantsFilterOn() const void TimelineToolbar::updateDataInputStatus() { CDoc *doc = g_StudioApp.GetCore()->GetDoc(); + if (!doc->isValid()) + return; qt3dsdm::Qt3DSDMPropertyHandle ctrldProp; qt3dsdm::Qt3DSDMInstanceHandle timeCtxRoot = doc->GetActiveRootInstance(); CClientDataModelBridge *theClientBridge = doc->GetStudioSystem()->GetClientDataModelBridge(); |