Fix setting theme type

Now reset the theme properties immediately to new theme type, instead
of waiting for the theme activation. Also make changing theme type
later work consistently.

Task-number: QTRD-2750
Change-Id: I970d69587623119df33ad2a825fbc12367804eae
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 24 insertions, 23 deletions

diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h
index 254bb7bf..13cbcdc9 100644
--- a/src/datavisualization/theme/thememanager_p.h
+++ b/src/datavisualization/theme/thememanager_p.h
@@ -48,31 +48,32 @@ public:
     Q3DTheme *activeTheme() const;
     QList<Q3DTheme *> themes() const;
 
+    static void setPredefinedPropertiesToTheme(Q3DTheme *theme, Q3DTheme::Theme type);
+
 protected:
     void connectThemeSignals();
-    void useTheme(Q3DTheme::Theme type);
-    QLinearGradient createGradient(const QColor &color, float colorLevel);
-    void setBaseColors(const QList<QColor> &colors);
-    void setBackgroundColor(const QColor &color);
-    void setWindowColor(const QColor &color);
-    void setTextColor(const QColor &color);
-    void setTextBackgroundColor(const QColor &color);
-    void setGridLineColor(const QColor &color);
-    void setSingleHighlightColor(const QColor &color);
-    void setMultiHighlightColor(const QColor &color);
-    void setLightColor(const QColor &color);
-    void setBaseGradients(const QList<QLinearGradient> &gradients);
-    void setSingleHighlightGradient(const QLinearGradient &gradient);
-    void setMultiHighlightGradient(const QLinearGradient &gradient);
-    void setLightStrength(float strength);
-    void setAmbientLightStrength(float strength);
-    void setHighlightLightStrength(float strength);
-    void setLabelBorderEnabled(bool enabled);
-    void setFont(const QFont &font);
-    void setBackgroundEnabled(bool enabled);
-    void setGridEnabled(bool enabled);
-    void setLabelBackgroundEnabled(bool enabled);
-    void setColorStyle(Q3DTheme::ColorStyle style);
+    static QLinearGradient createGradient(const QColor &color, float colorLevel);
+    static void setBaseColors(Q3DTheme *theme, const QList<QColor> &colors);
+    static void setBackgroundColor(Q3DTheme *theme, const QColor &color);
+    static void setWindowColor(Q3DTheme *theme, const QColor &color);
+    static void setTextColor(Q3DTheme *theme, const QColor &color);
+    static void setTextBackgroundColor(Q3DTheme *theme, const QColor &color);
+    static void setGridLineColor(Q3DTheme *theme, const QColor &color);
+    static void setSingleHighlightColor(Q3DTheme *theme, const QColor &color);
+    static void setMultiHighlightColor(Q3DTheme *theme, const QColor &color);
+    static void setLightColor(Q3DTheme *theme, const QColor &color);
+    static void setBaseGradients(Q3DTheme *theme, const QList<QLinearGradient> &gradients);
+    static void setSingleHighlightGradient(Q3DTheme *theme, const QLinearGradient &gradient);
+    static void setMultiHighlightGradient(Q3DTheme *theme, const QLinearGradient &gradient);
+    static void setLightStrength(Q3DTheme *theme, float strength);
+    static void setAmbientLightStrength(Q3DTheme *theme, float strength);
+    static void setHighlightLightStrength(Q3DTheme *theme, float strength);
+    static void setLabelBorderEnabled(Q3DTheme *theme, bool enabled);
+    static void setFont(Q3DTheme *theme, const QFont &font);
+    static void setBackgroundEnabled(Q3DTheme *theme, bool enabled);
+    static void setGridEnabled(Q3DTheme *theme, bool enabled);
+    static void setLabelBackgroundEnabled(Q3DTheme *theme, bool enabled);
+    static void setColorStyle(Q3DTheme *theme, Q3DTheme::ColorStyle style);
 
 private:
     Q3DTheme *m_activeTheme;