Skip to content

Commit 0c7643c

Browse files
sledgehammer999Christophe Dumez
sledgehammer999
authored and
Christophe Dumez
committed
Show Libraries's version used in the about window.
(cherry picked from commit 7b007f82caaac98a21101a37a71bbc9464022ca3)
1 parent 3282e53 commit 0c7643c

4 files changed

Lines changed: 126 additions & 11 deletions

File tree

‎Changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
22
- COSMETIC: Display speed at the beginning of the Window title
3+
- OTHER: Display libraries versions in about dialog (sledgehammer999)
34

45
* Thu Jun 02 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.8.0
56
- FEATURE: Added full libtorrent v0.16 support (uTP, ...)

‎src/about.ui‎

Lines changed: 112 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<property name="currentIndex">
7979
<number>0</number>
8080
</property>
81-
<widget class="QWidget" name="tab2">
81+
<widget class="QWidget" name="tab6">
8282
<attribute name="title">
8383
<string>About</string>
8484
</attribute>
@@ -129,7 +129,7 @@ p, li { white-space: pre-wrap; }
129129
</item>
130130
</layout>
131131
</widget>
132-
<widget class="QWidget" name="tab3">
132+
<widget class="QWidget" name="tab5">
133133
<attribute name="title">
134134
<string>Author</string>
135135
</attribute>
@@ -259,7 +259,7 @@ p, li { white-space: pre-wrap; }
259259
</item>
260260
</layout>
261261
</widget>
262-
<widget class="QWidget" name="tab5">
262+
<widget class="QWidget" name="tab3">
263263
<attribute name="title">
264264
<string>Translation</string>
265265
</attribute>
@@ -276,7 +276,7 @@ p, li { white-space: pre-wrap; }
276276
</item>
277277
</layout>
278278
</widget>
279-
<widget class="QWidget" name="tab1">
279+
<widget class="QWidget" name="tab2">
280280
<attribute name="title">
281281
<string>License</string>
282282
</attribute>
@@ -289,14 +289,121 @@ p, li { white-space: pre-wrap; }
289289
</item>
290290
</layout>
291291
</widget>
292+
<widget class="QWidget" name="tab1">
293+
<attribute name="title">
294+
<string>Libraries</string>
295+
</attribute>
296+
<layout class="QVBoxLayout" name="verticalLayout">
297+
<item>
298+
<widget class="QLabel" name="label">
299+
<property name="sizePolicy">
300+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
301+
<horstretch>0</horstretch>
302+
<verstretch>0</verstretch>
303+
</sizepolicy>
304+
</property>
305+
<property name="text">
306+
<string>This version of qBittorrent was built against the following libraries:</string>
307+
</property>
308+
<property name="wordWrap">
309+
<bool>true</bool>
310+
</property>
311+
</widget>
312+
</item>
313+
<item>
314+
<widget class="Line" name="line">
315+
<property name="orientation">
316+
<enum>Qt::Horizontal</enum>
317+
</property>
318+
</widget>
319+
</item>
320+
<item>
321+
<layout class="QGridLayout" name="gridLayout_3">
322+
<item row="0" column="0">
323+
<widget class="QLabel" name="label_8">
324+
<property name="text">
325+
<string>Qt:</string>
326+
</property>
327+
<property name="alignment">
328+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
329+
</property>
330+
</widget>
331+
</item>
332+
<item row="2" column="0">
333+
<widget class="QLabel" name="label_10">
334+
<property name="text">
335+
<string>Boost:</string>
336+
</property>
337+
<property name="alignment">
338+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
339+
</property>
340+
</widget>
341+
</item>
342+
<item row="0" column="1">
343+
<widget class="QLabel" name="label_11">
344+
<property name="text">
345+
<string/>
346+
</property>
347+
</widget>
348+
</item>
349+
<item row="2" column="1">
350+
<widget class="QLabel" name="label_13">
351+
<property name="text">
352+
<string/>
353+
</property>
354+
</widget>
355+
</item>
356+
<item row="1" column="1">
357+
<widget class="QLabel" name="label_12">
358+
<property name="text">
359+
<string/>
360+
</property>
361+
</widget>
362+
</item>
363+
<item row="1" column="0">
364+
<widget class="QLabel" name="label_9">
365+
<property name="text">
366+
<string>Libtorrent:</string>
367+
</property>
368+
<property name="alignment">
369+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
370+
</property>
371+
</widget>
372+
</item>
373+
</layout>
374+
</item>
375+
<item>
376+
<widget class="Line" name="line_2">
377+
<property name="orientation">
378+
<enum>Qt::Horizontal</enum>
379+
</property>
380+
</widget>
381+
</item>
382+
<item>
383+
<spacer name="verticalSpacer_2">
384+
<property name="orientation">
385+
<enum>Qt::Vertical</enum>
386+
</property>
387+
<property name="sizeType">
388+
<enum>QSizePolicy::Expanding</enum>
389+
</property>
390+
<property name="sizeHint" stdset="0">
391+
<size>
392+
<width>0</width>
393+
<height>0</height>
394+
</size>
395+
</property>
396+
</spacer>
397+
</item>
398+
</layout>
399+
</widget>
292400
</widget>
293401
</item>
294402
</layout>
295403
</widget>
296404
<layoutdefault spacing="6" margin="11"/>
297405
<resources>
298406
<include location="icons.qrc"/>
299-
<include location="../icons.qrc"/>
300407
</resources>
301408
<connections/>
302409
</ui>

‎src/about_imp.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "ui_about.h"
3535
#include <QFile>
36+
#include <QtGlobal>
37+
#include <libtorrent/version.hpp>
38+
#include <boost/version.hpp>
3639

3740
class about : public QDialog, private Ui::AboutDlg{
3841
Q_OBJECT
@@ -99,6 +102,10 @@ class about : public QDialog, private Ui::AboutDlg{
99102
te_license->setHtml(licensefile.readAll());
100103
licensefile.close();
101104
}
105+
// Libraries
106+
label_11->setText(QT_VERSION_STR);
107+
label_12->setText(LIBTORRENT_VERSION);
108+
label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100));
102109
show();
103110
}
104111
};

‎winconf-mingw.pri‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ RC_FILE = qbittorrent_mingw.rc
77
#Adapt the lib names/versions accordingly
88
CONFIG(debug, debug|release) {
99
LIBS += libtorrent \
10-
libboost_system-mgw45-mt-d-1_46_1 \
11-
libboost_filesystem-mgw45-mt-d-1_46_1 \
12-
libboost_thread-mgw45-mt-d-1_46_1
10+
libboost_system-mgw45-mt-d-1_47 \
11+
libboost_filesystem-mgw45-mt-d-1_47 \
12+
libboost_thread-mgw45-mt-d-1_47
1313
} else {
1414
LIBS += libtorrent \
15-
libboost_system-mgw45-mt-1_46_1 \
16-
libboost_filesystem-mgw45-mt-1_46_1 \
17-
libboost_thread-mgw45-mt-1_46_1
15+
libboost_system-mgw45-mt-1_47 \
16+
libboost_filesystem-mgw45-mt-1_47 \
17+
libboost_thread-mgw45-mt-1_47
1818
}
1919

2020
LIBS += libadvapi32 libshell32

0 commit comments

Comments
 (0)