From 823313566399d6fe190f25cbcd6fe273367d3755 Mon Sep 17 00:00:00 2001
From: crowning- <crowning-@users.noreply.github.com>
Date: Sun, 25 Oct 2015 19:25:01 +0100
Subject: [PATCH 1/4] UI: show complete path to wallet.dat on Wallet-Repait tab

---
 src/qt/forms/rpcconsole.ui | 37 +++++++++++++++++++++++++------------
 src/qt/rpcconsole.cpp      |  3 +++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui
index 0cb1d7de498e..4e1aa728d3ff 100644
--- a/src/qt/forms/rpcconsole.ui
+++ b/src/qt/forms/rpcconsole.ui
@@ -1068,7 +1068,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>90</y>
+         <y>100</y>
          <width>301</width>
          <height>23</height>
         </rect>
@@ -1087,7 +1087,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>140</y>
+         <y>150</y>
          <width>301</width>
          <height>23</height>
         </rect>
@@ -1106,7 +1106,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>190</y>
+         <y>200</y>
          <width>301</width>
          <height>23</height>
         </rect>
@@ -1125,7 +1125,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>240</y>
+         <y>250</y>
          <width>301</width>
          <height>23</height>
         </rect>
@@ -1144,7 +1144,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>290</y>
+         <y>300</y>
          <width>301</width>
          <height>23</height>
         </rect>
@@ -1185,7 +1185,7 @@
        <property name="geometry">
         <rect>
          <x>330</x>
-         <y>80</y>
+         <y>90</y>
          <width>411</width>
          <height>41</height>
         </rect>
@@ -1201,7 +1201,7 @@
        <property name="geometry">
         <rect>
          <x>330</x>
-         <y>129</y>
+         <y>140</y>
          <width>411</width>
          <height>41</height>
         </rect>
@@ -1217,7 +1217,7 @@
        <property name="geometry">
         <rect>
          <x>330</x>
-         <y>179</y>
+         <y>190</y>
          <width>411</width>
          <height>41</height>
         </rect>
@@ -1233,7 +1233,7 @@
        <property name="geometry">
         <rect>
          <x>330</x>
-         <y>229</y>
+         <y>240</y>
          <width>411</width>
          <height>41</height>
         </rect>
@@ -1249,7 +1249,7 @@
        <property name="geometry">
         <rect>
          <x>330</x>
-         <y>279</y>
+         <y>290</y>
          <width>411</width>
          <height>41</height>
         </rect>
@@ -1288,7 +1288,7 @@
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>340</y>
+         <y>350</y>
          <width>301</width>
          <height>23</height>
         </rect>
@@ -1301,7 +1301,7 @@
        <property name="geometry">
         <rect>
          <x>330</x>
-         <y>330</y>
+         <y>340</y>
          <width>411</width>
          <height>41</height>
         </rect>
@@ -1313,6 +1313,19 @@
         <bool>true</bool>
        </property>
       </widget>
+      <widget class="QLabel" name="wallet_path">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>70</y>
+         <width>731</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Wallet Path</string>
+       </property>
+      </widget>
      </widget>
     </widget>
    </item>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 742f2772527f..6b06ad6c8ae4 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -244,6 +244,9 @@ RPCConsole::RPCConsole(QWidget *parent) :
     ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
 #ifdef ENABLE_WALLET
     ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0));
+    std::string walletPath = "Wallet in use: " + GetDataDir().string();
+    walletPath += "/" + GetArg("-wallet", "wallet.dat");
+    ui->wallet_path->setText(QString::fromStdString(walletPath));
 #else
     ui->label_berkeleyDBVersion->hide();
     ui->berkeleyDBVersion->hide();

From ba053de0d935f3078679227f307d786ace3ea056 Mon Sep 17 00:00:00 2001
From: crowning- <crowning-@users.noreply.github.com>
Date: Sun, 25 Oct 2015 20:54:46 +0100
Subject: [PATCH 2/4] UI: show complete path to wallet.dat on Wallet-Repait tab
 (separator-fix)

---
 src/qt/rpcconsole.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 6b06ad6c8ae4..b17b8a41e3b5 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -24,6 +24,7 @@
 #include <db_cxx.h>
 #endif
 
+#include <QDir>
 #include <QKeyEvent>
 #include <QScrollBar>
 #include <QThread>
@@ -244,9 +245,9 @@ RPCConsole::RPCConsole(QWidget *parent) :
     ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
 #ifdef ENABLE_WALLET
     ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0));
-    std::string walletPath = "Wallet in use: " + GetDataDir().string();
-    walletPath += "/" + GetArg("-wallet", "wallet.dat");
-    ui->wallet_path->setText(QString::fromStdString(walletPath));
+    std::string walletPath = GetDataDir().string();
+    walletPath += "/" + GetArg("-wallet", "wallet.dat");   
+    ui->wallet_path->setText(QDir::toNativeSeparators(QString::fromStdString(walletPath)));
 #else
     ui->label_berkeleyDBVersion->hide();
     ui->berkeleyDBVersion->hide();

From eb5224c1c16f446dc2e1d4fd8bfe54f8e5e5823b Mon Sep 17 00:00:00 2001
From: crowning- <crowning-@users.noreply.github.com>
Date: Sun, 25 Oct 2015 21:28:18 +0100
Subject: [PATCH 3/4] UI: show complete path to wallet.dat on Wallet-Repait tab
 (Win separator-fix)

---
 src/qt/rpcconsole.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index b17b8a41e3b5..b94e9285f8f5 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -246,8 +246,8 @@ RPCConsole::RPCConsole(QWidget *parent) :
 #ifdef ENABLE_WALLET
     ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0));
     std::string walletPath = GetDataDir().string();
-    walletPath += "/" + GetArg("-wallet", "wallet.dat");   
-    ui->wallet_path->setText(QDir::toNativeSeparators(QString::fromStdString(walletPath)));
+    walletPath += QDir::separator().toAscii() + GetArg("-wallet", "wallet.dat");
+    ui->wallet_path->setText(QString::fromStdString(walletPath));
 #else
     ui->label_berkeleyDBVersion->hide();
     ui->berkeleyDBVersion->hide();

From dbd19566d3f99bb623d6d1c97c6472bcc5639e19 Mon Sep 17 00:00:00 2001
From: crowning- <crowning-@users.noreply.github.com>
Date: Sun, 25 Oct 2015 21:45:08 +0100
Subject: [PATCH 4/4] UI: show complete path to wallet.dat on Wallet-Repait tab
 (Qt5 fix)

---
 src/qt/rpcconsole.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index b94e9285f8f5..0a16c2cb0f65 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -246,7 +246,7 @@ RPCConsole::RPCConsole(QWidget *parent) :
 #ifdef ENABLE_WALLET
     ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0));
     std::string walletPath = GetDataDir().string();
-    walletPath += QDir::separator().toAscii() + GetArg("-wallet", "wallet.dat");
+    walletPath += QDir::separator().toLatin1() + GetArg("-wallet", "wallet.dat");
     ui->wallet_path->setText(QString::fromStdString(walletPath));
 #else
     ui->label_berkeleyDBVersion->hide();