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

Load icons from resource file

Browse Source 
Reduces small library startup time on my system by 30%
This commit is contained in:
Kovid Goyal 2022-01-10 14:55:35 +05:30
parent bffaacd3c2
commit 0d0467b740
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/calibre/gui2/__init__.py
View File

@ -15,8 +15,8 @@ from qt.core import (
QDesktopServices, QDialog, QDialogButtonBox, QEvent, QFileDialog, QDesktopServices, QDialog, QDialogButtonBox, QEvent, QFileDialog,
QFileIconProvider, QFileInfo, QFont, QFontDatabase, QFontInfo, QFontMetrics, QFileIconProvider, QFileInfo, QFont, QFontDatabase, QFontInfo, QFontMetrics,
QGuiApplication, QIcon, QIODevice, QLocale, QNetworkProxyFactory, QObject, QGuiApplication, QIcon, QIODevice, QLocale, QNetworkProxyFactory, QObject,
QPalette, QSettings, QSocketNotifier, QStringListModel, QStyle, Qt, QThread, QPalette, QResource, QSettings, QSocketNotifier, QStringListModel, QStyle, Qt,
QTimer, QTranslator, QUrl, pyqtSignal QThread, QTimer, QTranslator, QUrl, pyqtSignal
) )
from threading import Lock, RLock from threading import Lock, RLock
@ -38,6 +38,7 @@ from calibre.utils.config import Config, ConfigProxy, JSONConfig, dynamic
from calibre.utils.date import UNDEFINED_DATE from calibre.utils.date import UNDEFINED_DATE
from calibre.utils.file_type_icons import EXT_MAP from calibre.utils.file_type_icons import EXT_MAP
from calibre.utils.localization import get_lang from calibre.utils.localization import get_lang
from calibre.utils.resources import user_dir
from polyglot import queue from polyglot import queue
from polyglot.builtins import iteritems, string_or_bytes from polyglot.builtins import iteritems, string_or_bytes
@ -48,22 +49,21 @@ except AttributeError:
NO_URL_FORMATTING = getattr(QUrl, 'None') NO_URL_FORMATTING = getattr(QUrl, 'None')
override_icon_path = None
def set_icon_paths(): def set_icon_paths():
paths = [] global override_icon_path
for main_dir in (os.path.join(config_dir, 'resources', 'images'), os.path.dirname(I(icons_subdirs[0], allow_user_override=False))): q = os.path.join(user_dir, 'images')
if os.path.exists(main_dir): override_icon_path = None
paths.append(main_dir) try:
for subdir in icons_subdirs: if os.listdir(q):
q = os.path.join(main_dir, subdir) override_icon_path = q
if os.path.exists(q): except Exception:
paths.append(q) pass
QIcon.setFallbackSearchPaths(paths) QResource.registerResource(P('icons.rcc', allow_user_override=False))
default_theme_path = P('icon-themes', allow_user_override=False) QIcon.setFallbackSearchPaths([])
paths = [default_theme_path] QIcon.setThemeSearchPaths([':/icons'])
user_theme_path = P('icon-themes')
if user_theme_path != default_theme_path:
paths.insert(0, user_theme_path)
QIcon.setThemeSearchPaths(paths)
def load_qicon(name): def load_qicon(name):
@ -72,6 +72,10 @@ def load_qicon(name):
if not name: if not name:
return QIcon() return QIcon()
if not os.path.isabs(name): if not os.path.isabs(name):
if override_icon_path:
q = os.path.join(override_icon_path, name)
if os.path.exists(q):
return QIcon(q)
parts = name.split('/') parts = name.split('/')
if len(parts) == 2 and parts[0] in icons_subdirs: if len(parts) == 2 and parts[0] in icons_subdirs:
name = parts[1] name = parts[1]