Merge #7732: [Qt] Debug window: replace "Build date" with "Datadir"

fc737d1 [Qt] remove unused formatBuildDate method (Jonas Schnelli) 4856f1d [Qt] Debug window: replace "Build date" with "Datadir" (Jonas Schnelli)
cddjr · Apr 6, 2017 · 27e9b94 · 27e9b94
1 parent ce87d6b
commit 27e9b94
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -204,11 +204,6 @@ QString ClientModel::formatSubVersion() const
     return QString::fromStdString(strSubVersion);
 }
 
-QString ClientModel::formatBuildDate() const
-{
-    return QString::fromStdString(CLIENT_DATE);
-}
-
 bool ClientModel::isReleaseVersion() const
 {
     return CLIENT_VERSION_IS_RELEASE;
@@ -225,6 +220,11 @@ QString ClientModel::formatClientStartupTime() const
     return QDateTime::fromTime_t(nClientStartupTime).toString(time_format);
 }
 
+QString ClientModel::dataDir() const
+{
+    return QString::fromStdString(GetDataDir().string());
+}
+
 void ClientModel::updateBanlist()
 {
     banTableModel->refresh();

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -81,10 +81,10 @@ class ClientModel : public QObject
 
     QString formatFullVersion() const;
     QString formatSubVersion() const;
-    QString formatBuildDate() const;
     bool isReleaseVersion() const;
     QString clientName() const;
     QString formatClientStartupTime() const;
+    QString dataDir() const;
     UnlimitedModel *unlimitedModel;
 
 private:

diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui
@@ -141,12 +141,12 @@
        <item row="5" column="0">
         <widget class="QLabel" name="label_12">
          <property name="text">
-          <string>Build date</string>
+          <string>Datadir</string>
          </property>
         </widget>
        </item>
        <item row="5" column="1" colspan="2">
-        <widget class="QLabel" name="buildDate">
+        <widget class="QLabel" name="dataDir">
          <property name="cursor">
           <cursorShape>IBeamCursor</cursorShape>
          </property>
@@ -156,6 +156,9 @@
          <property name="textFormat">
           <enum>Qt::PlainText</enum>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
          </property>

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -447,7 +447,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         ui->clientVersion->setText(model->formatFullVersion());
         ui->clientUserAgent->setText(model->formatSubVersion());
         ui->clientName->setText(model->clientName());
-        ui->buildDate->setText(model->formatBuildDate());
+        ui->dataDir->setText(model->dataDir());
         ui->startupTime->setText(model->formatClientStartupTime());
         ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));