Skip to content

Commit

Permalink
Remove openssl info from init/log and from Qt debug window
Browse files Browse the repository at this point in the history 
Backport of bitcoin#7605
  • Loading branch information
@jonasschnelli @Warrows
jonasschnelli authored and Warrows committed Aug 28, 2019
1 parent 15858bd commit 6152805
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 70 deletions.
1 change: 0 additions & 1 deletion src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,6 @@ bool AppInit2()
ShrinkDebugFile();
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
LogPrintf("PIVX version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
#ifdef ENABLE_WALLET
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
#endif
Expand Down
110 changes: 42 additions & 68 deletions src/qt/forms/rpcconsole.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>769</width>
<height>516</height>
<height>496</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -27,13 +27,6 @@
<property name="horizontalSpacing">
<number>12</number>
</property>
<item row="7" column="1">
<widget class="QLabel" name="dataDir">
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="generalHeader">
<property name="font">
Expand Down Expand Up @@ -94,17 +87,17 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="openSSLVersionLabel">
<widget class="QLabel" name="berkeleyDBVersionLabel">
<property name="text">
<string>Using OpenSSL version</string>
<string>Using BerkeleyDB version</string>
</property>
<property name="indent">
<number>10</number>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="openSSLVersion">
<widget class="QLabel" name="berkeleyDBVersion">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
Expand All @@ -120,17 +113,14 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="berkeleyDBVersionLabel">
<widget class="QLabel" name="buildDateLabel">
<property name="text">
<string>Using BerkeleyDB version</string>
</property>
<property name="indent">
<number>10</number>
<string>Build date</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="berkeleyDBVersion">
<widget class="QLabel" name="buildDate">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
Expand All @@ -146,14 +136,14 @@
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="buildDateLabel">
<widget class="QLabel" name="startupTimeLabel">
<property name="text">
<string>Build date</string>
<string>Startup time</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="buildDate">
<widget class="QLabel" name="startupTime">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
Expand All @@ -169,29 +159,20 @@
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="startupTimeLabel">
<widget class="QLabel" name="dataDirLabel">
<property name="text">
<string>Startup time</string>
<string>Data Directory</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="startupTime">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<widget class="QLabel" name="dataDir">
<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="8" column="0">
<item row="7" column="0">
<widget class="QLabel" name="networkHeader">
<property name="font">
<font>
Expand All @@ -204,14 +185,14 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="8" column="0">
<widget class="QLabel" name="networkNameLabel">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="8" column="1">
<widget class="QLabel" name="networkName">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -227,14 +208,14 @@
</property>
</widget>
</item>
<item row="10" column="0">
<item row="9" column="0">
<widget class="QLabel" name="numberOfConnectionsLabel">
<property name="text">
<string>Number of connections</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="9" column="1">
<widget class="QLabel" name="numberOfConnections">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -250,14 +231,14 @@
</property>
</widget>
</item>
<item row="11" column="0">
<item row="10" column="0">
<widget class="QLabel" name="masternodeCountLabel">
<property name="text">
<string>Number of Masternodes</string>
</property>
</widget>
</item>
<item row="11" column="1">
<item row="10" column="1">
<widget class="QLabel" name="masternodeCount">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -273,7 +254,7 @@
</property>
</widget>
</item>
<item row="12" column="0">
<item row="11" column="0">
<widget class="QLabel" name="blockchainHeader">
<property name="font">
<font>
Expand All @@ -286,14 +267,14 @@
</property>
</widget>
</item>
<item row="13" column="0">
<item row="12" column="0">
<widget class="QLabel" name="numberOfBlocksLabel">
<property name="text">
<string>Current number of blocks</string>
</property>
</widget>
</item>
<item row="13" column="1">
<item row="12" column="1">
<widget class="QLabel" name="numberOfBlocks">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -309,14 +290,14 @@
</property>
</widget>
</item>
<item row="14" column="0">
<item row="13" column="0">
<widget class="QLabel" name="lastBlockTimeLabel">
<property name="text">
<string>Last block time</string>
</property>
</widget>
</item>
<item row="14" column="1">
<item row="13" column="1">
<widget class="QLabel" name="lastBlockTime">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -332,7 +313,21 @@
</property>
</widget>
</item>
<item row="16" column="0">
<item row="14" column="0">
<widget class="QLabel" name="lastBlockHashLabel">
<property name="text">
<string>Last block hash</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QLabel" name="lastBlockHash">
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="15" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand All @@ -345,7 +340,7 @@
</property>
</spacer>
</item>
<item row="17" column="0">
<item row="16" column="0">
<widget class="QLabel" name="debugLogFileHeader">
<property name="font">
<font>
Expand All @@ -358,7 +353,7 @@
</property>
</widget>
</item>
<item row="18" column="0">
<item row="17" column="0">
<widget class="QPushButton" name="openDebugLogfileButton">
<property name="toolTip">
<string>Open the PIVX debug log file from the current data directory. This can take a few seconds for large log files.</string>
Expand All @@ -371,27 +366,6 @@
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="dataDirLabel">
<property name="text">
<string>Data Directory</string>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="lastBlockHashLabel">
<property name="text">
<string>Last block hash</string>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLabel" name="lastBlockHash">
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_console">
Expand Down
1 change: 0 additions & 1 deletion src/qt/rpcconsole.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ RPCConsole::RPCConsole(QWidget* parent) : QDialog(parent, Qt::WindowSystemMenuHi
connect(ui->btn_resync, SIGNAL(clicked()), this, SLOT(walletResync()));

// set library version labels
ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
#ifdef ENABLE_WALLET
std::string strPathCustom = GetArg("-backuppath", "");
std::string strzPIVPathCustom = GetArg("-zpivbackuppath", "");
Expand Down

0 comments on commit 6152805

Please sign in to comment.