diff -r b33946b65854 -r 397a14ba3ca6 RefactoringRope/ProgressHandle.py
--- a/RefactoringRope/ProgressHandle.py Sun Jan 05 13:53:23 2014 +0100
+++ b/RefactoringRope/ProgressHandle.py Thu Apr 03 18:33:58 2014 +0200
@@ -7,7 +7,7 @@
Module implementing a TaskHandle class with a progress dialog.
"""
-from PyQt4.QtGui import QApplication, QProgressDialog, QLabel
+from PyQt4.QtGui import QApplication, QLabel
import rope.base.taskhandle
@@ -30,10 +30,23 @@
cancelLabel = QApplication.translate("ProgressHandle", "Interrupt")
else:
cancelLabel = ""
- self.__progress = QProgressDialog("", cancelLabel, 0, 100, parent)
+ barFormat = QApplication.translate("ProgressHandle", "%v/%m files")
+ try:
+ from E5Gui.E5ProgressDialog import E5ProgressDialog
+ self.__progress = E5ProgressDialog("", cancelLabel, 0, 1,
+ barFormat, parent)
+ except ImportError:
+ from PyQt4.QtGui import QProgressDialog, QProgressBar
+ self.__progress = QProgressDialog("", cancelLabel, 0, 1, parent)
+ bar = QProgressBar(self.__progress)
+ bar.setFormat(barFormat)
+ self.__progress.setBar(bar)
label = QLabel("")
label.setWordWrap(True)
self.__progress.setLabel(label)
+ self.__progress.setWindowTitle(
+ QApplication.translate("ProgressHandle", "eric5 - {0}")
+ .format(title))
self.add_observer(self.__updateProgress)
def __updateProgress(self):
@@ -46,11 +59,11 @@
if jobset.get_name() is not None:
text += jobset.get_name()
if jobset.get_active_job_name() is not None:
- text += ' : ' + jobset.get_active_job_name()
+ text += ': ' + jobset.get_active_job_name()
self.__progress.setLabelText(text)
- percent = jobset.get_percent_done()
- if percent is not None:
- self.__progress.setValue(percent)
+ if jobset.count is not None:
+ self.__progress.setMaximum(jobset.count)
+ self.__progress.setValue(jobset.done)
QApplication.processEvents()
if not self.is_stopped() and self.__progress.wasCanceled():
self.stop()
