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

QmlDesigner: Refactor update bundle imported state

Browse Source 
Remove the useless round trip from model to view and back

Change-Id: I38a5826e165014f64d7855139b58e9691b0f6310
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2024-04-29 17:28:39 +03:00
parent 465a2e7ac4
commit 25f8081032
8 changed files with 75 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
View File

@@ -217,8 +217,10 @@ void ContentLibraryMaterialsModel::createImporter()
[&](const QmlDesigner::TypeName &typeName) {
m_importerRunning = false;
emit importerRunningChanged();
if (typeName.size())
if (typeName.size()) {
emit bundleMaterialImported(typeName);
updateImportedState();
}
});
#else
connect(m_importer,
@@ -227,8 +229,10 @@ void ContentLibraryMaterialsModel::createImporter()
[&](const QmlDesigner::NodeMetaInfo &metaInfo) {
m_importerRunning = false;
emit importerRunningChanged();
if (metaInfo.isValid())
if (metaInfo.isValid()) {
emit bundleMaterialImported(metaInfo);
updateImportedState();
}
});
#endif
@@ -238,6 +242,7 @@ void ContentLibraryMaterialsModel::createImporter()
m_importerRunning = false;
emit importerRunningChanged();
emit bundleMaterialUnimported(metaInfo);
updateImportedState();
});
resetModel();
@@ -355,11 +360,23 @@ void ContentLibraryMaterialsModel::setSearchText(const QString &searchText)
updateIsEmpty();
}
void ContentLibraryMaterialsModel::updateImportedState(const QStringList &importedMats)
void ContentLibraryMaterialsModel::updateImportedState()
{
if (!m_importer)
return;
QString bundleId = m_matBundleObj.value("id").toString();
Utils::FilePath bundlePath = m_importer->resolveBundleImportPath(bundleId);
QStringList importedItems;
if (bundlePath.exists()) {
importedItems = transform(bundlePath.dirEntries({{"*.qml"}, QDir::Files}),
[](const Utils::FilePath &f) { return f.baseName(); });
}
bool changed = false;
for (ContentLibraryMaterialsCategory *cat : std::as_const(m_bundleCategories))
changed |= cat->updateImportedState(importedMats);
changed |= cat->updateImportedState(importedItems);
if (changed)
resetModel();