From e59c0737ea3a24fa2c1e96b9f468154928037195 Mon Sep 17 00:00:00 2001
From: fekt <fekt.null@protonmail.com>
Date: Sat, 8 Oct 2022 13:48:49 -0400
Subject: [PATCH] QR code changes

---
 src/mainwindow.cpp  |  1 +
 src/mainwindow.ui   | 93 +++++++++++++++------------------------------
 src/qrcodelabel.cpp |  8 +++-
 3 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7c8c346..77351dd 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1892,6 +1892,7 @@ void MainWindow::setupReceiveTab() {
         ui->rcvBal->setText(Settings::getHUSHUSDDisplayFormat(rpc->getAllBalances()->value(addr)));
         ui->txtReceive->setPlainText(addr);
         ui->qrcodeDisplay->setQrcodeString(addr);
+
         if (rpc->getUsedAddresses()->value(addr, false)) {
             ui->rcvBal->setToolTip(tr("Address has been previously used"));
         } else {
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 2dc89d2..8385ec7 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -22,7 +22,7 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>5</number>
+       <number>2</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -385,8 +385,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>1403</width>
-                <height>619</height>
+                <width>1447</width>
+                <height>860</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="sendToLayout">
@@ -940,16 +940,38 @@
               </item>
              </layout>
             </item>
-            <item>
+            <item alignment="Qt::AlignTop">
              <widget class="QRCodeLabel" name="qrcodeDisplay">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="minimumSize">
+               <size>
+                <width>228</width>
+                <height>228</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="baseSize">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="autoFillBackground">
+               <bool>false</bool>
+              </property>
               <property name="styleSheet">
-               <string notr="true">background-color: #fff</string>
+               <string notr="true">background-color: #fff;
+image: url(:/img/res/logobig.gif);</string>
               </property>
               <property name="text">
                <string/>
@@ -1022,16 +1044,6 @@
           </property>
          </widget>
         </item>
-<!--
-         <widget class="QLabel" name="recentlyDisconnectedPeers">
-          <property name="text">
-           <string>
-            Looking For Recently Disconnected Peers ...
-            </string>
-          </property>
-         </widget>
-        </item>
--->
        </layout>
       </widget>
       <widget class="QWidget" name="tab_6">
@@ -1116,42 +1128,6 @@
         </item>
        </layout>
       </widget>
-<!--
-      <widget class="QWidget" name="chat_tab">
-       <attribute name="title">
-        <string>Chat</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_7">
-        <item>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="0">
-           <widget class="QListView" name="contactsView"/>
-          </item>
-          <item row="1" column="1">
-           <widget class="QTextEdit" name="textEdit"/>
-          </item>
-          <item row="0" column="1">
-           <widget class="QListView" name="chatView"/>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="pushButton">
-            <property name="text">
-             <string>Send</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="pushButton_2">
-            <property name="text">
-             <string>New HushChat</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
--->
       <widget class="QWidget" name="tab_5">
        <attribute name="title">
         <string>hushd</string>
@@ -1184,7 +1160,7 @@
              <item row="5" column="0" colspan="3">
               <widget class="QLabel" name="mining">
                <property name="text">
-                <string></string>
+                <string/>
                </property>
               </widget>
              </item>
@@ -1292,15 +1268,6 @@
                </property>
               </widget>
              </item>
-<!--
-             <item row="10" column="0">
-              <widget class="QLabel" name="kmdversionlabel">
-               <property name="text">
-                <string>KMD Version</string>
-               </property>
-              </widget>
-             </item>
--->
              <item row="11" column="0">
               <widget class="QLabel" name="protocolversionlabel">
                <property name="text">
@@ -1618,7 +1585,7 @@
      <x>0</x>
      <y>0</y>
      <width>1487</width>
-     <height>42</height>
+     <height>30</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/src/qrcodelabel.cpp b/src/qrcodelabel.cpp
index 2283785..bc5fa72 100644
--- a/src/qrcodelabel.cpp
+++ b/src/qrcodelabel.cpp
@@ -26,7 +26,7 @@ QPixmap QRCodeLabel::scaledPixmap() const {
     pm.fill(Qt::white);
     QPainter painter(&pm);
     
-    qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(str.toUtf8().constData(), qrcodegen::QrCode::Ecc::LOW);
+    qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(str.toUtf8().constData(), qrcodegen::QrCode::Ecc::HIGH);
     const int    s      = qr.getSize()>0?qr.getSize():1;
     const double w      = pm.width();
     const double h      = pm.height();
@@ -49,7 +49,11 @@ QPixmap QRCodeLabel::scaledPixmap() const {
             }
         }
     }
-    
+
+    // TODO: Maybe add logo if it doesn't break QR code - requires setting Ecc to HIGH
+    painter.drawPixmap(65, 65, 100, 100, QPixmap(":/img/res/logobig.gif"));
+    painter.end();
+
     return pm;
 }