diff --git a/hscommon/jobprogress/qt.py b/hscommon/jobprogress/qt.py index 1e18448f..cfb26b95 100644 --- a/hscommon/jobprogress/qt.py +++ b/hscommon/jobprogress/qt.py @@ -1,19 +1,19 @@ # Created By: Virgil Dupras # Created On: 2009-09-14 # Copyright 2011 Hardcoded Software (http://www.hardcoded.net) -# -# This software is licensed under the "BSD" License as described in the "LICENSE" file, -# which should be included with this package. The terms are also available at +# +# This software is licensed under the "BSD" License as described in the "LICENSE" file, +# which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/bsd_license -from PyQt4.QtCore import pyqtSignal, Qt, QTimer -from PyQt4.QtGui import QProgressDialog +from PyQt5.QtCore import pyqtSignal, Qt, QTimer +from PyQt5.QtWidgets import QProgressDialog -from . import job, performer +from . import performer class Progress(QProgressDialog, performer.ThreadedJobPerformer): finished = pyqtSignal(['QString']) - + def __init__(self, parent): flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint QProgressDialog.__init__(self, '', "Cancel", 0, 100, parent, flags) @@ -23,7 +23,7 @@ class Progress(QProgressDialog, performer.ThreadedJobPerformer): self._timer = QTimer() self._jobid = '' self._timer.timeout.connect(self.updateProgress) - + def updateProgress(self): # the values might change before setValue happens last_progress = self.last_progress @@ -40,7 +40,7 @@ class Progress(QProgressDialog, performer.ThreadedJobPerformer): if last_desc: self.setLabelText(last_desc) self.setValue(last_progress) - + def run(self, jobid, title, target, args=()): self._jobid = jobid self.reset() @@ -49,4 +49,4 @@ class Progress(QProgressDialog, performer.ThreadedJobPerformer): self.setWindowTitle(title) self.show() self._timer.start(500) - +