Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectResourcesBrowser.py	Sun Apr 11 11:34:32 2021 +0200
+++ b/eric6/Project/ProjectResourcesBrowser.py	Sun Apr 11 12:38:16 2021 +0200
@@ -750,10 +750,9 @@
             progress.setModal(True)
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Resources"))
-            i = 0
             
-            for fn in self.project.pdata["RESOURCES"]:
-                progress.setValue(i)
+            for prog, fn in enumerate(self.project.pdata["RESOURCES"]):
+                progress.setValue(prog)
                 if progress.wasCanceled():
                     break
                 proc = self.__compileQRC(fn, True, progress)
@@ -764,8 +763,6 @@
                         QApplication.processEvents()
                 else:
                     break
-                i += 1
-                
             progress.setValue(numResources)
         
     def __compileSelectedResources(self):
@@ -787,10 +784,9 @@
             progress.setModal(True)
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Resources"))
-            i = 0
             
-            for fn in files:
-                progress.setValue(i)
+            for prog, fn in enumerate(files):
+                progress.setValue(prog)
                 if progress.wasCanceled():
                     break
                 if not fn.endswith('.ui.h'):
@@ -802,8 +798,6 @@
                             QApplication.processEvents()
                     else:
                         break
-                i += 1
-                
             progress.setValue(numResources)
         
     def __checkResourcesNewer(self, filename, mtime):
@@ -859,13 +853,12 @@
                 self.tr("Abort"), 0, 100, self.tr("%v/%m Resources"))
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Resources"))
-            i = 0
             
             # get list of changed resources
             changedResources = []
             progress.setMaximum(len(self.project.pdata["RESOURCES"]))
-            for fn in self.project.pdata["RESOURCES"]:
-                progress.setValue(i)
+            for prog, fn in enumerate(self.project.pdata["RESOURCES"]):
+                progress.setValue(prog)
                 QApplication.processEvents()
                 ifn = os.path.join(self.project.ppath, fn)
                 if self.project.getProjectLanguage() == "Python3":
@@ -885,19 +878,17 @@
                     changedResources.append(fn)
                 elif self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime):
                     changedResources.append(fn)
-                i += 1
-            progress.setValue(i)
+            progress.setValue(len(self.project.pdata["RESOURCES"]))
             QApplication.processEvents()
             
             if changedResources:
                 progress.setLabelText(
                     self.tr("Compiling changed resources..."))
                 progress.setMaximum(len(changedResources))
-                i = 0
-                progress.setValue(i)
+                progress.setValue(0)
                 QApplication.processEvents()
-                for fn in changedResources:
-                    progress.setValue(i)
+                for prog, fn in enumerate(changedResources):
+                    progress.setValue(prog)
                     if progress.wasCanceled():
                         break
                     proc = self.__compileQRC(fn, True, progress)
@@ -908,7 +899,6 @@
                             QApplication.processEvents()
                     else:
                         break
-                    i += 1
                 progress.setValue(len(changedResources))
                 QApplication.processEvents()