rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'balanceofcowards-master'

Browse Source
This commit is contained in:
Florian Bruhin 2015-01-08 23:11:53 +01:00
commit 30e93ca4b8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.asciidoc
View File

@ -141,6 +141,7 @@ Contributors, sorted by the number of commits in descending order:
* Matthias Lisin * Matthias Lisin
* Helen Sherwood-Taylor * Helen Sherwood-Taylor
* HalosGhost * HalosGhost
* Andreas Fischer
// QUTE_AUTHORS_END // QUTE_AUTHORS_END
The following people have contributed graphics: The following people have contributed graphics:

5
qutebrowser/utils/usertypes.py
View File

@ -27,7 +27,7 @@ import operator
import collections.abc import collections.abc
import enum as pyenum import enum as pyenum
from PyQt5.QtCore import pyqtSignal, QObject, QTimer from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QTimer
from qutebrowser.utils import log, qtutils, utils from qutebrowser.utils import log, qtutils, utils
@ -307,6 +307,7 @@ class Question(QObject):
raise TypeError("Mode {} is no PromptMode member!".format(val)) raise TypeError("Mode {} is no PromptMode member!".format(val))
self._mode = val self._mode = val
@pyqtSlot()
def done(self): def done(self):
"""Must be called when the queston was answered completely.""" """Must be called when the queston was answered completely."""
self.answered.emit(self.answer) self.answered.emit(self.answer)
@ -317,11 +318,13 @@ class Question(QObject):
self.answered_no.emit() self.answered_no.emit()
self.completed.emit() self.completed.emit()
@pyqtSlot()
def cancel(self): def cancel(self):
"""Cancel the question (resulting from user-input).""" """Cancel the question (resulting from user-input)."""
self.cancelled.emit() self.cancelled.emit()
self.completed.emit() self.completed.emit()
@pyqtSlot()
def abort(self): def abort(self):
"""Abort the question.""" """Abort the question."""
self.is_aborted = True self.is_aborted = True