Merge pull request mariuz#330 from arvanus/master

fix saving style error and code scanning alert
Jdochoa · Oct 5, 2023 · d62df7e · d62df7e
2 parents c8e4bb4 + aaa5111
commit d62df7e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/config/Config.cpp b/src/config/Config.cpp
@@ -404,6 +404,10 @@ const wxString FRConfig::getSysTemplateFileName(const wxString& templateName)
 
 wxString FRConfig::getXmlStylesPath() const
 {
+    if (wxDirExists(getUserLocalDataDir() + wxFileName::GetPathSeparator() + "xml-styles"))
+        return getUserLocalDataDir() + wxFileName::GetPathSeparator()
+            + "xml-styles" + wxFileName::GetPathSeparator();
+
     return getHomePath() + "xml-styles"
         + wxFileName::GetPathSeparator();
 }

diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp
@@ -1984,6 +1984,27 @@ bool PrefDlgThemeSetting::parseProperty(wxXmlNode* xmln)
 bool PrefDlgThemeSetting::saveToTargetConfig(Config& config)
 {
     config.setValue(keyM, fileComboBoxM->GetValue());
+    wxString userStyleFolder = config.getUserLocalDataDir() + wxFileName::GetPathSeparator() + "xml-styles" + wxFileName::GetPathSeparator();
+    if (!wxDirExists(userStyleFolder))
+    {
+        wxFileName mFile = getStyleManager()->getfileName();
+        mFile.SetPath(userStyleFolder);
+
+        wxString sourceDirName = config.getHomePath() + "xml-styles" + wxFileName::GetPathSeparator();
+
+        wxString fileSpec = _T("*.xml");
+        wxArrayString files;
+        if (wxDir::GetAllFiles(sourceDirName, &files, fileSpec, wxDIR_FILES) > 0) {
+            wxMkdir(userStyleFolder);
+            wxString name, ext;
+            for (size_t i = 0; i < files.GetCount(); i++) {
+                wxFileName::SplitPath(files[i], NULL, &name, &ext);
+                wxCopyFile(files[i], userStyleFolder + name + "." + ext);
+            }
+        }
+        getStyleManager()->setfileName(mFile);
+    }
+
     getStyleManager()->saveStyle();
 
     return true;

diff --git a/src/sql/StatementBuilder.cpp b/src/sql/StatementBuilder.cpp
@@ -116,7 +116,7 @@ void StatementBuilder::addNewLine()
 {
     completedLinesM += currentLineM;
     completedLinesM += wxTextBuffer::GetEOL();
-    currentLineM = wxString(wxChar(' '), indentLevelM * indentCharsM);
+    currentLineM = wxString(wxChar(' '), static_cast<unsigned long>(indentLevelM) * static_cast<unsigned long>(indentCharsM));
 }
 
 void StatementBuilder::reset()