w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-30 20:40:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.3.0' into develop

Browse Source
This commit is contained in:
Bill Somerville 2020-12-07 10:44:52 +00:00
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

3
Darwin/ReadMe.txt
View File

@ -34,8 +34,7 @@ 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

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});
} }