Mercurial Repositories > eric / changeset

--- a/Project/ProjectFormsBrowser.py	Tue Jun 26 18:38:04 2018 +0200
+++ b/Project/ProjectFormsBrowser.py	Tue Jun 26 18:39:14 2018 +0200
@@ -941,7 +941,7 @@
             
             progress = E5ProgressDialog(
                 self.tr("Determining changed forms..."),
-                None, 0, 100, self.tr("%v/%m Forms"))
+                self.tr("Abort"), 0, 100, self.tr("%v/%m Forms"))
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Forms"))
             i = 0
@@ -976,6 +976,9 @@
                 QApplication.processEvents()
                 for fn in changedForms:
                     progress.setValue(i)
+                    if progress.wasCanceled():
+                        break
+                    
                     proc = self.__compileUI(fn, True, progress)
                     if proc is not None:
                         while proc.state() == QProcess.Running:

--- a/Project/ProjectResourcesBrowser.py	Tue Jun 26 18:38:04 2018 +0200
+++ b/Project/ProjectResourcesBrowser.py	Tue Jun 26 18:39:14 2018 +0200
@@ -846,7 +846,7 @@
         else:
             progress = E5ProgressDialog(
                 self.tr("Determining changed resources..."),
-                None, 0, 100, self.tr("%v/%m Resources"))
+                self.tr("Abort"), 0, 100, self.tr("%v/%m Resources"))
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Resources"))
             i = 0
@@ -887,6 +887,8 @@
                 QApplication.processEvents()
                 for fn in changedResources:
                     progress.setValue(i)
+                    if progress.wasCanceled():
+                        break
                     proc = self.__compileQRC(fn, True, progress)
                     if proc is not None:
                         while proc.state() == QProcess.Running: