Use the xschedule version, format fixes and update the build script

build_scripts/msw/xSchedule_common.iss

@@ -3,5 +3,5 @@
 
 #define MyTitleName "xSchedule"
 #define Year 2026
-#define Version 03
-#define Other "_3"
+#define Version "05"
+#define Other ""

xSchedule/OptionsDialog.cpp

@@ -21,7 +21,7 @@
 #include "../xlights/xLights/utils/UtilFunctions.h"
 #include "../xlights/xLights/ui/wxUtilities.h"
 #include "../xlights/xLights/outputs/IPOutput.h"
-#include "../xlights/xLights/xLightsVersion.h"
+#include "xScheduleVersion.h"
 #include "PlayList/VideoWindowPositionDialog.h"
 #include <wx/file.h>
 #include <wx/xml/xml.h>
@@ -728,7 +728,7 @@ void OptionsDialog::OnButton_ExportClick(wxCommandEvent& event) {
         hotkey = ListView_Buttons->GetItemText(row, 3)[0];
     }
     std::string color = ListView_Buttons->GetItemText(row, 4).ToStdString();
-    wxString v = xlights_version_string;
+    wxString v = xschedule_version_string;
 
     wxString filename = wxFileSelector(_("Choose output file"), wxEmptyString, label, wxEmptyString, "xSchedule Button files (*.xbutton)|*.xbutton", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
     if (filename.IsEmpty())

xSchedule/SyncFPP.cpp

@@ -18,7 +18,7 @@
 #include <wx/filename.h>
 #include "Control.h"
 #include "../xlights/xLights/outputs/IPOutput.h"
-#include "../xlights/xLights/xLightsVersion.h"
+#include "xScheduleVersion.h"
 
 #define FPP_MEDIA_SYNC_INTERVAL_MS 500
 #define FPP_SEQ_SYNC_INTERVAL_FRAMES 16
@@ -72,7 +72,7 @@ void SyncFPP::Ping(bool remote, const std::string& localIP)
     uint8_t* ed = (uint8_t*)(&buffer[7]);
     memset(ed, 0, cp->extraDataLen - 7);
 
-    auto v = wxSplit(xlights_version_string, '.');
+    auto v = wxSplit(xschedule_version_string, '.');
     int majorVersion = wxAtoi(v[0]);
     int minorVersion = wxAtoi(v[1]);
 
@@ -92,7 +92,7 @@ void SyncFPP::Ping(bool remote, const std::string& localIP)
     ed[11] = wxAtoi(ip[3]);
 
     strncpy((char*)(ed + 12), wxGetHostName().c_str(), 65);
-    strncpy((char*)(ed + 77), xlights_version_string.c_str(), 41);
+    strncpy((char*)(ed + 77), xschedule_version_string.c_str(), 41);
     strncpy((char*)(ed + 118), "xSchedule", 41);
 
     fppBroadcastSocket->SendTo(remoteAddr, &buffer[0], bufsize);

xSchedule/Xschedule.vcxproj.filters

@@ -618,6 +618,7 @@
     <ClInclude Include="..\xlights\xLights\utils\AnimatedImage.h" />
     <ClInclude Include="..\xlights\xLights\utils\xlImage.h" />
     <ClInclude Include="..\xlights\xLights\xLightsVersion.h" />
+    <ClInclude Include="xScheduleVersion.h" />
     <ClInclude Include="Blend.h" />
     <ClInclude Include="..\xlights\xLights\utils\UtilFunctions.h" />
     <ClInclude Include="FPPRemotesDialog.h" />

xSchedule/events/ListenerFPP.cpp

@@ -13,7 +13,7 @@
 #include "../../xLights/utils/UtilFunctions.h"
 #include "../../xLights/ui/wxUtilities.h"
 #include "../../xLights/outputs/IPOutput.h"
-#include "../../xLights/xLightsVersion.h"
+#include "../xScheduleVersion.h"
 #include "../Control.h"
 #include <log.h>
 #include <wx/socket.h>
@@ -278,7 +278,7 @@ void ListenerFPP::Poll() {
 
                             uint8_t* ed = (uint8_t*)(outBuf + 7);
 
-                            auto v = wxSplit(xlights_version_string, '.');
+                            auto v = wxSplit(xschedule_version_string, '.');
                             int majorVersion = wxAtoi(v[0]);
                             int minorVersion = wxAtoi(v[1]);
 
@@ -302,7 +302,7 @@ void ListenerFPP::Poll() {
                             ed[11] = wxAtoi(ip[3]);
 
                             strncpy((char*)(ed + 12), wxGetHostName().c_str(), 65);
-                            strncpy((char*)(ed + 77), xlights_version_string.c_str(), 41);
+                            strncpy((char*)(ed + 77), xschedule_version_string.c_str(), 41);
                             strncpy((char*)(ed + 118), "xSchedule", 41);
                             // strncpy((char *)(ed + 159), sysInfo.ranges.c_str(), 41);
 

xSchedule/xSchedule.cbp

@@ -226,6 +226,7 @@
 		<Unit filename="../xlights/xLights/ui/shared/utils/xLightsTimer.cpp" />
 		<Unit filename="../xlights/xLights/ui/shared/utils/xLightsTimer.h" />
 		<Unit filename="../xlights/xLights/xLightsVersion.cpp" />
+		<Unit filename="xScheduleVersion.h" />
 		<Unit filename="AddReverseDialog.cpp" />
 		<Unit filename="AddReverseDialog.h" />
 		<Unit filename="BackgroundPlaylistDialog.cpp" />

xSchedule/xSchedule.vcxproj

@@ -520,6 +520,7 @@ IF EXIST "$(SolutionDir)..\bin\*.cfg" copy "$(SolutionDir)..\bin\*.cfg" "$(Targe
     <ClInclude Include="..\xlights\xLights\render\WindowsHardwareVideoReader.h" />
     <ClInclude Include="..\xlights\xLights\ui\shared\utils\xLightsTimer.h" />
     <ClInclude Include="..\xlights\xLights\xLightsVersion.h" />
+    <ClInclude Include="xScheduleVersion.h" />
     <ClInclude Include="AddReverseDialog.h" />
     <ClInclude Include="BackgroundPlaylistDialog.h" />
     <ClInclude Include="Blend.h" />

xSchedule/xScheduleApp.cpp

@@ -27,6 +27,7 @@
 #include "ScheduleManager.h"
 #include "../xlights/xLights/outputs/OutputManager.h"
 #include "../xlights/xLights/xLightsVersion.h"
+#include "xScheduleVersion.h"
 #include "../xlights/xLights/utils/UtilFunctions.h"
 #include "../xlights/xLights/ui/wxUtilities.h"
 #include <wx/cmdline.h>
@@ -166,9 +167,9 @@ std::string DecodeOS(wxOperatingSystemId o)
 
 void DumpConfig()
 {
-    spdlog::info("Version: " + xlights_version_string);
+    spdlog::info("Version: " + xschedule_version_string);
     spdlog::info("Bits: " + GetBitness());
-    spdlog::info("Build Date: " + xlights_build_date);
+    spdlog::info("Build Date: " + xschedule_build_date);
     spdlog::info("WX Version: " + std::string(wxString(wxVERSION_STRING).c_str()));
 
     spdlog::info("Machine configuration:");

xSchedule/xScheduleMain.cpp

@@ -40,6 +40,7 @@
 #include "WebServer.h"
 #include "PlayList/PlayListStep.h"
 #include "../xlights/xLights/xLightsVersion.h"
+#include "xScheduleVersion.h"
 #include "../xlights/xLights/outputs/OutputManager.h"
 #include "RunningSchedule.h"
 #include "UserButton.h"
@@ -744,7 +745,7 @@ xScheduleFrame::xScheduleFrame(wxWindow* parent, const std::string& showdir, con
     _timer.SetName("xSchedule frame timer");
     _timerSchedule.SetName("xSchedule schedule timer");
 
-    SetTitle("xLights Scheduler " + GetDisplayVersionString());
+    SetTitle("xLights Scheduler " + GetXScheduleDisplayVersionString());
 
     StaticText_RemoteWarning->SetFont(wxFont(14, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
         wxFONTWEIGHT_BOLD, false, wxEmptyString, wxFONTENCODING_DEFAULT));
@@ -879,7 +880,7 @@ xScheduleFrame::xScheduleFrame(wxWindow* parent, const std::string& showdir, con
     _timer.Start(_useHalfFrames ? rate / 2 : rate, false, "FrameTimer");
     _timerSchedule.Start(500, false, "ScheduleTimer");
 
-    StaticText_IP->SetLabel("    " + __schedule->GetOurIP() + ":" + wxString::Format("{}", __schedule->GetOptions()->GetWebServerPort()) + "   ");
+    StaticText_IP->SetLabel("    " + __schedule->GetOurIP() + ":" + wxString::Format("%d", __schedule->GetOptions()->GetWebServerPort()) + "   ");
 
     StaticBitmap_WebIcon->SetBitmap(_nowebicon);
     StaticBitmap_Slow->SetBitmap(_nowebicon);
@@ -1170,7 +1171,7 @@ void xScheduleFrame::OnQuit(wxCommandEvent& event)
 
 void xScheduleFrame::OnAbout(wxCommandEvent& event)
 {
-    auto about = wxString::Format(wxT("xSchedule v{}, the xLights scheduler."), GetDisplayVersionString());
+    auto about = wxString::Format(wxT("xSchedule v%s, the xLights scheduler."), GetXScheduleDisplayVersionString());
     wxMessageBox(about, _("Welcome to..."));
 }
 
@@ -1257,7 +1258,7 @@ bool xScheduleFrame::CheckForUpdate(bool showMessageBoxes)
         }
     }
 
-    std::string currentVersion = xlights_version_string;
+    std::string currentVersion = xschedule_version_string;
     spdlog::info("xSchedule current version: '{}'. Latest available: '{}'. Skip version: '{}'.",
                  currentVersion, urlVersion, skipver.ToStdString());
 
@@ -1408,7 +1409,7 @@ void xScheduleFrame::DeleteSelectedItem()
     wxTreeItemId treeitem = TreeCtrl_PlayListsSchedules->GetSelection();
     if (treeitem.IsOk() && (IsPlayList(treeitem) || IsSchedule(treeitem)))
     {
-        if (wxMessageBox(wxString::Format("Are you sure you want to delete '{}'?", TreeCtrl_PlayListsSchedules->GetItemText(treeitem)),
+        if (wxMessageBox(wxString::Format("Are you sure you want to delete '%s'?", TreeCtrl_PlayListsSchedules->GetItemText(treeitem)),
             "Are you sure?", wxYES_NO) == wxYES)
         {
             wxTreeItemId parent = TreeCtrl_PlayListsSchedules->GetItemParent(treeitem);
@@ -1937,7 +1938,7 @@ void xScheduleFrame::OnMenuItem_OptionsSelected(wxCommandEvent& event)
         OutputManager::SetRetryOpen(__schedule->GetOptions()->IsRetryOpen());
         __schedule->GetOutputManager()->SetSyncEnabled(__schedule->GetOptions()->IsSync());
 
-        StaticText_IP->SetLabel("    " + __schedule->GetOurIP() + ":" + wxString::Format("{}", __schedule->GetOptions()->GetWebServerPort()) + "   ");
+        StaticText_IP->SetLabel("    " + __schedule->GetOurIP() + ":" + wxString::Format("%d", __schedule->GetOptions()->GetWebServerPort()) + "   ");
 
         VideoReader::SetHardwareAcceleratedVideo(__schedule->GetOptions()->IsHardwareAcceleratedVideo());
 
@@ -2159,7 +2160,7 @@ void xScheduleFrame::OnMenuItem_ViewLogSelected(wxCommandEvent& event)
     }
     else {
         spdlog::warn("Unable to view log file {}.", fn.ToStdString());
-        wxMessageBox(wxString::Format("Unable to show log file '{}'.", fn), _("Error"));
+        wxMessageBox(wxString::Format("Unable to show log file '%s'.", fn), _("Error"));
     }
 }
 
@@ -3215,7 +3216,7 @@ void xScheduleFrame::RemoteWarning()
 
 void xScheduleFrame::OnMenuItem_WebInterfaceSelected(wxCommandEvent& event)
 {
-    ::wxLaunchDefaultBrowser(wxString::Format("http://localhost:{}", __schedule->GetOptions()->GetWebServerPort()));
+    ::wxLaunchDefaultBrowser(wxString::Format("http://localhost:%d", __schedule->GetOptions()->GetWebServerPort()));
 }
 
 void xScheduleFrame::OnMenuItem_AddPlayListSelected(wxCommandEvent& event)
@@ -3426,7 +3427,7 @@ void xScheduleFrame::UpdateUI(bool force)
 
     if (!minimiseUIUpdates) {
 
-        StaticText_PacketsPerSec->SetLabel(wxString::Format("Packets/Sec: {}", __schedule->GetPPS()));
+        StaticText_PacketsPerSec->SetLabel(wxString::Format("Packets/Sec: %d", __schedule->GetPPS()));
 
         if (__schedule->GetWebRequestToggle()) {
             if (!_webIconDisplayed) {
@@ -3534,7 +3535,7 @@ void xScheduleFrame::UpdateUI(bool force)
                     ListView_Ping->SetItem(item, 1, "");
                 }
                 else {
-                    ListView_Ping->SetItem(item, 1, wxString::Format("{}", it->GetFailCount()));
+                    ListView_Ping->SetItem(item, 1, wxString::Format("%d", it->GetFailCount()));
                 }
 
                 switch (it->GetPingResult()) {

xSchedule/xScheduleVersion.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+#include "../xlights/xLights/xLightsVersion.h"
+
+static const std::string xschedule_version_string = "2026.05";
+static const std::string xschedule_build_date     = __DATE__;
+
+inline std::string GetXScheduleDisplayVersionString() {
+#ifndef __WXOSX__
+    return xschedule_version_string + " " + GetBitness();
+#else
+    return xschedule_version_string;
+#endif
+}