diff --git a/electrum/plugins/revealer/SIL Open Font License.txt b/electrum/plugins/revealer/SIL Open Font License.txt index 295975a5d..f621a8154 100644 --- a/electrum/plugins/revealer/SIL Open Font License.txt +++ b/electrum/plugins/revealer/SIL Open Font License.txt @@ -1,43 +1,95 @@ -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. +Copyright 2010-2024 Adobe (http://www.adobe.com/), with Reserved Font Name +'Source'. All Rights Reserved. Source is a trademark of Adobe in the United +States and/or other countries. This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + ----------------------------------------------------------- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ----------------------------------------------------------- PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. DEFINITIONS -"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. -"Reserved Font Name" refers to any names specified as such after the copyright statement(s). +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). -"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). -"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. - -5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. TERMINATION -This license becomes null and void if any of the above conditions are not met. +This license becomes null and void if any of the above conditions are +not met. DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/electrum/plugins/revealer/SourceSans3-Bold.otf b/electrum/plugins/revealer/SourceSans3-Bold.otf new file mode 100644 index 000000000..d2129396e Binary files /dev/null and b/electrum/plugins/revealer/SourceSans3-Bold.otf differ diff --git a/electrum/plugins/revealer/SourceSansPro-Bold.otf b/electrum/plugins/revealer/SourceSansPro-Bold.otf deleted file mode 100644 index 98dbee74d..000000000 Binary files a/electrum/plugins/revealer/SourceSansPro-Bold.otf and /dev/null differ diff --git a/electrum/plugins/revealer/qt.py b/electrum/plugins/revealer/qt.py index 0e85fc436..e7ca53bec 100644 --- a/electrum/plugins/revealer/qt.py +++ b/electrum/plugins/revealer/qt.py @@ -6,7 +6,7 @@ Secret backup plug-in for the electrum wallet. Copyright: 2017 Tiago Romagnani Silveira - 2023 Soren Stoutner + 2023-2024 Soren Stoutner Distributed under the MIT software license, see the accompanying file LICENCE or http://www.opensource.org/licenses/mit-license.php @@ -19,6 +19,7 @@ import traceback from decimal import Decimal from functools import partial import sys +from typing import TYPE_CHECKING import qrcode from PyQt5.QtPrintSupport import QPrinter @@ -39,6 +40,10 @@ from electrum.gui.qt.main_window import StatusBarButton from .revealer import RevealerPlugin +if TYPE_CHECKING: + from electrum.gui.qt import ElectrumGui + + class Plugin(RevealerPlugin): MAX_PLAINTEXT_LEN = 189 # chars @@ -63,6 +68,16 @@ class Plugin(RevealerPlugin): make_dir(self.base_dir) self.extension = False + self._init_qt_received = False + + @hook + def init_qt(self, gui: 'ElectrumGui'): + if self._init_qt_received: # only need/want the first signal + return + self._init_qt_received = True + # load custom fonts (note: here, and not in __init__, as it needs the QApplication to be created) + QFontDatabase.addApplicationFont(os.path.join(os.path.dirname(__file__), 'SourceSans3-Bold.otf')) + QFontDatabase.addApplicationFont(os.path.join(os.path.dirname(__file__), 'DejaVuSansMono-Bold.ttf')) @hook def create_status_bar(self, sb): @@ -402,7 +417,6 @@ class Plugin(RevealerPlugin): bitmap.fill(Qt.white) painter = QPainter() painter.begin(bitmap) - QFontDatabase.addApplicationFont(os.path.join(os.path.dirname(__file__), 'SourceSansPro-Bold.otf')) if len(txt) < 102 : fontsize = 15 linespace = 15 @@ -416,7 +430,7 @@ class Plugin(RevealerPlugin): max_lines = 9 max_words = int(max_letters/4) - font = QFont('Source Sans Pro', fontsize, QFont.Bold) + font = QFont('Source Sans 3', fontsize, QFont.Bold) font.setLetterSpacing(QFont.PercentageSpacing, 100) font.setPixelSize(fontsize) painter.setFont(font) @@ -548,13 +562,13 @@ class Plugin(RevealerPlugin): painter = QPainter() painter.begin(printer) painter.drawImage(553,533, image) - font = QFont('Source Sans Pro', 10, QFont.Bold) + font = QFont('Source Sans 3', 10, QFont.Bold) painter.setFont(font) painter.drawText(254,277, _("Calibration sheet")) - font = QFont('Source Sans Pro', 7, QFont.Bold) + font = QFont('Source Sans 3', 7, QFont.Bold) painter.setFont(font) painter.drawText(600,2077, _("Instructions:")) - font = QFont('Source Sans Pro', 7, QFont.Normal) + font = QFont("", 7, QFont.Normal) painter.setFont(font) painter.drawText(700, 2177, _("1. Place this paper on a flat and well illuminated surface.")) painter.drawText(700, 2277, _("2. Align your Revealer borderlines to the dashed lines on the top and left.")) @@ -644,7 +658,6 @@ class Plugin(RevealerPlugin): #print code f_size = 37 - QFontDatabase.addApplicationFont(os.path.join(os.path.dirname(__file__), 'DejaVuSansMono-Bold.ttf')) font = QFont("DejaVu Sans Mono", f_size-11, QFont.Bold) font.setPixelSize(35) painter.setFont(font)