w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-27 04:24:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Uniform appearance of window titles.

Browse Source 
Svn revision  number displayed  in about  window and  sent PSKReporter
only.

About box text centred and uses Copyright symbol.

Window   title   on  "Log   QSO"   dialog   includes  rig-name   where
multi-instance support  is enabled. This  is necessary since  the "Log
QSO" dialog is not modal.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3960 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2014-03-30 01:31:40 +00:00
parent e4b69c7370
commit 42844e3104
9 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+13 -13
View File
@@ -44,15 +44,6 @@ wchar_t buffer[256];
QTextEdit* pShortcuts;
QTextEdit* pPrefixes;
#if defined (CMAKE_BUILD)
QString rev (" " WSJTX_STRINGIZE (SVNVERSION));
QString Program_Title_Version ("WSJT-X v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) ", " WSJTX_STRINGIZE (SVNVERSION) " by K1JT");
#else
QString rev="$Rev$";
QString Program_Title_Version=" WSJT-X v1.4, r" + rev.mid(6,4) +
" by K1JT";
#endif
namespace
{
Radio::Frequency constexpr default_frequency {14076000};
@@ -87,9 +78,18 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_multiple {multiple},
m_settings (settings),
ui(new Ui::MainWindow),
#if defined (CMAKE_BUILD)
m_rev {" " WSJTX_STRINGIZE (SVNVERSION)},
m_windowTitle {QApplication::applicationName () + " v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " by K1JT"},
#else
m_rev {"$Rev$"},
m_windowTitle {"WSJT-X v1.4, r" + m_rev.mid(6,4) + " by K1JT"},
#endif
m_config (thekey, settings, this),
m_wideGraph (new WideGraph (settings)),
m_logDlg (new LogQSO (settings, &m_config, this)),
m_logDlg (new LogQSO (m_windowTitle, settings, &m_config, this)),
m_dialFreq {0},
m_detector (RX_SAMPLE_RATE, NTMAX / 2, 6912 / 2, downSampleFactor),
m_modulator (TX_SAMPLE_RATE, NTMAX / 2),
@@ -221,7 +221,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
setDecodedTextFont (font);
});
setWindowTitle(Program_Title_Version);
setWindowTitle(m_windowTitle);
createStatusBar();
connect(&proc_jt9, SIGNAL(readyReadStandardOutput()),
@@ -727,7 +727,7 @@ void MainWindow::monitor (bool state)
void MainWindow::on_actionAbout_triggered() //Display "About"
{
CAboutDlg dlg(this,Program_Title_Version);
CAboutDlg dlg(this);
dlg.exec();
}
@@ -2985,5 +2985,5 @@ void MainWindow::pskSetLocal ()
psk_Reporter->setLocalStation(
m_config.my_callsign ()
, m_config.my_grid ()
, antenna_description, "WSJT-X r" + rev.mid(6,4));
, antenna_description, "WSJT-X r" + m_rev.mid(6,4));
}