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

Fix #1876254 [[Enhancement - Status bar] Don't use bold text for the Jobs button](https://bugs.launchpad.net/calibre/+bug/1876254)

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-01 13:33:01 +05:30
parent 2bd808fe86
commit dd96653ca0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calibre/gui2/jobs.py
View File

@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
Job management. Job management.
''' '''
import re, time import time
from PyQt5.Qt import (QAbstractTableModel, QModelIndex, Qt, QPainter, from PyQt5.Qt import (QAbstractTableModel, QModelIndex, Qt, QPainter,
QTimer, pyqtSignal, QIcon, QDialog, QAbstractItemDelegate, QApplication, QTimer, pyqtSignal, QIcon, QDialog, QAbstractItemDelegate, QApplication,
@ -31,7 +31,7 @@ from calibre.gui2.threaded_jobs import ThreadedJobServer, ThreadedJob
from calibre.gui2.widgets2 import Dialog from calibre.gui2.widgets2 import Dialog
from calibre.utils.search_query_parser import SearchQueryParser, ParseException from calibre.utils.search_query_parser import SearchQueryParser, ParseException
from calibre.utils.icu import lower from calibre.utils.icu import lower
from polyglot.builtins import unicode_type, range from polyglot.builtins import range
from polyglot.queue import Empty, Queue from polyglot.queue import Empty, Queue
@ -500,10 +500,12 @@ class JobsButton(QWidget): # {{{
def __init__(self, parent=None): def __init__(self, parent=None):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)
self.num_jobs = 0
self.mouse_over = False self.mouse_over = False
self.pi = ProgressIndicator(self, self.style().pixelMetric(QStyle.PM_ToolBarIconSize)) self.pi = ProgressIndicator(self, self.style().pixelMetric(QStyle.PM_ToolBarIconSize))
self._jobs = QLabel('<b>'+_('Jobs:')+' 0 ') self._jobs = QLabel('')
self._jobs.mouseReleaseEvent = self.mouseReleaseEvent self._jobs.mouseReleaseEvent = self.mouseReleaseEvent
self.update_label()
self.shortcut = 'Alt+Shift+J' self.shortcut = 'Alt+Shift+J'
self.l = l = QHBoxLayout(self) self.l = l = QHBoxLayout(self)
@ -522,6 +524,11 @@ class JobsButton(QWidget): # {{{
if hasattr(parent, 'keyboard'): if hasattr(parent, 'keyboard'):
parent.keyboard.register_shortcut('toggle jobs list', _('Show/hide the Jobs List'), default_keys=(self.shortcut,), action=self.action_toggle) parent.keyboard.register_shortcut('toggle jobs list', _('Show/hide the Jobs List'), default_keys=(self.shortcut,), action=self.action_toggle)
def update_label(self):
n = self.jobs()
prefix = '<b>' if n > 0 else ''
self._jobs.setText(prefix + _('Jobs:') + ' {} '.format(n))
def event(self, ev): def event(self, ev):
m = None m = None
et = ev.type() et = ev.type()
@ -560,8 +567,7 @@ class JobsButton(QWidget): # {{{
self.pi.stopAnimation() self.pi.stopAnimation()
def jobs(self): def jobs(self):
src = unicode_type(self._jobs.text()) return self.num_jobs
return int(re.search(r'\d+', src).group())
def tray_tooltip(self, num=0): def tray_tooltip(self, num=0):
if num == 0: if num == 0:
@ -575,20 +581,14 @@ class JobsButton(QWidget): # {{{
return text return text
def job_added(self, nnum): def job_added(self, nnum):
jobs = self._jobs self.num_jobs = nnum
src = unicode_type(jobs.text()) self.update_label()
num = self.jobs()
text = src.replace(unicode_type(num), unicode_type(nnum))
jobs.setText(text)
self.start() self.start()
self.tray_tooltip_updated.emit(self.tray_tooltip(nnum)) self.tray_tooltip_updated.emit(self.tray_tooltip(nnum))
def job_done(self, nnum): def job_done(self, nnum):
jobs = self._jobs self.num_jobs = nnum
src = unicode_type(jobs.text()) self.update_label()
num = self.jobs()
text = src.replace(unicode_type(num), unicode_type(nnum))
jobs.setText(text)
if nnum == 0: if nnum == 0:
self.no_more_jobs() self.no_more_jobs()
self.tray_tooltip_updated.emit(self.tray_tooltip(nnum)) self.tray_tooltip_updated.emit(self.tray_tooltip(nnum))