Add address label to request payment QR Code (QT)

makevoid · makevoid · commit 1c2a1bac0ad6 · 2016-06-13T16:09:14.000+01:00
In the Receive 'Tab' of the QT wallet, when 'Show'ing a previously requested payment, add a label underneath the QR Code showing the bitcoin address where the funds will go to. This way the user can be sure that the QR code scanner app the user using is reading the correct bitcoin address, preventing funds to be stolen. Includes fix for HiDPI screens by @jonasschnelli.
diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui
@@ -22,7 +22,7 @@
      <property name="minimumSize">
       <size>
        <width>300</width>
-       <height>300</height>
+       <height>320</height>
       </size>
      </property>
      <property name="toolTip">
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
@@ -43,7 +43,7 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80;
 static const int MAX_URI_LENGTH = 255;
 
 /* QRCodeDialog -- size of exported QR Code image */
-#define EXPORT_IMAGE_SIZE 256
+#define QR_IMAGE_SIZE 300
 
 /* Number of frames in spinner animation */
 #define SPINNER_FRAMES 36
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
@@ -45,7 +45,7 @@ QImage QRImageWidget::exportImage()
 {
     if(!pixmap())
         return QImage();
-    return pixmap()->toImage().scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE);
+    return pixmap()->toImage();
 }
 
 void QRImageWidget::mousePressEvent(QMouseEvent *event)
@@ -166,20 +166,32 @@ void ReceiveRequestDialog::update()
                 ui->lblQRCode->setText(tr("Error encoding URI into QR Code."));
                 return;
             }
-            QImage myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);
-            myImage.fill(0xffffff);
+            QImage qrImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);
+            qrImage.fill(0xffffff);
             unsigned char *p = code->data;
             for (int y = 0; y < code->width; y++)
             {
                 for (int x = 0; x < code->width; x++)
                 {
-                    myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));
+                    qrImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));
                     p++;
                 }
             }
             QRcode_free(code);
 
-            ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300));
+            QImage qrAddrImage = QImage(QR_IMAGE_SIZE, QR_IMAGE_SIZE+20, QImage::Format_RGB32);
+            qrAddrImage.fill(0xffffff);
+            QPainter painter(&qrAddrImage);
+            painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));
+            QFont font = GUIUtil::fixedPitchFont();
+            font.setPixelSize(12);
+            painter.setFont(font);
+            QRect paddedRect = qrAddrImage.rect();
+            paddedRect.setHeight(QR_IMAGE_SIZE+12);
+            painter.drawText(paddedRect, Qt::AlignBottom|Qt::AlignCenter, info.address);
+            painter.end();
+
+            ui->lblQRCode->setPixmap(QPixmap::fromImage(qrAddrImage));
             ui->btnSaveAs->setEnabled(true);
         }
     }
diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h
@@ -10,6 +10,7 @@
 #include <QDialog>
 #include <QImage>
 #include <QLabel>
+#include <QPainter>
 
 class OptionsModel;
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ QImage QRImageWidget::exportImage()`
`45`	`45`	`{`
`46`	`46`	`if(!pixmap())`
`47`	`47`	`return QImage();`
`48`		`- return pixmap()->toImage().scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE);`
	`48`	`+ return pixmap()->toImage();`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`void QRImageWidget::mousePressEvent(QMouseEvent *event)`
`@@ -166,20 +166,32 @@ void ReceiveRequestDialog::update()`
`166`	`166`	`ui->lblQRCode->setText(tr("Error encoding URI into QR Code."));`
`167`	`167`	`return;`
`168`	`168`	`}`
`169`		`- QImage myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);`
`170`		`- myImage.fill(0xffffff);`
	`169`	`+ QImage qrImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);`
	`170`	`+ qrImage.fill(0xffffff);`
`171`	`171`	`unsigned char *p = code->data;`
`172`	`172`	`for (int y = 0; y < code->width; y++)`
`173`	`173`	`{`
`174`	`174`	`for (int x = 0; x < code->width; x++)`
`175`	`175`	`{`
`176`		`- myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));`
	`176`	`+ qrImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff));`
`177`	`177`	`p++;`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`QRcode_free(code);`
`181`	`181`
`182`		`- ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300));`
	`182`	`+ QImage qrAddrImage = QImage(QR_IMAGE_SIZE, QR_IMAGE_SIZE+20, QImage::Format_RGB32);`
	`183`	`+ qrAddrImage.fill(0xffffff);`
	`184`	`+ QPainter painter(&qrAddrImage);`
	`185`	`+ painter.drawImage(0, 0, qrImage.scaled(QR_IMAGE_SIZE, QR_IMAGE_SIZE));`
	`186`	`+ QFont font = GUIUtil::fixedPitchFont();`
	`187`	`+ font.setPixelSize(12);`
	`188`	`+ painter.setFont(font);`
	`189`	`+ QRect paddedRect = qrAddrImage.rect();`
	`190`	`+ paddedRect.setHeight(QR_IMAGE_SIZE+12);`
	`191`	`+ painter.drawText(paddedRect, Qt::AlignBottom\|Qt::AlignCenter, info.address);`
	`192`	`+ painter.end();`
	`193`	`+`
	`194`	`+ ui->lblQRCode->setPixmap(QPixmap::fromImage(qrAddrImage));`
`183`	`195`	`ui->btnSaveAs->setEnabled(true);`
`184`	`196`	`}`
`185`	`197`	`}`