Merge branch 'hotfix-2.0.0-rc6' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc6

Configuration.cpp

@@ -1446,7 +1446,9 @@ void Configuration::impl::read_settings ()
 
   stations_.station_list (settings_->value ("stations").value<StationList::Stations> ());
 
-  decode_highlighing_model_.items (settings_->value ("DecodeHighlighting", QVariant::fromValue (DecodeHighlightingModel::default_items ())).value<DecodeHighlightingModel::HighlightItems> ());
+  auto highlight_items = settings_->value ("DecodeHighlighting", QVariant::fromValue (DecodeHighlightingModel::default_items ())).value<DecodeHighlightingModel::HighlightItems> ();
+  if (!highlight_items.size ()) highlight_items = DecodeHighlightingModel::default_items ();
+  decode_highlighing_model_.items (highlight_items);
   highlight_by_mode_ = settings_->value("HighlightByMode", false).toBool ();
   LotW_days_since_upload_ = settings_->value ("LotWDaysSinceLastUpload", 365).toInt ();
   lotw_users_.set_age_constraint (LotW_days_since_upload_);

doc/common/links.adoc

@@ -79,6 +79,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
 :log4om: http://www.log4om.com[Log4OM]
 :lunarEchoes: http://physics.princeton.edu/pulsar/K1JT/LunarEchoes_QEX.pdf[QEX]
 :msk144: http://physics.princeton.edu/pulsar/k1jt/MSK144_Protocol_QEX.pdf[QEX]
+:msvcpp_redist: https://www.microsoft.com/en-ph/download/details.aspx?id=40784[Microsoft VC++ 2013 Redistributable]
 :msys_url: http://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/[MSYS Download]
 :n1mm_logger: https://n1mm.hamdocs.com/tiki-index.php[N1MM Logger+]
 :ntpsetup: http://www.satsignal.eu/ntp/setup.html[Network Time Protocol Setup]
@@ -89,6 +90,8 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
 :sourceforge: https://sourceforge.net/user/registration[SourceForge]
 :sourceforge-jtsdk: https://sourceforge.net/projects/jtsdk[SourceForge JTSDK]
 :ubuntu_sdk: https://launchpad.net/~ubuntu-sdk-team/+archive/ppa[Ubuntu SDK Notice]
+:win_openssl_packages: https://slproweb.com/products/Win32OpenSSL.html[Windows OpenSSL Packages]
+:win32_openssl: https://slproweb.com/download/Win32OpenSSL_Light-1_0_2q.exe[Win32 OpenSSL Lite Package]
 :writelog: https://writelog.com/[Writelog]
 :wsjt_yahoo_group: https://groups.yahoo.com/neo/groups/wsjtgroup/info[WSJT Group]
 :wsjtx: http://physics.princeton.edu/pulsar/K1JT/wsjtx.html[WSJT-X]

doc/user_guide/en/faq.adoc

@@ -47,6 +47,10 @@ location for each instance of _WSJT-X_.
  wsjtx --rig-name=TS2000
  wsjtx --rig-name=FT847
 
+I am getting a "Network Error - SSL/TLS support not installed" message. What should I do?::
+
+You need to install suitable _OpenSSL_ libraries - see <<OPENSSL,Instructions to install _OpenSSL_>>.
+
 I occasionally get Rig Control Errors if I adjust my Icom rig's VFO. What's wrong?::
 
 By default most Icom transceivers have *CI-V Tranceive Mode" enabled,

doc/user_guide/en/install-windows.adoc

@@ -3,36 +3,62 @@
 Download and execute the package file {win32}, following these
 instructions:
 
-- Install _WSJT-X_ into its own directory, for example `C:\WSJTX` or
+* Install _WSJT-X_ into its own directory, for example `C:\WSJTX` or `
-`C:\WSJT\WSJTX`, rather than the conventional location
+  C:\WSJT\WSJTX`, rather than the conventional location `C:\Program
-`C:\Program Files\WSJTX`.
+  Files (x86)\WSJTX`.
 
-- All program files relating to _WSJT-X_ will be stored in the chosen
+* All program files relating to _WSJT-X_ will be stored in the chosen
-installation directory and its subdirectories. 
+  installation directory and its subdirectories.
+
+* Logs and other writeable files will normally be found in the
+  directory +
 
-- Logs and other writeable files will normally be found in the 
-directory +
 `C:\Users\<username>\AppData\Local\WSJT-X`.
 
 TIP: Your computer may be configured so that this directory is
-"`invisible`".  It's there, however, and accessible.  An alternative
+     "`invisible`".  It's there, however, and accessible.  An
-(shortcut) directory name is `"%LOCALAPPDATA%\WSJT-X\"`.
+     alternative (shortcut) directory name is
+     `"%LocalAppData%\WSJT-X\"`.
 
-- The built-in Windows facility for time synchronization is usually
+* The built-in Windows facility for time synchronization is usually
-not adequate. We recommend the program _Meinberg NTP_ (see {ntpsetup}
+  not adequate. We recommend the program _Meinberg NTP_ (see
-for downloading and installation instructions) or _Dimension 4_ from
+  {ntpsetup} for downloading and installation instructions) or
-{dimension4}. Recent versions of Windows 10 are now shipped with a
+  _Dimension 4_ from {dimension4}. Recent versions of Windows 10 are
-more capable Internet time synchronization service that is suitable if
+  now shipped with a more capable Internet time synchronization
-configured appropriately.
+  service that is suitable if configured appropriately.
 
-- _WSJT-X_ expects your sound card to do its raw sampling at 48000 Hz.
+[[OPENSSL]]
-To ensure that this will be so when running under recent versions of
-Windows, open the system's *Sound* control panel and select in turn
-the *Recording* and *Playback* tabs. Click on *Properties*, then
-*Advanced*, and select *16 bit, 48000 Hz (DVD Quality)*. Switch of all
-audio enhancement features for these devices.
 
-- You can uninstall _WSJT-X_ by clicking its *Uninstall* link in the
+* image:LoTW_TLS_error.png[_WSJT-X_ LoTW download TLS error,
-Windows *Start* menu, or by using *Uninstall a Program* on the Windows
+  role="right"] From this version onward _WSJT-X_ requires the
-Control Panel Programs and Features option or in Settings Apps on
+  _OpenSSL_ libraries to be installed. Suitable libraries may already
-Windows 10.
+  be installed on your system, if they are not you will see this error
+  shortly after startup. To fix this you need to install the _OpenSSL_
+  libraries.
+
+** You can download a suitable _OpenSSL_ package for from
+   {win_openssl_packages}, you need the latest *Win32 v1.0.2 Lite*
+   version (Note it is the Win32 package even if you are using a
+   64-bit Windows operating system) which at the time of writing was
+   {win32_openssl}.
+
+** Install the package and accept the default options, including the
+   option to copy the OpenSSL DLLs to the Windows system directory
+   (this is important). +
+
+NOTE: If you still get the same network error after installing the
+      _OpenSSL_ libraries then you also need to install the
+      {msvcpp_redist} component. From the download page select
+      `vcredist_x86.exe` and run it to install.
+
+* _WSJT-X_ expects your sound card to do its raw sampling at 48000 Hz.
+  To ensure that this will be so when running under recent versions of
+  Windows, open the system's *Sound* control panel and select in turn
+  the *Recording* and *Playback* tabs. Click on *Properties*, then
+  *Advanced*, and select *16 bit, 48000 Hz (DVD Quality)*. Switch of
+  all audio enhancement features for these devices.
+
+* You can uninstall _WSJT-X_ by clicking its *Uninstall* link in the
+  Windows *Start* menu, or by using *Uninstall a Program* on the
+  Windows Control Panel Programs and Features option or in Settings
+  Apps on Windows 10.