From b8efe93cd850c3cc88e79fa8d8a323ae144df41b Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 30 Jun 2019 18:05:00 +0200
Subject: [PATCH] Minor stylesheet utils improvements

---
 src/blackgui/stylesheetutility.cpp | 26 +++++++++++++++++++-------
 src/blackgui/stylesheetutility.h   |  4 ++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp
index 0dcf0543d..206de7196 100644
--- a/src/blackgui/stylesheetutility.cpp
+++ b/src/blackgui/stylesheetutility.cpp
@@ -27,6 +27,7 @@
 #include <QTextStream>
 #include <QWidget>
 #include <QtGlobal>
+#include <QStringBuilder>
 
 using namespace BlackConfig;
 using namespace BlackMisc;
@@ -143,6 +144,8 @@ namespace BlackGui
 
         QMap<QString, QString> newStyleSheets;
         const QFileInfoList fileInfoList = directory.entryInfoList();
+
+        // here we generate the style sheets
         for (const QFileInfo &fileInfo : fileInfoList)
         {
             const QString absolutePath = fileInfo.absoluteFilePath();
@@ -154,6 +157,13 @@ namespace BlackGui
                 const QString c = removeComments(in.readAll(), true, true);
                 const QString f = fileInfo.fileName().toLower();
 
+                // save files for debugging
+                if (CBuildConfig::isLocalDeveloperDebugBuild())
+                {
+                    const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), f);
+                    CFileUtils::writeStringToFile(c, fn);
+                }
+
                 // keep even empty files as placeholders
                 newStyleSheets.insert(f, c); // set an empty string here to disable all stylesheet
             }
@@ -199,10 +209,12 @@ namespace BlackGui
             {
                 s = m_styleSheets[key];
             }
-            if (s.isEmpty()) continue;
-            if (!style.isEmpty()) style.append("\n\n");
-            style.append("/** file: ").append(fileName).append(" **/\n");
-            style.append(s);
+            if (s.isEmpty()) { continue; }
+
+            style +=
+                (style.isEmpty() ? QString() : "\n\n") %
+                u"/** file: " % fileName % " **/\n" %
+                s;
         }
         return style;
     }
@@ -476,15 +488,15 @@ namespace BlackGui
         QString specific;
         if (CBuildConfig::isRunningOnWindowsNtPlatform())
         {
-            specific = fn + ".win" + qss;
+            specific = fn % u".win" % qss;
         }
         else if (CBuildConfig::isRunningOnMacOSPlatform())
         {
-            specific = fn + ".mac" + qss;
+            specific = fn % u".mac" % qss;
         }
         else if (CBuildConfig::isRunningOnLinuxPlatform())
         {
-            specific = fn + ".linux" + qss;
+            specific = fn % u".linux" % qss;
         }
         return qssFileExists(specific) ? specific : fn + qss;
     }
diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h
index 41953447a..a5a1b0688 100644
--- a/src/blackgui/stylesheetutility.h
+++ b/src/blackgui/stylesheetutility.h
@@ -171,8 +171,8 @@ namespace BlackGui
         //! Check existance of qss file
         static bool qssFileExists(const QString &filename);
 
-        QMap<QString, QString> m_styleSheets;         //!< filename, stylesheet
-        QFileSystemWatcher     m_fileWatcher {this};  //!< Monitor my qss files
+        QMap<QString, QString> m_styleSheets;           //!< filename, stylesheet
+        QFileSystemWatcher     m_fileWatcher { this };  //!< monitor my qss files
     };
 }
 #endif // guard