summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/MainFrm.cpp
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2018-05-15 11:46:46 +0300
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-05-15 10:52:32 +0000
commit00c5202d656e1fd8e1b23b63b2d2b186c76e95d2 (patch)
treed6995f7674530d7d982068aeb7386f3b2a2f2edd /src/Authoring/Studio/MainFrm.cpp
parentcfa1ced225f44a92cbdce0f000b73de944c8bf29 (diff)
Fix shortcut duplicate for slides
Task-number: QT3DS-1642 Change-Id: Id9889608588b32d0983bcfabdc202d7fb5fcb276 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.cpp')
-rw-r--r--src/Authoring/Studio/MainFrm.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index 1f988128..f4e8a0fe 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -682,7 +682,7 @@ void CMainFrame::OnUpdateTimelineSetInterpolation()
*/
void CMainFrame::OnEditDuplicate()
{
- g_StudioApp.HandleDuplicateCommand();
+ g_StudioApp.HandleDuplicateCommand(m_slideActive);
}
//==============================================================================
@@ -695,7 +695,7 @@ void CMainFrame::OnEditDuplicate()
*/
void CMainFrame::OnUpdateEditDuplicate()
{
- m_ui->action_Duplicate_Object->setEnabled(g_StudioApp.CanDuplicateObject());
+ m_ui->action_Duplicate_Object->setEnabled(m_slideActive || g_StudioApp.CanDuplicateObject());
}
//=============================================================================
@@ -1950,7 +1950,7 @@ void CMainFrame::toggleSelectMode()
m_sceneView->onToolItemSelection();
}
-void CMainFrame::actionActive(bool active)
+void CMainFrame::onActionActive(bool active)
{
m_actionActive = active;
m_ui->actionDelete->setEnabled(!active);
@@ -1966,3 +1966,8 @@ void CMainFrame::showScene()
setCentralWidget(m_sceneView.data());
}
}
+
+void CMainFrame::onSlideActive(bool active)
+{
+ m_slideActive = active;
+}