diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe81af4fc..5edc13f00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,6 +580,7 @@ set (TOP_LEVEL_RESOURCES
mouse_commands.txt
prefixes.txt
cty.dat
+ icons/Darwin/wsjtx.iconset/icon_128x128.png
contrib/gpl-v3-logo.svg
)
diff --git a/about.cpp b/about.cpp
index 9db5428f2..14d82acd9 100644
--- a/about.cpp
+++ b/about.cpp
@@ -6,7 +6,6 @@
#include "revision_utils.hpp"
#include "ui_about.h"
-#include "moc_about.cpp"
CAboutDlg::CAboutDlg(QWidget *parent) :
QDialog(parent),
@@ -14,23 +13,23 @@ CAboutDlg::CAboutDlg(QWidget *parent) :
{
ui->setupUi(this);
- ui->labelTxt->setText (""
- + QString {"WSJT-X v"
+ ui->labelTxt->setText ("" + QString {"WSJT-X v"
+ QCoreApplication::applicationVersion ()
- + " " + revision ()}.simplified ()
- + "
\n\n"
- "WSJT-X implements a number of digital modes designed for
"
- "weak-signal Amateur Radio communication.
"
- "© 2001-2016 by Joe Taylor, K1JT, with grateful
"
- "acknowledgment for contributions from AC6SL, AE4JY,
"
- "DJ0OT, G4KLA, G4WJS, IW3RAB, K3WYC, K9AN, KA6MAL,
"
- "KA9Q, KB1ZMX, KD6EKQ, KI7MT, KK1D, ND0B, PY2SDR,
"
- "VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB.
"
- "WSJT-X is licensed under the terms of Version 3
"
- "of the GNU General Public License (GPL)
"
+ + " " + revision ()}.simplified () + "
"
+ "WSJT-X implements a number of digital modes designed for
"
+ "weak-signal Amateur Radio communication.
"
+ "© 2001-2016 by Joe Taylor, K1JT, with grateful
"
+ "acknowledgment for contributions from AC6SL, AE4JY,
"
+ "DJ0OT, G4KLA, G4WJS, IW3RAB, K3WYC, K9AN, KA6MAL,
"
+ "KA9Q, KB1ZMX, KD6EKQ, KI7MT, KK1D, ND0B, PY2SDR,
"
+ "VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB.
"
+ "WSJT-X is licensed under the terms of Version 3
"
+ "of the GNU General Public License (GPL)
"
+ ""
+ "![](\":/icon_128x128.png\")
"
""
"![](\":/gpl-v3-logo.svg\")
"
- "https://www.gnu.org/licenses/gpl-3.0.txt");\
+ "https://www.gnu.org/licenses/gpl-3.0.txt");
}
CAboutDlg::~CAboutDlg()
diff --git a/about.h b/about.h
index c2ac75d1b..460b7eff3 100644
--- a/about.h
+++ b/about.h
@@ -9,10 +9,9 @@ namespace Ui {
class CAboutDlg;
}
-class CAboutDlg : public QDialog
+class CAboutDlg
+ : public QDialog
{
- Q_OBJECT;
-
public:
explicit CAboutDlg(QWidget *parent = nullptr);
~CAboutDlg ();
diff --git a/about.ui b/about.ui
index 72a730158..84a59c63e 100644
--- a/about.ui
+++ b/about.ui
@@ -5,20 +5,6 @@
Qt::NonModal
-
-
- 0
- 0
- 374
- 144
-
-
-
-
- 0
- 0
-
-
About WSJT-X
@@ -75,6 +61,19 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
diff --git a/wsjtx_config.h.in b/wsjtx_config.h.in
index 23f4f2952..9e6e0368f 100644
--- a/wsjtx_config.h.in
+++ b/wsjtx_config.h.in
@@ -15,6 +15,7 @@
#cmakedefine WSJT_DOC_DESTINATION "@WSJT_DOC_DESTINATION@"
#cmakedefine WSJT_DATA_DESTINATION "@WSJT_DATA_DESTINATION@"
#cmakedefine PROJECT_MANUAL "@PROJECT_MANUAL@"
+#cmakedefine PROJECT_HOMEPAGE "@PROJECT_HOMEPAGE@"
#cmakedefine PROJECT_MANUAL_DIRECTORY_URL "@PROJECT_MANUAL_DIRECTORY_URL@"
#cmakedefine PROJECT_SAMPLES_URL "@PROJECT_SAMPLES_URL@"