diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py index 74f511e6a2..042e0c578d 100644 --- a/src/calibre/gui2/init.py +++ b/src/calibre/gui2/init.py @@ -145,20 +145,23 @@ class StatusBar(QStatusBar): # {{{ self._font = QFont() self._font.setBold(True) self.setFont(self._font) + self.defmsg = QLabel(self.default_message) + self.defmsg.setFont(self._font) + self.addWidget(self.defmsg) def initialize(self, systray=None): self.systray = systray self.notifier = get_notifier(systray) - self.messageChanged.connect(self.message_changed, - type=Qt.QueuedConnection) - self.message_changed('') def device_connected(self, devname): self.device_string = _('Connected ') + devname + self.defmsg.setText(self.default_message + ' ..::.. ' + + self.device_string) self.clearMessage() def device_disconnected(self): self.device_string = '' + self.defmsg.setText(self.default_message) self.clearMessage() def new_version_available(self, ver, url): @@ -188,15 +191,6 @@ class StatusBar(QStatusBar): # {{{ def clear_message(self): self.clearMessage() - def message_changed(self, msg): - if not msg or msg.isEmpty() or msg.isNull() or \ - not unicode(msg).strip(): - extra = '' - if self.device_string: - extra = ' ..::.. ' + self.device_string - self.showMessage(self.default_message + extra) - - # }}} class LayoutMixin(object): # {{{ diff --git a/src/calibre/gui2/preferences/main.py b/src/calibre/gui2/preferences/main.py index f6a20d74d9..a15a6dcb22 100644 --- a/src/calibre/gui2/preferences/main.py +++ b/src/calibre/gui2/preferences/main.py @@ -33,18 +33,13 @@ class StatusBar(QStatusBar): # {{{ self._font.setBold(True) self.setFont(self._font) - self.messageChanged.connect(self.message_changed, - type=Qt.QueuedConnection) - self.message_changed('') - - def message_changed(self, msg): - if not msg or msg.isEmpty() or msg.isNull() or \ - not unicode(msg).strip(): - self.showMessage(self.default_message) + self.w = QLabel(self.default_message) + self.w.setFont(self._font) + self.addWidget(self.w) # }}} -class BarTitle(QWidget): +class BarTitle(QWidget): # {{{ def __init__(self, parent=None): QWidget.__init__(self, parent) @@ -70,6 +65,8 @@ class BarTitle(QWidget): self.setToolTip(tt) self.setWhatsThis(tt) +# }}} + class Category(QWidget): # {{{ plugin_activated = pyqtSignal(object)