Merge pull request #52840 from qgis/backport-52839-to-release-3_30

[Backport release-3_30] [Plugin installer] Don't show wait cursor when fetching repositories
qgis · May 3, 2023 · d22b79c · d22b79c
2 parents d20aae4 + 7f44bc5
commit d22b79c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/python/pyplugin_installer/installer.py b/python/pyplugin_installer/installer.py
@@ -120,22 +120,21 @@ def fetchAvailablePlugins(self, reloadMode):
         """ Fetch plugins from all enabled repositories."""
         """  reloadMode = true:  Fully refresh data from QgsSettings to mRepositories  """
         """  reloadMode = false: Fetch unready repositories only """
-        with OverrideCursor(Qt.WaitCursor):
-            if reloadMode:
-                repositories.load()
-                plugins.clearRepoCache()
-                plugins.getAllInstalled()
+        if reloadMode:
+            repositories.load()
+            plugins.clearRepoCache()
+            plugins.getAllInstalled()
 
-            for key in repositories.allEnabled():
-                if reloadMode or repositories.all()[key]["state"] == 3:  # if state = 3 (error or not fetched yet), try to fetch once again
-                    repositories.requestFetching(key, force_reload=reloadMode)
-
-            if repositories.fetchingInProgress():
-                fetchDlg = QgsPluginInstallerFetchingDialog(iface.mainWindow())
-                fetchDlg.exec_()
-                del fetchDlg
-                for key in repositories.all():
-                    repositories.killConnection(key)
+        for key in repositories.allEnabled():
+            if reloadMode or repositories.all()[key]["state"] == 3:  # if state = 3 (error or not fetched yet), try to fetch once again
+                repositories.requestFetching(key, force_reload=reloadMode)
+
+        if repositories.fetchingInProgress():
+            fetchDlg = QgsPluginInstallerFetchingDialog(iface.mainWindow())
+            fetchDlg.exec_()
+            del fetchDlg
+            for key in repositories.all():
+                repositories.killConnection(key)
 
         # display error messages for every unavailable repository, unless Shift pressed nor all repositories are unavailable
         keepQuiet = QgsApplication.keyboardModifiers() == Qt.KeyboardModifiers(Qt.ShiftModifier)

diff --git a/python/pyplugin_installer/qgsplugininstallerfetchingdialog.py b/python/pyplugin_installer/qgsplugininstallerfetchingdialog.py
@@ -24,7 +24,7 @@
  ***************************************************************************/
 """
 
-from qgis.PyQt.QtCore import QCoreApplication
+from qgis.PyQt.QtCore import Qt, QCoreApplication
 from qgis.PyQt.QtWidgets import QDialog, QTreeWidgetItem
 
 from .ui_qgsplugininstallerfetchingbase import Ui_QgsPluginInstallerFetchingDialogBase
@@ -54,6 +54,7 @@ def __init__(self, parent):
                 self.itemProgress[key] = 0
                 self.displayState(key, 2)
         self.treeWidget.resizeColumnToContents(0)
+        self.treeWidget.setCursor(Qt.WaitCursor)
         repositories.repositoryFetched.connect(self.repositoryFetched)
         repositories.anythingChanged.connect(self.displayState)