diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-02 14:42:27 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-04 09:46:48 +0300 |
commit | 3dc2625e2a478dfe9b5b916f6f5688548a5c2ee2 (patch) | |
tree | 7248782bd3f3a50b3c6a8e97a82b957bfd54e6e4 /src | |
parent | a37605d126b677760676fa48fc956ef26c24bed9 (diff) |
Add new Qt theme template
Added new theme template ChartThemeQt. The colors are the ones
used in official Qt documentation.
Task-number: QTRD-1924
Change-Id: I2bb2d33b0198cad6275244d2e815908a2db033a3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/chartthememanager.cpp | 4 | ||||
-rw-r--r-- | src/qchart.h | 3 | ||||
-rw-r--r-- | src/themes/chartthemeqt_p.h | 74 | ||||
-rw-r--r-- | src/themes/themes.pri | 3 |
4 files changed, 82 insertions, 2 deletions
diff --git a/src/chartthememanager.cpp b/src/chartthememanager.cpp index 5bd5122f..9a2e3c24 100644 --- a/src/chartthememanager.cpp +++ b/src/chartthememanager.cpp @@ -29,6 +29,7 @@ #include "chartthemebluencs_p.h" #include "chartthemehighcontrast_p.h" #include "chartthemeblueicy_p.h" +#include "chartthemeqt_p.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -64,6 +65,9 @@ void ChartThemeManager::setTheme(QChart::ChartTheme theme) case QChart::ChartThemeBlueIcy: m_theme.reset(new ChartThemeBlueIcy()); break; + case QChart::ChartThemeQt: + m_theme.reset(new ChartThemeQt()); + break; default: m_theme.reset(new ChartThemeSystem()); break; diff --git a/src/qchart.h b/src/qchart.h index 4bd01d4f..9f48d0df 100644 --- a/src/qchart.h +++ b/src/qchart.h @@ -67,7 +67,8 @@ public: ChartThemeBrownSand, ChartThemeBlueNcs, ChartThemeHighContrast, - ChartThemeBlueIcy + ChartThemeBlueIcy, + ChartThemeQt }; enum AnimationOption { diff --git a/src/themes/chartthemeqt_p.h b/src/themes/chartthemeqt_p.h new file mode 100644 index 00000000..0d9c0ddc --- /dev/null +++ b/src/themes/chartthemeqt_p.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Enterprise Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#ifndef CHARTTHEMEQT_P_H +#define CHARTTHEMEQT_P_H + +#include "charttheme_p.h" + +QTCOMMERCIALCHART_BEGIN_NAMESPACE + +class ChartThemeQt : public ChartTheme +{ +public: + ChartThemeQt() : ChartTheme(QChart::ChartThemeQt) + { + // Series colors + m_seriesColors << QRgb(0x80c342); + m_seriesColors << QRgb(0x328930); + m_seriesColors << QRgb(0x006325); + m_seriesColors << QRgb(0x35322f); + m_seriesColors << QRgb(0x5d5b59); + m_seriesColors << QRgb(0x868482); + m_seriesColors << QRgb(0xaeadac); + m_seriesColors << QRgb(0xd7d6d5); + m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors); + + // Background + QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0); + backgroundGradient.setColorAt(0.0, QRgb(0xffffff)); + backgroundGradient.setColorAt(1.0, QRgb(0xffffff)); + backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode); + m_chartBackgroundGradient = backgroundGradient; + + // Axes and other + m_labelBrush = QBrush(QRgb(0x35322f)); + m_axisLinePen = QPen(QRgb(0xd7d6d5)); + m_axisLinePen.setWidth(1); + m_gridLinePen = QPen(QRgb(0xd7d6d5)); + m_gridLinePen.setWidth(1); + m_backgroundShades = BackgroundShadesNone; + m_outlinePen = QPen(QRgb(0x35322f)); + m_outlinePen.setWidthF(2.0); + } +}; + +QTCOMMERCIALCHART_END_NAMESPACE + +#endif diff --git a/src/themes/themes.pri b/src/themes/themes.pri index 53af4826..656552af 100644 --- a/src/themes/themes.pri +++ b/src/themes/themes.pri @@ -10,4 +10,5 @@ THEMES += \ $$PWD/chartthemebrownsand_p.h \ $$PWD/chartthemebluencs_p.h \ $$PWD/chartthemehighcontrast_p.h \ - $$PWD/chartthemeblueicy_p.h + $$PWD/chartthemeblueicy_p.h \ + $$PWD/chartthemeqt_p.h |