mirror of
https://github.com/Hopiu/linkchecker.git
synced 2026-04-15 11:51:02 +00:00
Activate cancel button in progress dialog
git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3969 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
parent
06c44542f2
commit
afd866456a
2 changed files with 18 additions and 22 deletions
2
TODO.txt
2
TODO.txt
|
|
@ -1,2 +1,4 @@
|
|||
- [GUI] Store checked links in urldata list; display in a QTreeWidget;
|
||||
columns result (as icon), URL, name; doubleclick opens property popup
|
||||
signal "foo(PyQt_PyObject)"
|
||||
- [GUI] Progressbar cancel button
|
||||
|
|
|
|||
|
|
@ -61,12 +61,17 @@ class LinkCheckerMain (QtGui.QMainWindow, Ui_MainWindow):
|
|||
self.connect(self.checker, QtCore.SIGNAL("terminated()"), self.set_status_idle)
|
||||
self.connect(self.checker, QtCore.SIGNAL("add_message(QString)"), self.add_message)
|
||||
self.connect(self.checker, QtCore.SIGNAL("status(QString)"), self.progress.status)
|
||||
self.connect(self.controlButton, QtCore.SIGNAL("clicked()"), self.start_stop)
|
||||
self.connect(self.controlButton, QtCore.SIGNAL("clicked()"), self.start)
|
||||
self.connect(self.optionsButton, QtCore.SIGNAL("clicked()"), self.options.exec_)
|
||||
self.connect(self.progress.cancelButton, QtCore.SIGNAL("clicked()"), self.stop)
|
||||
self.connect(self.actionQuit, QtCore.SIGNAL("triggered()"), self.close)
|
||||
self.connect(self.actionAbout, QtCore.SIGNAL("triggered()"), self.about)
|
||||
self.connect(self.actionHelp, QtCore.SIGNAL("triggered()"), self.showDocumentation)
|
||||
self.status = Status.idle
|
||||
#self.controlButton.setText(_("Start"))
|
||||
#icon = QtGui.QIcon()
|
||||
#icon.addPixmap(QtGui.QPixmap(":/icons/start.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||
#self.controlButton.setIcon(icon)
|
||||
|
||||
def get_status (self):
|
||||
return self._status
|
||||
|
|
@ -76,27 +81,16 @@ class LinkCheckerMain (QtGui.QMainWindow, Ui_MainWindow):
|
|||
if status == Status.idle:
|
||||
self.progress.reset()
|
||||
self.progress.hide()
|
||||
self.controlButton.setText(_("Start"))
|
||||
icon = QtGui.QIcon()
|
||||
icon.addPixmap(QtGui.QPixmap(":/icons/start.png"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
|
||||
self.controlButton.setIcon(icon)
|
||||
self.aggregate = None
|
||||
self.controlButton.setEnabled(True)
|
||||
self.optionsButton.setEnabled(True)
|
||||
self.set_statusbar(_("Ready."))
|
||||
elif status == Status.checking:
|
||||
self.controlButton.setText(_("Stop"))
|
||||
icon = QtGui.QIcon()
|
||||
icon.addPixmap(QtGui.QPixmap(":/icons/stop.png"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
|
||||
self.controlButton.setIcon(icon)
|
||||
self.controlButton.setEnabled(True)
|
||||
self.controlButton.setEnabled(False)
|
||||
self.optionsButton.setEnabled(False)
|
||||
elif status == Status.stopping:
|
||||
self.controlButton.setText(_("Start"))
|
||||
icon = QtGui.QIcon()
|
||||
icon.addPixmap(QtGui.QPixmap(":/icons/start.png"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
|
||||
self.controlButton.setIcon(icon)
|
||||
self.controlButton.setEnabled(False)
|
||||
self.optionsButton.setEnabled(False)
|
||||
self.set_statusbar(_("Stopping."))
|
||||
|
||||
status = property(get_status, set_status)
|
||||
|
|
@ -137,12 +131,16 @@ for broken links.</p>
|
|||
Version 2 or later.</p>
|
||||
</qt>""") % d)
|
||||
|
||||
def start_stop (self):
|
||||
"""Start a new check or stop an active check."""
|
||||
def start (self):
|
||||
"""Start a new check."""
|
||||
if self.status == Status.idle:
|
||||
self.check()
|
||||
elif self.status == Status.checking:
|
||||
self.stop()
|
||||
|
||||
def stop (self):
|
||||
"""Stop an active check."""
|
||||
if self.status == Status.checking:
|
||||
director.abort(self.aggregate)
|
||||
self.status = Status.stopping
|
||||
|
||||
def check (self):
|
||||
"""Check given URL."""
|
||||
|
|
@ -176,10 +174,6 @@ Version 2 or later.</p>
|
|||
self.checker.check(self.aggregate)
|
||||
self.status = Status.checking
|
||||
|
||||
def stop (self):
|
||||
director.abort(self.aggregate)
|
||||
self.status = Status.stopping
|
||||
|
||||
def get_config (self):
|
||||
"""Return check configuration."""
|
||||
config = configuration.Configuration()
|
||||
|
|
|
|||
Loading…
Reference in a new issue