mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-27 08:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10788 from silverqx/add-zlib-version-to-gui

Browse Source 
Add zlib version to GUI & stackdump
This commit is contained in:
Mike Tzou 2019-06-13 09:41:42 +08:00 committed by GitHub
commit a65f36592a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/stacktracedialog.h
View File

@ -72,15 +72,17 @@ public:
"Qt version: " QT_VERSION_STR "<br/>"
"Boost version: %3<br/>"
"OpenSSL version: %4<br/>"
"OS version: %5<br/><br/>"
"Caught signal: %6"
"zlib version: %5<br/>"
"OS version: %6<br/><br/>"
"Caught signal: %7"
"</font></p>"
"<pre><code>%7</code></pre>"
"<pre><code>%8</code></pre>"
"<br/><hr><br/><br/>")
.arg(QString::number(QT_POINTER_SIZE * 8)
, Utils::Misc::libtorrentVersionString()
, Utils::Misc::boostVersionString()
, Utils::Misc::opensslVersionString()
, Utils::Misc::zlibVersionString()
, Utils::Misc::osName()
, sigName
, trace);

8
src/base/utils/misc.cpp
View File

@ -44,6 +44,7 @@
#include <boost/version.hpp>
#include <openssl/opensslv.h>
#include <libtorrent/version.hpp>
#include <zlib.h>
#include <QCoreApplication>
#include <QRegularExpression>
@ -463,6 +464,13 @@ QString Utils::Misc::opensslVersionString()
return version.split(' ', QString::SkipEmptyParts)[1];
}
QString Utils::Misc::zlibVersionString()
{
// static initialization for usage in signal handler
static const QString version {ZLIB_VERSION};
return version;
}
#ifdef Q_OS_WIN
QString Utils::Misc::windowsSystemPath()
{

1
src/base/utils/misc.h
View File

@ -70,6 +70,7 @@ namespace Utils
QString boostVersionString();
QString libtorrentVersionString();
QString opensslVersionString();
QString zlibVersionString();
QString unitString(SizeUnit unit, bool isSpeed = false);

1
src/gui/aboutdialog.h
View File

@ -99,6 +99,7 @@ public:
m_ui->labelLibtVer->setText(Utils::Misc::libtorrentVersionString());
m_ui->labelBoostVer->setText(Utils::Misc::boostVersionString());
m_ui->labelOpensslVer->setText(Utils::Misc::opensslVersionString());
m_ui->labelZlibVer->setText(Utils::Misc::zlibVersionString());
Utils::Gui::resize(this);
show();

20
src/gui/aboutdialog.ui
View File

@ -441,6 +441,26 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_12">
<property name="text">
<string notr="true">zlib:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="labelZlibVer">
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>

1
src/webui/api/appcontroller.cpp
View File

@ -71,6 +71,7 @@ void AppController::buildInfoAction()
{"libtorrent", Utils::Misc::libtorrentVersionString()},
{"boost", Utils::Misc::boostVersionString()},
{"openssl", Utils::Misc::opensslVersionString()},
{"zlib", Utils::Misc::zlibVersionString()},
{"bitness", (QT_POINTER_SIZE * 8)}
};
setResult(versions);

5
src/webui/www/private/about.html
View File

@ -671,6 +671,10 @@
<td>OpenSSL:</td>
<td><span id="opensslVersion"></span></td>
</tr>
<tr>
<td>zlib:</td>
<td><span id="zlibVersion"></span></td>
</tr>
</table>
</div>
@ -691,6 +695,7 @@
$('libtorrentVersion').textContent = info.libtorrent;
$('boostVersion').textContent = info.boost;
$('opensslVersion').textContent = info.openssl;
$('zlibVersion').textContent = info.zlib;
$('qbittorrentVersion').textContent += " (" + info.bitness + "-bit)";
}
}).send();