merged

README.md

@@ -1,4 +1,4 @@
-zcash-qt-wallet is a z-Addr first wallet UI frontend for zcashd that runs on Windows and Linux
+zcash-qt-wallet is a z-Addr first, Sapling compatible wallet for zcashd that runs on Windows and Linux
 
 ![Screenshot](docs/screenshot-main.png?raw=true)
 

src/mainwindow.cpp

@@ -291,8 +291,8 @@ std::function<void(bool)> MainWindow::addZAddrsToComboList(bool sapling) {
             ui->listRecieveAddresses->clear();
 
             std::for_each(addrs->begin(), addrs->end(), [=] (auto addr) {
-                if ( (sapling &&  settings->isSaplingAddress(addr)) ||
-                    (!sapling && !settings->isSaplingAddress(addr)))
+                if ( (sapling &&  Settings::getInstance()->isSaplingAddress(addr)) ||
+                    (!sapling && !Settings::getInstance()->isSaplingAddress(addr)))
                     ui->listRecieveAddresses->addItem(addr);
             }); 
 

src/mainwindow.h

@@ -78,7 +78,6 @@ private:
     void importPrivKeys();
 
     RPC*                rpc;
-    Settings*           settings;
 
     QMovie*             loadingMovie;
 };

src/scripts/mkwinrelease.ps1

@@ -20,7 +20,7 @@ Move-Item release/zcash-qt-wallet.exe release/$target | Out-Null
 
 echo "Copying"
 # No need for deploy, since we're using a static Qt5 library
-# & "$Env:QT_STATIC\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null
+& "$Env:QT_STATIC\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null
 Copy-Item LICENSE release/$target | Out-Null
 Copy-Item README.md release/$target | Out-Null