Merge master

src/addressbook.cpp

@@ -3,6 +3,7 @@
 #include "ui_mainwindow.h"
 #include "settings.h"
 #include "mainwindow.h"
+#include "rpc.h"
 
 
 AddressBookModel::AddressBookModel(QTableView *parent)
@@ -221,6 +222,9 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target) {
             fnSetTargetLabelAddr(target, item.first, item.second);
         }
     };
+
+    // Refresh after the dialog is closed to update the labels everywhere.
+    parent->getRPC()->refresh(true);
 }
 
 //=============

src/mainwindow.cpp

@@ -700,10 +700,6 @@ void MainWindow::doImport(QList<QString>* keys) {
 
     if (keys->isEmpty()) {
         delete keys;
-
-        QMessageBox::information(this,
-            "Imported", tr("The keys were imported. It may take several minutes to rescan the blockchain. Until then, functionality may be limited"),
-            QMessageBox::Ok);
         ui->statusBar->showMessage(tr("Private key import rescan finished"));
         return;
     }
@@ -836,7 +832,12 @@ void MainWindow::importPrivKey() {
         });
 
         // Start the import. The function takes ownership of keys
-        doImport(keys);
+        QTimer::singleShot(1, [=]() {doImport(keys);});
+
+        // Show the dialog that keys will be imported. 
+        QMessageBox::information(this,
+            "Imported", tr("The keys were imported. It may take several minutes to rescan the blockchain. Until then, functionality may be limited"),
+            QMessageBox::Ok);
     }
 }
 

src/scripts/desktopentry

@@ -6,7 +6,7 @@ Exec=/usr/local/bin/zec-qt-wallet
 Icon=zec-qt-wallet.xpm
 Type=Application
 StartupNotify=true
-StartupWMClass=Code
+StartupWMClass=zecqtwallet
 Categories=Utility;
 MimeType=text/plain;inode/directory;
 Keywords=zec-qt-wallet;

src/scripts/dounifiedbuild.ps1

@@ -61,7 +61,9 @@ ssh $winserver "New-Item zqwbuild -itemtype directory" | Out-Null
 # Same while copying the built msi. A straight scp pull from windows to here doesn't work,
 # so we ssh to windows, and then scp push the file to here.
 $myhostname = (hostname) | Out-String -NoNewline
-Remove-Item -Path /tmp/zqwbuild -Recurse -ErrorAction Ignore | Out-Null
+# Powershell seems not to be able to remove this directory for some reason!
+# Remove-Item -Path /tmp/zqwbuild -Recurse -ErrorAction Ignore | Out-Null
+bash "rm -rf /tmp/zqwbuild" 2>&1 | Out-Null
 New-Item    -Path /tmp/zqwbuild -itemtype directory          | Out-Null
 Copy-Item src     /tmp/zqwbuild/ -Recurse
 Copy-Item res     /tmp/zqwbuild/ -Recurse
@@ -87,3 +89,7 @@ if (! (Test-Path ./artifacts/linux-binaries-zec-qt-wallet-v$version.tar.gz) -or
         exit 1;
     }
 Write-Host "[OK]"
+
+Write-Host -NoNewline "Signing Binaries......"
+bash src/scripts/signbinaries.sh --version $version
+Write-Host "[OK]"

src/scripts/signbinaries.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Accept the variables as command line arguments as well
+POSITIONAL=()
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -v|--version)
+    APP_VERSION="$2"
+    shift # past argument
+    shift # past value
+    ;;
+    *)    # unknown option
+    POSITIONAL+=("$1") # save it in an array for later
+    shift # past argument
+    ;;
+esac
+done
+set -- "${POSITIONAL[@]}" # restore positional parameters
+
+if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi
+
+# Store the hash and signatures here
+rm -rf release/signatures
+mkdir -p release/signatures 
+
+cd artifacts
+echo "[Signing Binaries]"
+
+# Remove previous signatures/hashes
+rm -f sha256sum-v$APP_VERSION.txt
+rm -f signatures-v$APP_VERSION.tar.gz
+
+# sha256sum the binaries
+gsha256sum *$APP_VERSION* > sha256sum-v$APP_VERSION.txt
+
+for i in $( ls *zec-qt-wallet-v$APP_VERSION* sha256sum-v$APP_VERSION* ); do
+  echo "Signing" $i
+  gpg --batch --output ../release/signatures/$i.sig --detach-sig $i 
+done
+
+mv sha256sum-v$APP_VERSION.txt ../release/signatures/
+cp ../res/SIGNATURES_README ../release/signatures/README
+
+cd ../release/signatures
+tar -czf signatures-v$APP_VERSION.tar.gz *
+mv signatures-v$APP_VERSION.tar.gz ../../artifacts
+

src/sendtab.cpp

@@ -12,8 +12,7 @@ using json = nlohmann::json;
 
 void MainWindow::setupSendTab() {
     // Create the validator for send to/amount fields
-    auto amtValidator = new QDoubleValidator(0, 21000000, 8, ui->Amount1);
-    amtValidator->setNotation(QDoubleValidator::StandardNotation);
+    auto amtValidator = new QRegExpValidator(QRegExp("[0-9]{0,8}\\.?[0-9]{0,8}"));    
     ui->Amount1->setValidator(amtValidator);
 
     // Send button
@@ -74,8 +73,7 @@ void MainWindow::setupSendTab() {
         }
     });
     //Fees validator
-    auto feesValidator = new QDoubleValidator(0, 1, 8, ui->Amount1);
-    feesValidator->setNotation(QDoubleValidator::StandardNotation);
+    auto feesValidator = new QRegExpValidator(QRegExp("[0-9]{0,8}\\.?[0-9]{0,8}")); 
     ui->minerFeeAmt->setValidator(feesValidator);
 
     // Font for the first Memo label
@@ -219,8 +217,9 @@ void MainWindow::addAddressSection() {
     Amount1->setPlaceholderText(tr("Amount"));    
     Amount1->setObjectName(QString("Amount") % QString::number(itemNumber));   
     Amount1->setBaseSize(QSize(200, 0));
+    Amount1->setAlignment(Qt::AlignRight);    
     // Create the validator for send to/amount fields
-    auto amtValidator = new QDoubleValidator(0, 21000000, 8, Amount1);
+    auto amtValidator = new QRegExpValidator(QRegExp("[0-9]{0,8}\\.?[0-9]{0,8}")); 
     Amount1->setValidator(amtValidator);
     QObject::connect(Amount1, &QLineEdit::textChanged, [=] (auto text) {
         this->amountChanged(itemNumber, text);