summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp1
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp9
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h3
3 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
index 21928ea06a..5ad81ef9a2 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
@@ -77,6 +77,7 @@ void ItemLibraryView::modelAttached(Model *model)
AbstractView::modelAttached(model);
m_widget->clearSearchFilter();
+ m_widget->switchToComponentsView();
m_widget->setModel(model);
updateImports();
if (model)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 75a564d738..e6f2b2825e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -278,7 +278,7 @@ void ItemLibraryWidget::handleAddImport(int index)
imports.append(import);
model->changeImports(imports, {});
- QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "switchToComponentsView");
+ switchToComponentsView();
updateSearch();
}
@@ -310,7 +310,7 @@ void ItemLibraryWidget::setModel(Model *model)
m_subCompEditMode = subCompEditMode;
// Switch out of add module view if it's active
if (m_subCompEditMode)
- QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "switchToComponentsView");
+ switchToComponentsView();
emit subCompEditModeChanged();
}
}
@@ -330,6 +330,11 @@ void ItemLibraryWidget::clearSearchFilter()
QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "clearSearchFilter");
}
+void ItemLibraryWidget::switchToComponentsView()
+{
+ QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "switchToComponentsView");
+}
+
void ItemLibraryWidget::reloadQmlSource()
{
const QString itemLibraryQmlPath = qmlSourcesPath() + "/ItemsView.qml";
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index be905f181a..1b63c2fc66 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -73,8 +73,9 @@ public:
QList<QToolButton *> createToolBarWidgets();
static QString qmlSourcesPath();
- void clearSearchFilter();
+ void clearSearchFilter();
+ void switchToComponentsView();
void delayedUpdateModel();
void updateModel();
void updatePossibleImports(const QList<Import> &possibleImports);