From e5686cb21f2e57b766bd1da53284e7ae171501bb Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 7 Dec 2020 10:40:52 +0000 Subject: [PATCH 1/2] Minor documentation clarification --- Darwin/ReadMe.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Darwin/ReadMe.txt b/Darwin/ReadMe.txt index 283aa1025..78c092ca4 100644 --- a/Darwin/ReadMe.txt +++ b/Darwin/ReadMe.txt @@ -34,10 +34,9 @@ Double-click on the wsjtx-...-Darwin.dmg file you have downloaded from K1JT's we Now open a Terminal window by going to Applications->Utilities and clicking on Terminal. Along with this ReadMe file there is a file: sysctl.conf which must be copied to a -system area by typing these two lines in the Terminal window and then pressing the Return key -after each line. +system area by typing this line in the Terminal window and then pressing the Return key. - sudo cp /Volumes/WSJT-X/sysctl.conf /etc + sudo cp /Volumes/WSJT-X/sysctl.conf /etc you will be asked for your normal password because authorisation is needed to copy this file. (Your password will not be echoed but press the Return key when completed.) @@ -45,7 +44,7 @@ Now re-boot your Mac. This is necessary to install the changes. After the reboot you should re-open the Terminal window as before and you can check that the change has been made by typing: - sysctl -a | grep sysv.shm + sysctl -a | grep sysv.shm If shmmax is not shown as 104857600 then contact me since WSJT-X will fail to load with an error message: "Unable to create shared memory segment". From cefc8e26452375c2188976f1ee6c079721cd38ab Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 7 Dec 2020 10:41:33 +0000 Subject: [PATCH 2/2] Use the system localized short date format for Log QSO dialog dates This brings these fields into line with other QSO start and end date/time fields elsewhere in the user interface. Note that time entry and edit fields use a fixed hh:mm:ss 24-hour clock format consistent with UTC usage and of suitable accuracy for logging QSOs. --- widgets/logqso.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/widgets/logqso.cpp b/widgets/logqso.cpp index 7a74b86cf..f49274494 100644 --- a/widgets/logqso.cpp +++ b/widgets/logqso.cpp @@ -1,5 +1,6 @@ #include "logqso.h" +#include #include #include #include @@ -61,6 +62,9 @@ LogQSO::LogQSO(QString const& programTitle, QSettings * settings ui->comboBoxPropMode->addItem (prop_mode.name_, prop_mode.id_); } loadSettings (); + auto date_time_format = QLocale {}.dateFormat (QLocale::ShortFormat) + " hh:mm:ss"; + ui->start_date_time->setDisplayFormat (date_time_format); + ui->end_date_time->setDisplayFormat (date_time_format); ui->grid->setValidator (new MaidenheadLocatorValidator {this}); }