New theme with light colors, chartview background

7 files changed, 50 insertions, 15 deletions

diff --git a/src/themes/chartthemebluecerulean_p.h b/src/themes/chartthemebluecerulean_p.h
index 4976843c..93e87035 100644
--- a/src/themes/chartthemebluecerulean_p.h
+++ b/src/themes/chartthemebluecerulean_p.h
@@ -13,23 +13,19 @@ public:
         m_seriesColors << QRgb(0x4fbef3);
         generateSeriesGradients();
 
-        // Background
-        QLinearGradient backgroundGradient;
-        backgroundGradient.setColorAt(0.0, QRgb(0x056188));
-        backgroundGradient.setColorAt(1.0, QRgb(0x101a33));
-        backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-        m_backgroundGradient = backgroundGradient;
+        // No chart background, chart view specifies a background
+        // TODO: what if the chart is drawn on custom graphics scene instead of QChartView?
 
         // Axes and other
         m_masterFont = QFont();
-        m_axisLinePen = QPen(QRgb(0x0f0f0f));
+        m_axisLinePen = QPen(QRgb(0xf7f7ff));
         m_axisLinePen.setWidth(2);
-        m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
+        m_axisLabelBrush = QBrush(QRgb(0xf7f7ff));
         m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
         m_backgroundShadesPen = Qt::NoPen;
         m_backgroundShades = BackgroundShadesNone;
-        m_gridLinePen = QPen(QRgb(0x0f0f0f));
-        m_gridLinePen.setWidth(2);
+        m_gridLinePen = QPen(QRgb(0xf7f7ff));
+        m_gridLinePen.setWidth(1);
     }
 };
 
diff --git a/src/themes/chartthemedefault_p.h b/src/themes/chartthemedefault_p.h
index 552604ab..2e9635b4 100644
--- a/src/themes/chartthemedefault_p.h
+++ b/src/themes/chartthemedefault_p.h
@@ -110,7 +110,7 @@ public:
         backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
         backgroundGradient.setColorAt(1.0, QRgb(0xe9e9e9));
         backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-        m_backgroundGradient = backgroundGradient;
+        m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
         m_masterFont = QFont();
diff --git a/src/themes/chartthemegrayscale_p.h b/src/themes/chartthemegrayscale_p.h
index bf53c531..6ae2c7f3 100644
--- a/src/themes/chartthemegrayscale_p.h
+++ b/src/themes/chartthemegrayscale_p.h
@@ -19,7 +19,7 @@ public:
         backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
         backgroundGradient.setColorAt(1.0, QRgb(0xe0e3e5));
         backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-        m_backgroundGradient = backgroundGradient;
+        m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
         m_masterFont = QFont();
@@ -28,6 +28,7 @@ public:
         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 f3b174f3..78b873f7 100644
--- a/src/themes/chartthemeicy_p.h
+++ b/src/themes/chartthemeicy_p.h
@@ -19,7 +19,7 @@ public:
         backgroundGradient.setColorAt(0.0, QRgb(0xebebeb));
         backgroundGradient.setColorAt(1.0, QRgb(0xf8f9fb));
         backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-        m_backgroundGradient = backgroundGradient;
+        m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
         m_masterFont = QFont();
@@ -28,6 +28,7 @@ public:
         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
new file mode 100644
index 00000000..f15fca5e
--- /dev/null
+++ b/src/themes/chartthemelight_p.h
@@ -0,0 +1,36 @@
+#include "charttheme_p.h"
+
+QTCOMMERCIALCHART_BEGIN_NAMESPACE
+
+class ChartThemeLight: public ChartTheme
+{
+public:
+    ChartThemeLight() : ChartTheme(QChart::ChartThemeLight)
+    {
+        // Series colors
+        m_seriesColors << QRgb(0x1c9dde);
+        m_seriesColors << QRgb(0xf7a015);
+        m_seriesColors << QRgb(0x8dc444);
+        generateSeriesGradients();
+
+        // Background
+        QLinearGradient backgroundGradient;
+        backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
+        backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
+        backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
+        m_chartBackgroundGradient = backgroundGradient;
+
+        // Axes and other
+        m_masterFont = QFont();
+        m_axisLinePen = QPen(QRgb(0x424242));
+        m_axisLinePen.setWidth(1);
+        m_axisLabelBrush = QBrush(QRgb(0x424242));
+        m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
+        m_backgroundShadesPen = Qt::NoPen;
+        m_backgroundShades = BackgroundShadesNone;
+        m_gridLinePen = QPen(QRgb(0x424242));
+        m_gridLinePen.setWidth(1);
+    }
+};
+
+QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/themes/chartthemescientific_p.h b/src/themes/chartthemescientific_p.h
index 69184f3a..67b9c991 100644
--- a/src/themes/chartthemescientific_p.h
+++ b/src/themes/chartthemescientific_p.h
@@ -19,7 +19,7 @@ public:
         backgroundGradient.setColorAt(0.0, QRgb(0xfffefc));
         backgroundGradient.setColorAt(1.0, QRgb(0xfffefc));
         backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-        m_backgroundGradient = backgroundGradient;
+        m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
         m_masterFont = QFont();
diff --git a/src/themes/chartthemevanilla_p.h b/src/themes/chartthemevanilla_p.h
index c085c778..ecd149bb 100644
--- a/src/themes/chartthemevanilla_p.h
+++ b/src/themes/chartthemevanilla_p.h
@@ -20,7 +20,7 @@ public:
         backgroundGradient.setColorAt(0.0, QRgb(0xfbf9f1));
         backgroundGradient.setColorAt(1.0, QRgb(0xf5f0dc));
         backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-        m_backgroundGradient = backgroundGradient;
+        m_chartBackgroundGradient = backgroundGradient;
 
         // Axes and other
         m_masterFont = QFont();
@@ -29,6 +29,7 @@ public:
         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);
     }