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 bitcoin-gui#118: Remove BDB version from the Information tab

Browse Source 
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
Kittywhiskers Van Gogh 2022-03-06 12:38:31 +05:30
parent c0c3934ff0
commit d03a47820f
2 changed files with 32 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,39 +147,13 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_berkeleyDBVersion">
<property name="text">
<string>Using BerkeleyDB version</string>
</property>
<property name="indent">
<number>10</number>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QLabel" name="berkeleyDBVersion">
<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="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="4" column="1" colspan="2"> <item row="3" 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>
@ -201,14 +175,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Blocksdir</string> <string>Blocksdir</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="blocksDir"> <widget class="QLabel" name="blocksDir">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -230,14 +204,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>
@ -253,21 +227,21 @@
</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="text"> <property name="text">
<string>Network</string> <string>Network</string>
</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>
@ -283,14 +257,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>
@ -306,14 +280,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="9" column="0">
<widget class="QLabel" name="masternodeCountLabel"> <widget class="QLabel" name="masternodeCountLabel">
<property name="text"> <property name="text">
<string>Number of Masternodes</string> <string>Number of Masternodes</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="9" column="1">
<widget class="QLabel" name="masternodeCount"> <widget class="QLabel" name="masternodeCount">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -321,29 +295,26 @@
<property name="text"> <property name="text">
<string>N/A</string> <string>N/A</string>
</property> </property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</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>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="10" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Block chain</string> <string>Block chain</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="11" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Current block height</string> <string>Current block height</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="numberOfBlocks"> <widget class="QLabel" name="numberOfBlocks">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -359,14 +330,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="0"> <item row="12" 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="13" column="1" colspan="2"> <item row="12" 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>
@ -382,14 +353,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="13" column="0">
<widget class="QLabel" name="lastBlockHashLabel"> <widget class="QLabel" name="lastBlockHashLabel">
<property name="text"> <property name="text">
<string>Last block hash</string> <string>Last block hash</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="13" column="1">
<widget class="QLabel" name="lastBlockHash"> <widget class="QLabel" name="lastBlockHash">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -405,14 +376,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="14" column="0">
<widget class="QLabel" name="bestChainLockHashLabel"> <widget class="QLabel" name="bestChainLockHashLabel">
<property name="text"> <property name="text">
<string>Latest ChainLocked block hash</string> <string>Latest ChainLocked block hash</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="14" column="1">
<widget class="QLabel" name="bestChainLockHash"> <widget class="QLabel" name="bestChainLockHash">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -428,14 +399,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="0"> <item row="15" column="0">
<widget class="QLabel" name="bestChainLockHeightLabel"> <widget class="QLabel" name="bestChainLockHeightLabel">
<property name="text"> <property name="text">
<string>Latest ChainLocked block height</string> <string>Latest ChainLocked block height</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1"> <item row="15" column="1">
<widget class="QLabel" name="bestChainLockHeight"> <widget class="QLabel" name="bestChainLockHeight">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -451,21 +422,21 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="0"> <item row="16" column="0">
<widget class="QLabel" name="labelMempoolTitle"> <widget class="QLabel" name="labelMempoolTitle">
<property name="text"> <property name="text">
<string>Memory Pool</string> <string>Memory Pool</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="0"> <item row="17" 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="18" column="1"> <item row="17" column="1">
<widget class="QLabel" name="mempoolNumberTxs"> <widget class="QLabel" name="mempoolNumberTxs">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -481,14 +452,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="0"> <item row="18" 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="19" column="1"> <item row="18" column="1">
<widget class="QLabel" name="mempoolSize"> <widget class="QLabel" name="mempoolSize">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -504,7 +475,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="2" rowspan="3"> <item row="17" 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>
@ -544,14 +515,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="20" column="0"> <item row="19" column="0">
<widget class="QLabel" name="labelInstantSendLockCount"> <widget class="QLabel" name="labelInstantSendLockCount">
<property name="text"> <property name="text">
<string>InstantSend locks</string> <string>InstantSend locks</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="1"> <item row="19" column="1">
<widget class="QLabel" name="instantSendLockCount"> <widget class="QLabel" name="instantSendLockCount">
<property name="cursor"> <property name="cursor">
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
@ -567,7 +538,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="21" column="0"> <item row="20" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

10
src/qt/rpcconsole.cpp
View File

@ -504,16 +504,6 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags
connect(ui->btn_upgradewallet, &QPushButton::clicked, this, &RPCConsole::walletUpgrade); connect(ui->btn_upgradewallet, &QPushButton::clicked, this, &RPCConsole::walletUpgrade);
connect(ui->btn_reindex, &QPushButton::clicked, this, &RPCConsole::walletReindex); connect(ui->btn_reindex, &QPushButton::clicked, this, &RPCConsole::walletReindex);
// set library version labels
#ifdef ENABLE_WALLET
ui->berkeleyDBVersion->setText(QString::fromStdString(BerkeleyDatabaseVersion()));
std::string walletPath = GetDataDir().string();
walletPath += QDir::separator().toLatin1() + gArgs.GetArg("-wallet", "wallet.dat");
ui->wallet_path->setText(QString::fromStdString(walletPath));
#else
ui->label_berkeleyDBVersion->hide();
ui->berkeleyDBVersion->hide();
#endif
// Register RPC timer interface // Register RPC timer interface
rpcTimerInterface = new QtRPCTimerInterface(); rpcTimerInterface = new QtRPCTimerInterface();
// avoid accidentally overwriting an existing, non QTThread // avoid accidentally overwriting an existing, non QTThread