AaronFiore/electrum
1
0
Fork 0
Code Activity

qt,qml: move fonts to /electrum/gui for use in all guis.

Browse Source
This commit is contained in:
Sander van Grieken
2025-03-02 15:15:39 +01:00
parent 0a093754d7
commit fc2d43acfd
6 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/build-wine/deterministic.spec
View File

@@ -36,6 +36,7 @@ datas = [
(f"{PROJECT_ROOT}/{PYPKG}/locale", f"{PYPKG}/locale"), (f"{PROJECT_ROOT}/{PYPKG}/locale", f"{PYPKG}/locale"),
(f"{PROJECT_ROOT}/{PYPKG}/plugins", f"{PYPKG}/plugins"), (f"{PROJECT_ROOT}/{PYPKG}/plugins", f"{PYPKG}/plugins"),
(f"{PROJECT_ROOT}/{PYPKG}/gui/icons", f"{PYPKG}/gui/icons"), (f"{PROJECT_ROOT}/{PYPKG}/gui/icons", f"{PYPKG}/gui/icons"),
(f"{PROJECT_ROOT}/{PYPKG}/gui/fonts", f"{PYPKG}/gui/fonts"),
] ]
datas += collect_data_files(f"{PYPKG}.plugins") datas += collect_data_files(f"{PYPKG}.plugins")
datas += collect_data_files('trezorlib') # TODO is this needed? and same question for other hww libs datas += collect_data_files('trezorlib') # TODO is this needed? and same question for other hww libs

1
contrib/osx/osx.spec
View File

@@ -39,6 +39,7 @@ datas = [
(f"{PROJECT_ROOT}/{PYPKG}/locale", f"{PYPKG}/locale"), (f"{PROJECT_ROOT}/{PYPKG}/locale", f"{PYPKG}/locale"),
(f"{PROJECT_ROOT}/{PYPKG}/plugins", f"{PYPKG}/plugins"), (f"{PROJECT_ROOT}/{PYPKG}/plugins", f"{PYPKG}/plugins"),
(f"{PROJECT_ROOT}/{PYPKG}/gui/icons", f"{PYPKG}/gui/icons"), (f"{PROJECT_ROOT}/{PYPKG}/gui/icons", f"{PYPKG}/gui/icons"),
(f"{PROJECT_ROOT}/{PYPKG}/gui/fonts", f"{PYPKG}/gui/fonts"),
] ]
datas += collect_data_files(f"{PYPKG}.plugins") datas += collect_data_files(f"{PYPKG}.plugins")
datas += collect_data_files('trezorlib') # TODO is this needed? and same question for other hww libs datas += collect_data_files('trezorlib') # TODO is this needed? and same question for other hww libs

0
electrum/gui/qml/fonts/PTMono-Bold.ttf → electrum/gui/fonts/PTMono-Bold.ttf
View File

0
electrum/gui/qml/fonts/PTMono-Regular.ttf → electrum/gui/fonts/PTMono-Regular.ttf
View File

0
electrum/gui/qml/fonts/PTMono.LICENSE → electrum/gui/fonts/PTMono.LICENSE
View File

4
electrum/gui/qml/qeapp.py
View File

@@ -426,8 +426,8 @@ class ElectrumQmlApplication(QGuiApplication):
# add a monospace font as we can't rely on device having one # add a monospace font as we can't rely on device having one
self.fixedFont = 'PT Mono' self.fixedFont = 'PT Mono'
not_loaded = QFontDatabase.addApplicationFont('electrum/gui/qml/fonts/PTMono-Regular.ttf') < 0 not_loaded = QFontDatabase.addApplicationFont('electrum/gui/fonts/PTMono-Regular.ttf') < 0
not_loaded = QFontDatabase.addApplicationFont('electrum/gui/qml/fonts/PTMono-Bold.ttf') < 0 and not_loaded not_loaded = QFontDatabase.addApplicationFont('electrum/gui/fonts/PTMono-Bold.ttf') < 0 and not_loaded
if not_loaded: if not_loaded:
self.logger.warning('Could not load font PT Mono') self.logger.warning('Could not load font PT Mono')
self.fixedFont = 'Monospace' # hope for the best self.fixedFont = 'Monospace' # hope for the best