Cleanup about_imp.h

Fix dialog too narrow on highDPI screens
Remove IRC link
Rewrite about text to support RTL languages better
Follow project coding style. Issue #2192.
This commit is contained in:
Chocobo1 2015-11-30 14:28:48 +08:00
parent 958b70e4ac
commit 65a30bab3f
2 changed files with 55 additions and 56 deletions

View File

@ -5,4 +5,3 @@
<file>translators.html</file> <file>translators.html</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -33,67 +33,67 @@
#include "ui_about.h" #include "ui_about.h"
#include <QFile> #include <QFile>
#include <QtGlobal>
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#include "base/unicodestrings.h" #include "base/unicodestrings.h"
class about : public QDialog, private Ui::AboutDlg{ class about: public QDialog, private Ui::AboutDlg
Q_OBJECT {
Q_OBJECT
public: public:
~about() { about(QWidget *parent) : QDialog(parent)
qDebug("Deleting about dlg"); {
} setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
about(QWidget *parent): QDialog(parent) { // Title & icon
setupUi(this); logo->setPixmap(QPixmap(":/icons/skin/qbittorrent22.png"));
setAttribute(Qt::WA_DeleteOnClose); lb_name->setText("<b><h1>qBittorrent " VERSION "</h1></b>");
// About
QString aboutText = // About
QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-size:11pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") + QString aboutText = QString(
tr("An advanced BitTorrent client programmed in <nobr>C++</nobr>, based on Qt toolkit and libtorrent-rasterbar.") + "<p style=\"white-space: pre-wrap;\">"
QString::fromUtf8(" <br /><br />") + "%1\n\n"
trUtf8("Copyright %1 2006-2016 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT)) + "%2\n\n\n"
QString::fromUtf8("<br /><br />") + "%3 <a href=\"http://www.qbittorrent.org\">http://www.qbittorrent.org</a>\n"
tr("Home Page: ") + "%4 <a href=\"http://forum.qbittorrent.org\">http://forum.qbittorrent.org</a>\n"
QString::fromUtf8("<a href=\"http://www.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.qbittorrent.org</span></a></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") + "%5 <a href=\"http://bugs.qbittorrent.org\">http://bugs.qbittorrent.org</a>"
tr("Bug Tracker: ") + "</p>")
QString::fromUtf8("<a href=\"http://bugs.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://bugs.qbittorrent.org</span></a><br />") + .arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar."))
tr("Forum: ") + .arg(tr("Copyright %1 2006-2016 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT)))
QString::fromUtf8( .arg(tr("Home Page:"))
"<a href=\"http://forum.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://forum.qbittorrent.org</span></a></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") + .arg(tr("Forum:"))
tr("IRC: #qbittorrent on Freenode") + .arg(tr("Bug Tracker:"));
QString::fromUtf8( lb_about->setText(aboutText);
"</p></body></html>");
lb_about->setText(aboutText); // Thanks
// Set icons QFile thanksfile(":/thanks.html");
logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/skin/qbittorrent22.png"))); if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
//Title te_thanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData()));
lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" " VERSION"</h1></b>")); thanksfile.close();
// Thanks }
QFile thanksfile(":/thanks.html");
if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) { // Translation
te_thanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData())); QFile translatorsfile(":/translators.html");
thanksfile.close(); if (translatorsfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
} te_translation->setHtml(QString::fromUtf8(translatorsfile.readAll().constData()));
// Translation translatorsfile.close();
QFile translatorsfile(":/translators.html"); }
if (translatorsfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
te_translation->setHtml(QString::fromUtf8(translatorsfile.readAll().constData())); // License
translatorsfile.close(); QFile licensefile(":/gpl.html");
} if (licensefile.open(QIODevice::ReadOnly | QIODevice::Text)) {
// License te_license->setHtml(QString::fromUtf8(licensefile.readAll().constData()));
QFile licensefile(":/gpl.html"); licensefile.close();
if (licensefile.open(QIODevice::ReadOnly | QIODevice::Text)) { }
te_license->setHtml(QString::fromUtf8(licensefile.readAll().constData()));
licensefile.close(); // Libraries
} label_11->setText(QT_VERSION_STR);
// Libraries label_12->setText(LIBTORRENT_VERSION);
label_11->setText(QT_VERSION_STR); label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100));
label_12->setText(LIBTORRENT_VERSION);
label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100)); show();
show();
} }
}; };