sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fc737d1 [Qt] remove unused formatBuildDate method (Jonas Schnelli)
4856f1d [Qt] Debug window: replace "Build date" with "Datadir" (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2016-03-25 11:21:47 +01:00
commit 0b98dd7939
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/clientmodel.cpp
View File

@ -173,11 +173,6 @@ QString ClientModel::formatSubVersion() const
return QString::fromStdString(strSubVersion); return QString::fromStdString(strSubVersion);
} }
QString ClientModel::formatBuildDate() const
{
return QString::fromStdString(CLIENT_DATE);
}
bool ClientModel::isReleaseVersion() const bool ClientModel::isReleaseVersion() const
{ {
return CLIENT_VERSION_IS_RELEASE; return CLIENT_VERSION_IS_RELEASE;
@ -193,6 +188,11 @@ QString ClientModel::formatClientStartupTime() const
return QDateTime::fromTime_t(nClientStartupTime).toString(); return QDateTime::fromTime_t(nClientStartupTime).toString();
} }
QString ClientModel::dataDir() const
{
return QString::fromStdString(GetDataDir().string());
}
void ClientModel::updateBanlist() void ClientModel::updateBanlist()
{ {
banTableModel->refresh(); banTableModel->refresh();

2
src/qt/clientmodel.h
View File

@ -72,10 +72,10 @@ public:
QString formatFullVersion() const; QString formatFullVersion() const;
QString formatSubVersion() const; QString formatSubVersion() const;
QString formatBuildDate() const;
bool isReleaseVersion() const; bool isReleaseVersion() const;
QString clientName() const; QString clientName() const;
QString formatClientStartupTime() const; QString formatClientStartupTime() const;
QString dataDir() const;
private: private:
OptionsModel *optionsModel; OptionsModel *optionsModel;

7
src/qt/forms/debugwindow.ui
View File

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

2
src/qt/rpcconsole.cpp
View File

@ -444,7 +444,7 @@ void RPCConsole::setClientModel(ClientModel *model)
ui->clientVersion->setText(model->formatFullVersion()); ui->clientVersion->setText(model->formatFullVersion());
ui->clientUserAgent->setText(model->formatSubVersion()); ui->clientUserAgent->setText(model->formatSubVersion());
ui->clientName->setText(model->clientName()); ui->clientName->setText(model->clientName());
ui->buildDate->setText(model->formatBuildDate()); ui->dataDir->setText(model->dataDir());
ui->startupTime->setText(model->formatClientStartupTime()); ui->startupTime->setText(model->formatClientStartupTime());
ui->networkName->setText(QString::fromStdString(Params().NetworkIDString())); ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));