Merge branch 'master' of git@github.com:danmar/cppcheck
Conflicts: gui/mainwindow.cpp
This commit is contained in:
commit
7d2c26bd25
|
@ -46,12 +46,18 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
|
||||||
QLabel *gpl = new QLabel(tr("This program is licensed under the terms " \
|
QLabel *gpl = new QLabel(tr("This program is licensed under the terms " \
|
||||||
"of the GNU General Public License version 3"));
|
"of the GNU General Public License version 3"));
|
||||||
gpl->setWordWrap(true);
|
gpl->setWordWrap(true);
|
||||||
|
QString url = "<a href=\"http://cppcheck.wiki.sourceforge.net/\">http://cppcheck.wiki.sourceforge.net/</a>";
|
||||||
|
QString homepageText = QString(tr("Visit Cppcheck homepage at %1")).arg(url);
|
||||||
|
QLabel *homepage = new QLabel(homepageText);
|
||||||
|
homepage->setOpenExternalLinks(true);
|
||||||
|
homepage->setWordWrap(true);
|
||||||
QPushButton *quit = new QPushButton(tr("Close"));
|
QPushButton *quit = new QPushButton(tr("Close"));
|
||||||
|
|
||||||
mainLayout->addWidget(name);
|
mainLayout->addWidget(name);
|
||||||
mainLayout->addWidget(ver);
|
mainLayout->addWidget(ver);
|
||||||
mainLayout->addWidget(copy);
|
mainLayout->addWidget(copy);
|
||||||
mainLayout->addWidget(gpl);
|
mainLayout->addWidget(gpl);
|
||||||
|
mainLayout->addWidget(homepage);
|
||||||
mainLayout->addStretch();
|
mainLayout->addStretch();
|
||||||
|
|
||||||
mainLayout->addLayout(btnLayout);
|
mainLayout->addLayout(btnLayout);
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="aboutdialog.cpp" line="49"/>
|
<location filename="aboutdialog.cpp" line="50"/>
|
||||||
|
<source>Visit Cppcheck homepage at %1</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="aboutdialog.cpp" line="54"/>
|
||||||
<source>Close</source>
|
<source>Close</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
<translation>This program is licensed under the terms of the GNU General Public License version 3</translation>
|
<translation>This program is licensed under the terms of the GNU General Public License version 3</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="aboutdialog.cpp" line="49"/>
|
<location filename="aboutdialog.cpp" line="50"/>
|
||||||
|
<source>Visit Cppcheck homepage at %1</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="aboutdialog.cpp" line="54"/>
|
||||||
<source>Close</source>
|
<source>Close</source>
|
||||||
<translation>Close</translation>
|
<translation>Close</translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
<translation>Tämä ohjelma on lisensoitu GNU General Public Lisenssin version 3 alaiseksi</translation>
|
<translation>Tämä ohjelma on lisensoitu GNU General Public Lisenssin version 3 alaiseksi</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="aboutdialog.cpp" line="49"/>
|
<location filename="aboutdialog.cpp" line="50"/>
|
||||||
|
<source>Visit Cppcheck homepage at %1</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="aboutdialog.cpp" line="54"/>
|
||||||
<source>Close</source>
|
<source>Close</source>
|
||||||
<translation>Sulje</translation>
|
<translation>Sulje</translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="aboutdialog.cpp" line="49"/>
|
<location filename="aboutdialog.cpp" line="50"/>
|
||||||
|
<source>Visit Cppcheck homepage at %1</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="aboutdialog.cpp" line="54"/>
|
||||||
<source>Close</source>
|
<source>Close</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="aboutdialog.cpp" line="49"/>
|
<location filename="aboutdialog.cpp" line="50"/>
|
||||||
|
<source>Visit Cppcheck homepage at %1</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="aboutdialog.cpp" line="54"/>
|
||||||
<source>Close</source>
|
<source>Close</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
Loading…
Reference in New Issue