diff --git a/src/widget/form/settings/aboutform.cpp b/src/widget/form/settings/aboutform.cpp
index c50831f34..9344ecf9b 100644
--- a/src/widget/form/settings/aboutform.cpp
+++ b/src/widget/form/settings/aboutform.cpp
@@ -49,14 +49,43 @@ AboutForm::AboutForm() :
//nightly builds from stable releases.
void AboutForm::replaceVersions()
{
+ QString TOXCORE_VERSION = QString::number(TOX_VERSION_MAJOR) + "." +
+ QString::number(TOX_VERSION_MINOR) + "." +
+ QString::number(TOX_VERSION_PATCH);
bodyUI->youareusing->setText(bodyUI->youareusing->text().replace("$GIT_DESCRIBE", QString(GIT_DESCRIBE)));
bodyUI->gitVersion->setText(bodyUI->gitVersion->text().replace("$GIT_VERSION", QString(GIT_VERSION)));
- bodyUI->toxCoreVersion->setText(
- bodyUI->toxCoreVersion->text().replace("$TOXCOREVERSION",
- QString::number(TOX_VERSION_MAJOR) + "." +
- QString::number(TOX_VERSION_MINOR) + "." +
- QString::number(TOX_VERSION_PATCH)));
- bodyUI->qtVersion->setText(tr("Qt version:") + " " + QT_VERSION_STR);
+ bodyUI->toxCoreVersion->setText(bodyUI->toxCoreVersion->text().replace("$TOXCOREVERSION", TOXCORE_VERSION));
+ bodyUI->qtVersion->setText(bodyUI->qtVersion->text().replace("$QTVERSION", QT_VERSION_STR));
+ bodyUI->knownIssues->setText(
+ tr("A list of all known issues may be found at our %1 at Github. If you discover a bug or security vulnerability within qTox, please %3 according to the guidelines in our %2 wiki article.")
+ .arg(QString::fromUtf8("%1")
+ .arg(tr("bug-tracker")))
+ .arg(QString::fromUtf8("%1")
+ .arg(tr("Writing Useful Bug Reports")))
+ .arg(QString::fromUtf8("%8")
+ .arg(
+ QString("%0"),
+ QString("%2"),
+ QString("%3"),
+ QString(GIT_DESCRIBE),
+ QString(GIT_VERSION),
+ QString(TOXCORE_VERSION),
+ QString(QT_VERSION_STR),
+ tr("report it")))
+ );
}
AboutForm::~AboutForm()
diff --git a/src/widget/form/settings/aboutsettings.ui b/src/widget/form/settings/aboutsettings.ui
index 6fadd3594..a69ef8c28 100644
--- a/src/widget/form/settings/aboutsettings.ui
+++ b/src/widget/form/settings/aboutsettings.ui
@@ -85,7 +85,7 @@
- Qt version:
+ Qt version: $QTVERSION
Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
@@ -307,7 +307,7 @@ p, li { white-space: pre-wrap; }
-
-
+
0
@@ -320,7 +320,7 @@ p, li { white-space: pre-wrap; }
- <html><head/><body><p>A list of all known issues may be found at our <a href="https://github.com/tux3/qTox/issues"><span style=" text-decoration: underline; color:#0000ff;">bug-tracker</span></a> at Github. If you discover a bug or security vulnerability within qTox, please report it according to the guidelines in our <a href="https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports"><span style=" text-decoration: underline; color:#0000ff;">Writing Useful Bug Reports</span></a> wiki article.</p></body></html>
+ <html><head/><body><p>A list of all known issues may be found at our <a href="https://github.com/tux3/qTox/issues"><span style=" text-decoration: underline; color:#0000ff;">bug-tracker</span></a> at Github. If you discover a bug or security vulnerability within qTox, please <a href="https://github.com/tux3/qTox/issues/new?body=%0A%0A%0A%0A---%0A%0AqTox:+$GIT_DESCRIBE%0ACommit+hash:+$GIT_VERSION%0Atoxcore:+$TOXCOREVERSION%0AQt:+$QTVERSION%0AOS+version:"><span style=" text-decoration: underline; color:#0000ff;">report it</span></a> according to the guidelines in our <a href="https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports"><span style=" text-decoration: underline; color:#0000ff;">Writing Useful Bug Reports</span></a> wiki article.</p></body></html>
true