From 1e3953613a3e28e5fe0cc8d4bcc7d7ad138cf77c Mon Sep 17 00:00:00 2001
From: adityapk00 <adityapk@gmail.com>
Date: Sun, 27 Jan 2019 12:05:00 -0800
Subject: [PATCH] Allow configuring custom data folder

---
 src/.ui_createzcashconfdialog.h.swp | Bin 0 -> 16384 bytes
 src/connection.cpp                  |  45 +++++++-
 src/createzcashconfdialog.ui        | 173 ++++++++++++++++++++++++++++
 zec-qt-wallet.pro                   |   3 +-
 4 files changed, 218 insertions(+), 3 deletions(-)
 create mode 100644 src/.ui_createzcashconfdialog.h.swp
 create mode 100644 src/createzcashconfdialog.ui

diff --git a/src/.ui_createzcashconfdialog.h.swp b/src/.ui_createzcashconfdialog.h.swp
new file mode 100644
index 0000000000000000000000000000000000000000..903309633e281725a79f16d17fed829e0164c43f
GIT binary patch
literal 16384
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
XSJS&+Tqx3yWzGfvuoQCiBb@&L@NwT2

literal 0
HcmV?d00001

diff --git a/src/connection.cpp b/src/connection.cpp
index 5db52a3..21dcc60 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -2,6 +2,7 @@
 #include "mainwindow.h"
 #include "settings.h"
 #include "ui_connection.h"
+#include "ui_createzcashconfdialog.h"
 #include "rpc.h"
 
 #include "precompiled.h"
@@ -128,9 +129,42 @@ void ConnectionLoader::createZcashConf() {
     main->logger->write("createZcashConf");
 
     auto confLocation = zcashConfWritableLocation();
-    main->logger->write("Creating file " + confLocation);
-
     QFileInfo fi(confLocation);
+
+    QDialog d(main);
+    Ui_createZcashConf ui;
+    ui.setupUi(&d);
+
+    QPixmap logo(":/img/res/zcashdlogo.gif");
+    ui.lblTopIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    ui.btnPickDir->setEnabled(false);
+    ui.lblDirName->setText(fi.dir().absolutePath());
+
+    QObject::connect(ui.chkCustomDatadir, &QCheckBox::stateChanged, [=](int chked) {
+        if (chked == Qt::Checked) {
+            ui.btnPickDir->setEnabled(true);
+        }
+        else {
+            ui.btnPickDir->setEnabled(false);
+        }
+    });
+
+    QObject::connect(ui.btnPickDir, &QPushButton::clicked, [=]() {
+        auto datadir = QFileDialog::getExistingDirectory(main, QObject::tr("Choose data directory"), fi.dir().absolutePath(), QFileDialog::ShowDirsOnly);
+        if (!datadir.isEmpty()) {
+            ui.lblDirName->setText(datadir);
+        }
+    });
+
+    // Show the dialog
+    QString datadir = "";
+    bool useTor = false;
+    if (d.exec() == QDialog::Accepted) {
+        datadir = ui.lblDirName->text();
+        useTor = ui.chkUseTor->isChecked();
+    }
+
+    main->logger->write("Creating file " + confLocation);
     QDir().mkdir(fi.dir().absolutePath());
 
     QFile file(confLocation);
@@ -145,6 +179,13 @@ void ConnectionLoader::createZcashConf() {
     out << "addnode=mainnet.z.cash\n";
     out << "rpcuser=zec-qt-wallet\n";
     out << "rpcpassword=" % randomPassword() << "\n";
+    if (!datadir.isEmpty()) {
+        out << "datadir=" % QDir::toNativeSeparators(datadir) % "\n";
+    }
+    if (useTor) {
+        out << "proxy=127.0.0.1:9050\n";
+    }
+
     file.close();
 
     // Now that zcash.conf exists, try to autoconnect again
diff --git a/src/createzcashconfdialog.ui b/src/createzcashconfdialog.ui
new file mode 100644
index 0000000..b223bf6
--- /dev/null
+++ b/src/createzcashconfdialog.ui
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>createZcashConf</class>
+ <widget class="QDialog" name="createZcashConf">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>503</width>
+    <height>288</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Configure zcash.conf</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="1">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Please chose a directory to store your wallet.dat and blockchain</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="FilledIconLabel" name="lblTopIcon">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background: #fff;</string>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="scaledContents">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="QCheckBox" name="chkUseTor">
+     <property name="text">
+      <string>Connect over Tor</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="btnPickDir">
+       <property name="text">
+        <string>Choose directory</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblDirName">
+       <property name="text">
+        <string notr="true">TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="6" column="1">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string notr="true"/>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QCheckBox" name="chkCustomDatadir">
+     <property name="text">
+      <string>Use custom datadir</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Please note that you'll need to already have a Tor service configured on port 9050</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>FilledIconLabel</class>
+   <extends>QLabel</extends>
+   <header>fillediconlabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>createZcashConf</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>createZcashConf</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/zec-qt-wallet.pro b/zec-qt-wallet.pro
index 730c9bd..2b0da58 100644
--- a/zec-qt-wallet.pro
+++ b/zec-qt-wallet.pro
@@ -84,7 +84,8 @@ FORMS += \
     src/memodialog.ui \ 
     src/connection.ui \
     src/zboard.ui \
-    src/addressbook.ui
+    src/addressbook.ui \
+    src/createzcashconfdialog.ui
 
 
 TRANSLATIONS = res/zec_qt_wallet_es.ts \