Merge branch 'master' into develop

This commit is contained in:
Bill Somerville 2020-05-29 00:53:36 +01:00
commit a57dcd4a6f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
11 changed files with 89 additions and 12457 deletions

View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR)
if (APPLE)
#
# The following variables define the portability and compatability attributes of the Mac OS X build
# The following variables define the portability and compatability attributes of the Mac macOS build
# they are choosen with care and should not be changed without good cause.
#
# Among other things these options are chosen to match the portability and compatability options of the
@ -10,15 +10,15 @@ if (APPLE)
#
# otool -l <binary> | grep -A3 LC_VERSION_MIN_MACOSX
#
set (CMAKE_OSX_DEPLOYMENT_TARGET 10.13
CACHE STRING "Earliest version of OS X supported
set (CMAKE_OSX_DEPLOYMENT_TARGET 10.12
CACHE STRING "Earliest version of macOS supported
Earliest version we can support with Qt 5.14, C++11 & libc++ is 10.13.
Earliest version we can support with Qt 5.12, C++11 & libc++ is 10.13.
Do not override this if you intend to build an official deployable installer.")
set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
CACHE STRING "Mac OS X SDK to build with
Change this to the newest SDK available that you can install on your system (10.14 preferred).
Change this to the newest SDK available that you can install on your system (>10.14 preferred).
Do not override this if you intend to build an official deployable installer.")
endif (APPLE)
@ -1097,10 +1097,8 @@ add_custom_target (etags COMMAND ${ETAGS} -o ${CMAKE_SOURCE_DIR}/TAGS -R ${sourc
# Qt i18n
set (LANGUAGES
en_GB # English UK
pt # Poutuguese
es # Spanish
ca # Catalan
ja # Japanese
)
foreach (lang_ ${LANGUAGES})
file (TO_NATIVE_PATH translations/wsjtx_${lang_}.ts ts_)

23
NEWS
View File

@ -12,6 +12,29 @@
Copyright 2001 - 2019 by Joe Taylor, K1JT.
Release: WSJT-X 2.2.0-rc3
May 30, 2020
-------------------------
WSJT-X 2.2.0-rc3 is the third release candidate for WSJT-X 2.2.0.
The most important differences from the -rc2 version are the
correction of regressions in hamlib code that affected particular
radios and PTT keying by means of DTR or RTS on a COM port.
In addition, RC3 has the following enhancements and minor bug fixes:
- Updates to Catalan translation of the UI (thanks to EA3W)
- Spanish translation of the UI (EA3W)
- Load language translations only when matching primary language
- Minor corrections to User Guide
- Increased FT8 sync threshold in "Normal" and "Fast" decoding
- Corrected the code that restores the WideGraph, EchoGraph, and
FastGraph windows to normal view after they have been minimized.
- Don't allow restart with "ISCAT B" mode label unless VHF features
are enabled.
- Repair regression defect in WSPR power combo box items
Release: WSJT-X 2.2.0-rc2
May 25, 2020

View File

@ -12,6 +12,30 @@
Copyright 2001 - 2020 by Joe Taylor, K1JT.
Release: WSJT-X 2.2.0-rc3
May 30, 2020
-------------------------
WSJT-X 2.2.0-rc3 is the third release candidate for WSJT-X 2.2.0.
The most important differences from the -rc2 version are the
correction of regressions in hamlib code that affected particular
radios and PTT keying by means of DTR or RTS on a COM port.
In addition, RC3 has the following enhancements and minor bug fixes:
- Updates to Catalan translation of the UI (thanks to EA3W)
- Spanish translation of the UI (EA3W)
- Load language translations only when matching primary language
- Minor corrections to User Guide
- Increased FT8 sync threshold in "Normal" and "Fast" decoding
- Corrected the code that restores the WideGraph, EchoGraph, and
FastGraph windows to normal view after they have been minimized.
- Don't allow restart with "ISCAT B" mode label unless VHF features
are enabled.
- Repair regression defect in WSPR power combo box items
Release: WSJT-X 2.2.0-rc2
May 25, 2020
-------------------------

View File

@ -1,6 +1,6 @@
// These instructions are up-to-date for WSJT-X v2.2
*macOS 10.13* and later: Download the file {osx} to your desktop,
*OS X 10.12* and later: Download the file {osx} to your desktop,
double-click on it and consult its `ReadMe` file for important
installation notes.

View File

@ -2,7 +2,7 @@
[[FIG_BAND_SETTINGS]]
_By default, the *Working Frequencies* table contains a list of
By default, the *Working Frequencies* table contains a list of
frequencies conventionally used for modes FT8, JT4, JT9, JT65, MSK144,
WSPR, and Echo. Conventions may change with time or by user
preference; you can modify the frequency table as desired.

View File

@ -3,7 +3,7 @@
[[FigTxMacros]]
*Tx Macros* are an aid for sending brief, frequently used free-text
messages such as the examples shown above.
messages such as the examples shown below.
image::tx-macros.png[align="center",alt="Tx Macros Screen"]

View File

@ -135,6 +135,7 @@ contains
do ipass=1,npass
newdat=.true.
syncmin=1.3
if(ndepth.le.2) syncmin=1.6
if(ipass.eq.1) then
lsubtract=.true.
ndeep=ndepth

View File

@ -10,6 +10,7 @@
#include <QTemporaryFile>
#include <QDateTime>
#include <QApplication>
#include <QLocale>
#include <QTranslator>
#include <QRegularExpression>
#include <QObject>
@ -161,7 +162,7 @@ int main(int argc, char *argv[])
for (QString locale_name : locale.uiLanguages ())
{
auto language = locale_name.left (2);
if (base_translator_from_resources.load ("wsjtx_" + language, ":/Translations"))
if (locale.uiLanguages ().front ().left (2) == language)
{
*early_messages << QString {"Trying %1"}.arg (language);
if (base_translator_from_resources.load ("wsjtx_" + language, translations_dir))
@ -179,7 +180,7 @@ int main(int argc, char *argv[])
QTranslator translator_from_resources;
if (translator_from_resources.load (locale, "wsjtx", "_", translations_dir))
{
qDebug () << "Loaded translations for current locale from resources";
*early_messages << "Loaded translations for current locale from resources";
a.installTranslator (&translator_from_resources);
}
@ -278,19 +279,23 @@ int main(int argc, char *argv[])
for (QString locale_name : locale.uiLanguages ())
{
auto language = locale_name.left (2);
if (locale.uiLanguages ().front ().left (2) == language)
{
*early_messages << QString {"Trying %1"}.arg (language);
if (base_translator_from_cwd.load ("wsjtx_" + language))
{
qDebug () << QString {"Loaded base translation file from $cwd based on language %1"}.arg (language);
*early_messages << QString {"Loaded base translation file from $cwd based on language %1"}.arg (language);
a.installTranslator (&base_translator_from_cwd);
break;
}
}
}
// now try and load the most specific translations (may be a
// duplicate but we shouldn't care)
QTranslator translator_from_cwd;
if (translator_from_cwd.load (locale, "wsjtx", "_"))
{
qDebug () << "loaded translations for current locale from a file";
*early_messages << "loaded translations for current locale from a file";
a.installTranslator (&translator_from_cwd);
}
@ -309,14 +314,14 @@ int main(int argc, char *argv[])
auto base_language = language.left (2);
if (base_translation_override_from_cwd.load ("wsjtx_" + base_language))
{
qDebug () << QString {"Loaded base translation file from $cwd based on language %1"}.arg (base_language);
*early_messages << QString {"Loaded base translation file from $cwd based on language %1"}.arg (base_language);
a.installTranslator (&base_translation_override_from_cwd);
}
// now load the requested translations (may be a duplicate
// but we shouldn't care)
if (translation_override_from_cwd.load ("wsjtx_" + language))
{
qDebug () << QString {"loaded translation file from $cwd based on language %1"}.arg (language);
*early_messages << QString {"loaded translation file from $cwd based on language %1"}.arg (language);
a.installTranslator (&translation_override_from_cwd);
}
}
@ -390,6 +395,13 @@ int main(int argc, char *argv[])
qDebug () << program_title (revision ()) + " - Program startup";
#endif
// trace early messages now we have a trace file
for (auto const& message : *early_messages)
{
qDebug () << message;
}
early_messages.reset (); // free memory
// Create a unique writeable temporary directory in a suitable location
bool temp_ok {false};
QString unique_directory {QApplication::applicationName ()};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -812,7 +812,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
char const * const power[] = {"1 mW","2 mW","5 mW","10 mW","20 mW","50 mW","100 mW","200 mW","500 mW",
"1 W","2 W","5 W","10 W","20 W","50 W","100 W","200 W","500 W","1 kW"};
for(auto i = 0u; i < sizeof power / sizeof power[0]; ++i) { //Initialize dBm values
ui->TxPowerComboBox->addItem (QString {"%1 dBm %2"}.arg (int (10. * i / 3.)).arg (power[i]));
ui->TxPowerComboBox->addItem (QString {"%1 dBm %2"}.arg (int ((10. * i / 3.) + .5)).arg (power[i]));
}
m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc();
@ -921,7 +921,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
set_mode (m_mode);
if(m_mode=="Echo") monitor(false); //Don't auto-start Monitor in Echo mode.
ui->sbSubmode->setValue (vhf ? m_nSubMode : 0);
ui->sbSubmode->setValue (vhf ? m_nSubMode : 0); //Submodes require VHF features
if(m_mode=="ISCAT" and !vhf) mode_label.setText("ISCAT A");
if(m_mode=="MSK144") {
Q_EMIT transmitFrequency (1000.0);
} else {
@ -2415,17 +2416,17 @@ void MainWindow::on_actionLocal_User_Guide_triggered()
void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls
{
m_wideGraph->show();
m_wideGraph->showNormal();
}
void MainWindow::on_actionEcho_Graph_triggered()
{
m_echoGraph->show();
m_echoGraph->showNormal();
}
void MainWindow::on_actionFast_Graph_triggered()
{
m_fastGraph->show();
m_fastGraph->showNormal();
}
void MainWindow::on_actionSolve_FreqCal_triggered()
@ -5981,7 +5982,7 @@ void MainWindow::on_actionJT9_triggered()
if(m_bFast9) {
m_TRperiod = ui->sbTR->value ();
m_wideGraph->hide();
m_fastGraph->show();
m_fastGraph->showNormal();
ui->TxFreqSpinBox->setValue(700);
ui->RxFreqSpinBox->setValue(700);
ui->decodedTextLabel->setText("UTC dB T Freq " + tr ("Message"));
@ -6144,7 +6145,7 @@ void MainWindow::on_actionISCAT_triggered()
m_wideGraph->setMode(m_mode);
m_wideGraph->setModeTx(m_modeTx);
statusChanged();
if(!m_fastGraph->isVisible()) m_fastGraph->show();
if(!m_fastGraph->isVisible()) m_fastGraph->showNormal();
if(m_wideGraph->isVisible()) m_wideGraph->hide();
setup_status_bar (true);
ui->cbShMsgs->setChecked(false);
@ -6197,7 +6198,7 @@ void MainWindow::on_actionMSK144_triggered()
m_bFast9=false;
m_TRperiod = ui->sbTR->value ();
m_wideGraph->hide();
m_fastGraph->show();
m_fastGraph->showNormal();
ui->TxFreqSpinBox->setValue(1500);
ui->RxFreqSpinBox->setValue(1500);
ui->RxFreqSpinBox->setMinimum(1400);
@ -6402,9 +6403,9 @@ void MainWindow::fast_config(bool b)
ui->sbTR->setVisible(b);
if(b and (m_bFast9 or m_mode=="MSK144" or m_mode=="ISCAT")) {
m_wideGraph->hide();
m_fastGraph->show();
m_fastGraph->showNormal();
} else {
m_wideGraph->show();
m_wideGraph->showNormal();
m_fastGraph->hide();
}
}