diff --git a/map65/CMakeLists.txt b/map65/CMakeLists.txt
index 8ee96ab08..4f64a71c9 100644
--- a/map65/CMakeLists.txt
+++ b/map65/CMakeLists.txt
@@ -48,7 +48,8 @@ add_subdirectory (libm65)
qt5_wrap_ui (map65_GENUISRCS ${map65_UISRCS})
add_executable (map65 ${map65_CXXSRCS} ${map65_CSRCS} ${map65_GENUISRCS} map65.rc)
-target_link_libraries (map65 m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb)
+target_include_directories (map65 PRIVATE ${CMAKE_SOURCE_DIR})
+target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb)
install (
CODE "file (TO_NATIVE_PATH \"/\" _separator)
diff --git a/map65/about.cpp b/map65/about.cpp
index 9428a6fe0..61df66178 100644
--- a/map65/about.cpp
+++ b/map65/about.cpp
@@ -1,20 +1,20 @@
#include "about.h"
+#include "revision_utils.hpp"
#include "ui_about.h"
-CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) :
+CAboutDlg::CAboutDlg(QWidget *parent) :
QDialog(parent),
- m_Revision(Revision),
ui(new Ui::CAboutDlg)
{
ui->setupUi(this);
- ui->labelTxt->clear();
- m_Str = "" + m_Revision + "
\n\n";
- m_Str += "MAP65 implements a wideband polarization-matching receiver
";
- m_Str += "for the JT65 protocol, with a matching transmitting facility.
";
- m_Str += "It is primarily intended for amateur radio EME communication.
";
- m_Str += "Copyright 2001-2021 by Joe Taylor, K1JT. Additional
";
- m_Str += "acknowledgments are contained in the source code.
";
- ui->labelTxt->setText(m_Str);
+ ui->labelTxt->setText("" + QString {"MAP65 v"
+ + QCoreApplication::applicationVersion ()
+ + " " + revision ()}.simplified () + "
"
+ "MAP65 implements a wideband polarization-matching receiver
"
+ "for the JT65 protocol, with a matching transmitting facility.
"
+ "It is primarily intended for amateur radio EME communication.
"
+ "Copyright 2001-2021 by Joe Taylor, K1JT. Additional
"
+ "acknowledgments are contained in the source code.");
}
CAboutDlg::~CAboutDlg()
diff --git a/map65/about.h b/map65/about.h
index ca45d1996..a5206661a 100644
--- a/map65/about.h
+++ b/map65/about.h
@@ -12,11 +12,10 @@ class CAboutDlg : public QDialog
Q_OBJECT
public:
- explicit CAboutDlg(QWidget *parent=0, QString Revision="");
- ~CAboutDlg();
+ explicit CAboutDlg(QWidget *parent = nullptr);
+ ~CAboutDlg();
private:
- QString m_Revision;
Ui::CAboutDlg *ui;
QString m_Str;
};
diff --git a/map65/about.ui b/map65/about.ui
index d2ed43771..fb20f48db 100644
--- a/map65/about.ui
+++ b/map65/about.ui
@@ -22,19 +22,15 @@
About MAP65
-
-
-
- 20
- 10
- 331
- 131
-
-
-
-
-
-
+
+ -
+
+
+
+
+
+
+
diff --git a/map65/bandmap.cpp b/map65/bandmap.cpp
index 130928d55..67c73440b 100644
--- a/map65/bandmap.cpp
+++ b/map65/bandmap.cpp
@@ -1,6 +1,6 @@
#include "bandmap.h"
#include "ui_bandmap.h"
-#include "../qt_helpers.hpp"
+#include "qt_helpers.hpp"
#include
BandMap::BandMap(QWidget *parent) :
diff --git a/map65/main.cpp b/map65/main.cpp
index 6498827d2..04deaca52 100644
--- a/map65/main.cpp
+++ b/map65/main.cpp
@@ -5,6 +5,7 @@
#endif
#include
+#include "revision_utils.hpp"
#include "mainwindow.h"
static QtMessageHandler default_message_handler;
@@ -22,6 +23,9 @@ int main(int argc, char *argv[])
default_message_handler = qInstallMessageHandler (my_message_handler);
QApplication a {argc, argv};
+ // Override programs executable basename as application name.
+ a.setApplicationName ("MAP65");
+ a.setApplicationVersion ("3.0.0-devel");
MainWindow w;
w.show ();
return a.exec ();
diff --git a/map65/mainwindow.cpp b/map65/mainwindow.cpp
index 9d8caf016..5256d0d6d 100644
--- a/map65/mainwindow.cpp
+++ b/map65/mainwindow.cpp
@@ -1,5 +1,6 @@
//------------------------------------------------------------------ MainWindow
#include "mainwindow.h"
+#include "revision_utils.hpp"
#include "ui_mainwindow.h"
#include "devsetup.h"
#include "plotter.h"
@@ -32,8 +33,6 @@ BandMap* g_pBandMap = NULL;
TxTune* g_pTxTune = NULL;
QSharedMemory mem_m65("mem_m65");
-QString Program_Title_Version=" MAP65 3.0.0-devel by K1JT, G4WJS, K9AN, and IV3NWV";
-
extern const int RxDataFrequency = 96000;
extern const int TxDataFrequency = 11025;
@@ -92,7 +91,7 @@ MainWindow::MainWindow(QWidget *parent) :
connect(ui->decodedTextBrowser,SIGNAL(selectCallsign(bool)),this,
SLOT(selectCall2(bool)));
- setWindowTitle(Program_Title_Version);
+ setWindowTitle (program_title ());
connect(&soundInThread, SIGNAL(readyForFFT(int)),
this, SLOT(dataSink(int)));
@@ -782,7 +781,7 @@ void MainWindow::on_actionBlue_triggered()
void MainWindow::on_actionAbout_triggered() //Display "About"
{
- CAboutDlg dlg(this,Program_Title_Version);
+ CAboutDlg dlg(this);
dlg.exec();
}
diff --git a/map65/messages.cpp b/map65/messages.cpp
index f63b6473c..2c08de0e8 100644
--- a/map65/messages.cpp
+++ b/map65/messages.cpp
@@ -1,7 +1,7 @@
#include "messages.h"
#include "ui_messages.h"
#include "mainwindow.h"
-#include "../qt_helpers.hpp"
+#include "qt_helpers.hpp"
Messages::Messages(QWidget *parent) :
QDialog(parent),