tMerge pull request #4611 from tiagotrs/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e7ef4aa4f6fa34fc8a96dcc9def198b76a6b9b22
DIR parent deee29228ea31e47bc6b24167b5139e42e72a11b
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 13 Aug 2018 11:21:08 +0200
Merge pull request #4611 from tiagotrs/master
fix Revealer hidpi related bug #4576, and make PNGs the same size
Diffstat:
M electrum/plugins/revealer/qt.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum/plugins/revealer/qt.py b/electrum/plugins/revealer/qt.py
t@@ -263,20 +263,21 @@ class Plugin(BasePlugin):
painter.begin(bitmap)
QFontDatabase.addApplicationFont(os.path.join(os.path.dirname(__file__), 'SourceSansPro-Bold.otf') )
if len(txt) < 102 :
- fontsize = 12
+ fontsize = 15
linespace = 15
max_letters = 17
max_lines = 6
max_words = 3
else:
- fontsize = 9
+ fontsize = 12
linespace = 10
- max_letters = 24
+ max_letters = 23
max_lines = 9
max_words = int(max_letters/4)
font = QFont('Source Sans Pro', fontsize, QFont.Bold)
font.setLetterSpacing(QFont.PercentageSpacing, 100)
+ font.setPixelSize(fontsize)
painter.setFont(font)
seed_array = txt.split(' ')
t@@ -339,8 +340,9 @@ class Plugin(BasePlugin):
revealer = self.pixelcode_2x2(self.rawnoise)
revealer.invertPixels()
revealer = QBitmap.fromImage(revealer)
+ revealer = revealer.scaled(self.f_size, Qt.KeepAspectRatio)
revealer = self.overlay_marks(revealer)
- revealer = revealer.scaled(1014, 642)
+
self.filename = 'Revealer - '
revealer.save(self.base_dir + self.filename + self.version+'_'+self.code_id + '.png')
self.toPdf(QImage(revealer))
t@@ -519,6 +521,7 @@ class Plugin(BasePlugin):
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)
if not calibration_sheet: