Merge branch 'master' of github.com:adityapk00/zec-qt-wallet

.gitignore

@@ -9,6 +9,7 @@ src/ui_*.h
 src/precompiled.h.cpp
 .qmake.stash
 zec-qt-wallet
+zec-qt-wallet.app
 zec-qt-wallet-mingw*
 zec-qt-wallet.vcxproj*
 zec-qt-wallet.sln
@@ -20,4 +21,4 @@ zec-qt-wallet_plugin_import.cpp
 zec-qt-wallet_resource*
 workspace.code-workspace
 *.zip
-*.tar.gz
+*.tar.gz

src/connection.cpp

@@ -107,6 +107,7 @@ void ConnectionLoader::createZcashConf() {
         QTextStream out(&file); 
         
         out << "server=1\n";
+        out << "addnode=mainnet.z.cash\n";
         out << "rpcuser=zec-qt-wallet\n";
         out << "rpcpassword=" % randomPassword() << "\n";
         file.close();

src/scripts/mkmacdmg.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ -z $QT_PATH ]; then 
+    echo "QT_PATH is not set. Please set it to the base directory of Qt"; 
+    exit 1; 
+fi
+
+if [ -z $APP_VERSION ]; then
+    echo "APP_VERSION is not set. Please set it to the current release version of the app";
+    exit 1;
+fi
+
+#Clean
+make distclean 2>&1 >/dev/null
+
+# Build
+$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release
+make -j4 >/dev/null
+
+#Qt deploy
+mkdir artifacts
+rm -f artifcats/zec-qt-wallet.dmg
+rm -f artifacts/rw*
+$QT_PATH/bin/macdeployqt zec-qt-wallet.app 
+
+create-dmg --volname "zec-qt-wallet-v0.3.0" --volicon "res/logo.icns" --window-pos 200 120 --icon "zec-qt-wallet.app" 200 190 --app-drop-link 600 185 --hide-extension "zec-qt-wallet.app"  --window-size 800 400 artifacts/zec-qt-wallet.dmg zec-qt-wallet.app
+
+mv artifacts/zec-qt-wallet.dmg artifacts/MacOS-zec-qt-wallet-v$APP_VERSION.dmg
+

zec-qt-wallet.pro

@@ -87,6 +87,7 @@ FORMS += \
     src/addressbook.ui
 
 win32: RC_ICONS = res/icon.ico
+ICON = res/logo.icns
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin