Skip to content

Commit 4ae0409

Browse files
author
MarcoFalke
committed
Merge bitcoin-core#118: Remove BDB version from the Information tab
e4fc45a gui: Remove BDB version from the Information tab (Hennadii Stepanov) Pull request description: Master (67d4643): ![DeepinScreenshot_select-area_20201027161350](https://user-images.githubusercontent.com/32963518/97313812-b90cea80-186f-11eb-8fec-781b0724bd9c.png) This PR: ![DeepinScreenshot_select-area_20201027161449](https://user-images.githubusercontent.com/32963518/97313883-c924ca00-186f-11eb-8f82-ebb9f68414b1.png) ACKs for top commit: achow101: ACK e4fc45a jonasschnelli: utACK e4fc45a Sjors: utACK e4fc45a promag: ACK e4fc45a. jarolrod: Tested ACK e4fc45a Tree-SHA512: 3660b78607a4dc364b7cb2bc74ccd8b57acd7a16084151e58945e1a92a9af97a37edb33e94a87067fabfe9ce1c45be11fab270bc146f742a2f1010530470c433
2 parents 4b24c39 + e4fc45a commit 4ae0409

File tree

2 files changed

+22
-55
lines changed

2 files changed

+22
-55
lines changed

‎src/qt/forms/debugwindow.ui

Lines changed: 22 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -109,39 +109,13 @@
109109
</widget>
110110
</item>
111111
<item row="3" column="0">
112-
<widget class="QLabel" name="label_berkeleyDBVersion">
113-
<property name="text">
114-
<string>Using BerkeleyDB version</string>
115-
</property>
116-
<property name="indent">
117-
<number>10</number>
118-
</property>
119-
</widget>
120-
</item>
121-
<item row="3" column="1" colspan="2">
122-
<widget class="QLabel" name="berkeleyDBVersion">
123-
<property name="cursor">
124-
<cursorShape>IBeamCursor</cursorShape>
125-
</property>
126-
<property name="text">
127-
<string>N/A</string>
128-
</property>
129-
<property name="textFormat">
130-
<enum>Qt::PlainText</enum>
131-
</property>
132-
<property name="textInteractionFlags">
133-
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
134-
</property>
135-
</widget>
136-
</item>
137-
<item row="4" column="0">
138112
<widget class="QLabel" name="label_12">
139113
<property name="text">
140114
<string>Datadir</string>
141115
</property>
142116
</widget>
143117
</item>
144-
<item row="4" column="1" colspan="2">
118+
<item row="3" column="1" colspan="2">
145119
<widget class="QLabel" name="dataDir">
146120
<property name="cursor">
147121
<cursorShape>IBeamCursor</cursorShape>
@@ -163,14 +137,14 @@
163137
</property>
164138
</widget>
165139
</item>
166-
<item row="5" column="0">
140+
<item row="4" column="0">
167141
<widget class="QLabel" name="label_11">
168142
<property name="text">
169143
<string>Blocksdir</string>
170144
</property>
171145
</widget>
172146
</item>
173-
<item row="5" column="1" colspan="2">
147+
<item row="4" column="1" colspan="2">
174148
<widget class="QLabel" name="blocksDir">
175149
<property name="cursor">
176150
<cursorShape>IBeamCursor</cursorShape>
@@ -192,14 +166,14 @@
192166
</property>
193167
</widget>
194168
</item>
195-
<item row="6" column="0">
169+
<item row="5" column="0">
196170
<widget class="QLabel" name="label_13">
197171
<property name="text">
198172
<string>Startup time</string>
199173
</property>
200174
</widget>
201175
</item>
202-
<item row="6" column="1" colspan="2">
176+
<item row="5" column="1" colspan="2">
203177
<widget class="QLabel" name="startupTime">
204178
<property name="cursor">
205179
<cursorShape>IBeamCursor</cursorShape>
@@ -215,7 +189,7 @@
215189
</property>
216190
</widget>
217191
</item>
218-
<item row="7" column="0">
192+
<item row="6" column="0">
219193
<widget class="QLabel" name="labelNetwork">
220194
<property name="font">
221195
<font>
@@ -228,14 +202,14 @@
228202
</property>
229203
</widget>
230204
</item>
231-
<item row="8" column="0">
205+
<item row="7" column="0">
232206
<widget class="QLabel" name="label_8">
233207
<property name="text">
234208
<string>Name</string>
235209
</property>
236210
</widget>
237211
</item>
238-
<item row="8" column="1" colspan="2">
212+
<item row="7" column="1" colspan="2">
239213
<widget class="QLabel" name="networkName">
240214
<property name="cursor">
241215
<cursorShape>IBeamCursor</cursorShape>
@@ -251,14 +225,14 @@
251225
</property>
252226
</widget>
253227
</item>
254-
<item row="9" column="0">
228+
<item row="8" column="0">
255229
<widget class="QLabel" name="label_7">
256230
<property name="text">
257231
<string>Number of connections</string>
258232
</property>
259233
</widget>
260234
</item>
261-
<item row="9" column="1" colspan="2">
235+
<item row="8" column="1" colspan="2">
262236
<widget class="QLabel" name="numberOfConnections">
263237
<property name="cursor">
264238
<cursorShape>IBeamCursor</cursorShape>
@@ -274,7 +248,7 @@
274248
</property>
275249
</widget>
276250
</item>
277-
<item row="10" column="0">
251+
<item row="9" column="0">
278252
<widget class="QLabel" name="label_10">
279253
<property name="font">
280254
<font>
@@ -287,14 +261,14 @@
287261
</property>
288262
</widget>
289263
</item>
290-
<item row="11" column="0">
264+
<item row="10" column="0">
291265
<widget class="QLabel" name="label_3">
292266
<property name="text">
293267
<string>Current block height</string>
294268
</property>
295269
</widget>
296270
</item>
297-
<item row="11" column="1" colspan="2">
271+
<item row="10" column="1" colspan="2">
298272
<widget class="QLabel" name="numberOfBlocks">
299273
<property name="cursor">
300274
<cursorShape>IBeamCursor</cursorShape>
@@ -310,14 +284,14 @@
310284
</property>
311285
</widget>
312286
</item>
313-
<item row="12" column="0">
287+
<item row="11" column="0">
314288
<widget class="QLabel" name="labelLastBlockTime">
315289
<property name="text">
316290
<string>Last block time</string>
317291
</property>
318292
</widget>
319293
</item>
320-
<item row="12" column="1" colspan="2">
294+
<item row="11" column="1" colspan="2">
321295
<widget class="QLabel" name="lastBlockTime">
322296
<property name="cursor">
323297
<cursorShape>IBeamCursor</cursorShape>
@@ -333,7 +307,7 @@
333307
</property>
334308
</widget>
335309
</item>
336-
<item row="13" column="0">
310+
<item row="12" column="0">
337311
<widget class="QLabel" name="labelMempoolTitle">
338312
<property name="font">
339313
<font>
@@ -346,14 +320,14 @@
346320
</property>
347321
</widget>
348322
</item>
349-
<item row="14" column="0">
323+
<item row="13" column="0">
350324
<widget class="QLabel" name="labelNumberOfTransactions">
351325
<property name="text">
352326
<string>Current number of transactions</string>
353327
</property>
354328
</widget>
355329
</item>
356-
<item row="14" column="1">
330+
<item row="13" column="1">
357331
<widget class="QLabel" name="mempoolNumberTxs">
358332
<property name="cursor">
359333
<cursorShape>IBeamCursor</cursorShape>
@@ -369,14 +343,14 @@
369343
</property>
370344
</widget>
371345
</item>
372-
<item row="15" column="0">
346+
<item row="14" column="0">
373347
<widget class="QLabel" name="labelMemoryUsage">
374348
<property name="text">
375349
<string>Memory usage</string>
376350
</property>
377351
</widget>
378352
</item>
379-
<item row="15" column="1">
353+
<item row="14" column="1">
380354
<widget class="QLabel" name="mempoolSize">
381355
<property name="cursor">
382356
<cursorShape>IBeamCursor</cursorShape>
@@ -392,7 +366,7 @@
392366
</property>
393367
</widget>
394368
</item>
395-
<item row="13" column="2" rowspan="3">
369+
<item row="12" column="2" rowspan="3">
396370
<layout class="QVBoxLayout" name="verticalLayoutDebugButton">
397371
<property name="spacing">
398372
<number>3</number>
@@ -432,7 +406,7 @@
432406
</item>
433407
</layout>
434408
</item>
435-
<item row="16" column="0">
409+
<item row="15" column="0">
436410
<spacer name="verticalSpacer">
437411
<property name="orientation">
438412
<enum>Qt::Vertical</enum>

‎src/qt/rpcconsole.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -479,13 +479,6 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
479479
ui->WalletSelector->setVisible(false);
480480
ui->WalletSelectorLabel->setVisible(false);
481481

482-
// set library version labels
483-
#ifdef ENABLE_WALLET
484-
ui->berkeleyDBVersion->setText(QString::fromStdString(BerkeleyDatabaseVersion()));
485-
#else
486-
ui->label_berkeleyDBVersion->hide();
487-
ui->berkeleyDBVersion->hide();
488-
#endif
489482
// Register RPC timer interface
490483
rpcTimerInterface = new QtRPCTimerInterface();
491484
// avoid accidentally overwriting an existing, non QTThread

0 commit comments

Comments
 (0)