Skip to content

Commit 6a87eb0

Browse files
jonasschnellijonasschnelli
committed
Merge #8281: qt: Remove client name from debug window
a7897c0 qt: Remove client name from debug window (Wladimir J. van der Laan)
2 parents 3685e0c + a7897c0 commit 6a87eb0

File tree

4 files changed

+26
-56
lines changed

4 files changed

+26
-56
lines changed

‎src/qt/clientmodel.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@ bool ClientModel::isReleaseVersion() const
179179
return CLIENT_VERSION_IS_RELEASE;
180180
}
181181

182-
QString ClientModel::clientName() const
183-
{
184-
return QString::fromStdString(CLIENT_NAME);
185-
}
186-
187182
QString ClientModel::formatClientStartupTime() const
188183
{
189184
return QDateTime::fromTime_t(nClientStartupTime).toString();

‎src/qt/clientmodel.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ class ClientModel : public QObject
7373
QString formatFullVersion() const;
7474
QString formatSubVersion() const;
7575
bool isReleaseVersion() const;
76-
QString clientName() const;
7776
QString formatClientStartupTime() const;
7877
QString dataDir() const;
7978

‎src/qt/forms/debugwindow.ui

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,13 @@
4141
</widget>
4242
</item>
4343
<item row="1" column="0">
44-
<widget class="QLabel" name="label_5">
45-
<property name="text">
46-
<string>Client name</string>
47-
</property>
48-
</widget>
49-
</item>
50-
<item row="1" column="1" colspan="2">
51-
<widget class="QLabel" name="clientName">
52-
<property name="cursor">
53-
<cursorShape>IBeamCursor</cursorShape>
54-
</property>
55-
<property name="text">
56-
<string>N/A</string>
57-
</property>
58-
<property name="textFormat">
59-
<enum>Qt::PlainText</enum>
60-
</property>
61-
<property name="textInteractionFlags">
62-
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
63-
</property>
64-
</widget>
65-
</item>
66-
<item row="2" column="0">
6744
<widget class="QLabel" name="label_6">
6845
<property name="text">
6946
<string>Client version</string>
7047
</property>
7148
</widget>
7249
</item>
73-
<item row="2" column="1" colspan="2">
50+
<item row="1" column="1" colspan="2">
7451
<widget class="QLabel" name="clientVersion">
7552
<property name="cursor">
7653
<cursorShape>IBeamCursor</cursorShape>
@@ -86,7 +63,7 @@
8663
</property>
8764
</widget>
8865
</item>
89-
<item row="3" column="0">
66+
<item row="2" column="0">
9067
<widget class="QLabel" name="labelClientUserAgent">
9168
<property name="text">
9269
<string>User Agent</string>
@@ -96,7 +73,7 @@
9673
</property>
9774
</widget>
9875
</item>
99-
<item row="3" column="1" colspan="2">
76+
<item row="2" column="1" colspan="2">
10077
<widget class="QLabel" name="clientUserAgent">
10178
<property name="cursor">
10279
<cursorShape>IBeamCursor</cursorShape>
@@ -112,7 +89,7 @@
11289
</property>
11390
</widget>
11491
</item>
115-
<item row="4" column="0">
92+
<item row="3" column="0">
11693
<widget class="QLabel" name="label_berkeleyDBVersion">
11794
<property name="text">
11895
<string>Using BerkeleyDB version</string>
@@ -122,7 +99,7 @@
12299
</property>
123100
</widget>
124101
</item>
125-
<item row="4" column="1" colspan="2">
102+
<item row="3" column="1" colspan="2">
126103
<widget class="QLabel" name="berkeleyDBVersion">
127104
<property name="cursor">
128105
<cursorShape>IBeamCursor</cursorShape>
@@ -138,14 +115,14 @@
138115
</property>
139116
</widget>
140117
</item>
141-
<item row="5" column="0">
118+
<item row="4" column="0">
142119
<widget class="QLabel" name="label_12">
143120
<property name="text">
144121
<string>Datadir</string>
145122
</property>
146123
</widget>
147124
</item>
148-
<item row="5" column="1" colspan="2">
125+
<item row="4" column="1" colspan="2">
149126
<widget class="QLabel" name="dataDir">
150127
<property name="cursor">
151128
<cursorShape>IBeamCursor</cursorShape>
@@ -164,14 +141,14 @@
164141
</property>
165142
</widget>
166143
</item>
167-
<item row="6" column="0">
144+
<item row="5" column="0">
168145
<widget class="QLabel" name="label_13">
169146
<property name="text">
170147
<string>Startup time</string>
171148
</property>
172149
</widget>
173150
</item>
174-
<item row="6" column="1" colspan="2">
151+
<item row="5" column="1" colspan="2">
175152
<widget class="QLabel" name="startupTime">
176153
<property name="cursor">
177154
<cursorShape>IBeamCursor</cursorShape>
@@ -187,7 +164,7 @@
187164
</property>
188165
</widget>
189166
</item>
190-
<item row="7" column="0">
167+
<item row="6" column="0">
191168
<widget class="QLabel" name="labelNetwork">
192169
<property name="font">
193170
<font>
@@ -200,14 +177,14 @@
200177
</property>
201178
</widget>
202179
</item>
203-
<item row="8" column="0">
180+
<item row="7" column="0">
204181
<widget class="QLabel" name="label_8">
205182
<property name="text">
206183
<string>Name</string>
207184
</property>
208185
</widget>
209186
</item>
210-
<item row="8" column="1" colspan="2">
187+
<item row="7" column="1" colspan="2">
211188
<widget class="QLabel" name="networkName">
212189
<property name="cursor">
213190
<cursorShape>IBeamCursor</cursorShape>
@@ -223,14 +200,14 @@
223200
</property>
224201
</widget>
225202
</item>
226-
<item row="9" column="0">
203+
<item row="8" column="0">
227204
<widget class="QLabel" name="label_7">
228205
<property name="text">
229206
<string>Number of connections</string>
230207
</property>
231208
</widget>
232209
</item>
233-
<item row="9" column="1" colspan="2">
210+
<item row="8" column="1" colspan="2">
234211
<widget class="QLabel" name="numberOfConnections">
235212
<property name="cursor">
236213
<cursorShape>IBeamCursor</cursorShape>
@@ -246,7 +223,7 @@
246223
</property>
247224
</widget>
248225
</item>
249-
<item row="10" column="0">
226+
<item row="9" column="0">
250227
<widget class="QLabel" name="label_10">
251228
<property name="font">
252229
<font>
@@ -259,14 +236,14 @@
259236
</property>
260237
</widget>
261238
</item>
262-
<item row="11" column="0">
239+
<item row="10" column="0">
263240
<widget class="QLabel" name="label_3">
264241
<property name="text">
265242
<string>Current number of blocks</string>
266243
</property>
267244
</widget>
268245
</item>
269-
<item row="11" column="1" colspan="2">
246+
<item row="10" column="1" colspan="2">
270247
<widget class="QLabel" name="numberOfBlocks">
271248
<property name="cursor">
272249
<cursorShape>IBeamCursor</cursorShape>
@@ -282,14 +259,14 @@
282259
</property>
283260
</widget>
284261
</item>
285-
<item row="12" column="0">
262+
<item row="11" column="0">
286263
<widget class="QLabel" name="labelLastBlockTime">
287264
<property name="text">
288265
<string>Last block time</string>
289266
</property>
290267
</widget>
291268
</item>
292-
<item row="12" column="1" colspan="2">
269+
<item row="11" column="1" colspan="2">
293270
<widget class="QLabel" name="lastBlockTime">
294271
<property name="cursor">
295272
<cursorShape>IBeamCursor</cursorShape>
@@ -305,7 +282,7 @@
305282
</property>
306283
</widget>
307284
</item>
308-
<item row="13" column="0">
285+
<item row="12" column="0">
309286
<widget class="QLabel" name="labelMempoolTitle">
310287
<property name="font">
311288
<font>
@@ -318,14 +295,14 @@
318295
</property>
319296
</widget>
320297
</item>
321-
<item row="14" column="0">
298+
<item row="13" column="0">
322299
<widget class="QLabel" name="labelNumberOfTransactions">
323300
<property name="text">
324301
<string>Current number of transactions</string>
325302
</property>
326303
</widget>
327304
</item>
328-
<item row="14" column="1">
305+
<item row="13" column="1">
329306
<widget class="QLabel" name="mempoolNumberTxs">
330307
<property name="cursor">
331308
<cursorShape>IBeamCursor</cursorShape>
@@ -341,14 +318,14 @@
341318
</property>
342319
</widget>
343320
</item>
344-
<item row="15" column="0">
321+
<item row="14" column="0">
345322
<widget class="QLabel" name="labelMemoryUsage">
346323
<property name="text">
347324
<string>Memory usage</string>
348325
</property>
349326
</widget>
350327
</item>
351-
<item row="15" column="1">
328+
<item row="14" column="1">
352329
<widget class="QLabel" name="mempoolSize">
353330
<property name="cursor">
354331
<cursorShape>IBeamCursor</cursorShape>
@@ -364,7 +341,7 @@
364341
</property>
365342
</widget>
366343
</item>
367-
<item row="13" column="2" rowspan="3">
344+
<item row="12" column="2" rowspan="3">
368345
<layout class="QVBoxLayout" name="verticalLayoutDebugButton">
369346
<property name="spacing">
370347
<number>3</number>
@@ -404,7 +381,7 @@
404381
</item>
405382
</layout>
406383
</item>
407-
<item row="16" column="0">
384+
<item row="15" column="0">
408385
<spacer name="verticalSpacer">
409386
<property name="orientation">
410387
<enum>Qt::Vertical</enum>

‎src/qt/rpcconsole.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,6 @@ void RPCConsole::setClientModel(ClientModel *model)
451451
// Provide initial values
452452
ui->clientVersion->setText(model->formatFullVersion());
453453
ui->clientUserAgent->setText(model->formatSubVersion());
454-
ui->clientName->setText(model->clientName());
455454
ui->dataDir->setText(model->dataDir());
456455
ui->startupTime->setText(model->formatClientStartupTime());
457456
ui->networkName->setText(QString::fromStdString(Params().NetworkIDString()));

0 commit comments

Comments
 (0)