diff --git a/APRSTransmit/APRSTransmit.vcxproj b/APRSTransmit/APRSTransmit.vcxproj index 8c383ab..8f09ab0 100644 --- a/APRSTransmit/APRSTransmit.vcxproj +++ b/APRSTransmit/APRSTransmit.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/APRSTransmit/APRSTransmitD.vcxproj b/APRSTransmit/APRSTransmitD.vcxproj index 8c76d99..fca7a3a 100644 --- a/APRSTransmit/APRSTransmitD.vcxproj +++ b/APRSTransmit/APRSTransmitD.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index e4a94e4..7a8e458 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -27,24 +27,24 @@ StaticLibrary - v142 + v143 Unicode true StaticLibrary - v142 + v143 Unicode true StaticLibrary - v142 + v143 Unicode StaticLibrary - v142 + v143 Unicode @@ -88,7 +88,7 @@ Disabled - $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;C:\Program Files\mosquitto\devel;C:\Program Files;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;__WXDEBUG__;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_LIB;DCS_LINK;%(PreprocessorDefinitions) true EnableFastChecks @@ -105,7 +105,7 @@ Disabled - $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;C:\Program Files\mosquitto\devel;C:\Program Files;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;__WXDEBUG__;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_LIB;DCS_LINK;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -122,7 +122,7 @@ MaxSpeed true - $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;C:\Program Files\mosquitto\devel;C:\Program Files;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed true - $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;C:\Program Files\mosquitto\devel;C:\Program Files;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -192,6 +192,8 @@ + + @@ -263,6 +265,8 @@ + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 3dbcf6d..4d25347 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -50,9 +50,6 @@ Source Files - - Source Files - Source Files @@ -212,6 +209,12 @@ Source Files + + Source Files + + + Source Files + @@ -256,9 +259,6 @@ Header Files - - Header Files - Header Files @@ -439,5 +439,11 @@ Header Files + + Header Files + + + Header Files + \ No newline at end of file diff --git a/Common/Version.h b/Common/Version.h index 1d8a2d3..8647750 100644 --- a/Common/Version.h +++ b/Common/Version.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015,2018,2019,2020,2023 by Jonathan Naylor G4KLX + * Copyright (C) 2010-2015,2018,2019,2020,2023,2026 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,9 +24,9 @@ const wxString VENDOR_NAME = wxT("G4KLX"); #if defined(__WXDEBUG__) -const wxString VERSION = wxT("20230723 - DEBUG"); +const wxString VERSION = wxT("20260218 - DEBUG"); #else -const wxString VERSION = wxT("20230723"); +const wxString VERSION = wxT("20260218"); #endif #endif diff --git a/GUICommon/DPRSSet.cpp b/GUICommon/DPRSSet.cpp index be2a8b4..ea13b15 100644 --- a/GUICommon/DPRSSet.cpp +++ b/GUICommon/DPRSSet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2010,2018,2020,2026 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,17 +20,11 @@ const unsigned int BORDER_SIZE = 5U; const unsigned int CONTROL_WIDTH1 = 200U; -const unsigned int CONTROL_WIDTH2 = 80U; -const unsigned int PORT_LENGTH = 5U; -const unsigned int PASSWORD_LENGTH = 5U; - -CDPRSSet::CDPRSSet(wxWindow* parent, int id, const wxString& title, bool enabled, const wxString& address, unsigned int port) : +CDPRSSet::CDPRSSet(wxWindow* parent, int id, const wxString& title, bool enabled) : wxPanel(parent, id), m_title(title), -m_enabled(NULL), -m_address(NULL), -m_port(NULL) +m_enabled(NULL) { wxFlexGridSizer* sizer = new wxFlexGridSizer(2); @@ -43,22 +37,6 @@ m_port(NULL) sizer->Add(m_enabled, 0, wxALL | wxALIGN_LEFT, BORDER_SIZE); m_enabled->SetSelection(enabled ? 1 : 0); - wxStaticText* addressLabel = new wxStaticText(this, -1, _("Address")); - sizer->Add(addressLabel, 0, wxALL | wxALIGN_LEFT, BORDER_SIZE); - - m_address = new wxTextCtrl(this, -1, address, wxDefaultPosition, wxSize(CONTROL_WIDTH1, -1)); - sizer->Add(m_address, 0, wxALL | wxALIGN_LEFT, BORDER_SIZE); - - wxStaticText* portLabel = new wxStaticText(this, -1, _("Port")); - sizer->Add(portLabel, 0, wxALL | wxALIGN_LEFT, BORDER_SIZE); - - wxString buffer; - buffer.Printf(wxT("%u"), port); - - m_port = new CPortTextCtrl(this, -1, buffer, wxDefaultPosition, wxSize(CONTROL_WIDTH2, -1)); - m_port->SetMaxLength(PORT_LENGTH); - sizer->Add(m_port, 0, wxALL | wxALIGN_LEFT, BORDER_SIZE); - SetAutoLayout(true); SetSizer(sizer); @@ -75,18 +53,6 @@ bool CDPRSSet::Validate() if (n == wxNOT_FOUND) return false; - wxString address = m_address->GetValue(); - if (address.IsEmpty()) - return true; - - unsigned int port = getPort(); - - if (port == 0U || port > 65535U) { - wxMessageDialog dialog(this, _("The Port is not valid"), m_title + _(" Error"), wxICON_ERROR); - dialog.ShowModal(); - return false; - } - return true; } @@ -98,17 +64,3 @@ bool CDPRSSet::getEnabled() const return c == 1; } - -wxString CDPRSSet::getAddress() const -{ - return m_address->GetValue(); -} - -unsigned int CDPRSSet::getPort() const -{ - unsigned long n; - - m_port->GetValue().ToULong(&n); - - return n; -} diff --git a/GUICommon/DPRSSet.h b/GUICommon/DPRSSet.h index 78185c8..83c72ad 100644 --- a/GUICommon/DPRSSet.h +++ b/GUICommon/DPRSSet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2010,2018,2020,2026 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,26 +19,20 @@ #ifndef DPRSSet_H #define DPRSSet_H -#include "PortTextCtrl.h" - #include class CDPRSSet : public wxPanel { public: - CDPRSSet(wxWindow* parent, int id, const wxString& title, bool enabled, const wxString& address, unsigned int port); + CDPRSSet(wxWindow* parent, int id, const wxString& title, bool enabled); virtual ~CDPRSSet(); virtual bool Validate(); - virtual bool getEnabled() const; - virtual wxString getAddress() const; - virtual unsigned int getPort() const; + virtual bool getEnabled() const; private: wxString m_title; wxChoice* m_enabled; - wxTextCtrl* m_address; - CPortTextCtrl* m_port; }; #endif diff --git a/GUICommon/GUICommon.vcxproj b/GUICommon/GUICommon.vcxproj index 832cc6d..a3d8fda 100644 --- a/GUICommon/GUICommon.vcxproj +++ b/GUICommon/GUICommon.vcxproj @@ -27,24 +27,24 @@ StaticLibrary - v142 + v143 Unicode true StaticLibrary - v142 + v143 Unicode true StaticLibrary - v142 + v143 Unicode StaticLibrary - v142 + v143 Unicode @@ -172,4 +172,4 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index f54c25b..c510b54 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This is the ircDDB Gateway. It allows a D-Star Repeater to interface into callsi There are many external programs that allow for inserting voice or text messages, as well as remote control operation. -They all build on 32-bit and 64-bit Linux as well as on Windows using Visual Studio 2017 on x86 and x64. +They all build on 32-bit and 64-bit Linux as well as on Windows using Visual Studio 2022 on x86 and x64. This software is licenced under the GPL v2. diff --git a/RemoteControl/RemoteControl.vcxproj b/RemoteControl/RemoteControl.vcxproj index 4b5b287..f7366f1 100644 --- a/RemoteControl/RemoteControl.vcxproj +++ b/RemoteControl/RemoteControl.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/TextTransmit/TextTransmit.vcxproj b/TextTransmit/TextTransmit.vcxproj index c8c556e..31faabc 100644 --- a/TextTransmit/TextTransmit.vcxproj +++ b/TextTransmit/TextTransmit.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/TimeServer/TimeServer.vcxproj b/TimeServer/TimeServer.vcxproj index 2676d4d..2d88273 100644 --- a/TimeServer/TimeServer.vcxproj +++ b/TimeServer/TimeServer.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/TimerControl/TimerControl.vcxproj b/TimerControl/TimerControl.vcxproj index 61543c9..67bf171 100644 --- a/TimerControl/TimerControl.vcxproj +++ b/TimerControl/TimerControl.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/VoiceTransmit/VoiceTransmit.vcxproj b/VoiceTransmit/VoiceTransmit.vcxproj index 2c67175..275a00a 100644 --- a/VoiceTransmit/VoiceTransmit.vcxproj +++ b/VoiceTransmit/VoiceTransmit.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode diff --git a/ircDDB/ircDDB.vcxproj b/ircDDB/ircDDB.vcxproj index fc1ca68..9da164a 100644 --- a/ircDDB/ircDDB.vcxproj +++ b/ircDDB/ircDDB.vcxproj @@ -27,24 +27,24 @@ StaticLibrary - v142 + v143 Unicode true StaticLibrary - v142 + v143 Unicode true StaticLibrary - v142 + v143 Unicode StaticLibrary - v142 + v143 Unicode diff --git a/ircDDBGateway.sln b/ircDDBGateway.sln index b080f45..860223d 100644 --- a/ircDDBGateway.sln +++ b/ircDDBGateway.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.1 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36930.0 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ircDDBGateway", "ircDDBGateway\ircDDBGateway.vcxproj", "{6DDA3497-66A3-4856-BAD4-1DDCDBDFF959}" EndProject @@ -9,8 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ircDDB", "ircDDB\ircDDB.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{E793CB8E-2AC9-431A-BBFC-3F52537BB3CF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StarNetServer", "StarNetServer\StarNetServer.vcxproj", "{4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteControl", "RemoteControl\RemoteControl.vcxproj", "{F7756875-1F58-4006-AD55-5C963AB682C0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimerControl", "TimerControl\TimerControl.vcxproj", "{68CFAB6D-AED3-4B8A-BCB3-EE4136CA00A3}" @@ -61,14 +59,6 @@ Global {E793CB8E-2AC9-431A-BBFC-3F52537BB3CF}.Release|Win32.Build.0 = Release|Win32 {E793CB8E-2AC9-431A-BBFC-3F52537BB3CF}.Release|x64.ActiveCfg = Release|x64 {E793CB8E-2AC9-431A-BBFC-3F52537BB3CF}.Release|x64.Build.0 = Release|x64 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Debug|Win32.ActiveCfg = Debug|Win32 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Debug|Win32.Build.0 = Debug|Win32 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Debug|x64.ActiveCfg = Debug|x64 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Debug|x64.Build.0 = Debug|x64 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Release|Win32.ActiveCfg = Release|Win32 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Release|Win32.Build.0 = Release|Win32 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Release|x64.ActiveCfg = Release|x64 - {4E9989C8-80D4-4F6E-BCA1-754DCED3AF5F}.Release|x64.Build.0 = Release|x64 {F7756875-1F58-4006-AD55-5C963AB682C0}.Debug|Win32.ActiveCfg = Debug|Win32 {F7756875-1F58-4006-AD55-5C963AB682C0}.Debug|Win32.Build.0 = Debug|Win32 {F7756875-1F58-4006-AD55-5C963AB682C0}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/ircDDBGateway/ircDDBGateway.vcxproj b/ircDDBGateway/ircDDBGateway.vcxproj index 5b8ae21..586ef50 100644 --- a/ircDDBGateway/ircDDBGateway.vcxproj +++ b/ircDDBGateway/ircDDBGateway.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode @@ -89,7 +89,7 @@ Disabled - $(WXWIN)\include\msvc;$(WXWIN)\include;../Common;../ircDDB;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;C:\Program Files\mosquitto\devel;C:\Program Files;..\Common;..\ircDDB WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;__WXDEBUG__;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DCS_LINK;%(PreprocessorDefinitions) true EnableFastChecks @@ -109,7 +109,7 @@ Disabled - $(WXWIN)\include\msvc;$(WXWIN)\include;../Common;../ircDDB;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;C:\Program Files\mosquitto\devel;C:\Program Files;..\Common;..\ircDDB WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;__WXDEBUG__;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DCS_LINK;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -129,7 +129,7 @@ MaxSpeed true - $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;../Common;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;C:\Program Files\mosquitto\devel;C:\Program Files;..\Common;..\ircDDB WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -151,7 +151,7 @@ MaxSpeed true - $(WXWIN)\include\msvc;$(WXWIN)\include;../ircDDB;../Common;%(AdditionalIncludeDirectories) + $(WXWIN)\include\msvc;$(WXWIN)\include;C:\Program Files\mosquitto\devel;C:\Program Files;..\Common;..\ircDDB WIN32;NDEBUG;_WINDOWS;WINVER=0x0400;__WXMSW__;WXUSINGDLL;wxUSE_GUI=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/ircDDBGatewayConfig/IRCDDBGatewayConfigFrame.cpp b/ircDDBGatewayConfig/IRCDDBGatewayConfigFrame.cpp index 2e11c32..a21f2ac 100644 --- a/ircDDBGatewayConfig/IRCDDBGatewayConfigFrame.cpp +++ b/ircDDBGatewayConfig/IRCDDBGatewayConfigFrame.cpp @@ -194,12 +194,10 @@ m_miscellaneous(NULL) m_ircDDB4 = new CIRCDDBGatewayConfigIrcDDBSet(noteBook, -1, APPLICATION_NAME, ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword); noteBook->AddPage(m_ircDDB4, wxT("ircDDB 4th Network"), false); - wxString aprsAddress; - unsigned int aprsPort; bool aprsEnabled; - m_config->getDPRS(aprsEnabled, aprsAddress, aprsPort); + m_config->getDPRS(aprsEnabled); - m_dprs = new CDPRSSet(noteBook, -1, APPLICATION_NAME, aprsEnabled, aprsAddress, aprsPort); + m_dprs = new CDPRSSet(noteBook, -1, APPLICATION_NAME, aprsEnabled); noteBook->AddPage(m_dprs, wxT("D-PRS"), false); m_dextra = new CDExtraSet(noteBook, -1, APPLICATION_NAME, dextraEnabled, maxDExtraDongles, MAX_DEXTRA_LINKS); @@ -504,9 +502,7 @@ void CIRCDDBGatewayConfigFrame::onSave(wxCommandEvent&) m_config->setIrcDDB4(ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword); bool aprsEnabled = m_dprs->getEnabled(); - wxString aprsAddress = m_dprs->getAddress(); - unsigned int aprsPort = m_dprs->getPort(); - m_config->setDPRS(aprsEnabled, aprsAddress, aprsPort); + m_config->setDPRS(aprsEnabled); bool dextraEnabled = m_dextra->getEnabled(); unsigned int maxDExtraDongles = m_dextra->getMaxDongles(); diff --git a/ircDDBGatewayConfig/ircDDBGatewayConfig.vcxproj b/ircDDBGatewayConfig/ircDDBGatewayConfig.vcxproj index 786e575..5522a94 100644 --- a/ircDDBGatewayConfig/ircDDBGatewayConfig.vcxproj +++ b/ircDDBGatewayConfig/ircDDBGatewayConfig.vcxproj @@ -27,24 +27,24 @@ Application - v142 + v143 Unicode true Application - v142 + v143 Unicode true Application - v142 + v143 Unicode Application - v142 + v143 Unicode