##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Removed default theme, now using light as the default
Tero Ahola -
r853:9dc445f7b1fb
parent child
Show More
Show file before | Show file after | Hide comments
@@ -48,10 +48,9 ThemeWidget::ThemeWidget(QWidget* parent) :
48 48 m_valueCount(7),
49 49 m_dataTable(generateRandomData(m_listCount,m_valueMax,m_valueCount)),
50 50 m_themeComboBox(createThemeBox()),
51 m_antialiasCheckBox(new QCheckBox("Anti aliasing")),
51 m_antialiasCheckBox(new QCheckBox("Anti-aliasing")),
52 52 m_animatedComboBox(createAnimationBox()),
53 53 m_legendComboBox(createLegendBox())
54
55 54 {
56 55 connectSignals();
57 56 // create layout
@@ -141,7 +140,6 QComboBox* ThemeWidget::createThemeBox() const
141 140 {
142 141 // settings layout
143 142 QComboBox* themeComboBox = new QComboBox();
144 themeComboBox->addItem("Default", QChart::ChartThemeDefault);
145 143 themeComboBox->addItem("Light", QChart::ChartThemeLight);
146 144 themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean);
147 145 themeComboBox->addItem("Dark", QChart::ChartThemeDark);
Show file before | Show file after | Hide comments
@@ -57,7 +57,6 MainWidget::MainWidget(QWidget* parent)
57 57
58 58 // chart settings
59 59 m_themeComboBox = new QComboBox();
60 m_themeComboBox->addItem("Default", QChart::ChartThemeDefault);
61 60 m_themeComboBox->addItem("Light", QChart::ChartThemeLight);
62 61 m_themeComboBox->addItem("BlueCerulean", QChart::ChartThemeBlueCerulean);
63 62 m_themeComboBox->addItem("Dark", QChart::ChartThemeDark);
Show file before | Show file after | Hide comments
@@ -57,7 +57,7 ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(char
57 57 m_backgroundPadding(10)
58 58 {
59 59 createConnections();
60 setTheme(QChart::ChartThemeDefault,false);
60 setTheme(QChart::ChartThemeLight, false);
61 61 }
62 62
63 63 ChartPresenter::~ChartPresenter()
Show file before | Show file after | Hide comments
@@ -49,7 +49,7
49 49 #include "splinechartitem_p.h"
50 50
51 51 //themes
52 #include "chartthemedefault_p.h"
52 #include "chartthemesystem_p.h"
53 53 #include "chartthemelight_p.h"
54 54 #include "chartthemebluecerulean_p.h"
55 55 #include "chartthemedark_p.h"
@@ -61,7 +61,7
61 61 QTCOMMERCIALCHART_BEGIN_NAMESPACE
62 62
63 63 ChartTheme::ChartTheme(QChart::ChartTheme id) :
64 m_masterFont(QFont("arial", 12)),
64 m_masterFont(QFont("arial", 14)),
65 65 m_labelFont(QFont("arial", 10)),
66 66 m_titleBrush(QColor(QRgb(0x000000))),
67 67 m_axisLinePen(QPen(QRgb(0x000000))),
@@ -94,7 +94,7 ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
94 94 case QChart::ChartThemeBlueIcy:
95 95 return new ChartThemeBlueIcy();
96 96 default:
97 return new ChartThemeDefault();
97 return new ChartThemeSystem();
98 98 }
99 99 }
100 100
Show file before | Show file after | Hide comments
@@ -58,7 +58,7 public:
58 58 };
59 59
60 60 protected:
61 explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeDefault);
61 explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeLight);
62 62 public:
63 63 static ChartTheme* createTheme(QChart::ChartTheme theme);
64 64 QChart::ChartTheme id() const {return m_id;}
Show file before | Show file after | Hide comments
@@ -30,8 +30,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30 30
31 31 This enum describes the theme used by the chart.
32 32
33 \value ChartThemeDefault Follows the GUI style of the Operating System
34 \value ChartThemeLight
33 \value ChartThemeLight The default theme
35 34 \value ChartThemeBlueCerulean
36 35 \value ChartThemeDark
37 36 \value ChartThemeBrownSand
Show file before | Show file after | Hide comments
@@ -40,8 +40,7 class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
40 40
41 41 public:
42 42 enum ChartTheme {
43 ChartThemeDefault,
44 ChartThemeLight,
43 ChartThemeLight = 0,
45 44 ChartThemeBlueCerulean,
46 45 ChartThemeDark,
47 46 ChartThemeBrownSand,
Show file before | Show file after | Hide comments
@@ -2,7 +2,7 INCLUDEPATH += $$PWD
2 2 DEPENDPATH += $$PWD
3 3
4 4 THEMES += \
5 $$PWD/chartthemedefault_p.h \
5 $$PWD/chartthemesystem_p.h \
6 6 $$PWD/chartthemelight_p.h \
7 7 $$PWD/chartthemebluecerulean_p.h \
8 8 $$PWD/chartthemedark_p.h \
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now