HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r853:9dc445f7b1fb

Removed default theme, now using light as the default

Tero Ahola -

r853:9dc445f7b1fb

parent child

Context file:

r853:9dc445f7b1fb

demos/chartthemes/themewidget.cpp +1 -3

                 m_valueCount(7),
                 m_dataTable(generateRandomData(m_listCount,m_valueMax,m_valueCount)),
                 m_themeComboBox(createThemeBox()),
-                m_antialiasCheckBox(new QCheckBox("Anti aliasing")),
+                m_antialiasCheckBox(new QCheckBox("Anti-aliasing")),
                 m_animatedComboBox(createAnimationBox()),
                 m_legendComboBox(createLegendBox())
             {
                 connectSignals();
                 // create layout
             {
                 // settings layout
                 QComboBox* themeComboBox = new QComboBox();
-                themeComboBox->addItem("Default", QChart::ChartThemeDefault);
                 themeComboBox->addItem("Light", QChart::ChartThemeLight);
                 themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean);
                 themeComboBox->addItem("Dark", QChart::ChartThemeDark);

demos/piechartcustomization/mainwidget.cpp 0 -1

                 // chart settings
                 m_themeComboBox = new QComboBox();
-                m_themeComboBox->addItem("Default", QChart::ChartThemeDefault);
                 m_themeComboBox->addItem("Light", QChart::ChartThemeLight);
                 m_themeComboBox->addItem("BlueCerulean", QChart::ChartThemeBlueCerulean);
                 m_themeComboBox->addItem("Dark", QChart::ChartThemeDark);

src/chartpresenter.cpp +1 -1

                 m_backgroundPadding(10)
             {
                 createConnections();
-                setTheme(QChart::ChartThemeDefault,false);
+                setTheme(QChart::ChartThemeLight, false);
             }
             ChartPresenter::~ChartPresenter()

src/charttheme.cpp +3 -3

             #include "splinechartitem_p.h"
             //themes
-            #include "chartthemedefault_p.h"
+            #include "chartthemesystem_p.h"
             #include "chartthemelight_p.h"
             #include "chartthemebluecerulean_p.h"
             #include "chartthemedark_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartTheme::ChartTheme(QChart::ChartTheme id) :
-                m_masterFont(QFont("arial", 12)),
+                m_masterFont(QFont("arial", 14)),
                 m_labelFont(QFont("arial", 10)),
                 m_titleBrush(QColor(QRgb(0x000000))),
                 m_axisLinePen(QPen(QRgb(0x000000))),
                     case QChart::ChartThemeBlueIcy:
                         return new ChartThemeBlueIcy();
                     default:
-                        return new ChartThemeDefault();
+                        return new ChartThemeSystem();
                 }
             }

src/charttheme_p.h +1 -1

                 };
             protected:
-                explicit ChartTheme(QChart::ChartTheme id =  QChart::ChartThemeDefault);
+                explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeLight);
             public:
                 static ChartTheme* createTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme id() const {return m_id;}

src/qchart.cpp +1 -2

              This enum describes the theme used by the chart.
-             \value ChartThemeDefault Follows the GUI style of the Operating System
+             \value ChartThemeLight The default theme
-             \value ChartThemeLight
              \value ChartThemeBlueCerulean
              \value ChartThemeDark
              \value ChartThemeBrownSand

src/qchart.h +1 -2

             public:
                 enum ChartTheme {
-                    ChartThemeDefault,
+                    ChartThemeLight = 0,
-                    ChartThemeLight,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,

src/themes/themes.pri +1 -1

             DEPENDPATH += $$PWD
             THEMES += \
-                $$PWD/chartthemedefault_p.h \
+                $$PWD/chartthemesystem_p.h \
                 $$PWD/chartthemelight_p.h \
                 $$PWD/chartthemebluecerulean_p.h \
                 $$PWD/chartthemedark_p.h \

src/themes/chartthemedefault_p.h removed 0 -170

NO CONTENT: file was removed

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages