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

Queue messages to the end of the eventloop.

Browse Source 
When not doing this, error messages sent before the signals get connected (i.e.
during init) get lost.
This commit is contained in:
Florian Bruhin 2014-06-25 11:02:34 +02:00
parent ab99669b4a
commit 46a3e2af92
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qutebrowser/utils/message.py
View File

@ -19,7 +19,7 @@
"""Message singleton so we don't have to define unneeded signals.""" """Message singleton so we don't have to define unneeded signals."""
from PyQt5.QtCore import QObject, pyqtSignal, QCoreApplication from PyQt5.QtCore import pyqtSignal, QCoreApplication, QObject, QTimer
from qutebrowser.utils.usertypes import PromptMode, Question from qutebrowser.utils.usertypes import PromptMode, Question
from qutebrowser.utils.log import misc as logger from qutebrowser.utils.log import misc as logger
@ -40,7 +40,8 @@ def error(message, queue=False):
""" """
message = str(message) message = str(message)
logger.error(message) logger.error(message)
instance().error.emit(message, queue) bridge = instance()
bridge.queue(bridge.error, message, queue)
def info(message, queue=False): def info(message, queue=False):
@ -53,14 +54,16 @@ def info(message, queue=False):
""" """
message = str(message) message = str(message)
logger.info(message) logger.info(message)
instance().info.emit(message, queue) bridge = instance()
bridge.queue(bridge.info, message, queue)
def text(message): def text(message):
"""Display a persistent message in the statusbar.""" """Display a persistent message in the statusbar."""
message = str(message) message = str(message)
logger.debug(message) logger.debug(message)
instance().text.emit(message) bridge = instance()
bridge.queue(bridge.text, message)
def modular_question(message, mode, default=None): def modular_question(message, mode, default=None):
@ -110,7 +113,8 @@ def question(message, mode, handler, cancelled_handler=None, default=None):
q.answered.connect(handler) q.answered.connect(handler)
if cancelled_handler is not None: if cancelled_handler is not None:
q.cancelled.connect(cancelled_handler) q.cancelled.connect(cancelled_handler)
instance().question.emit(q, False) bridge = instance()
bridge.queue(bridge.question, q, False)
def confirm_action(message, yes_action, no_action=None, default=None): def confirm_action(message, yes_action, no_action=None, default=None):
@ -129,17 +133,20 @@ def confirm_action(message, yes_action, no_action=None, default=None):
q.answered_yes.connect(yes_action) q.answered_yes.connect(yes_action)
if no_action is not None: if no_action is not None:
q.answered_no.connect(no_action) q.answered_no.connect(no_action)
instance().question.emit(q, False) bridge = instance()
bridge.queue(bridge.question, q, False)
def clear(): def clear():
"""Clear a persistent message in the statusbar.""" """Clear a persistent message in the statusbar."""
instance().text.emit('') bridge = instance()
bridge.queue(bridge.text, '')
def set_cmd_text(txt): def set_cmd_text(txt):
"""Set the statusbar command line to a preset text.""" """Set the statusbar command line to a preset text."""
instance().set_cmd_text.emit(txt) bridge = instance()
bridge.queue(bridge.set_cmd_text, txt)
class MessageBridge(QObject): class MessageBridge(QObject):
@ -154,3 +161,12 @@ class MessageBridge(QObject):
def __repr__(self): def __repr__(self):
return '<{}>'.format(self.__class__.__name__) return '<{}>'.format(self.__class__.__name__)
def queue(self, signal, *args):
"""Queue a message to be emitted.
Args:
signal: The signal to be emitted.
*args: Args to be passed to the signal.
"""
QTimer.singleShot(0, lambda: signal.emit(*args))