Add the WSJT-X logo to the about dialog and make it clickable

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6793 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-06-22 15:19:24 +00:00
parent 0842ee2a97
commit 132596242f
5 changed files with 31 additions and 32 deletions

View File

@ -580,6 +580,7 @@ set (TOP_LEVEL_RESOURCES
mouse_commands.txt mouse_commands.txt
prefixes.txt prefixes.txt
cty.dat cty.dat
icons/Darwin/wsjtx.iconset/icon_128x128.png
contrib/gpl-v3-logo.svg contrib/gpl-v3-logo.svg
) )

View File

@ -6,7 +6,6 @@
#include "revision_utils.hpp" #include "revision_utils.hpp"
#include "ui_about.h" #include "ui_about.h"
#include "moc_about.cpp"
CAboutDlg::CAboutDlg(QWidget *parent) : CAboutDlg::CAboutDlg(QWidget *parent) :
QDialog(parent), QDialog(parent),
@ -14,23 +13,23 @@ CAboutDlg::CAboutDlg(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
ui->labelTxt->setText ("<html><h2>" ui->labelTxt->setText ("<h2>" + QString {"WSJT-X v"
+ QString {"WSJT-X v"
+ QCoreApplication::applicationVersion () + QCoreApplication::applicationVersion ()
+ " " + revision ()}.simplified () + " " + revision ()}.simplified () + "</h2><br />"
+ "</h2>\n\n" "WSJT-X implements a number of digital modes designed for <br />"
"WSJT-X implements a number of digital modes designed for <br>" "weak-signal Amateur Radio communication. <br /><br />"
"weak-signal Amateur Radio communication. <br><br>" "&copy; 2001-2016 by Joe Taylor, K1JT, with grateful <br />"
"&copy; 2001-2016 by Joe Taylor, K1JT, with grateful <br>" "acknowledgment for contributions from AC6SL, AE4JY, <br />"
"acknowledgment for contributions from AC6SL, AE4JY, <br>" "DJ0OT, G4KLA, G4WJS, IW3RAB, K3WYC, K9AN, KA6MAL, <br />"
"DJ0OT, G4KLA, G4WJS, IW3RAB, K3WYC, K9AN, KA6MAL, <br>" "KA9Q, KB1ZMX, KD6EKQ, KI7MT, KK1D, ND0B, PY2SDR, <br />"
"KA9Q, KB1ZMX, KD6EKQ, KI7MT, KK1D, ND0B, PY2SDR, <br>" "VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB.<br /><br />"
"VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB.<br><br>" "WSJT-X is licensed under the terms of Version 3 <br />"
"WSJT-X is licensed under the terms of Version 3 <br>" "of the GNU General Public License (GPL) <br />"
"of the GNU General Public License (GPL) <br>" "<a href=" WSJTX_STRINGIZE (PROJECT_HOMEPAGE) ">"
"<img src=\":/icon_128x128.png\" /></a>"
"<a href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">" "<a href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">"
"<img src=\":/gpl-v3-logo.svg\" height=\"80\" /><br />" "<img src=\":/gpl-v3-logo.svg\" height=\"80\" /><br />"
"https://www.gnu.org/licenses/gpl-3.0.txt</a>");\ "https://www.gnu.org/licenses/gpl-3.0.txt</a>");
} }
CAboutDlg::~CAboutDlg() CAboutDlg::~CAboutDlg()

View File

@ -9,10 +9,9 @@ namespace Ui {
class CAboutDlg; class CAboutDlg;
} }
class CAboutDlg : public QDialog class CAboutDlg
: public QDialog
{ {
Q_OBJECT;
public: public:
explicit CAboutDlg(QWidget *parent = nullptr); explicit CAboutDlg(QWidget *parent = nullptr);
~CAboutDlg (); ~CAboutDlg ();

View File

@ -5,20 +5,6 @@
<property name="windowModality"> <property name="windowModality">
<enum>Qt::NonModal</enum> <enum>Qt::NonModal</enum>
</property> </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>374</width>
<height>144</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>About WSJT-X</string> <string>About WSJT-X</string>
</property> </property>
@ -75,6 +61,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

View File

@ -15,6 +15,7 @@
#cmakedefine WSJT_DOC_DESTINATION "@WSJT_DOC_DESTINATION@" #cmakedefine WSJT_DOC_DESTINATION "@WSJT_DOC_DESTINATION@"
#cmakedefine WSJT_DATA_DESTINATION "@WSJT_DATA_DESTINATION@" #cmakedefine WSJT_DATA_DESTINATION "@WSJT_DATA_DESTINATION@"
#cmakedefine PROJECT_MANUAL "@PROJECT_MANUAL@" #cmakedefine PROJECT_MANUAL "@PROJECT_MANUAL@"
#cmakedefine PROJECT_HOMEPAGE "@PROJECT_HOMEPAGE@"
#cmakedefine PROJECT_MANUAL_DIRECTORY_URL "@PROJECT_MANUAL_DIRECTORY_URL@" #cmakedefine PROJECT_MANUAL_DIRECTORY_URL "@PROJECT_MANUAL_DIRECTORY_URL@"
#cmakedefine PROJECT_SAMPLES_URL "@PROJECT_SAMPLES_URL@" #cmakedefine PROJECT_SAMPLES_URL "@PROJECT_SAMPLES_URL@"