w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up program identification to pskreporter and other places 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4987 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-02-23 15:19:41 +00:00
parent 0f72c3fd9b
commit 4933a30546
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
about.cpp
View File

@ -1,16 +1,24 @@
#include "about.h"
#include "ui_about.h"
#include <QCoreApplication>
#include <QString>
#include "revision_utils.hpp"
#include "ui_about.h"
#include "moc_about.cpp"
CAboutDlg::CAboutDlg(QString const& program_title, QWidget *parent) :
CAboutDlg::CAboutDlg(QWidget *parent) :
QDialog(parent),
ui(new Ui::CAboutDlg)
{
ui->setupUi(this);
ui->labelTxt->setText ("<html><h2>" + program_title + "</h2>\n\n"
ui->labelTxt->setText ("<html><h2>"
+ QString {"WSJT-X v"
+ QCoreApplication::applicationVersion ()
+ " " + revision ()}.simplified ()
+ "</h2>\n\n"
"WSJT-X implements digital modes JT9 and JT65 for <br>"
"Amateur Radio communication. <br><br>"
"&copy; 2001-2014 by Joe Taylor, K1JT, with grateful <br>"

2
about.h
View File

@ -14,7 +14,7 @@ class CAboutDlg : public QDialog
Q_OBJECT;
public:
explicit CAboutDlg(QString const& program_title, QWidget *parent = nullptr);
explicit CAboutDlg(QWidget *parent = nullptr);
~CAboutDlg ();
private:

13
main.cpp
View File

@ -86,7 +86,7 @@ int main(int argc, char *argv[])
QStandardPaths::setTestModeEnabled (parser.isSet (test_option));
// support for multiple instances running from a single installation
if (parser.isSet (rig_option))
if (parser.isSet (rig_option) || parser.isSet (test_option))
{
auto temp_name = parser.value (rig_option);
if (!temp_name.isEmpty ())
@ -98,12 +98,13 @@ int main(int argc, char *argv[])
}
a.setApplicationName (a.applicationName () + " - " + temp_name);
if (parser.isSet (test_option))
{
a.setApplicationName (a.applicationName () + " - test");
}
}
if (parser.isSet (test_option))
{
a.setApplicationName (a.applicationName () + " - test");
}
multiple = true;
}

4
mainwindow.cpp
View File

@ -740,7 +740,7 @@ void MainWindow::monitor (bool state)
void MainWindow::on_actionAbout_triggered() //Display "About"
{
CAboutDlg {program_title (m_revision), this}.exec ();
CAboutDlg {this}.exec ();
}
void MainWindow::on_autoButton_clicked (bool checked)
@ -3134,7 +3134,7 @@ void MainWindow::pskSetLocal ()
psk_Reporter->setLocalStation(
m_config.my_callsign ()
, m_config.my_grid ()
, antenna_description, program_title (m_revision));
, antenna_description, QString {"WSJT-X v" + version() + " " + m_revision}.simplified ());
}
void MainWindow::transmitDisplay (bool transmitting)

7
revision_utils.cpp
View File

@ -78,11 +78,6 @@ QString version ()
QString program_title (QString const& revision)
{
QString id {QCoreApplication::applicationName ()};
#if defined (CMAKE_BUILD)
id += " v" + version ();
#else
id += " Not for Release";
#endif
QString id {QCoreApplication::applicationName () + " v" + QCoreApplication::applicationVersion ()};
return id + " " + revision + " by K1JT";
}