Browse Source

qt: Remove client name from debug window

Remove the client name from the debug window in the GUI. It is already
part of the user agent, so adding it separately doesn't add anything.
0.13
Wladimir J. van der Laan 8 years ago
parent
commit
a7897c02f7
  1. 5
      src/qt/clientmodel.cpp
  2. 1
      src/qt/clientmodel.h
  3. 75
      src/qt/forms/debugwindow.ui
  4. 1
      src/qt/rpcconsole.cpp

5
src/qt/clientmodel.cpp

@ -179,11 +179,6 @@ bool ClientModel::isReleaseVersion() const
return CLIENT_VERSION_IS_RELEASE; return CLIENT_VERSION_IS_RELEASE;
} }
QString ClientModel::clientName() const
{
return QString::fromStdString(CLIENT_NAME);
}
QString ClientModel::formatClientStartupTime() const QString ClientModel::formatClientStartupTime() const
{ {
return QDateTime::fromTime_t(nClientStartupTime).toString(); return QDateTime::fromTime_t(nClientStartupTime).toString();

1
src/qt/clientmodel.h

@ -73,7 +73,6 @@ public:
QString formatFullVersion() const; QString formatFullVersion() const;
QString formatSubVersion() const; QString formatSubVersion() const;
bool isReleaseVersion() const; bool isReleaseVersion() const;
QString clientName() const;
QString formatClientStartupTime() const; QString formatClientStartupTime() const;
QString dataDir() const; QString dataDir() const;

75
src/qt/forms/debugwindow.ui

@ -41,36 +41,13 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Client name</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLabel" name="clientName">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>N/A</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Client version</string> <string>Client version</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2"> <item row="1" column="1" colspan="2">
<widget class="QLabel" name="clientVersion"> <widget class="QLabel" name="clientVersion">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -86,7 +63,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="labelClientUserAgent"> <widget class="QLabel" name="labelClientUserAgent">
<property name="text"> <property name="text">
<string>User Agent</string> <string>User Agent</string>
@ -96,7 +73,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2"> <item row="2" column="1" colspan="2">
<widget class="QLabel" name="clientUserAgent"> <widget class="QLabel" name="clientUserAgent">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -112,7 +89,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_berkeleyDBVersion"> <widget class="QLabel" name="label_berkeleyDBVersion">
<property name="text"> <property name="text">
<string>Using BerkeleyDB version</string> <string>Using BerkeleyDB version</string>
@ -122,7 +99,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QLabel" name="berkeleyDBVersion"> <widget class="QLabel" name="berkeleyDBVersion">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -138,14 +115,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>Datadir</string> <string>Datadir</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1" colspan="2"> <item row="4" column="1" colspan="2">
<widget class="QLabel" name="dataDir"> <widget class="QLabel" name="dataDir">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -164,14 +141,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
<string>Startup time</string> <string>Startup time</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1" colspan="2"> <item row="5" column="1" colspan="2">
<widget class="QLabel" name="startupTime"> <widget class="QLabel" name="startupTime">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -187,7 +164,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<widget class="QLabel" name="labelNetwork"> <widget class="QLabel" name="labelNetwork">
<property name="font"> <property name="font">
<font> <font>
@ -200,14 +177,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1" colspan="2"> <item row="7" column="1" colspan="2">
<widget class="QLabel" name="networkName"> <widget class="QLabel" name="networkName">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -223,14 +200,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Number of connections</string> <string>Number of connections</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1" colspan="2"> <item row="8" column="1" colspan="2">
<widget class="QLabel" name="numberOfConnections"> <widget class="QLabel" name="numberOfConnections">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -246,7 +223,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="9" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="font"> <property name="font">
<font> <font>
@ -259,14 +236,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="10" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Current number of blocks</string> <string>Current number of blocks</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1" colspan="2"> <item row="10" column="1" colspan="2">
<widget class="QLabel" name="numberOfBlocks"> <widget class="QLabel" name="numberOfBlocks">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -282,14 +259,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="11" column="0">
<widget class="QLabel" name="labelLastBlockTime"> <widget class="QLabel" name="labelLastBlockTime">
<property name="text"> <property name="text">
<string>Last block time</string> <string>Last block time</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1" colspan="2"> <item row="11" column="1" colspan="2">
<widget class="QLabel" name="lastBlockTime"> <widget class="QLabel" name="lastBlockTime">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -305,7 +282,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="0"> <item row="12" column="0">
<widget class="QLabel" name="labelMempoolTitle"> <widget class="QLabel" name="labelMempoolTitle">
<property name="font"> <property name="font">
<font> <font>
@ -318,14 +295,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="13" column="0">
<widget class="QLabel" name="labelNumberOfTransactions"> <widget class="QLabel" name="labelNumberOfTransactions">
<property name="text"> <property name="text">
<string>Current number of transactions</string> <string>Current number of transactions</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="13" column="1">
<widget class="QLabel" name="mempoolNumberTxs"> <widget class="QLabel" name="mempoolNumberTxs">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -341,14 +318,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="14" column="0">
<widget class="QLabel" name="labelMemoryUsage"> <widget class="QLabel" name="labelMemoryUsage">
<property name="text"> <property name="text">
<string>Memory usage</string> <string>Memory usage</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="14" column="1">
<widget class="QLabel" name="mempoolSize"> <widget class="QLabel" name="mempoolSize">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -364,7 +341,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="2" rowspan="3"> <item row="12" column="2" rowspan="3">
<layout class="QVBoxLayout" name="verticalLayoutDebugButton"> <layout class="QVBoxLayout" name="verticalLayoutDebugButton">
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
@ -404,7 +381,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="16" column="0"> <item row="15" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

1
src/qt/rpcconsole.cpp

@ -451,7 +451,6 @@ void RPCConsole::setClientModel(ClientModel *model)
// Provide initial values // Provide initial values
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->dataDir->setText(model->dataDir()); 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()));

Loading…
Cancel
Save