diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-11-28 13:36:15 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-11-29 08:50:23 +0000 |
commit | 59553021acfe3df91a42e2ba06baf4f06777b3b0 (patch) | |
tree | 3baea07e1c79d4e2bb3814f8a0c0814cc4c5de53 | |
parent | 3b52a1f11e2d676f12657cc976a07abea1e7ea6c (diff) |
Hide broken 'save as' and 'save copy' functionality
This functionality requires redesign and reimplementation, as it is
currently useless and broken. Disabling it until it can be properly
fixed.
Task-number: QT3DS-2749
Change-Id: I35698293e4fd91d3469fc75631a23054cf81b544
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r-- | doc/src/03-studio/0-menu.qdoc | 2 | ||||
-rw-r--r-- | doc/src/03-studio/9-keyboard-shortcuts.qdoc | 2 | ||||
-rw-r--r-- | src/Authoring/Studio/Application/StudioApp.cpp | 4 | ||||
-rw-r--r-- | src/Authoring/Studio/MainFrm.cpp | 9 |
4 files changed, 12 insertions, 5 deletions
diff --git a/doc/src/03-studio/0-menu.qdoc b/doc/src/03-studio/0-menu.qdoc index 8b0d5bd5..62cb85e0 100644 --- a/doc/src/03-studio/0-menu.qdoc +++ b/doc/src/03-studio/0-menu.qdoc @@ -49,6 +49,7 @@ \uicontrol{Open} - Opens a \c{.uip} presentation file. \li \uicontrol{Save} - Saves changes to the open presentation. +\omit \li \uicontrol{Save As} - Saves the presentation to a new location. No \c{.uia} file will be created or modified in the new location. @@ -56,6 +57,7 @@ \uicontrol{Save a Copy} - Saves a copy of the presentation to a new location (but keep working on the current presentation). No \c{.uia} file will be created or modified in the new location. +\endomit \li \uicontrol{Revert} - With confirmation, abandons all in-memory changes to the presentation and re-opens it from disk. diff --git a/doc/src/03-studio/9-keyboard-shortcuts.qdoc b/doc/src/03-studio/9-keyboard-shortcuts.qdoc index c014183e..1e46b988 100644 --- a/doc/src/03-studio/9-keyboard-shortcuts.qdoc +++ b/doc/src/03-studio/9-keyboard-shortcuts.qdoc @@ -57,6 +57,7 @@ \li Save \li \c{Ctrl + S} \li \c{Cmd + S} +\omit \row \li Save as... \li \c{Ctrl + Shift + S} @@ -65,6 +66,7 @@ \li Save a copy \li \c{Ctrl + Alt + S} \li \c{Cmd + Option + S} +\endomit \row \li Exit \li \c{Ctrl + Q} diff --git a/src/Authoring/Studio/Application/StudioApp.cpp b/src/Authoring/Studio/Application/StudioApp.cpp index e96729cd..20f0f7a5 100644 --- a/src/Authoring/Studio/Application/StudioApp.cpp +++ b/src/Authoring/Studio/Application/StudioApp.cpp @@ -1577,7 +1577,6 @@ bool CStudioApp::OnSave(bool autosave) } } -//============================================================================= /** * Command handler for the File Save As menu option. * This will prompt the user for a location to save the file out to then @@ -1594,9 +1593,8 @@ bool CStudioApp::OnSaveAs() return false; } -//============================================================================= /** - * Command handler for the File Save As menu option. + * Command handler for the File Save Copy menu option. * This will prompt the user for a location to save the file out to then * save a copy, leaving the original file open in the editor. * @return true if the file was successfully saved. diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index 96d5e527..bc4b7727 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -395,6 +395,10 @@ void CMainFrame::OnCreate() m_ui->actionZoom_Tool->setVisible(false); #endif + // TODO: Save as/save copy functionality hidden until it is redesigned (QT3DS-2630) + m_ui->actionSave_As->setVisible(false); + m_ui->actionSave_a_Copy->setVisible(false); + // Show a message about opening or creating a presentation m_sceneView.data()->setVisible(false); setCentralWidget(m_ui->infoText); @@ -421,8 +425,9 @@ void CMainFrame::OnNewPresentation() m_ui->menu_Edit->setEnabled(true); m_ui->menu_Timeline->setEnabled(true); m_ui->menu_View->setEnabled(true); - m_ui->actionSave_As->setEnabled(true); - m_ui->actionSave_a_Copy->setEnabled(true); + // TODO: Save as/save copy functionality disabled until it is redesigned (QT3DS-2630) +// m_ui->actionSave_As->setEnabled(true); +// m_ui->actionSave_a_Copy->setEnabled(true); m_ui->action_Connect_to_Device->setEnabled(true); m_ui->action_Revert->setEnabled(true); m_ui->actionImportAssets->setEnabled(true); |