Mercurial Repositories > eric / file diff

diff -r 013aee248a62 -r 006ee31b4835 eric6/Project/ProjectFormsBrowser.py
--- a/eric6/Project/ProjectFormsBrowser.py	Sun Apr 11 11:34:32 2021 +0200
+++ b/eric6/Project/ProjectFormsBrowser.py	Sun Apr 11 12:38:16 2021 +0200
@@ -932,10 +932,9 @@
             progress.setModal(True)
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Forms"))
-            i = 0
             
-            for fn in self.project.pdata["FORMS"]:
-                progress.setValue(i)
+            for prog, fn in enumerate(self.project.pdata["FORMS"]):
+                progress.setValue(prog)
                 if progress.wasCanceled():
                     break
                 
@@ -947,8 +946,6 @@
                         QApplication.processEvents()
                 else:
                     break
-                i += 1
-                
             progress.setValue(numForms)
         
     def __compileSelectedForms(self):
@@ -970,10 +967,9 @@
             progress.setModal(True)
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Forms"))
-            i = 0
             
-            for fn in files:
-                progress.setValue(i)
+            for prog, fn in enumerate(files):
+                progress.setValue(prog)
                 if progress.wasCanceled():
                     break
                 
@@ -985,8 +981,6 @@
                         QApplication.processEvents()
                 else:
                     break
-                i += 1
-                
             progress.setValue(numForms)
         
     def compileChangedForms(self):
@@ -1007,13 +1001,12 @@
                 self.tr("Abort"), 0, 100, self.tr("%v/%m Forms"))
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Forms"))
-            i = 0
             
             # get list of changed forms
             changedForms = []
             progress.setMaximum(len(self.project.pdata["FORMS"]))
-            for fn in self.project.pdata["FORMS"]:
-                progress.setValue(i)
+            for prog, fn in enumerate(self.project.pdata["FORMS"]):
+                progress.setValue(prog)
                 QApplication.processEvents()
                 
                 ifn = os.path.join(self.project.ppath, fn)
@@ -1027,19 +1020,17 @@
                     os.stat(ifn).st_mtime > os.stat(ofn).st_mtime
                 ):
                     changedForms.append(fn)
-                i += 1
-            progress.setValue(i)
+            progress.setValue(len(self.project.pdata["FORMS"]))
             QApplication.processEvents()
             
             if changedForms:
                 progress.setLabelText(
                     self.tr("Compiling changed forms..."))
                 progress.setMaximum(len(changedForms))
-                i = 0
-                progress.setValue(i)
+                progress.setValue(prog)
                 QApplication.processEvents()
-                for fn in changedForms:
-                    progress.setValue(i)
+                for prog, fn in enumerate(changedForms):
+                    progress.setValue(prog)
                     if progress.wasCanceled():
                         break
                     
@@ -1051,7 +1042,6 @@
                             QApplication.processEvents()
                     else:
                         break
-                    i += 1
                 progress.setValue(len(changedForms))
                 QApplication.processEvents()