From 4a416175d24488ca66ff3553c93ddd85b1b09690 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 5 Aug 2017 13:36:14 +0000 Subject: [PATCH] Merged from trunk: ------------------------------------------------------------------------ r8005 | bsomervi | 2017-08-05 14:29:55 +0100 (Sat, 05 Aug 2017) | 5 lines User guide and help text updates Details of --config command line option. Note that low confidence decodes '?' are not spotted and more generic text for --help command line option now derived from CMakeLists description strings. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@8007 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- doc/user_guide/en/controls-functions-menus.adoc | 4 ++++ doc/user_guide/en/decoder_notes.adoc | 3 ++- main.cpp | 2 +- wsjtx_config.h.in | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/user_guide/en/controls-functions-menus.adoc b/doc/user_guide/en/controls-functions-menus.adoc index d931d15c7..50e8e43a2 100644 --- a/doc/user_guide/en/controls-functions-menus.adoc +++ b/doc/user_guide/en/controls-functions-menus.adoc @@ -26,6 +26,10 @@ menu for switching between modes. Simply *Clone* the *Default* entry, configuration. These settings will be restored whenever you select that configuration. +As well as switching between configurations while running _WSJT-X_ you +can also start the application in any configuration by using the +`--config ` command line option (`-c` for short). + [[VIEW_MENU]] ==== View Menu image::view-menu.png[align="left",alt="View Menu"] diff --git a/doc/user_guide/en/decoder_notes.adoc b/doc/user_guide/en/decoder_notes.adoc index 8005646f3..88a467512 100644 --- a/doc/user_guide/en/decoder_notes.adoc +++ b/doc/user_guide/en/decoder_notes.adoc @@ -30,7 +30,8 @@ proceeds to determine whether the remaining message and parity bits are consistent with the hypothesized AP bits. If a codeword is found that the decoder judges to have high (but not overwhelmingly high) probability of being correct, a ? character is appended when the -decoded message is displayed. +decoded message is displayed. Decodes thus marked are not sent to +{pskreporter} to avoid occasional misleading spots of false decodes. Successful AP decodes are always labeled with an end-of-line indicator of the form aP, where P is one of the single-digit AP decoding types diff --git a/main.cpp b/main.cpp index 1f93103e7..8ce40a71e 100644 --- a/main.cpp +++ b/main.cpp @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) #if QT_VERSION >= 0x050200 QCommandLineParser parser; - parser.setApplicationDescription ("\nJT65, JT9, JT4, MSK144, QRA64, ISCAT & WSPR Weak Signal Communications Program."); + parser.setApplicationDescription ("\n" PROJECT_SUMMARY_DESCRIPTION); auto help_option = parser.addHelpOption (); auto version_option = parser.addVersionOption (); diff --git a/wsjtx_config.h.in b/wsjtx_config.h.in index dd30a4abb..c3e80564c 100644 --- a/wsjtx_config.h.in +++ b/wsjtx_config.h.in @@ -13,6 +13,7 @@ #cmakedefine PROJECT_HOMEPAGE "@PROJECT_HOMEPAGE@" #cmakedefine PROJECT_MANUAL_DIRECTORY_URL "@PROJECT_MANUAL_DIRECTORY_URL@" #cmakedefine PROJECT_SAMPLES_URL "@PROJECT_SAMPLES_URL@" +#cmakedefine PROJECT_SUMMARY_DESCRIPTION "@PROJECT_SUMMARY_DESCRIPTION@" #cmakedefine01 WSJT_SHARED_RUNTIME #cmakedefine01 WSJT_QDEBUG_TO_FILE