mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'patch-1' of https://github.com/morealaz/calibre
This commit is contained in:
commit
d2efdc648a
@ -271,7 +271,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
|
|||||||
if self.system_tray_icon is not None:
|
if self.system_tray_icon is not None:
|
||||||
self.system_tray_icon.setIcon(QIcon(I('lt.png', allow_user_override=False)))
|
self.system_tray_icon.setIcon(QIcon(I('lt.png', allow_user_override=False)))
|
||||||
if not (iswindows or isosx):
|
if not (iswindows or isosx):
|
||||||
self.system_tray_icon.setIcon(QIcon.fromTheme('calibre-gui', self.system_tray_icon.icon()))
|
self.system_tray_icon.setIcon(QIcon.fromTheme('calibre-tray', self.system_tray_icon.icon()))
|
||||||
self.system_tray_icon.setToolTip(self.jobs_button.tray_tooltip())
|
self.system_tray_icon.setToolTip(self.jobs_button.tray_tooltip())
|
||||||
self.system_tray_icon.setVisible(True)
|
self.system_tray_icon.setVisible(True)
|
||||||
self.jobs_button.tray_tooltip_updated.connect(self.system_tray_icon.setToolTip)
|
self.jobs_button.tray_tooltip_updated.connect(self.system_tray_icon.setToolTip)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user