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

Continue displaying queued messages after immediate ones

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-19 04:04:59 +02:00
parent f0d1d4ed45
commit 274608b1d9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qutebrowser/widgets/statusbar/bar.py
View File

@ -197,8 +197,8 @@ class StatusBar(QWidget):
else now - self._last_text_time) else now - self._last_text_time)
self._last_text_time = now self._last_text_time = now
logging.debug("queue: {} / delta: {}".format(self._text_queue, delta)) logging.debug("queue: {} / delta: {}".format(self._text_queue, delta))
if (not queue) or (not self._text_queue and ( if not self._text_queue and (delta is None or delta.total_seconds() *
delta is None or delta.total_seconds() * 1000.0 > mindelta)): 1000.0 > mindelta):
# If the queue is empty and we didn't print messages for long # If the queue is empty and we didn't print messages for long
# enough, we can take the short route and display the message # enough, we can take the short route and display the message
# immediately. We then start the pop_timer only to restore the # immediately. We then start the pop_timer only to restore the
@ -206,17 +206,26 @@ class StatusBar(QWidget):
logging.debug("Displaying immediately") logging.debug("Displaying immediately")
self.error = error self.error = error
self.txt.temptext = text self.txt.temptext = text
self._text_pop_timer.start()
elif self._text_queue and self._text_queue[-1] == (error, text): elif self._text_queue and self._text_queue[-1] == (error, text):
# If we get the same message multiple times in a row and we're # If we get the same message multiple times in a row and we're
# still displaying it *anyways* we ignore the new one # still displaying it *anyways* we ignore the new one
logging.debug("ignoring") logging.debug("ignoring")
return elif not queue:
# This message is a reaction to a keypress and should be displayed
# immediately, temporarely interrupting the message queue.
# We display this immediately and restart the timer.to clear it and
# display the rest of the queue later.
logging.debug("Moving to beginning of queue")
self.error = error
self.txt.temptext = text
self._text_pop_timer.start()
else: else:
# There are still some messages to be displayed, so we queue this # There are still some messages to be displayed, so we queue this
# up. # up.
logging.debug("queueing") logging.debug("queueing")
self._text_queue.append((error, text)) self._text_queue.append((error, text))
self._text_pop_timer.start() self._text_pop_timer.start()
@pyqtSlot(str, bool) @pyqtSlot(str, bool)
def disp_error(self, text, queue=False): def disp_error(self, text, queue=False):