From 394332575192ea38459e00ee5537fb7a8f81b88b Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Wed, 17 Oct 2018 15:49:08 -0700
Subject: [PATCH] Simplify Receive tab

---
 src/mainwindow.ui   | 159 ++++++++++++++++++++++----------------------
 src/ui_mainwindow.h |  24 ++-----
 2 files changed, 85 insertions(+), 98 deletions(-)

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index fa6212c..4c920c4 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>0</number>
+       <number>2</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -200,9 +200,15 @@
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <item>
          <widget class="QGroupBox" name="groupBox_4">
+          <property name="autoFillBackground">
+           <bool>false</bool>
+          </property>
           <property name="title">
            <string>Pay From</string>
           </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
           <layout class="QVBoxLayout" name="verticalLayout_6">
            <item>
             <layout class="QHBoxLayout" name="horizontalLayout_8">
@@ -546,104 +552,95 @@
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_5">
         <item>
-         <widget class="QGroupBox" name="groupBox_5">
-          <property name="title">
-           <string>Receive Address</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_7">
-           <item>
-            <layout class="QVBoxLayout" name="verticalLayout_8">
+         <layout class="QVBoxLayout" name="verticalLayout_8">
+          <item>
+           <widget class="QGroupBox" name="groupBox_6">
+            <property name="title">
+             <string>Address Type</string>
+            </property>
+            <property name="flat">
+             <bool>false</bool>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_9">
              <item>
-              <widget class="QGroupBox" name="groupBox_6">
-               <property name="title">
-                <string>Address Type</string>
-               </property>
-               <property name="flat">
-                <bool>false</bool>
-               </property>
-               <property name="checkable">
-                <bool>false</bool>
-               </property>
-               <layout class="QVBoxLayout" name="verticalLayout_9">
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_9">
-                  <item>
-                   <widget class="QRadioButton" name="rdioZAddr">
-                    <property name="text">
-                     <string>z-Addr</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QRadioButton" name="rdioTAddr">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>t-Addr</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_10">
-                  <item>
-                   <widget class="QComboBox" name="listRecieveAddresses">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QPushButton" name="btnRecieveNewAddr">
-                    <property name="text">
-                     <string>New Address</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_11">
+              <layout class="QHBoxLayout" name="horizontalLayout_9">
                <item>
-                <widget class="QPlainTextEdit" name="txtRecieve">
-                 <property name="readOnly">
-                  <bool>true</bool>
+                <widget class="QRadioButton" name="rdioZAddr">
+                 <property name="text">
+                  <string>z-Addr</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QLabel" name="qrcodeDisplay">
+                <widget class="QRadioButton" name="rdioTAddr">
                  <property name="sizePolicy">
-                  <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
-                 <property name="styleSheet">
-                  <string notr="true">background-color: #fff</string>
-                 </property>
                  <property name="text">
-                  <string/>
+                  <string>t-Addr</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_10">
+               <item>
+                <widget class="QComboBox" name="listRecieveAddresses">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="btnRecieveNewAddr">
+                 <property name="text">
+                  <string>New Address</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
             </layout>
-           </item>
-          </layout>
-         </widget>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_11">
+            <item>
+             <widget class="QPlainTextEdit" name="txtRecieve">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="qrcodeDisplay">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color: #fff</string>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
         </item>
        </layout>
       </widget>
diff --git a/src/ui_mainwindow.h b/src/ui_mainwindow.h
index 95d482d..e126a9b 100644
--- a/src/ui_mainwindow.h
+++ b/src/ui_mainwindow.h
@@ -113,8 +113,6 @@ public:
     QPushButton *cancelSendButton;
     QWidget *tab_3;
     QVBoxLayout *verticalLayout_5;
-    QGroupBox *groupBox_5;
-    QVBoxLayout *verticalLayout_7;
     QVBoxLayout *verticalLayout_8;
     QGroupBox *groupBox_6;
     QVBoxLayout *verticalLayout_9;
@@ -295,6 +293,8 @@ public:
         verticalLayout_4->setObjectName(QStringLiteral("verticalLayout_4"));
         groupBox_4 = new QGroupBox(tab_2);
         groupBox_4->setObjectName(QStringLiteral("groupBox_4"));
+        groupBox_4->setAutoFillBackground(false);
+        groupBox_4->setFlat(false);
         verticalLayout_6 = new QVBoxLayout(groupBox_4);
         verticalLayout_6->setSpacing(6);
         verticalLayout_6->setContentsMargins(11, 11, 11, 11);
@@ -508,16 +508,10 @@ public:
         verticalLayout_5->setSpacing(6);
         verticalLayout_5->setContentsMargins(11, 11, 11, 11);
         verticalLayout_5->setObjectName(QStringLiteral("verticalLayout_5"));
-        groupBox_5 = new QGroupBox(tab_3);
-        groupBox_5->setObjectName(QStringLiteral("groupBox_5"));
-        verticalLayout_7 = new QVBoxLayout(groupBox_5);
-        verticalLayout_7->setSpacing(6);
-        verticalLayout_7->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_7->setObjectName(QStringLiteral("verticalLayout_7"));
         verticalLayout_8 = new QVBoxLayout();
         verticalLayout_8->setSpacing(6);
         verticalLayout_8->setObjectName(QStringLiteral("verticalLayout_8"));
-        groupBox_6 = new QGroupBox(groupBox_5);
+        groupBox_6 = new QGroupBox(tab_3);
         groupBox_6->setObjectName(QStringLiteral("groupBox_6"));
         groupBox_6->setFlat(false);
         groupBox_6->setCheckable(false);
@@ -570,13 +564,13 @@ public:
         horizontalLayout_11 = new QHBoxLayout();
         horizontalLayout_11->setSpacing(6);
         horizontalLayout_11->setObjectName(QStringLiteral("horizontalLayout_11"));
-        txtRecieve = new QPlainTextEdit(groupBox_5);
+        txtRecieve = new QPlainTextEdit(tab_3);
         txtRecieve->setObjectName(QStringLiteral("txtRecieve"));
         txtRecieve->setReadOnly(true);
 
         horizontalLayout_11->addWidget(txtRecieve);
 
-        qrcodeDisplay = new QLabel(groupBox_5);
+        qrcodeDisplay = new QLabel(tab_3);
         qrcodeDisplay->setObjectName(QStringLiteral("qrcodeDisplay"));
         QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Expanding);
         sizePolicy2.setHorizontalStretch(0);
@@ -591,10 +585,7 @@ public:
         verticalLayout_8->addLayout(horizontalLayout_11);
 
 
-        verticalLayout_7->addLayout(verticalLayout_8);
-
-
-        verticalLayout_5->addWidget(groupBox_5);
+        verticalLayout_5->addLayout(verticalLayout_8);
 
         tabWidget->addTab(tab_3, QString());
         tab_4 = new QWidget();
@@ -656,7 +647,7 @@ public:
 
         retranslateUi(MainWindow);
 
-        tabWidget->setCurrentIndex(0);
+        tabWidget->setCurrentIndex(2);
 
 
         QMetaObject::connectSlotsByName(MainWindow);
@@ -701,7 +692,6 @@ public:
         sendTransactionButton->setText(QApplication::translate("MainWindow", "Send", nullptr));
         cancelSendButton->setText(QApplication::translate("MainWindow", "Cancel", nullptr));
         tabWidget->setTabText(tabWidget->indexOf(tab_2), QApplication::translate("MainWindow", "Send", nullptr));
-        groupBox_5->setTitle(QApplication::translate("MainWindow", "Receive Address", nullptr));
         groupBox_6->setTitle(QApplication::translate("MainWindow", "Address Type", nullptr));
         rdioZAddr->setText(QApplication::translate("MainWindow", "z-Addr", nullptr));
         rdioTAddr->setText(QApplication::translate("MainWindow", "t-Addr", nullptr));