Merge branch 'master' of https://github.com/ea4k/klog

Author: ea4k

devscripts/win32-create-package.bat

@@ -28,7 +28,7 @@ rem *
 rem *****************************************************************************/@echo off
 echo Setting up environment for Qt usage...
 set KLOGDEVELVERSION=1
-set PATH=%PATH%;C:\Qt\6.8.3\mingw_64\bin;C:\Qt\Tools\mingw810_32\bin
+set PATH=%PATH%;C:\Qt\6.8.3\mingw_64\bin;C:\Qt\Tools\mingw1310_64\bin
 set PATH=%PATH%;C:\Program Files\InstallBuilder Enterprise 23.10.1\bin;
 set PATH=%PATH%;C:\Program Files (x86)\BitRock InstallBuilder Enterprise 15.10.1\bin;
 echo Line 10
@@ -50,8 +50,8 @@ set KLOGDEVELVERSION=!KLOGDEVELVERSION: =!
 rem set KLOGDEVELVERSION=%KLOGDEVELVERSION:~1%
 echo Building KLog-%KLOGDEVELVERSION%
 echo Line 40
-qmake -set CONFIG+=x86_32
-qmake src.pro
+qmake6 -set CONFIG+=x86_32
+qmake6 src.pro
 echo Line 41
 mingw32-make
 echo Line 42
@@ -61,8 +61,8 @@ xcopy /Y /S /F build\target\* release
 echo localdir=%cd%
 echo %localdir%
 rem COPY OpenSSL DLL
-copy ..\..\..\libs\win32\openssl\bin\*.dll release
-copy ..\..\..\libs\win32\hamlib\bin\*.dll release
+copy ..\..\libs\win32\openssl\*.dll release
+copy ..\..\libs\win32\hamlib\bin\*.dll release
 windeployqt6 --qmldir release release\klog.exe
 :: The SSL DLLs must be included and must match the version that were used to build Qt.
 :: Check in main.cpp and uncomment the SSL line to see what is the version that was used.

devscripts/win64-create-package.bat

@@ -53,9 +53,9 @@ set KLOGDEVELVERSION=!KLOGDEVELVERSION: =!
 rem set KLOGDEVELVERSION=%KLOGDEVELVERSION:~1%
 echo Building KLog-%KLOGDEVELVERSION%
 echo Line 40
-qmake -set CONFIG+=x86_64
+qmake6 -set CONFIG+=x86_64
 echo Line 41
-qmake src.pro
+qmake6 src.pro
 echo Line 42
 mingw32-make
 echo Line 43

src/mainwindow.cpp

@@ -164,7 +164,7 @@ MainWindow::MainWindow(DataProxy_SQLite *dp):
     loggWinAct = new QAction(tr("&Log Window"), this);
 
 
-    dxClusterAssistant = new DXClusterAssistant(Q_FUNC_INFO);
+    //dxClusterAssistant = new DXClusterAssistant(Q_FUNC_INFO);
 
      //qDebug() << Q_FUNC_INFO << ": Awards to be created " << QTime::currentTime().toString("hh:mm:ss") ;
     //awards = new Awards(dataProxy, Q_FUNC_INFO);
@@ -464,7 +464,7 @@ void MainWindow::init()
     awardsWidget->setManageDXMarathon(manageDxMarathon);
 
     dxClusterWidget->setCurrentLog(currentLog);
-    dxClusterAssistant->init();
+    //dxClusterAssistant->init();
 
      //qDebug() << Q_FUNC_INFO << " -  80" << (QTime::currentTime()).toString("HH:mm:ss") ;
      //qDebug() << Q_FUNC_INFO << ": calling Software update ..." << (QTime::currentTime()).toString("HH:mm:ss") ;
@@ -847,10 +847,10 @@ void MainWindow::slotShowMap()
     //mapWindow->addLocators(a, QColor(0, 0, 255, 127));
 }
 
-void MainWindow::slotShowDXClusterAssistant()
-{
-    dxClusterAssistant->show();
-}
+//void MainWindow::slotShowDXClusterAssistant()
+//{
+    //dxClusterAssistant->show();
+//}
 void MainWindow::setMainWindowTitle()
 {
     //qDebug() << Q_FUNC_INFO << " - Start";
@@ -2550,10 +2550,10 @@ void MainWindow::createMenusCommon()
     connect(showMapAct, SIGNAL(triggered()), this, SLOT(slotShowMap()));
     showMapAct->setToolTip(tr("Show the statistics of your radio activity."));
 
-    dxClusterAssistantAct = new QAction (tr("DXCluster Assistant"), this);
-    toolMenu->addAction(dxClusterAssistantAct);
-    connect(dxClusterAssistantAct, SIGNAL(triggered()), this, SLOT(slotShowDXClusterAssistant()));
-    dxClusterAssistantAct->setToolTip(tr("Show the statistics of your radio activity."));
+    //dxClusterAssistantAct = new QAction (tr("DXCluster Assistant"), this);
+    //toolMenu->addAction(dxClusterAssistantAct);
+    //connect(dxClusterAssistantAct, SIGNAL(triggered()), this, SLOT(slotShowDXClusterAssistant()));
+    //dxClusterAssistantAct->setToolTip(tr("Show the statistics of your radio activity."));
 
 
      //qDebug() << "MainWindow::createMenusCommon before" ;
@@ -5004,7 +5004,6 @@ void MainWindow::slotAnalyzeDxClusterSignal(const DXSpot &_spot)
 
     //proposedQSOs pQSO;
 
-
     //pQSO.status = awards.getQSOStatus(statusI);
     //Callsign callsign(spot.getDxCall());
     //if (callsign.isValid())

src/mainwindow.h

@@ -45,7 +45,7 @@
 //#include "locator.h"
 #include "dxcluster/dxcluster.h"
 #include "dxcluster/dxspot.h"
-#include "dxcluster/dxclusterassistant.h"
+//#include "dxcluster/dxclusterassistant.h"
 #include "frequency.h"
 #include "awards.h"
 #include "inputwidgets/mainwindowsattab.h"
@@ -310,7 +310,7 @@ private slots:
     void slotShowQSOsFromDXCCWidget(QList<int> _qsos);
 
     // DXCLUSTER ASSISTANT
-    void slotShowDXClusterAssistant();
+    //void slotShowDXClusterAssistant();
 
     //UDP Server (WXJT-x)
     void slotWSJXstatusFromUDPServer(const int _type, const QString &_dxcall, const double _freq, const QString &_mode,
@@ -584,7 +584,7 @@ private slots:
     QAction *qslSentRequestedAct;
     QAction *qslRecRequestedAct;
     QAction *showMapAct;
-    QAction *dxClusterAssistantAct;
+    //QAction *dxClusterAssistantAct;
 
     QStringList bands;
     QStringList modes;
@@ -633,7 +633,7 @@ private slots:
     bool dxClusterShowHF, dxClusterShowVHF, dxClusterShowWARC, dxClusterShowWorked, dxClusterShowConfirmed, dxClusterShowAnn, dxClusterShowWWV, dxClusterShowWCY;
     // </CLUSTER>
 
-    DXClusterAssistant *dxClusterAssistant;
+   // DXClusterAssistant *dxClusterAssistant;
 
     // </UI>
     int infoTimeout; // timeout that temporary info will stay in the infobars

src/src.pro

@@ -34,7 +34,7 @@ CONFIG -=depend_includepath
 #CONFIG += release
 TEMPLATE = app
 PKGVERSION = 2.4.0-RC1
-VERSION = 2.4.0-RC1
+VERSION = 2.4.0
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
@@ -394,7 +394,7 @@ win32: {
     TARGET = klog
     QMAKE_TARGET_COMPANY = EA4K
     QMAKE_TARGET_DESCRIPTION = Hamradio logging
-
+    QMAKE_CXXFLAGS += -std=c++20
     contains(QT_ARCH, i386) {
         message("32-bit")
         LIBS += -L"$$PWD/../../libs/win32/hamlib/lib/gcc" -lhamlib