diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-23 06:13:23 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-23 08:04:47 +0300 |
| commit | 611dfce313e6b1998b8d7afc49d63beac90b42e9 (patch) | |
| tree | 347f07b62df67e71612277400ed0b07308c68b13 /examples/scatterchart | |
| parent | d57aabe85e6b4012f93348884df16262889906d8 (diff) | |
Removed old themes
Task-number: QTRD-2319
Change-Id: I90e6add03fdca157fec6aa2398488982ab05d104
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples/scatterchart')
| -rw-r--r-- | examples/scatterchart/main.cpp | 10 | ||||
| -rw-r--r-- | examples/scatterchart/scatterchart.cpp | 12 | ||||
| -rw-r--r-- | examples/scatterchart/scatterchart.h | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp index 8b18f5d4..f61c2ab4 100644 --- a/examples/scatterchart/main.cpp +++ b/examples/scatterchart/main.cpp @@ -53,14 +53,6 @@ int main(int argc, char **argv) hLayout->addLayout(vLayout); QComboBox *themeList = new QComboBox(widget); - themeList->addItem(QStringLiteral("System")); - themeList->addItem(QStringLiteral("Blue Cerulean")); - themeList->addItem(QStringLiteral("Blue Icy")); - themeList->addItem(QStringLiteral("Blue Ncs")); - themeList->addItem(QStringLiteral("Brown Sand")); - themeList->addItem(QStringLiteral("Dark")); - themeList->addItem(QStringLiteral("High Contrast")); - themeList->addItem(QStringLiteral("Light")); themeList->addItem(QStringLiteral("Qt")); themeList->addItem(QStringLiteral("Primary Colors")); themeList->addItem(QStringLiteral("Digia")); @@ -69,7 +61,7 @@ int main(int argc, char **argv) themeList->addItem(QStringLiteral("Retro")); themeList->addItem(QStringLiteral("Ebony")); themeList->addItem(QStringLiteral("Isabelle")); - themeList->setCurrentIndex(4); + themeList->setCurrentIndex(6); QPushButton *labelButton = new QPushButton(widget); labelButton->setText(QStringLiteral("Change label style")); diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index f68b8ad5..88a83567 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -36,7 +36,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) font.setPointSize(m_fontSize); m_chart->setFont(font); m_chart->setObjectType(QDataVis::Spheres, true); - m_chart->setTheme(QDataVis::ThemeBrownSand); + m_chart->setTheme(QDataVis::ThemeEbony); m_chart->setShadowQuality(QDataVis::ShadowHigh); m_chart->setCameraPreset(QDataVis::PresetFront); m_chart->setAxisX(new Q3DValueAxis); @@ -117,16 +117,6 @@ void ScatterDataModifier::changePresetCamera() preset = QDataVis::PresetFrontLow; } -void ScatterDataModifier::changeTheme() -{ - static int theme = QDataVis::ThemeSystem; - - m_chart->setTheme((QDataVis::ColorTheme)theme); - - if (++theme > QDataVis::ThemeLight) - theme = QDataVis::ThemeSystem; -} - void ScatterDataModifier::changeTransparency() { static int transparency = QDataVis::TransparencyNone; diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h index 9a1726b9..bfdcb5bc 100644 --- a/examples/scatterchart/scatterchart.h +++ b/examples/scatterchart/scatterchart.h @@ -34,7 +34,6 @@ public: void addData(); void changeStyle(); void changePresetCamera(); - void changeTheme(); void changeTransparency(); void changeFont(const QFont &font); void changeFontSize(int fontsize); |