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

On Linux, use the system tray icon from the system theme, if available

Browse Source 
Merge branch 'master' of https://github.com/Arkq/calibre
This commit is contained in:
Kovid Goyal 2015-11-06 12:50:56 +05:30
commit 9e231f9e32
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/ui.py
View File

@ -21,7 +21,8 @@ from PyQt5.Qt import (
QApplication, QSystemTrayIcon) QApplication, QSystemTrayIcon)
from calibre import prints, force_unicode, detect_ncpus from calibre import prints, force_unicode, detect_ncpus
from calibre.constants import __appname__, isosx, filesystem_encoding, DEBUG from calibre.constants import (
__appname__, isosx, iswindows, filesystem_encoding, DEBUG)
from calibre.utils.config import prefs, dynamic from calibre.utils.config import prefs, dynamic
from calibre.utils.ipc.pool import Pool from calibre.utils.ipc.pool import Pool
from calibre.db.legacy import LibraryDatabase from calibre.db.legacy import LibraryDatabase
@ -260,6 +261,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
self.system_tray_icon = factory(app_id='com.calibre-ebook.gui').create_system_tray_icon(parent=self, title='calibre') self.system_tray_icon = factory(app_id='com.calibre-ebook.gui').create_system_tray_icon(parent=self, title='calibre')
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'))) self.system_tray_icon.setIcon(QIcon(I('lt.png')))
if not (iswindows or isosx):
self.system_tray_icon.setIcon(QIcon.fromTheme('calibre-gui', QIcon(I('lt.png'))))
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)