diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-08 16:23:03 +0200 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-12 13:29:07 +0000 |
| commit | 4f6db42ce61e5a712ed196e96e0d90a1780c73fd (patch) | |
| tree | ee90500be87525adca7285aad6155bd9bed509c1 /src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | |
| parent | 52730ddc3a94acc32cd2b28fc49b45dd5f19e3c5 (diff) | |
Implement variants filtering dialog
Implement variants filtering toolbar action, when clicked it shows the
filtering dialog where the user can choose the tags to be used by the
viewer. Also update the 'preview on remote device' icon.
Task-number: QT3DS-3115
Change-Id: I4d93c8cefe94726f1f04aa6fc7e6f9f07fb8a8b2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp index be8cdbcf..5b4996a1 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp @@ -78,8 +78,6 @@ InspectorControlView::InspectorControlView(const QSize &preferredSize, QWidget * m_variantsGroupModel(new VariantsGroupModel(this)), m_inspectorControlModel(new InspectorControlModel(m_variantsGroupModel, this)), m_meshChooserView(new MeshChooserView(this)), - m_instance(0), - m_handle(0), m_preferredSize(preferredSize) { setResizeMode(QQuickWidget::SizeRootObjectToView); @@ -484,6 +482,8 @@ void InspectorControlView::showTagContextMenu(int x, int y, const QString &group g_StudioApp.GetViews()->getMainFrame()->getTimelineWidget()->refreshVariants(); g_StudioApp.GetViews()->getMainFrame()->getSlideView()->refreshVariants(); m_variantsGroupModel->refresh(); + if (g_StudioApp.GetCore()->getProjectFile().variantsDef()[group].m_tags.size() == 0) + g_StudioApp.GetViews()->getMainFrame()->updateActionFilterEnableState(); }); theContextMenu.exec(mapToGlobal({x, y})); @@ -522,6 +522,7 @@ void InspectorControlView::showGroupContextMenu(int x, int y, const QString &gro projectFile.deleteVariantGroup(group); g_StudioApp.GetViews()->getMainFrame()->getTimelineWidget()->refreshVariants(); g_StudioApp.GetViews()->getMainFrame()->getSlideView()->refreshVariants(); + g_StudioApp.GetViews()->getMainFrame()->updateActionFilterEnableState(); m_variantsGroupModel->refresh(); }); |