diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2025-05-22 03:38:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-22 10:38:39 +0200 |
| commit | eddc30a47f3daefbe4ef29b5de261a1e18949dd3 (patch) | |
| tree | 2f29288944010550270fa0a0130dd37027a346b0 /src | |
| parent | 52b37a760c0731f6160bb07e1ab909bbf268c2a6 (diff) | |
Dependency Updates Meta PR (#2242)
* Update dll manifests
* Fixes for emit / model refresh issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/dlls.manifest.debug.qt6 | 19 | ||||
| -rw-r--r-- | src/dlls.manifest.qt6 | 19 | ||||
| -rw-r--r-- | src/downloadmanager.cpp | 3 | ||||
| -rw-r--r-- | src/modinfodialogesps.cpp | 3 | ||||
| -rw-r--r-- | src/modinfodialogtextfiles.cpp | 3 | ||||
| -rw-r--r-- | src/modlistview.cpp | 6 |
6 files changed, 21 insertions, 32 deletions
diff --git a/src/dlls.manifest.debug.qt6 b/src/dlls.manifest.debug.qt6 index 18845fba..285095cd 100644 --- a/src/dlls.manifest.debug.qt6 +++ b/src/dlls.manifest.debug.qt6 @@ -4,16 +4,15 @@ <file name="7z.dll" /> <file name="archive.dll" /> <file name="d3dcompiler_47.dll" /> + <file name="dxcompiler.dll" /> + <file name="dxil.dll" /> <file name="libbsarch.dll" /> <file name="libcrypto-3-x64.dll" /> - <file name="libEGL.dll" /> - <file name="libGLESV2.dll" /> <file name="liblz4.dll" /> <file name="libssl-3-x64.dll" /> <file name="opengl32sw.dll" /> <file name="Qt6Concurrentd.dll" /> <file name="Qt6Cored.dll" /> - <file name="Qt6Core5Compatd.dll" /> <file name="Qt6Guid.dll" /> <file name="Qt6Networkd.dll" /> <file name="Qt6OpenGLd.dll" /> @@ -21,22 +20,12 @@ <file name="Qt6Positioningd.dll" /> <file name="Qt6PrintSupportd.dll" /> <file name="Qt6Qmld.dll" /> - <file name="Qt6QmlLocalStoraged.dll" /> + <file name="Qt6QmlMetad.dll" /> <file name="Qt6QmlModelsd.dll" /> <file name="Qt6QmlWorkerScriptd.dll" /> - <file name="Qt6QmlXmlListModeld.dll" /> <file name="Qt6Quickd.dll" /> - <file name="Qt6QuickControls2d.dll" /> - <file name="Qt6QuickControls2Impld.dll" /> - <file name="Qt6QuickDialogs2d.dll" /> - <file name="Qt6QuickDialogs2QuickImpld.dll" /> - <file name="Qt6QuickDialogs2Utilsd.dll" /> - <file name="Qt6QuickLayoutsd.dll" /> - <file name="Qt6QuickParticlesd.dll" /> - <file name="Qt6QuickShapesd.dll" /> - <file name="Qt6QuickTemplates2d.dll" /> <file name="Qt6QuickWidgetsd.dll" /> - <file name="Qt6Sqld.dll" /> + <file name="Qt6SerialPortd.dll" /> <file name="Qt6Svgd.dll" /> <file name="Qt6WebChanneld.dll" /> <file name="Qt6WebEngineCored.dll" /> diff --git a/src/dlls.manifest.qt6 b/src/dlls.manifest.qt6 index f5d1d9fd..3bb7b655 100644 --- a/src/dlls.manifest.qt6 +++ b/src/dlls.manifest.qt6 @@ -4,16 +4,15 @@ <file name="7z.dll" /> <file name="archive.dll" /> <file name="d3dcompiler_47.dll" /> + <file name="dxcompiler.dll" /> + <file name="dxil.dll" /> <file name="libbsarch.dll" /> <file name="libcrypto-3-x64.dll" /> - <file name="libEGL.dll" /> - <file name="libGLESV2.dll" /> <file name="liblz4.dll" /> <file name="libssl-3-x64.dll" /> <file name="opengl32sw.dll" /> <file name="Qt6Concurrent.dll" /> <file name="Qt6Core.dll" /> - <file name="Qt6Core5Compat.dll" /> <file name="Qt6Gui.dll" /> <file name="Qt6Network.dll" /> <file name="Qt6OpenGL.dll" /> @@ -21,22 +20,12 @@ <file name="Qt6Positioning.dll" /> <file name="Qt6PrintSupport.dll" /> <file name="Qt6Qml.dll" /> - <file name="Qt6QmlLocalStorage.dll" /> + <file name="Qt6QmlMeta.dll" /> <file name="Qt6QmlModels.dll" /> <file name="Qt6QmlWorkerScript.dll" /> - <file name="Qt6QmlXmlListModel.dll" /> <file name="Qt6Quick.dll" /> - <file name="Qt6QuickControls2.dll" /> - <file name="Qt6QuickControls2Impl.dll" /> - <file name="Qt6QuickDialogs2.dll" /> - <file name="Qt6QuickDialogs2QuickImpl.dll" /> - <file name="Qt6QuickDialogs2Utils.dll" /> - <file name="Qt6QuickLayouts.dll" /> - <file name="Qt6QuickParticles.dll" /> - <file name="Qt6QuickShapes.dll" /> - <file name="Qt6QuickTemplates2.dll" /> <file name="Qt6QuickWidgets.dll" /> - <file name="Qt6Sql.dll" /> + <file name="Qt6SerialPort.dll" /> <file name="Qt6Svg.dll" /> <file name="Qt6WebChannel.dll" /> <file name="Qt6WebEngineCore.dll" /> diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index 5156c357..7c02b17b 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -332,6 +332,7 @@ void DownloadManager::refreshList() TimeThis tt("DownloadManager::refreshList()"); try { + emit aboutToUpdate(); // avoid triggering other refreshes ScopedDisableDirWatcher scopedDirWatcher(this); @@ -2225,10 +2226,12 @@ void DownloadManager::downloadFinished(int index) "There may be an issue with the Nexus servers.")); emit update(-1); } else if (info->isPausedState() || info->m_State == STATE_PAUSING) { + emit aboutToUpdate(); info->m_Output.close(); createMetaFile(info); emit update(index); } else { + emit aboutToUpdate(); QString url = info->m_Urls[info->m_CurrentUrl]; if (info->m_FileInfo->userData.contains("downloadMap")) { foreach (const QVariant& server, diff --git a/src/modinfodialogesps.cpp b/src/modinfodialogesps.cpp index f9a3ba8c..4de93aab 100644 --- a/src/modinfodialogesps.cpp +++ b/src/modinfodialogesps.cpp @@ -99,6 +99,7 @@ class ESPListModel : public QAbstractItemModel public: void clear() { + beginResetModel(); m_esps.clear(); endResetModel(); } @@ -161,6 +162,8 @@ public: void finished() { + beginResetModel(); + std::sort(m_esps.begin(), m_esps.end(), [](const auto& a, const auto& b) { return (naturalCompare(a.filename(), b.filename()) < 0); }); diff --git a/src/modinfodialogtextfiles.cpp b/src/modinfodialogtextfiles.cpp index cc13e2d2..1f22d370 100644 --- a/src/modinfodialogtextfiles.cpp +++ b/src/modinfodialogtextfiles.cpp @@ -9,6 +9,7 @@ class FileListModel : public QAbstractItemModel public: void clear() { + beginResetModel(); m_files.clear(); endResetModel(); } @@ -58,6 +59,8 @@ public: void finished() { + beginResetModel(); + std::sort(m_files.begin(), m_files.end(), [](const auto& a, const auto& b) { return (naturalCompare(a.text, b.text) < 0); }); diff --git a/src/modlistview.cpp b/src/modlistview.cpp index 8cfd8b42..7b3669fd 100644 --- a/src/modlistview.cpp +++ b/src/modlistview.cpp @@ -1078,7 +1078,8 @@ void ModListView::setOverwriteMarkers(const QModelIndexList& indexes) } } dataChanged(model()->index(0, 0), - model()->index(model()->rowCount(), model()->columnCount())); + model()->index(model()->rowCount() ? model()->rowCount() - 1 : 0, + model()->columnCount() ? model()->columnCount() - 1 : 0)); verticalScrollBar()->repaint(); } @@ -1117,7 +1118,8 @@ void ModListView::setHighlightedMods(const std::set<QString>& modNames) } } dataChanged(model()->index(0, 0), - model()->index(model()->rowCount(), model()->columnCount())); + model()->index(model()->rowCount() ? model()->rowCount() - 1 : 0, + model()->columnCount() ? model()->columnCount() - 1 : 0)); verticalScrollBar()->repaint(); } |
