summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/MainFrm.cpp
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2018-01-19 07:59:19 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-01-23 05:11:22 +0000
commit821bd2e53180f245b10f397a3a562a8d7d0d2210 (patch)
tree95c26fffda222befaebe4c9e67826d5395532c80 /src/Authoring/Studio/MainFrm.cpp
parent7e2c4ec731206ffa9b6219fbd3e8dfed5af4a7fe (diff)
Enable launching data input dialog from Edit menu
Task-number: QT3DS-833 Change-Id: Ia260df099d720c9114883af3ad68432b7f901860 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.cpp')
-rw-r--r--src/Authoring/Studio/MainFrm.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index 86c165a9..4c892834 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -54,6 +54,7 @@
#include "ITickTock.h"
#include "IStudioRenderer.h"
#include "SubPresentationListDlg.h"
+#include "DataInputListDlg.h"
#include "StudioTutorialWidget.h"
#include "remotedeploymentsender.h"
#include "InspectorControlView.h"
@@ -123,6 +124,8 @@ CMainFrame::CMainFrame()
this, &CMainFrame::OnEditPresentationPreferences);
connect(m_ui->actionSubpresentations, &QAction::triggered, this,
&CMainFrame::OnEditSubPresentations);
+ connect(m_ui->actionData_Inputs, &QAction::triggered, this,
+ &CMainFrame::OnEditDataInputs);
connect(m_ui->action_Duplicate_Object, &QAction::triggered,
this, &CMainFrame::OnEditDuplicate);
@@ -779,7 +782,7 @@ void CMainFrame::OnEditPresentationPreferences()
//==============================================================================
/**
- * Displays the preferences dialog and can change subpresentation settings.
+ * Displays the sub-presentation dialog.
*/
void CMainFrame::OnEditSubPresentations()
{
@@ -795,6 +798,20 @@ void CMainFrame::OnEditSubPresentations()
//==============================================================================
/**
+ * Displays the data input dialog.
+ */
+void CMainFrame::OnEditDataInputs()
+{
+ CDataInputListDlg dataInputDlg(&(g_StudioApp.m_dataInputDialogItems));
+ dataInputDlg.exec();
+
+ // TODO: Implement writing (and reading) the data from UIA file (QT3DS-834)
+// if (dataInputDlg.result() == QDialog::Accepted)
+// g_StudioApp.SaveUIAFile();
+}
+
+//==============================================================================
+/**
* EditPreferences: Displays the presentation settings property sheet with
* the specified active page.
*