diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py index 3a0c6d5c48..bdce4f163d 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py @@ -5,7 +5,7 @@ import re import ssl from threading import Event, Thread -from qt.core import QCheckBox, QDialog, QDialogButtonBox, QGridLayout, QIcon, QLabel, QObject, Qt, QUrl, pyqtSignal +from qt.core import QApplication, QCheckBox, QDialog, QDialogButtonBox, QGridLayout, QIcon, QLabel, QObject, Qt, QUrl, pyqtSignal from calibre import as_unicode, prints from calibre.constants import __appname__, __version__, ismacos, isportable, iswindows, numeric_version @@ -206,7 +206,6 @@ class UpdateMixin: self.plugin_update_found(number_of_plugin_updates) version_url = as_hex_unicode(msgpack_dumps((calibre_version, number_of_plugin_updates))) calibre_version = '.'.join(map(str, calibre_version)) - if not has_calibre_update and not has_plugin_updates: self.status_bar.update_label.setVisible(False) return @@ -214,9 +213,10 @@ class UpdateMixin: plt = '' if has_plugin_updates: plt = ngettext(' and one plugin update', ' and {} plugin updates', number_of_plugin_updates).format(number_of_plugin_updates) - msg = ('%s: ' + green = 'darkgreen' if QApplication.instance().is_dark_theme else 'green' + msg = ('%s: ' '%s%s') % ( - _('Update found'), version_url, calibre_version, plt) + green, _('Update found'), version_url, calibre_version, plt) else: plt = ngettext('plugin update available', 'plugin updates available', number_of_plugin_updates) msg = ('%d %s')%(version_url, number_of_plugin_updates, plt)