diff -r 19e481fd2847 -r 3339c75dc777 RefactoringRope/ProgressHandle.py
--- a/RefactoringRope/ProgressHandle.py Sun Jul 06 13:27:49 2014 +0200
+++ b/RefactoringRope/ProgressHandle.py Sun Jul 06 14:17:24 2014 +0200
@@ -9,7 +9,8 @@
from __future__ import unicode_literals
-from PyQt4.QtGui import QApplication, QLabel
+from PyQt5.QtCore import QCoreApplication
+from PyQt5.QtWidgets import QApplication, QLabel
import rope.base.taskhandle
@@ -29,16 +30,17 @@
"""
rope.base.taskhandle.TaskHandle.__init__(self, title, interruptable)
if interruptable:
- cancelLabel = QApplication.translate("ProgressHandle", "Interrupt")
+ cancelLabel = QCoreApplication.translate(
+ "ProgressHandle", "Interrupt")
else:
cancelLabel = ""
- barFormat = QApplication.translate("ProgressHandle", "%v/%m files")
+ barFormat = QCoreApplication.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
+ from PyQt5.QtWidgets import QProgressDialog, QProgressBar
self.__progress = QProgressDialog("", cancelLabel, 0, 1, parent)
bar = QProgressBar(self.__progress)
bar.setFormat(barFormat)
@@ -47,8 +49,8 @@
label.setWordWrap(True)
self.__progress.setLabel(label)
self.__progress.setWindowTitle(
- QApplication.translate("ProgressHandle", "eric5 - {0}")
- .format(title))
+ QCoreApplication.translate("ProgressHandle", "eric6 - {0}")
+ .format(title))
self.add_observer(self.__updateProgress)
def __updateProgress(self):
