Merge branch 'foldynl:master' into master

Author: aa5sh

Changelog

@@ -1,3 +1,26 @@
+2025/12/06 - 0.47.0
+- [NEW] - Adds theme options - native, light, dark (PR #718 @kyleboyle)
+- [NEW] - Implemented ADIF 3.1.6
+- [NEW] - ADIF 3.1.6 - Added new modes FSK and MTONE
+- [NEW] - ADIF 3.1.6 - Added new contest IDs
+- [NEW] - ADIF 3.1.6 - Added new column EQSL_AG (Import/Export only)
+- [NEW] - Statistics, QSODetail contain deleted DXCC Entities (PR #728 @aa5sh @foldynl)
+- [NEW] - Settings Hamlib - Added support to define CIV Addr for Icom and Ten-Tec (issue #747)
+- [NEW] - Settings Hamlib - Added RTS and DTR control (PR #809 @aa5sh)
+- [NEW] - Settings GUI - Added options to switch distance unit
+- [NEW] - Added Linux manpage (PR #791 @dawkagaming)
+- [NEW] - Added a link to the GitHub release notes under Help-Whats New
+- [NEW] - Added workaround for WriteLog - always call callbook lookups (PR #833 @sjwoodr)
+- [NEW] - Awards - Added Not-Confirmed filter (PR #836 @aa5sh)
+- [NEW] - Rotator Widget - Added buttons to change button profiles
+- [CHANGED] - Settings - Added network loop detection for WSJTX Forward (issue #815 @aa5sh @foldynl)
+- [CHANGED] - Rotator - Rotator timeout is set to 5s (PR #823 @aa5sh)
+- [CHANGED] - Double Spin Boxes - the decimal separator is forced to be a period
+- [DELETED] - WSJTX Widget - Removed Freq and Mode
+- Fixed QSODetail - Anti-meridian bug on map (issue #786)
+- Fixed Statistics: Center maps on QTH longitude (issue #824)
+- Fixed OmniRig disconnecting when its status changed unexpectedly (issue #832)
+
 2025/10/31 - 0.46.2
 - Fixed Spaces after QRZ.com name (issue #767)
 - Fixed SPID Rot1Prog Rotator more 360 deg (issue #775)

QLog.pro

@@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
 
 TARGET = qlog
 TEMPLATE = app
-VERSION = 0.46.2
+VERSION = 0.47.0
 
 DEFINES += VERSION=\\\"$$VERSION\\\"
 
@@ -30,6 +30,10 @@ DEFINES += VERSION=\\\"$$VERSION\\\"
 #QTKEYCHAININCLUDEPATH =
 #QTKEYCHAINLIBPATH =
 
+# Define paths to zlib - Leave empty if system libraries should be used
+#ZLIBINCLUDEPATH =
+#ZLIBLIBPATH =
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -75,6 +79,7 @@ SOURCES += \
         data/ActivityProfile.cpp \
         data/AntProfile.cpp \
         data/BandPlan.cpp \
+        data/Accents.cpp \
         data/CWKeyProfile.cpp \
         data/CWShortcutProfile.cpp \
         data/Callsign.cpp \
@@ -171,6 +176,7 @@ SOURCES += \
         ui/WebEnginePage.cpp \
         ui/WsjtxFilterDialog.cpp \
         ui/WsjtxWidget.cpp \
+        ui/component/BaseDoubleSpinBox.cpp \
         ui/component/EditLine.cpp \
         ui/component/FreqQSpinBox.cpp \
         ui/component/MultiselectCompleter.cpp \
@@ -321,6 +327,7 @@ HEADERS += \
         ui/WsjtxWidget.h \
         i18n/dbstrings.tri \
         i18n/datastrings.tri \
+        ui/component/BaseDoubleSpinBox.h \
         ui/component/ButtonStyle.h \
         ui/component/EditLine.h \
         ui/component/FreqQSpinBox.h \
@@ -381,6 +388,7 @@ OTHER_FILES += \
     res/stylesheet.css \
     res/qlog.rc \
     res/qlog.desktop \
+    res/qlog.1 \
     res/io.github.foldynl.QLog.metainfo.xml
 
 TRANSLATIONS = i18n/qlog_cs.ts \
@@ -442,6 +450,10 @@ isEmpty(HAMLIBVERSION_PATCH){
    INCLUDEPATH += $$PTHREADINCLUDEPATH
 }
 
+!isEmpty(ZLIBINCLUDEPATH) {
+   INCLUDEPATH += $$ZLIBINCLUDEPATH
+}
+
 !isEmpty(HAMLIBLIBPATH) {
    LIBS += -L$$HAMLIBLIBPATH
 }
@@ -454,6 +466,10 @@ isEmpty(HAMLIBVERSION_PATCH){
    LIBS += -L$$PTHREADINCLUDEPATH
 }
 
+!isEmpty(ZLIBLIBPATH) {
+   LIBS += -L$$ZLIBLIBPATH
+}
+
 unix:!macx {
    isEmpty(PREFIX) {
      PREFIX = /usr/local
@@ -464,6 +480,9 @@ unix:!macx {
    desktop.path = $$PREFIX/share/applications/
    desktop.files += res/$${TARGET}.desktop
 
+   manpage.path = $$PREFIX/usr/share/man/man1
+   manpage.files += res/$${TARGET}.1
+
    icon.path = $$PREFIX/share/icons/hicolor/256x256/apps
    icon.files += res/$${TARGET}.png
 
@@ -473,7 +492,7 @@ unix:!macx {
    INSTALLS += target desktop icon metainfo
 
    INCLUDEPATH += /usr/local/include
-   LIBS += -L/usr/local/lib -lhamlib -lsqlite3
+   LIBS += -L/usr/local/lib -lhamlib -lsqlite3 -lz
    equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain
    equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain
 }
@@ -486,7 +505,7 @@ macx: {
    }
 
    INCLUDEPATH += /usr/local/include /opt/homebrew/include /opt/local/include
-   LIBS += -L/usr/local/lib -L/opt/homebrew/lib -lhamlib -lsqlite3 -L/opt/local/lib
+   LIBS += -L/usr/local/lib -L/opt/homebrew/lib -lhamlib -lsqlite3 -lz -L/opt/local/lib
    equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain
    equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain
    DISTFILES +=
@@ -527,7 +546,7 @@ win32: {
    QMAKE_TARGET_COMPANY = OK1MLG
    QMAKE_TARGET_DESCRIPTION = Hamradio logging
 
-   LIBS += -lws2_32 -llibhamlib-4
+   LIBS += -lws2_32 -llibhamlib-4 -lzlib
    equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain
    equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain
 

README.md

@@ -99,6 +99,7 @@ The above packages are maintained by the application maintainer. However, there
 
 Prerequisites:
 
+- Installed [Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-supported-redistributable-version)
 - Installed [Trusted QSL](http://www.arrl.org/tqsl-download) (Optional)
 - Installed [Omnirig v1](https://www.dxatlas.com/omnirig/) (Optional)
 - Installed [Omnirig v2](https://www.hb9ryz.ch/omnirig/) (Optional)
@@ -107,7 +108,7 @@ Installation package is available via GitHub [Releases](https://github.com/foldy
 
 ### MacOS
 
-Official support ended. Only for developers.
+MacOS DMG: https://github.com/aa5sh/QLog/releases
 
 ## Compilation
 
@@ -131,6 +132,8 @@ Prerequisites
 - `PTHREADLIBPATH` - the path to pthread Library - needed for Windows Hamlib 4.5 and later. Leave empty if system libraries should be used.
 - `QTKEYCHAININCLUDEPATH` - the path to QtKeyChain Includes 
 - `QTKEYCHAINLIBPATH`- the path to QtKeyChain Library
+- `ZLIBINCLUDEPATH` - the path to ZLIB Includes
+- `ZLIBLIBPATH` - the path to ZLIB Library
 
 Leave variables empty if system libraries and Hamlib version autodetect (calling `pkg-config`) should be used during compilation (for Windows, the parameter must be present)
 

core/AlertEvaluator.cpp

@@ -136,7 +136,7 @@ bool AlertRule::save()
 
     if ( ruleName.isEmpty() )
     {
-        qCDebug(runtime) << "rule name is emptry - do not save";
+        qCDebug(runtime) << "rule name is empty - do not save";
         return false;
     }
 

core/CallbookManager.cpp

@@ -31,7 +31,7 @@ void CallbookManager::queryCallsign(const QString &callsign)
     }
 
     // create an empty object in cache
-    // if there is the second query for the same call immediatelly after
+    // if there is the second query for the same call immediately after
     // the first query, then it returns a result of empty object
     queryCache.insert(callsign, new CallbookResponseData);