diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-04-17 12:26:24 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-04-20 06:19:12 +0000 |
| commit | 5810e60052a44266c77559dffd299f289f8a25e4 (patch) | |
| tree | 97759cf5c342cc3ff3a6e30e39d174bf5aba1e89 /src/Authoring/Studio/Palettes/Slide | |
| parent | 9c650461a3ed3153af770d20acfcd8bebc53ee9b (diff) | |
UX changes to Datainput
Layout changes in Inspector Panel and Datainput management dialog. Open
directly dialog for adding datainput when option "[Add new..." is selected
from datainput selector. Show datainput type in datainput selector.
Change-Id: I2e82cb2c10720d96b34a7e500f71dc86162a3003
Task-Id: QT3DS-1422
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Slide')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideView.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp index 38aba9b1..23372aaf 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp @@ -120,10 +120,11 @@ void SlideView::showControllerDialog(const QPoint &point) { QString currCtr = m_currentController.size() ? m_currentController : m_dataInputSelector->getNoneString(); - QStringList dataInputList; + QVector<QPair<QString, int>> dataInputList; for (int i = 0; i < g_StudioApp.m_dataInputDialogItems.size(); i++) { if (g_StudioApp.m_dataInputDialogItems[i]->type == EDataType::DataTypeString) - dataInputList.append(g_StudioApp.m_dataInputDialogItems[i]->name); + dataInputList.append(QPair<QString, int>(g_StudioApp.m_dataInputDialogItems[i]->name, + g_StudioApp.m_dataInputDialogItems[i]->type)); } m_dataInputSelector->setData(dataInputList, currCtr); showBrowser(m_dataInputSelector, point); |