From 902bc6f87a321dc0f5726f092c6b15ed8b9c0ebc Mon Sep 17 00:00:00 2001 From: bkkcoins Date: Fri, 4 Jan 2013 13:57:10 +0700 Subject: [PATCH 1/3] make qr codes scalable and centered --- lib/gui_qt.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/gui_qt.py b/lib/gui_qt.py index 077e8736..e11fc1d2 100644 --- a/lib/gui_qt.py +++ b/lib/gui_qt.py @@ -166,7 +166,6 @@ class QRCodeWidget(QWidget): black = QColor(0, 0, 0, 255) white = QColor(255, 255, 255, 255) - boxsize = 6 if not self.qr: qp = QtGui.QPainter() @@ -176,11 +175,16 @@ class QRCodeWidget(QWidget): qp.drawRect(0, 0, 198, 198) qp.end() return - - size = self.qr.getModuleCount()*boxsize + k = self.qr.getModuleCount() qp = QtGui.QPainter() qp.begin(self) + r = qp.viewport() + boxsize = min(r.width(), r.height())*0.8/k + size = k*boxsize + left = (r.width() - size)/2 + top = (r.height() - size)/2 + for r in range(k): for c in range(k): if self.qr.isDark(r, c): @@ -189,7 +193,7 @@ class QRCodeWidget(QWidget): else: qp.setBrush(white) qp.setPen(white) - qp.drawRect(c*boxsize, r*boxsize, boxsize, boxsize) + qp.drawRect(left+c*boxsize, top+r*boxsize, boxsize, boxsize) qp.end() @@ -1200,8 +1204,8 @@ class ElectrumWindow(QMainWindow): d.setMinimumSize(270, 300) vbox = QVBoxLayout() qrw = QRCodeWidget(data) - vbox.addWidget(qrw) - vbox.addWidget(QLabel(data)) + vbox.addWidget(qrw, 1) + vbox.addWidget(QLabel(data), 0, Qt.AlignHCenter) hbox = QHBoxLayout() hbox.addStretch(1) From 04dc6a0ea7a39711a71406ce76b0f2307d6b6920 Mon Sep 17 00:00:00 2001 From: bkkcoins Date: Fri, 4 Jan 2013 14:06:35 +0700 Subject: [PATCH 2/3] adjust invoice screen for scaling --- lib/gui_qt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gui_qt.py b/lib/gui_qt.py index e11fc1d2..34b90917 100644 --- a/lib/gui_qt.py +++ b/lib/gui_qt.py @@ -212,12 +212,12 @@ class QR_Window(QWidget): main_box = QHBoxLayout() self.qrw = QRCodeWidget() - main_box.addWidget(self.qrw) + main_box.addWidget(self.qrw, 1) vbox = QVBoxLayout() main_box.addLayout(vbox) - main_box.addStretch(1) + #main_box.addStretch(1) self.address_label = QLabel("") self.address_label.setFont(QFont(MONOSPACE_FONT)) From 3b0ed36c74499ef0ee6723800e1f53f71675a7e4 Mon Sep 17 00:00:00 2001 From: bkkcoins Date: Fri, 4 Jan 2013 14:11:37 +0700 Subject: [PATCH 3/3] remove commented code --- lib/gui_qt.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/gui_qt.py b/lib/gui_qt.py index 34b90917..5954412e 100644 --- a/lib/gui_qt.py +++ b/lib/gui_qt.py @@ -217,8 +217,6 @@ class QR_Window(QWidget): vbox = QVBoxLayout() main_box.addLayout(vbox) - #main_box.addStretch(1) - self.address_label = QLabel("") self.address_label.setFont(QFont(MONOSPACE_FONT)) vbox.addWidget(self.address_label)