Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

1 files changed, 20 insertions, 1 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp b/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp
index e48865f..89092d6 100644
--- a/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp
@@ -2,10 +2,12 @@
 #include "uiconfig.h"
 #include "mainwindow.h"
 #include "uiconfig.h"
+#include "style.h"
 #include <QApplication>
 #include <QFile>
 #include <QStyle>
 #include <QDebug>
+#include <QWizard>
 
 ThemeTuner* ThemeTuner::instance = nullptr;
 
@@ -22,7 +24,7 @@ void ThemeTuner::tuneTheme(const QString& themeName)
 
 void ThemeTuner::tuneCurrentTheme()
 {
-    tuneTheme(QApplication::style()->objectName());
+    tuneTheme(STYLE->name());
 }
 
 void ThemeTuner::manageCompactLayout(QWidget* w)
@@ -49,6 +51,23 @@ QString ThemeTuner::getDefaultCss(const QString& themeName) const
     return css;
 }
 
+void ThemeTuner::darkThemeFix(QWizard* wizard)
+{
+    QString themeName = STYLE->name();
+    if (qwizardThemeTuneRequired.contains(themeName))
+        wizard->setWizardStyle(QWizard::ClassicStyle);
+}
+
+void ThemeTuner::registerQWizardThemeTuneRequired(const QString& styleName)
+{
+    qwizardThemeTuneRequired << styleName;
+}
+
+void ThemeTuner::deregisterQWizardThemeTuneRequired(const QString& styleName)
+{
+    qwizardThemeTuneRequired.removeOne(styleName);
+}
+
 ThemeTuner* ThemeTuner::getInstance()
 {
     if (!instance)