Fonts and background of the themes

The theme demo app window color now matches the theme

7 files changed, 12 insertions, 61 deletions

diff --git a/src/themes/chartthemebluecerulean_p.h b/src/themes/chartthemebluecerulean_p.h
index 86a8f1a5..ea240f34 100644
--- a/src/themes/chartthemebluecerulean_p.h
+++ b/src/themes/chartthemebluecerulean_p.h
@@ -17,19 +17,17 @@ public:
 
         // Background
         QLinearGradient backgroundGradient;
-        backgroundGradient.setColorAt(0.0, QRgb(0xd6d6d6));
+        backgroundGradient.setColorAt(0.0, QRgb(0x2e303a));
         backgroundGradient.setColorAt(1.0, QRgb(0x121218));
         backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
+        m_masterFont = QFont("arial");
+        m_titleBrush = QBrush(QRgb(0xffffff));
         m_axisLinePen = QPen(QRgb(0x86878c));
         m_axisLinePen.setWidth(2);
-        m_axisLabelBrush = QBrush(QRgb(0x86878c));
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
-        m_backgroundShades = BackgroundShadesNone;
+        m_axisLabelBrush = QBrush(QRgb(0xffffff));
         m_gridLinePen = QPen(QRgb(0x86878c));
         m_gridLinePen.setWidth(1);
     }
diff --git a/src/themes/chartthemedefault_p.h b/src/themes/chartthemedefault_p.h
index c25c93dc..329b30a5 100644
--- a/src/themes/chartthemedefault_p.h
+++ b/src/themes/chartthemedefault_p.h
@@ -9,7 +9,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartThemeDefault: public ChartTheme
 {
 public:
-    ChartThemeDefault():ChartTheme(QChart::ChartThemeDefault)
+    ChartThemeDefault() : ChartTheme(QChart::ChartThemeDefault)
     {
 #ifdef Q_OS_WIN
         // TODO: use theme specific window frame color as a series base color (it would give more
@@ -63,13 +63,6 @@ public:
                                                   GetGValue(colorWindow),
                                                   GetBValue(colorWindow)));
         // Axes and other
-        m_masterFont = QFont();
-        m_masterFont.setPointSizeF(10.0);
-        m_axisLinePen = QPen(Qt::black);
-        m_axisLinePen.setWidth(2);
-        m_axisLabelBrush = QBrush(Qt::black);
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
         m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
         m_backgroundShades = BackgroundShadesVertical;
 
@@ -88,13 +81,6 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
-        m_masterFont.setPointSizeF(10.0);
-        m_axisLinePen = QPen(Qt::black);
-        m_axisLinePen.setWidth(2);
-        m_axisLabelBrush = QBrush(Qt::black);
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
         m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
         m_backgroundShades = BackgroundShadesVertical;
 
@@ -113,13 +99,6 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
-        m_masterFont.setPointSizeF(10.0);
-        m_axisLinePen = QPen(Qt::black);
-        m_axisLinePen.setWidth(2);
-        m_axisLabelBrush = QBrush(Qt::black);
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
         m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
         m_backgroundShades = BackgroundShadesVertical;
 
@@ -138,13 +117,6 @@ public:
         m_backgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
-        m_masterFont.setPointSizeF(10.0);
-        m_axisLinePen = QPen(Qt::black);
-        m_axisLinePen.setWidth(2);
-        m_axisLabelBrush = QBrush(Qt::black);
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
         m_backgroundShadesBrush = QBrush(QColor(0xaf, 0xaf, 0xaf, 0x50));
         m_backgroundShades = BackgroundShadesVertical;
 #endif
diff --git a/src/themes/chartthemegrayscale_p.h b/src/themes/chartthemegrayscale_p.h
index 6ae2c7f3..09148a71 100644
--- a/src/themes/chartthemegrayscale_p.h
+++ b/src/themes/chartthemegrayscale_p.h
@@ -5,7 +5,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartThemeGrayscale: public ChartTheme
 {
 public:
-    ChartThemeGrayscale():ChartTheme(QChart::ChartThemeGrayscale)
+    ChartThemeGrayscale() : ChartTheme(QChart::ChartThemeGrayscale)
     {
         // Series colors
         m_seriesColors << QRgb(0x869299);
@@ -22,13 +22,9 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
         m_axisLinePen = QPen(QRgb(0x0f0f0f));
         m_axisLinePen.setWidth(2);
         m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
-        m_backgroundShades = BackgroundShadesNone;
         m_gridLinePen = QPen(QRgb(0x0f0f0f));
         m_gridLinePen.setWidth(2);
     }
diff --git a/src/themes/chartthemeicy_p.h b/src/themes/chartthemeicy_p.h
index 78b873f7..1e39fc32 100644
--- a/src/themes/chartthemeicy_p.h
+++ b/src/themes/chartthemeicy_p.h
@@ -5,7 +5,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartThemeIcy: public ChartTheme
 {
 public:
-    ChartThemeIcy():ChartTheme(QChart::ChartThemeIcy)
+    ChartThemeIcy() : ChartTheme(QChart::ChartThemeIcy)
     {
         // Series
         m_seriesColors << QRgb(0x0d2673);
@@ -22,13 +22,9 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
         m_axisLinePen = QPen(QRgb(0x0f0f0f));
         m_axisLinePen.setWidth(2);
         m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
-        m_backgroundShades = BackgroundShadesNone;
         m_gridLinePen = QPen(QRgb(0x0f0f0f));
         m_gridLinePen.setWidth(2);
     }
diff --git a/src/themes/chartthemelight_p.h b/src/themes/chartthemelight_p.h
index 71724009..7d949f43 100644
--- a/src/themes/chartthemelight_p.h
+++ b/src/themes/chartthemelight_p.h
@@ -23,13 +23,10 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
-        m_axisLinePen = QPen(QRgb(0xe2e2e2));
+        m_masterFont = QFont("arial");
+        m_axisLinePen = QPen(0xd6d6d6);
         m_axisLinePen.setWidth(1);
-        m_axisLabelBrush = QBrush(QRgb(0x838383));
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
-        m_backgroundShades = BackgroundShadesNone;
+        m_axisLabelBrush = QBrush(QRgb(0x404044));
         m_gridLinePen = QPen(QRgb(0xe2e2e2));
         m_gridLinePen.setWidth(1);
     }
diff --git a/src/themes/chartthemescientific_p.h b/src/themes/chartthemescientific_p.h
index 67b9c991..1b0e5bf1 100644
--- a/src/themes/chartthemescientific_p.h
+++ b/src/themes/chartthemescientific_p.h
@@ -5,7 +5,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartThemeScientific: public ChartTheme
 {
 public:
-    ChartThemeScientific():ChartTheme(QChart::ChartThemeScientific)
+    ChartThemeScientific() : ChartTheme(QChart::ChartThemeScientific)
     {
         // Series
         m_seriesColors << QRgb(0xFFAD00);
@@ -22,13 +22,9 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
         m_axisLinePen = QPen(QRgb(0x0f0f0f));
         m_axisLinePen.setWidth(2);
         m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
-//        m_backgroundShadesBrush = QBrush(QColor(0x0f, 0x0f, 0x0f, 0x80));
         m_backgroundShadesBrush = QBrush(QColor(0xff, 0xad, 0x00, 0x50));
         m_backgroundShades = BackgroundShadesHorizontal;
         m_gridLinePen = QPen(QRgb(0x0f0f0f));
diff --git a/src/themes/chartthemevanilla_p.h b/src/themes/chartthemevanilla_p.h
index ecd149bb..7c79091d 100644
--- a/src/themes/chartthemevanilla_p.h
+++ b/src/themes/chartthemevanilla_p.h
@@ -5,7 +5,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartThemeVanilla: public ChartTheme
 {
 public:
-    ChartThemeVanilla():ChartTheme(QChart::ChartThemeVanilla)
+    ChartThemeVanilla() : ChartTheme(QChart::ChartThemeVanilla)
     {
         // Series
         m_seriesColors << QRgb(0xd9c574);
@@ -23,13 +23,9 @@ public:
         m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
-        m_masterFont = QFont();
         m_axisLinePen = QPen(QRgb(0x0f0f0f));
         m_axisLinePen.setWidth(2);
         m_axisLabelBrush = QBrush(QRgb(0xa0a071));
-        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
-        m_backgroundShadesPen = Qt::NoPen;
-        m_backgroundShades = BackgroundShadesNone;
         m_gridLinePen = QPen(QRgb(0x0f0f0f));
         m_gridLinePen.setWidth(2);
     }