1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #2983

kehugter (2):
      Add direct link with template for submitting new issues
      refractor: abstract HTML out of `new issue` GitHub link
This commit is contained in:
sudden6 2016-04-11 19:02:36 +02:00
commit 0a2f541945
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 38 additions and 9 deletions

View File

@ -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("<a href=\"https://github.com/tux3/qTox/issues\" style=\"text-decoration: underline; color:#0000ff;\">%1</a>")
.arg(tr("bug-tracker")))
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports\" style=\"text-decoration: underline; color:#0000ff;\">%1</a>")
.arg(tr("Writing Useful Bug Reports")))
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/issues/"
"new?body=%23%23%23%23%23+Brief+Description%1A%1AOS%3A+Windows+%2F+"
"OS+X+%2F+Linux+(include+version+and%2For+distro)%1AqTox+version"
"%3A+%4%1ACommit+hash%3A+%5%1Atoxcore%3A+%6%1AQt%3A+%7%1A"
"Hardware%3A++%1A%E2%80%A6%1A%1AReproducible%3A+Always+%2F+Almost+"
"Always+%2F+Sometimes+%2F+Rarely+%2F+Couldn%27t+Reproduce%1A%1A%23"
"%23%23%23%23+Steps+to+reproduce%1A%1A1.+%1A2.+%1A3.+%E2%80%A6%1A"
"%1A%23%23%23%23%23+Observed+Behavior%1A%1A%1A%23%23%23%23%23+"
"Expected+Behavior%1A%1A%1A%23%23%23%23%23+Additional+Info%1A(links"
"%2C+images%2C+etc+go+here)%1A%1A----%1A%1AMore+information+on+how+"
"to+write+good+bug+reports+in+the+wiki%3A+https%3A%2F%2Fgithub.com"
"%2Ftux3%2FqTox%2Fwiki%2FWriting-Useful-Bug-Reports.%1A%1APlease+"
"remove+any+unnecessary+template+section+before+submitting.\" "
"style=\"text-decoration: underline; color:#0000ff;\">%8</a>")
.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()

View File

@ -85,7 +85,7 @@
</font>
</property>
<property name="text">
<string>Qt version:</string>
<string>Qt version: $QTVERSION</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
@ -307,7 +307,7 @@ p, li { white-space: pre-wrap; }
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="knownIssues">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -320,7 +320,7 @@ p, li { white-space: pre-wrap; }
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A list of all known issues may be found at our &lt;a href=&quot;https://github.com/tux3/qTox/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug-tracker&lt;/span&gt;&lt;/a&gt; at Github. If you discover a bug or security vulnerability within qTox, please report it according to the guidelines in our &lt;a href=&quot;https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Writing Useful Bug Reports&lt;/span&gt;&lt;/a&gt; wiki article.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A list of all known issues may be found at our &lt;a href=&quot;https://github.com/tux3/qTox/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;bug-tracker&lt;/span&gt;&lt;/a&gt; at Github. If you discover a bug or security vulnerability within qTox, please &lt;a href=&quot;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:&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;report it&lt;/span&gt;&lt;/a&gt; according to the guidelines in our &lt;a href=&quot;https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Writing Useful Bug Reports&lt;/span&gt;&lt;/a&gt; wiki article.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>