Theme sync

Task-number: QTRD-2538

Change-Id: I12dfb562dc59ae1df3b5127f0f675a3796ba3f00
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

6 files changed, 32 insertions, 1 deletions

diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index a27782c5..6a35b1b1 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -176,6 +176,10 @@ void GraphModifier::changePresetCamera()
 void GraphModifier::changeTheme(int theme)
 {
     m_graph->setTheme(new Q3DTheme(QDataVis::Theme(theme)));
+    emit backgroundEnabledChanged(m_graph->theme()->isBackgroundEnabled());
+    emit gridEnabledChanged(m_graph->theme()->isGridEnabled());
+    emit fontChanged(m_graph->theme()->font());
+    emit fontSizeChanged(m_graph->theme()->font().pointSize());
 }
 
 void GraphModifier::changeLabelBackground()
@@ -195,7 +199,6 @@ void GraphModifier::changeSelectionMode(int selectionMode)
 void GraphModifier::changeFont(const QFont &font)
 {
     QFont newFont = font;
-    newFont.setPointSize(m_fontSize);
     m_graph->theme()->setFont(newFont);
 }
 
diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h
index b48451cd..6887a54b 100644
--- a/examples/bars/graphmodifier.h
+++ b/examples/bars/graphmodifier.h
@@ -58,6 +58,10 @@ public slots:
 
 signals:
     void shadowQualityChanged(int quality);
+    void backgroundEnabledChanged(bool enabled);
+    void gridEnabledChanged(bool enabled);
+    void fontChanged(QFont font);
+    void fontSizeChanged(int size);
 
 private:
     Q3DBars *m_graph;
diff --git a/examples/bars/main.cpp b/examples/bars/main.cpp
index 7a74473b..7cf4381d 100644
--- a/examples/bars/main.cpp
+++ b/examples/bars/main.cpp
@@ -214,6 +214,11 @@ int main(int argc, char **argv)
     QObject::connect(seriesCheckBox, &QCheckBox::stateChanged, modifier,
                      &GraphModifier::setSeriesVisibility);
 
+    QObject::connect(modifier, &GraphModifier::backgroundEnabledChanged,
+                     backgroundCheckBox, &QCheckBox::setChecked);
+    QObject::connect(modifier, &GraphModifier::gridEnabledChanged,
+                     gridCheckBox, &QCheckBox::setChecked);
+
     QObject::connect(barStyleList, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeStyle(int)));
 
@@ -236,6 +241,11 @@ int main(int argc, char **argv)
     QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
                      &GraphModifier::changeFont);
 
+    QObject::connect(modifier, &GraphModifier::fontSizeChanged, fontSizeSlider,
+                     &QSlider::setValue);
+    QObject::connect(modifier, &GraphModifier::fontChanged, fontList,
+                     &QFontComboBox::setCurrentFont);
+
     //! [3]
     widget->show();
     modifier->start();
diff --git a/examples/scatter/main.cpp b/examples/scatter/main.cpp
index c652361b..40027a40 100644
--- a/examples/scatter/main.cpp
+++ b/examples/scatter/main.cpp
@@ -136,6 +136,11 @@ int main(int argc, char **argv)
     QObject::connect(smoothCheckBox, &QCheckBox::stateChanged, modifier,
                      &ScatterDataModifier::setSmoothDots);
 
+    QObject::connect(modifier, &ScatterDataModifier::backgroundEnabledChanged,
+                     backgroundCheckBox, &QCheckBox::setChecked);
+    QObject::connect(modifier, &ScatterDataModifier::gridEnabledChanged,
+                     gridCheckBox, &QCheckBox::setChecked);
+
     QObject::connect(barStyleList, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeStyle(int)));
 
@@ -152,6 +157,9 @@ int main(int argc, char **argv)
 
     QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier,
                      &ScatterDataModifier::changeFont);
+
+    QObject::connect(modifier, &ScatterDataModifier::fontChanged, fontList,
+                     &QFontComboBox::setCurrentFont);
     //! [6]
 
     //! [3]
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index 5a46b0ec..fea50992 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -130,6 +130,9 @@ void ScatterDataModifier::setSmoothDots(int smooth)
 void ScatterDataModifier::changeTheme(int theme)
 {
     m_graph->setTheme(new Q3DTheme(QDataVis::Theme(theme)));
+    emit backgroundEnabledChanged(m_graph->theme()->isBackgroundEnabled());
+    emit gridEnabledChanged(m_graph->theme()->isGridEnabled());
+    emit fontChanged(m_graph->theme()->font());
 }
 
 void ScatterDataModifier::changePresetCamera()
diff --git a/examples/scatter/scatterdatamodifier.h b/examples/scatter/scatterdatamodifier.h
index 5cc9348b..43c58fd9 100644
--- a/examples/scatter/scatterdatamodifier.h
+++ b/examples/scatter/scatterdatamodifier.h
@@ -49,7 +49,10 @@ public slots:
     void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
 
 signals:
+    void backgroundEnabledChanged(bool enabled);
+    void gridEnabledChanged(bool enabled);
     void shadowQualityChanged(int quality);
+    void fontChanged(QFont font);
 
 private:
     QVector3D randVector();