Fix some warnings, put the html Check Sequence report in the Show Fol…

…der where safari might actualy have permission to open it, maybe.
xLightsSequencer · Jan 15, 2025 · 4fe5b56 · 4fe5b56
1 parent 7ef6400
commit 4fe5b56
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/xLights/PaletteMgmtDialog.cpp b/xLights/PaletteMgmtDialog.cpp
@@ -162,9 +162,8 @@ void PaletteMgmtDialog::OnButtonLoadPalette2Click(wxCommandEvent& event)
 
 void PaletteMgmtDialog::OnButtonCopyClick(wxCommandEvent& event)
 {
-    wxColour c;
     for (int i=1; i<=6; i++) {
-//~        c=panel1->GetPaletteColor(i);
+//~        wxColour c=panel1->GetPaletteColor(i);
 //~        panel2->SetPaletteColor(i,&c);
     }
 }

diff --git a/xLights/ShowFolderSearchDialog.cpp b/xLights/ShowFolderSearchDialog.cpp
@@ -104,7 +104,6 @@ void ShowFolderSearchDialog::ValidateWindow()
 
 wxString ShowFolderSearchDialog::FindLogFolder() const
 {
-    static log4cpp::Category& logger_base = log4cpp::Category::getInstance(std::string("log_base"));
     wxString dir;
 #ifdef __WXMSW__
     wxGetEnv("APPDATA", &dir);

diff --git a/xLights/controllers/FPP.cpp b/xLights/controllers/FPP.cpp
@@ -3159,8 +3159,6 @@ static void CreateController(Discovery &discovery, DiscoveredData *inst) {
 }
 
 static void ProcessFPPSystems(Discovery &discovery, const std::string &systemsString) {
-    static log4cpp::Category& logger_base = log4cpp::Category::getInstance(std::string("log_base"));
-
     wxJSONValue origJson;
     wxJSONReader reader;
     bool parsed = reader.Parse(systemsString, &origJson) == 0;

diff --git a/xLights/controllers/HinksPix.cpp b/xLights/controllers/HinksPix.cpp
@@ -315,10 +315,9 @@ bool HinksPix::UploadInputUniverses(Controller* controller, std::vector<HinksPix
         DisplayError("Getting HinksPix Input Mode FAILED.");
         return false;
     }
-    wxString const cur_mode = data.ItemAt("MODE").AsString();
 
     //Set Controller Input mode
-    //if (cur_mode != type) //send mode every time
+    //if (data.ItemAt("MODE").AsString() != type) //send mode every time
     {
         auto const ret = GetJSONControllerData(GetJSONPostURL(), cmd);
         if (ret.find("\"OK\"") == std::string::npos) {

diff --git a/xLights/effects/EffectPanelUtils.cpp b/xLights/effects/EffectPanelUtils.cpp
@@ -204,7 +204,7 @@ void EffectPanelUtils::enableControlsByName(wxWindow *window, const wxString &na
         w->Enable(enable);
     }
     wxString n2 = "IDD_" + name.SubString(3, name.size());
-    w = window->FindWindow(name);
+    w = window->FindWindow(n2);
     if (w != nullptr) {
         w->Enable(enable);
     }

diff --git a/xLights/xLightsMain.cpp b/xLights/xLightsMain.cpp
@@ -4955,7 +4955,7 @@ std::string FormatSectionSummary(const std::string& section, int errcount, int w
     wxString darkCol = (!IsDarkMode() ? "#000000" : "#FFFFFF");
     wxString errCol = (errcount == 0) ? darkCol : "#FF0000";
     wxString warnCol = (warncount == 0) ? darkCol : "#9ACD32";
-    return wxString::Format("<h4>Section Errors \(%s\) <span style='color:%s;'>%d</span>. Warnings  <span style='color:%s;'>%d</span>.</h4><br>", section, errCol, errcount, warnCol,  warncount).ToStdString();
+    return wxString::Format("<h4>Section Errors (%s) <span style='color:%s;'>%d</span>. Warnings  <span style='color:%s;'>%d</span>.</h4><br>", section, errCol, errcount, warnCol,  warncount).ToStdString();
 }
 
 std::string xLightsFrame::CheckSequence(bool displayInEditor, bool writeToFile)
@@ -4975,7 +4975,10 @@ std::string xLightsFrame::CheckSequence(bool displayInEditor, bool writeToFile)
     wxString darkTextCol = (IsDarkMode() ? "#FFFFFF" : "#000000");
 
     wxFile f;
-    wxString filename = wxFileName::CreateTempFileName("xLightsCheckSequence") + ".html";
+    wxFileName fnTemp;
+    fnTemp.AssignTempFileName("xLightsCheckSequence");
+    wxFileName fn(GetShowDirectory(), fnTemp.GetFullName() + ".html");
+    wxString filename = fn.GetFullPath();
     TempFileManager::GetTempFileManager().AddTempFile(filename);
 
     if (writeToFile || displayInEditor) {