diff --git a/src/.ui_createzcashconfdialog.h.swp b/src/.ui_createzcashconfdialog.h.swp
deleted file mode 100644
index 9033096..0000000
Binary files a/src/.ui_createzcashconfdialog.h.swp and /dev/null differ
diff --git a/src/connection.cpp b/src/connection.cpp
index 21dcc60..b54b3dc 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -138,7 +138,12 @@ void ConnectionLoader::createZcashConf() {
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());
+
+ ui.grpAdvanced->setVisible(false);
+ QObject::connect(ui.btnAdvancedConfig, &QPushButton::toggled, [=](bool isVisible) {
+ ui.grpAdvanced->setVisible(isVisible);
+ ui.btnAdvancedConfig->setText(isVisible ? QObject::tr("Hide Advanced Config") : QObject::tr("Show Advanced Config"));
+ });
QObject::connect(ui.chkCustomDatadir, &QCheckBox::stateChanged, [=](int chked) {
if (chked == Qt::Checked) {
@@ -152,7 +157,7 @@ void ConnectionLoader::createZcashConf() {
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);
+ ui.lblDirName->setText(QDir::toNativeSeparators(datadir));
}
});
@@ -180,7 +185,7 @@ void ConnectionLoader::createZcashConf() {
out << "rpcuser=zec-qt-wallet\n";
out << "rpcpassword=" % randomPassword() << "\n";
if (!datadir.isEmpty()) {
- out << "datadir=" % QDir::toNativeSeparators(datadir) % "\n";
+ out << "datadir=" % datadir % "\n";
}
if (useTor) {
out << "proxy=127.0.0.1:9050\n";
diff --git a/src/createzcashconfdialog.ui b/src/createzcashconfdialog.ui
index b223bf6..4da75b2 100644
--- a/src/createzcashconfdialog.ui
+++ b/src/createzcashconfdialog.ui
@@ -6,28 +6,14 @@
0
0
- 503
- 288
+ 508
+ 352
Configure zcash.conf
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Please chose a directory to store your wallet.dat and blockchain
-
-
-
-
@@ -47,31 +33,40 @@
- -
-
-
- Connect over Tor
+
-
+
+
+ Qt::Horizontal
- -
-
+
-
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Ok
+
+
+ true
+
+
+
+ -
+
-
-
+
- Choose directory
+ Show Advanced Configuration
+
+
+ true
-
-
-
- TextLabel
-
-
-
- -
-
+
Qt::Horizontal
@@ -85,45 +80,89 @@
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Ok
-
-
- true
-
-
-
-
-
+
- Use custom datadir
+ Your zcash node will be configured for you automatically
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
- -
-
-
- Please note that you'll need to already have a Tor service configured on port 9050
-
-
-
- -
-
-
- Qt::Horizontal
+
-
+
+
+
+
+
-
+
+
+ Use custom datadir
+
+
+
+ -
+
+
+ Please chose a directory to store your wallet.dat and blockchain
+
+
+
+ -
+
+
-
+
+
+ Choose directory
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Connect over Tor
+
+
+
+ -
+
+
+ Please note that you'll need to already have a Tor service configured on port 9050
+
+
+
+