Making it so I can track states in the log

[gc-dialer] / src / util / qui_utils.py

diff --git a/src/util/qui_utils.py b/src/util/qui_utils.py
index 7a9ac52..251e571 100644 (file)
--- a/src/util/qui_utils.py
+++ b/src/util/qui_utils.py
@@ -48,6 +48,7 @@ class QErrorLog(QtCore.QObject):
                self._messages = []
 
        def push_busy(self, message):
+               _moduleLogger.info("Entering state: %s" % message)
                self._push_message(message, ErrorMessage.LEVEL_BUSY)
 
        def push_message(self, message):
@@ -65,6 +66,7 @@ class QErrorLog(QtCore.QObject):
                if message is None:
                        del self._messages[0]
                else:
+                       _moduleLogger.info("Exiting state: %s" % message)
                        messageIndex = [
                                i
                                for (i, error) in enumerate(self._messages)
@@ -88,6 +90,8 @@ class QErrorLog(QtCore.QObject):
 
 class ErrorDisplay(object):
 
+       _SENTINEL_ICON = QtGui.QIcon()
+
        def __init__(self, errorLog):
                self._errorLog = errorLog
                self._errorLog.messagePushed.connect(self._on_message_pushed)
@@ -114,9 +118,13 @@ class ErrorDisplay(object):
                self._message = QtGui.QLabel()
                self._message.setText("Boo")
                self._message.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
+               self._message.setWordWrap(True)
 
-               closeIcon = get_theme_icon(("window-close", "general_close", "gtk-close"))
-               self._closeLabel = QtGui.QPushButton(closeIcon, "")
+               closeIcon = get_theme_icon(("window-close", "general_close", "gtk-close"), self._SENTINEL_ICON)
+               if closeIcon is not self._SENTINEL_ICON:
+                       self._closeLabel = QtGui.QPushButton(closeIcon, "")
+               else:
+                       self._closeLabel = QtGui.QPushButton("X")
                self._closeLabel.clicked.connect(self._on_close)
 
                self._controlLayout = QtGui.QHBoxLayout()