Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use proper technique for displaying default message in status bars

Browse Source
This commit is contained in:
Kovid Goyal 2010-09-07 11:04:52 -06:00
parent 58ed4caf91
commit 6823d962f6
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/init.py
View File

@ -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): # {{{

15
src/calibre/gui2/preferences/main.py
View File

@ -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)