w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.3.0' into develop

This commit is contained in:
Bill Somerville 2020-12-07 10:44:52 +00:00
parent 06f9800b2f cefc8e2645
commit 0410f4718f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Darwin/ReadMe.txt
View File

@ -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. 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 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 system area by typing this line in the Terminal window and then pressing the Return key.
after each line.
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. 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.) (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 reboot you should re-open the Terminal window as before and you can check that the
change has been made by typing: 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 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". an error message: "Unable to create shared memory segment".

4
widgets/logqso.cpp
View File

@ -1,5 +1,6 @@
#include "logqso.h" #include "logqso.h"
#include <QLocale>
#include <QString> #include <QString>
#include <QSettings> #include <QSettings>
#include <QStandardPaths> #include <QStandardPaths>
@ -61,6 +62,9 @@ LogQSO::LogQSO(QString const& programTitle, QSettings * settings
ui->comboBoxPropMode->addItem (prop_mode.name_, prop_mode.id_); ui->comboBoxPropMode->addItem (prop_mode.name_, prop_mode.id_);
} }
loadSettings (); 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}); ui->grid->setValidator (new MaidenheadLocatorValidator {this});
} }