summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2013-10-11 12:33:02 +0300
committerTitta Heikkala <titta.heikkala@digia.com>2013-10-11 12:45:13 +0300
commitecc23d4e019a8f89e549f16a621b41eef78cffad (patch)
tree4f0de714b13ca5d2aa80b47e41136aebeafb6c6d /tests
parentc58d5a10ac6546a13570cda940b17d4c342b0568 (diff)
Add the new Qt template to demos and tests
The new Qt template is added to demos and test applications that provide the selection for theme. Task-number: QTRD-1924 Change-Id: I847621c98c657e89678bc759ab9e8f6c290debd7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/boxplottester/mainwidget.cpp1
-rw-r--r--tests/chartwidgettest/mainwidget.cpp6
-rw-r--r--tests/polarcharttest/mainwindow.ui5
3 files changed, 11 insertions, 1 deletions
diff --git a/tests/boxplottester/mainwidget.cpp b/tests/boxplottester/mainwidget.cpp
index 9e78d2e6..2f95d141 100644
--- a/tests/boxplottester/mainwidget.cpp
+++ b/tests/boxplottester/mainwidget.cpp
@@ -169,6 +169,7 @@ void MainWidget::initThemeCombo(QGridLayout *grid)
chartTheme->addItem("Blue NCS");
chartTheme->addItem("High Contrast");
chartTheme->addItem("Blue Icy");
+ chartTheme->addItem("Qt");
connect(chartTheme, SIGNAL(currentIndexChanged(int)),
this, SLOT(changeChartTheme(int)));
grid->addWidget(new QLabel("Chart theme:"), m_rowPos, 0);
diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp
index b8747200..8528baf7 100644
--- a/tests/chartwidgettest/mainwidget.cpp
+++ b/tests/chartwidgettest/mainwidget.cpp
@@ -145,6 +145,7 @@ void MainWidget::initThemeCombo(QGridLayout *grid)
chartTheme->addItem("Blue NCS");
chartTheme->addItem("High Contrast");
chartTheme->addItem("Blue Icy");
+ chartTheme->addItem("Qt");
connect(chartTheme, SIGNAL(currentIndexChanged(int)),
this, SLOT(changeChartTheme(int)));
grid->addWidget(new QLabel("Chart theme:"), 8, 0);
@@ -371,5 +372,8 @@ void MainWidget::yMaxChanged(int value)
void MainWidget::changeChartTheme(int themeIndex)
{
qDebug() << "changeChartTheme: " << themeIndex;
- m_chart->setTheme((QChart::ChartTheme) themeIndex);
+ if (themeIndex == 0)
+ m_chart->setTheme(QChart::ChartThemeLight);
+ else
+ m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
}
diff --git a/tests/polarcharttest/mainwindow.ui b/tests/polarcharttest/mainwindow.ui
index 4faffb54..cc4b1994 100644
--- a/tests/polarcharttest/mainwindow.ui
+++ b/tests/polarcharttest/mainwindow.ui
@@ -878,6 +878,11 @@
<string>Theme: Blue Icy</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Theme: Qt</string>
+ </property>
+ </item>
</widget>
<widget class="QLabel" name="hoverLabel">
<property name="geometry">