Themes updated

Updated colors.
Adjusted lights.
Added grid line color to themes.

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

3 files changed, 68 insertions, 55 deletions

diff --git a/src/engine/q3dbars.cpp b/src/engine/q3dbars.cpp
index f456cb00..027ec996 100644
--- a/src/engine/q3dbars.cpp
+++ b/src/engine/q3dbars.cpp
@@ -992,7 +992,7 @@ void Q3DBars::drawScene()
         d_ptr->m_barShader->bind();
 
         // Set unchanging shader bindings
-        QVector3D barColor = Utils::vectorFromColor(Qt::black);
+        QVector3D barColor = Utils::vectorFromColor(d_ptr->m_theme->m_gridLine);
         d_ptr->m_barShader->setUniformValue(d_ptr->m_barShader->lightP(), lightPos);
         d_ptr->m_barShader->setUniformValue(d_ptr->m_barShader->view(), viewMatrix);
         d_ptr->m_barShader->setUniformValue(d_ptr->m_barShader->color(), barColor);
diff --git a/src/engine/theme.cpp b/src/engine/theme.cpp
index 15a66dfc..de56947d 100644
--- a/src/engine/theme.cpp
+++ b/src/engine/theme.cpp
@@ -56,6 +56,7 @@ Theme::Theme()
       m_windowColor(QColor(Qt::gray)),
       m_textColor(QColor(Qt::white)),
       m_textBackgroundColor(QColor(0x00, 0x00, 0x00, 0x80)),
+      m_gridLine(QColor(Qt::black)),
       m_highlightBarColor(QColor(Qt::red)),
       m_highlightRowColor(QColor(Qt::darkRed)),
       m_highlightColumnColor(QColor(Qt::darkMagenta)),
@@ -96,6 +97,7 @@ void Theme::useTheme(ColorTheme theme)
                                GetBValue(colorWindow));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
+        m_gridLine = QColor(QRgb(0xe2e2e2));
         m_highlightBarColor = QColor(QRgb(0xe2e2e2));
         m_highlightRowColor = QColor(QRgb(0xf2f2f2));
         m_highlightColumnColor = QColor(QRgb(0xf2f2f2));
@@ -106,14 +108,15 @@ void Theme::useTheme(ColorTheme theme)
 #elif defined(Q_OS_LINUX)
         m_baseColor = QColor(QRgb(0x60a6e6));
         m_heightColor = QColor(QRgb(0xfc5751));
-        m_depthColor = QColor(Qt::black);
+        m_depthColor = QColor(QRgb(0x92ca66));
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(QRgb(0xe2e2e2));
-        m_highlightRowColor = QColor(QRgb(0xf2f2f2));
-        m_highlightColumnColor = QColor(QRgb(0xf2f2f2));
+        m_gridLine = QColor(QRgb(0xe2e2e2));
+        m_highlightBarColor = QColor(QRgb(0xeba85f));
+        m_highlightRowColor = QColor(QRgb(0xfc5751));
+        m_highlightColumnColor = QColor(QRgb(0xfc5751));
         m_lightStrength = 4.0f;
         m_ambientStrength = 0.3f;
         m_highlightLightStrength = 6.0f;
@@ -121,14 +124,15 @@ void Theme::useTheme(ColorTheme theme)
 #elif defined(Q_OS_MAC)
         m_baseColor = QColor(QRgb(0x60a6e6));
         m_heightColor = QColor(QRgb(0xfc5751));
-        m_depthColor = QColor(Qt::black);
+        m_depthColor = QColor(QRgb(0x92ca66));
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(QRgb(0xe2e2e2));
-        m_highlightRowColor = QColor(QRgb(0xf2f2f2));
-        m_highlightColumnColor = QColor(QRgb(0xf2f2f2));
+        m_gridLine = QColor(QRgb(0xe2e2e2));
+        m_highlightBarColor = QColor(QRgb(0xeba85f));
+        m_highlightRowColor = QColor(QRgb(0xfc5751));
+        m_highlightColumnColor = QColor(QRgb(0xfc5751));
         m_lightStrength = 4.0f;
         m_ambientStrength = 0.3f;
         m_highlightLightStrength = 6.0f;
@@ -136,14 +140,15 @@ void Theme::useTheme(ColorTheme theme)
 #else
         m_baseColor = QColor(QRgb(0x60a6e6));
         m_heightColor = QColor(QRgb(0xfc5751));
-        m_depthColor = QColor(Qt::black);
+        m_depthColor = QColor(QRgb(0x92ca66));
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(QRgb(0xe2e2e2));
-        m_highlightRowColor = QColor(QRgb(0xf2f2f2));
-        m_highlightColumnColor = QColor(QRgb(0xf2f2f2));
+        m_gridLine = QColor(QRgb(0xe2e2e2));
+        m_highlightBarColor = QColor(QRgb(0xeba85f));
+        m_highlightRowColor = QColor(QRgb(0xfc5751));
+        m_highlightColumnColor = QColor(QRgb(0xfc5751));
         m_lightStrength = 4.0f;
         m_ambientStrength = 0.3f;
         m_highlightLightStrength = 6.0f;
@@ -155,14 +160,15 @@ void Theme::useTheme(ColorTheme theme)
     case ThemeBlueCerulean: {
         m_baseColor = QColor(QRgb(0xc7e85b));
         m_heightColor = QColor(QRgb(0xee7392));
-        m_depthColor = QColor(Qt::black);
+        m_depthColor = QColor(QRgb(0x1cb54f));
         m_backgroundColor = QColor(QRgb(0x056189));
         m_windowColor = QColor(QRgb(0x101a31));
         m_textColor = QColor(QRgb(0xffffff));
-        m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(Qt::blue);
-        m_highlightRowColor = QColor(Qt::darkBlue);
-        m_highlightColumnColor = QColor(Qt::darkBlue);
+        m_textBackgroundColor = QColor(0x05, 0x61, 0x89, 0x80);
+        m_gridLine = QColor(QRgb(0x84a2b0));
+        m_highlightBarColor = QColor(QRgb(0x5cbf9b));
+        m_highlightRowColor = QColor(QRgb(0x009fbf));
+        m_highlightColumnColor = QColor(QRgb(0x009fbf));
         m_lightStrength = 5.0f;
         m_ambientStrength = 0.2f;
         m_highlightLightStrength = 10.0f;
@@ -173,16 +179,17 @@ void Theme::useTheme(ColorTheme theme)
     case ThemeBlueIcy: {
         m_baseColor = QRgb(0x3daeda);
         m_heightColor = QRgb(0x2fa3b4);
-        m_depthColor = QColor(Qt::lightGray);
+        m_depthColor = QColor(QRgb(0x2685bf));
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
-        m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(Qt::white);
-        m_highlightRowColor = QColor(Qt::lightGray);
-        m_highlightColumnColor = QColor(Qt::lightGray);
+        m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0x80);
+        m_gridLine = QColor(QRgb(0xe2e2e2));
+        m_highlightBarColor = QColor(QRgb(0x0c2673));
+        m_highlightRowColor = QColor(QRgb(0x5f3dba));
+        m_highlightColumnColor = QColor(QRgb(0x5f3dba));
         m_lightStrength = 5.0f;
-        m_ambientStrength = 0.4f;
+        m_ambientStrength = 0.3f;
         m_highlightLightStrength = 8.0f;
         m_uniformColor = true;
         qDebug("ThemeBlueIcy");
@@ -191,14 +198,15 @@ void Theme::useTheme(ColorTheme theme)
     case ThemeBlueNcs: {
         m_baseColor = QColor(QRgb(0x1db0da));
         m_heightColor = QColor(QRgb(0x398ca3));
-        m_depthColor = QColor(Qt::lightGray);
+        m_depthColor = QColor(QRgb(0x1341a6));
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
-        m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(Qt::lightGray);
-        m_highlightRowColor = QColor(Qt::gray);
-        m_highlightColumnColor = QColor(Qt::gray);
+        m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0xff);
+        m_gridLine = QColor(QRgb(0xe2e2e2));
+        m_highlightBarColor = QColor(QRgb(0x88d41e));
+        m_highlightRowColor = QColor(QRgb(0xff8e1a));
+        m_highlightColumnColor = QColor(QRgb(0xff8e1a));
         m_lightStrength = 4.0f;
         m_ambientStrength = 0.2f;
         m_highlightLightStrength = 6.0f;
@@ -209,14 +217,15 @@ void Theme::useTheme(ColorTheme theme)
     case ThemeBrownSand: {
         m_baseColor = QColor(QRgb(0xb39b72));
         m_heightColor = QColor(QRgb(0x494345));
-        m_depthColor = QColor(Qt::darkYellow);
+        m_depthColor = QColor(QRgb(0xb3b376));
         m_backgroundColor = QColor(QRgb(0xf3ece0));
         m_windowColor = QColor(QRgb(0xf3ece0));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xb5, 0xb0, 0xa7, 0x80);
-        m_highlightBarColor = QColor(Qt::yellow);
-        m_highlightRowColor = QColor(Qt::darkYellow);
-        m_highlightColumnColor = QColor(Qt::darkYellow);
+        m_gridLine = QColor(QRgb(0xd4cec3));
+        m_highlightBarColor = QColor(QRgb(0xc35660));
+        m_highlightRowColor = QColor(QRgb(0x536780));
+        m_highlightColumnColor = QColor(QRgb(0x536780));
         m_lightStrength = 6.0f;
         m_ambientStrength = 0.3f;
         m_highlightLightStrength = 8.0f;
@@ -225,16 +234,17 @@ void Theme::useTheme(ColorTheme theme)
         break;
     }
     case ThemeDark: {
-        m_baseColor = QColor(QRgb(0x38ad6b));
-        m_heightColor = QColor(QRgb(0xbf593e));
-        m_depthColor = QColor(Qt::black);
-        m_backgroundColor = QColor(QRgb(0x2e303a));
-        m_windowColor = QColor(QRgb(0x121218));
-        m_textColor = QColor(QRgb(0xffffff));
-        m_textBackgroundColor = QColor(0x86, 0x87, 0x8c, 0x80);
-        m_highlightBarColor = QColor(Qt::gray);
-        m_highlightRowColor = QColor(Qt::darkGray);
-        m_highlightColumnColor = QColor(Qt::darkGray);
+        m_baseColor = QColor(QRgb(0x38ad6b));               // charts: series color 1
+        m_heightColor = QColor(QRgb(0xbf593e));             // charts: series color 5
+        m_depthColor = QColor(QRgb(0x3c84a7));              // charts: series color 2
+        m_backgroundColor = QColor(QRgb(0x2e303a));         // charts: background color 1
+        m_windowColor = QColor(QRgb(0x121218));             // charts: background color 2
+        m_textColor = QColor(QRgb(0xffffff));               // charts: label color
+        m_textBackgroundColor = QColor(0x86, 0x87, 0x8c, 0x80); // charts: axis line pen OR background color 2
+        m_gridLine = QColor(QRgb(0x86878c));                // charts: grid line color
+        m_highlightBarColor = QColor(QRgb(0xeb8817));       // charts: series color 3
+        m_highlightRowColor = QColor(QRgb(0x7b7f8c));       // charts: series color 4
+        m_highlightColumnColor = QColor(QRgb(0x7b7f8c));    // charts: series color 4
         m_lightStrength = 6.0f;
         m_ambientStrength = 0.2f;
         m_highlightLightStrength = 8.0f;
@@ -245,16 +255,17 @@ void Theme::useTheme(ColorTheme theme)
     case ThemeHighContrast: {
         m_baseColor = QColor(QRgb(0x202020));
         m_heightColor = QColor(QRgb(0xff4a41));
-        m_depthColor = QColor(Qt::red);
-        m_backgroundColor = QColor(QRgb(0xeeeeee));
+        m_depthColor = QColor(QRgb(0x596a74));
+        m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0x000000));
         m_textColor = QColor(QRgb(0x181818));
-        m_textBackgroundColor = QColor(0x8c, 0x8c, 0x8c, 0x80);
-        m_highlightBarColor = QColor(Qt::black);
-        m_highlightRowColor = QColor(Qt::white);
-        m_highlightColumnColor = QColor(Qt::white);
-        m_lightStrength = 5.0f;
-        m_ambientStrength = 1.0f;
+        m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0x80);
+        m_gridLine = QColor(QRgb(0x8c8c8c));
+        m_highlightBarColor = QColor(QRgb(0xffab03));
+        m_highlightRowColor = QColor(QRgb(0x038e9b));
+        m_highlightColumnColor = QColor(QRgb(0x038e9b));
+        m_lightStrength = 8.0f;
+        m_ambientStrength = 0.5f;
         m_highlightLightStrength = 10.0f;
         m_uniformColor = false;
         qDebug("ThemeHighContrast");
@@ -263,14 +274,15 @@ void Theme::useTheme(ColorTheme theme)
     case ThemeLight: {
         m_baseColor = QColor(QRgb(0x209fdf));
         m_heightColor = QColor(QRgb(0xbf593e));
-        m_depthColor = QColor(Qt::lightGray);
+        m_depthColor = QColor(QRgb(0x99ca53));
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);
-        m_highlightBarColor = QColor(Qt::white);
-        m_highlightRowColor = QColor(Qt::lightGray);
-        m_highlightColumnColor = QColor(Qt::lightGray);
+        m_gridLine = QColor(QRgb(0xe2e2e2));
+        m_highlightBarColor = QColor(QRgb(0xf6a625));
+        m_highlightRowColor = QColor(QRgb(0x6d5fd5));
+        m_highlightColumnColor = QColor(QRgb(0x6d5fd5));
         m_lightStrength = 3.0f;
         m_ambientStrength = 0.5f;
         m_highlightLightStrength = 6.0f;
diff --git a/src/engine/theme_p.h b/src/engine/theme_p.h
index 614c79d5..d55e9a33 100644
--- a/src/engine/theme_p.h
+++ b/src/engine/theme_p.h
@@ -82,6 +82,7 @@ private:
     QColor m_windowColor;
     QColor m_textColor;
     QColor m_textBackgroundColor;
+    QColor m_gridLine;
     QColor m_highlightBarColor;
     QColor m_highlightRowColor;
     QColor m_highlightColumnColor;