diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-27 13:49:34 +0200 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-27 11:57:01 +0000 |
| commit | 57ebc133065ea65b93b1bc67c635c2ef8e917c83 (patch) | |
| tree | 47a1340f8918ff2a1a4d27d7d37fc647cc52b659 | |
| parent | c02af01f8b6ef4e536171cffdaf81adcf120595c (diff) | |
Reset the variants filter on new presentation
Task-number: QT3DS-3230
Change-Id: Ib5a9b2ec48db014169fbe9a632be1fd28dac2209
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Application/FilterVariantsDlg.cpp | 5 | ||||
| -rw-r--r-- | src/Authoring/Studio/Application/FilterVariantsDlg.h | 1 | ||||
| -rw-r--r-- | src/Authoring/Studio/MainFrm.cpp | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Application/FilterVariantsDlg.cpp b/src/Authoring/Studio/Application/FilterVariantsDlg.cpp index 2b7fafb8..d6a47b6d 100644 --- a/src/Authoring/Studio/Application/FilterVariantsDlg.cpp +++ b/src/Authoring/Studio/Application/FilterVariantsDlg.cpp @@ -71,6 +71,11 @@ QString FilterVariantsDlg::filterStr() const return ret; } +void FilterVariantsDlg::clearFilter() +{ + m_variantsFilter.clear(); +} + int FilterVariantsDlg::actionSize() const { return m_actionSize; diff --git a/src/Authoring/Studio/Application/FilterVariantsDlg.h b/src/Authoring/Studio/Application/FilterVariantsDlg.h index be3b6206..3de1c294 100644 --- a/src/Authoring/Studio/Application/FilterVariantsDlg.h +++ b/src/Authoring/Studio/Application/FilterVariantsDlg.h @@ -45,6 +45,7 @@ public: Q_INVOKABLE int actionSize() const; QString filterStr() const; + void clearFilter(); protected: void focusOutEvent(QFocusEvent *e) override; diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index 5c33aba9..2e76d9d7 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -409,6 +409,10 @@ void CMainFrame::OnNewPresentation() // Clear data input list and sub-presentation list g_StudioApp.m_subpresentations.clear(); g_StudioApp.m_dataInputDialogItems.clear(); + + // reset the variants filter and preview button's icon + m_filterVariantsDlg->clearFilter(); + updateActionPreviewVariantsState(false); } /** |