feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Switch to components view upon model attach

Browse Source 
the "add imports" view looks confusing when it appears upon switching
from edit mode or welcome screen to design mode. Even worse when it
stays after creating a new project.

Change-Id: Ibc3ff1adc7f6b653d443fec2b8f1803d6ac56ed9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2022-06-02 22:31:10 +03:00
parent 35d8bc4ad8
commit 6a7f853ec9
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
View File

@@ -77,6 +77,7 @@ void ItemLibraryView::modelAttached(Model *model)
AbstractView::modelAttached(model); AbstractView::modelAttached(model);
m_widget->clearSearchFilter(); m_widget->clearSearchFilter();
m_widget->switchToComponentsView();
m_widget->setModel(model); m_widget->setModel(model);
updateImports(); updateImports();
if (model) if (model)

9
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -278,7 +278,7 @@ void ItemLibraryWidget::handleAddImport(int index)
imports.append(import); imports.append(import);
model->changeImports(imports, {}); model->changeImports(imports, {});
QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "switchToComponentsView"); switchToComponentsView();
updateSearch(); updateSearch();
} }
@@ -310,7 +310,7 @@ void ItemLibraryWidget::setModel(Model *model)
m_subCompEditMode = subCompEditMode; m_subCompEditMode = subCompEditMode;
// Switch out of add module view if it's active // Switch out of add module view if it's active
if (m_subCompEditMode) if (m_subCompEditMode)
QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "switchToComponentsView"); switchToComponentsView();
emit subCompEditModeChanged(); emit subCompEditModeChanged();
} }
} }
@@ -330,6 +330,11 @@ void ItemLibraryWidget::clearSearchFilter()
QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "clearSearchFilter"); QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "clearSearchFilter");
} }
void ItemLibraryWidget::switchToComponentsView()
{
QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "switchToComponentsView");
}
void ItemLibraryWidget::reloadQmlSource() void ItemLibraryWidget::reloadQmlSource()
{ {
const QString itemLibraryQmlPath = qmlSourcesPath() + "/ItemsView.qml"; const QString itemLibraryQmlPath = qmlSourcesPath() + "/ItemsView.qml";

3
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
View File

@@ -73,8 +73,9 @@ public:
QList<QToolButton *> createToolBarWidgets(); QList<QToolButton *> createToolBarWidgets();
static QString qmlSourcesPath(); static QString qmlSourcesPath();
void clearSearchFilter();
void clearSearchFilter();
void switchToComponentsView();
void delayedUpdateModel(); void delayedUpdateModel();
void updateModel(); void updateModel();
void updatePossibleImports(const QList<Import> &possibleImports); void updatePossibleImports(const QList<Import> &possibleImports);