[GUI] request dialog address not updated fix + layout reorg.

PIVX-Project · Aug 28, 2019 · 676b48d · 676b48d
1 parent c1446ba
commit 676b48d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/qt/pivx/forms/requestdialog.ui b/src/qt/pivx/forms/requestdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>602</width>
-    <height>646</height>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -151,7 +151,7 @@
          </size>
         </property>
         <property name="currentIndex">
-         <number>1</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="page_1">
          <property name="minimumSize">
@@ -188,7 +188,7 @@
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
+             <enum>QSizePolicy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -203,7 +203,7 @@
             <property name="minimumSize">
              <size>
               <width>0</width>
-              <height>100</height>
+              <height>80</height>
              </size>
             </property>
             <property name="text">
@@ -223,7 +223,7 @@
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
+             <enum>QSizePolicy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>

diff --git a/src/qt/pivx/receivewidget.cpp b/src/qt/pivx/receivewidget.cpp
@@ -173,8 +173,8 @@ void ReceiveWidget::refreshView(QString refreshAddress){
         updateQr(latestAddress);
         updateLabel();
     } catch (const runtime_error& error){
-        // Error generating address
-        std::cout << "Error generating address, correct me" << std::endl;
+        ui->labelQrImg->setText(tr("No available address, try unlocking the wallet"));
+        std::cout << "Error generating address, correct me: " << error.what() << std::endl;
         inform("Error generating address");
     }
 }

diff --git a/src/qt/pivx/requestdialog.cpp b/src/qt/pivx/requestdialog.cpp
@@ -64,7 +64,7 @@ RequestDialog::RequestDialog(QWidget *parent) :
     ui->stack->setCurrentIndex(pos);
     // Request QR Page
     // Address
-    ui->labelAddress->setText(tr("Eg.. D7VFR83SQbiezrW72hjcWJtcfip5krte2Z "));
+    ui->labelAddress->setText(tr("Error"));
     ui->labelAddress->setProperty("cssClass", "text-main-grey-big");
 
     // Buttons
@@ -90,7 +90,6 @@ void RequestDialog::setWalletModel(WalletModel *model){
 
 
 void RequestDialog::onNextClicked(){
-
     if(walletModel) {
         // info
         info = new SendCoinsRecipient();
@@ -115,6 +114,7 @@ void RequestDialog::onNextClicked(){
         // TODO: Complete amount and QR.
         ui->labelTitle->setText("Request for " + BitcoinUnits::format(displayUnit, value, false, BitcoinUnits::separatorAlways) + " PIV");
         updateQr(info->address);
+        ui->labelAddress->setText(info->address);
         ui->buttonsStack->setVisible(false);
         pos = 1;
         ui->stack->setCurrentIndex(pos);