diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 10:26:46 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 10:27:15 +0300 |
commit | 23052d3f50764e3d6a0def345d09c9a78d38857a (patch) | |
tree | 7fe8e3c3abf4e44ea3f62dc3022b0119ab966303 | |
parent | defd066b46329783c10ace4e67fddc4a2a65bf4c (diff) |
Refactored ColorTheme -> Theme
Task-number: QTRD-2362
Change-Id: I042e57a2307f7465588ff3475a659e0483a45da8
Change-Id: I042e57a2307f7465588ff3475a659e0483a45da8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
21 files changed, 48 insertions, 48 deletions
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index 88a83567..6d6e3eff 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -104,7 +104,7 @@ void ScatterDataModifier::setSmoothDots(int smooth) void ScatterDataModifier::changeTheme(int theme) { - m_chart->setTheme((QDataVis::ColorTheme)theme); + m_chart->setTheme((QDataVis::Theme)theme); } void ScatterDataModifier::changePresetCamera() diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp index b6b2739d..ec90cdf2 100644 --- a/examples/surfacechart/chartmodifier.cpp +++ b/examples/surfacechart/chartmodifier.cpp @@ -305,7 +305,7 @@ void ChartModifier::changeTransparency() void ChartModifier::changeTheme(int theme) { - m_chart->setTheme((QDataVis::ColorTheme)theme); + m_chart->setTheme((QDataVis::Theme)theme); } void ChartModifier::timeout() diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp index f0d21b3c..559165cc 100644 --- a/examples/surfacechart/main.cpp +++ b/examples/surfacechart/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) QSize screenSize = surfaceChart->screen()->size(); // Set to default, should be same as the initial on themeList - surfaceChart->setTheme(QDataVis::ColorTheme(initialTheme)); + surfaceChart->setTheme(QDataVis::Theme(initialTheme)); QWidget *container = QWidget::createWindowContainer(surfaceChart); container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 2)); diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index 6ecee12b..311d0a31 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -141,7 +141,7 @@ void ChartModifier::changePresetCamera() void ChartModifier::changeTheme(int theme) { - m_chart->setTheme((QDataVis::ColorTheme)theme); + m_chart->setTheme((QDataVis::Theme)theme); } void ChartModifier::changeTransparency() diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index cc8b6541..b1138db5 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -53,7 +53,7 @@ */ /*! - \qmlproperty AbstractGraph3D.ColorTheme AbstractGraph3D::theme + \qmlproperty AbstractGraph3D.Theme AbstractGraph3D::theme Theme of the graph. Theme affects visualization colors, label colors, text color, background color, window color and grid color. Lighting is also adjusted by themes. */ diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index f49d4d2f..fb4d7744 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -54,7 +54,7 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) : m_data(0), m_renderPending(false) { - m_theme.useColorTheme(QDataVis::ThemeQt); + m_theme.useTheme(QDataVis::ThemeQt); // Populate the scene m_scene->activeLight()->setPosition(defaultLightPos); @@ -685,9 +685,9 @@ QColor Abstract3DController::objectColor() const return m_theme.m_baseColor; } -void Abstract3DController::setColorTheme(QDataVis::ColorTheme colorTheme) +void Abstract3DController::setTheme(QDataVis::Theme theme) { - m_theme.useColorTheme(colorTheme); + m_theme.useTheme(theme); m_changeTracker.themeChanged = true; emitNeedRender(); diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 2c1867b1..3ccd12f5 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -255,7 +255,7 @@ public: // Set theme (bar colors, shaders, window color, background colors, light intensity and text // colors are affected) - virtual void setColorTheme(QDataVis::ColorTheme colorTheme); + virtual void setTheme(QDataVis::Theme theme); virtual Theme theme(); // Set font diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index d99ece1a..0efd076e 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -275,7 +275,7 @@ void Q3DBars::setCameraPosition(qreal horizontal, qreal vertical, int distance) } /*! - * Sets a predefined \a theme from \c QDataVis::ColorTheme. It is preset to \c QDataVis::ThemeQt by + * Sets a predefined \a theme from \c QDataVis::Theme. It is preset to \c QDataVis::ThemeQt by * default. Theme affects bar colors, label colors, text color, background color, window color and * grid color. Lighting is also adjusted by themes. * @@ -283,9 +283,9 @@ void Q3DBars::setCameraPosition(qreal horizontal, qreal vertical, int distance) * * \warning This method is subject to change. */ -void Q3DBars::setTheme(QDataVis::ColorTheme theme) +void Q3DBars::setTheme(QDataVis::Theme theme) { - d_ptr->m_shared->setColorTheme(theme); + d_ptr->m_shared->setTheme(theme); } /*! diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index e4c1d785..957c69b8 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -62,7 +62,7 @@ public: void setCameraPosition(qreal horizontal, qreal vertical, int distance = 100); - void setTheme(QDataVis::ColorTheme theme); + void setTheme(QDataVis::Theme theme); void setBarThickness(qreal thicknessRatio); qreal barThickness(); diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 816849fe..c7359c55 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -214,7 +214,7 @@ void Q3DScatter::setCameraPosition(qreal horizontal, qreal vertical, int distanc } /*! - * Sets a predefined \a theme from \c QDataVis::ColorTheme. It is preset to \c QDataVis::ThemeQt by + * Sets a predefined \a theme from \c QDataVis::Theme. It is preset to \c QDataVis::ThemeQt by * default. Theme affects bar colors, label colors, text color, background color, window color and * grid color. Lighting is also adjusted by themes. * @@ -222,9 +222,9 @@ void Q3DScatter::setCameraPosition(qreal horizontal, qreal vertical, int distanc * * \warning This method is subject to change. */ -void Q3DScatter::setTheme(QDataVis::ColorTheme theme) +void Q3DScatter::setTheme(QDataVis::Theme theme) { - d_ptr->m_shared->setColorTheme(theme); + d_ptr->m_shared->setTheme(theme); } /*! diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index 33e74d7d..3799c325 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -59,7 +59,7 @@ public: void setCameraPosition(qreal horizontal, qreal vertical, int distance = 100); - void setTheme(QDataVis::ColorTheme theme); + void setTheme(QDataVis::Theme theme); void setObjectColor(const QColor &baseColor, bool uniform = true); QColor objectColor() const; diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 8522eb81..c809fedc 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -202,20 +202,20 @@ bool Q3DSurface::isBackgroundVisible() const /*! * \property Q3DSurface::theme * - * A predefined \a theme from \c QDataVis::ColorTheme. It is preset to \c QDataVis::ThemeQt by + * A predefined \a theme from \c QDataVis::Theme. It is preset to \c QDataVis::ThemeQt by * default. Theme affects label colors, text color, background color, window color and * grid color. Lighting is also adjusted by themes. * * \warning This property is subject to change. */ -void Q3DSurface::setTheme(QDataVis::ColorTheme theme) +void Q3DSurface::setTheme(QDataVis::Theme theme) { - d_ptr->m_shared->setColorTheme(theme); + d_ptr->m_shared->setTheme(theme); } -QDataVis::ColorTheme Q3DSurface::theme() const +QDataVis::Theme Q3DSurface::theme() const { - return d_ptr->m_shared->theme().colorTheme(); + return d_ptr->m_shared->theme().theme(); } /*! diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 97b0dde0..a51112e6 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -35,7 +35,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) - Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme) + Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) @@ -59,8 +59,8 @@ public: void setBackgroundVisible(bool visible); bool isBackgroundVisible() const; - void setTheme(QDataVis::ColorTheme theme); - QDataVis::ColorTheme theme() const; + void setTheme(QDataVis::Theme theme); + QDataVis::Theme theme() const; void setShadowQuality(QDataVis::ShadowQuality quality); QDataVis::ShadowQuality shadowQuality() const; diff --git a/src/datavisualization/engine/theme.cpp b/src/datavisualization/engine/theme.cpp index 38a54196..d9f2974a 100644 --- a/src/datavisualization/engine/theme.cpp +++ b/src/datavisualization/engine/theme.cpp @@ -51,15 +51,15 @@ Theme::~Theme() { } -QDataVis::ColorTheme Theme::colorTheme() +QDataVis::Theme Theme::theme() { - return m_colorTheme; + return m_theme; } -void Theme::useColorTheme(QDataVis::ColorTheme colorTheme) +void Theme::useTheme(QDataVis::Theme theme) { - m_colorTheme = colorTheme; - switch (colorTheme) { + m_theme = theme; + switch (theme) { case QDataVis::ThemeQt: { m_baseColor = QColor(QRgb(0x80c342)); //m_heightColor = QColor(QRgb(0x)); @@ -227,7 +227,7 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme) void Theme::setFromTheme(Theme &theme) { - m_colorTheme = theme.m_colorTheme; + m_theme = theme.m_theme; m_baseColor = theme.m_baseColor; m_heightColor = theme.m_heightColor; m_depthColor = theme.m_depthColor; diff --git a/src/datavisualization/engine/theme_p.h b/src/datavisualization/engine/theme_p.h index e8e7231a..ec689f63 100644 --- a/src/datavisualization/engine/theme_p.h +++ b/src/datavisualization/engine/theme_p.h @@ -43,8 +43,8 @@ public: explicit Theme(); ~Theme(); - void useColorTheme(QDataVis::ColorTheme theme); - QDataVis::ColorTheme colorTheme(); + void useTheme(QDataVis::Theme theme); + QDataVis::Theme theme(); void setFromTheme(Theme &theme); private: @@ -57,7 +57,7 @@ private: friend class SelectionPointer; friend class Drawer; - QDataVis::ColorTheme m_colorTheme; + QDataVis::Theme m_theme; QColor m_baseColor; QColor m_heightColor; QColor m_depthColor; diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h index 72ae2901..a4bba2d3 100644 --- a/src/datavisualization/global/qdatavisualizationenums.h +++ b/src/datavisualization/global/qdatavisualizationenums.h @@ -30,7 +30,7 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject Q_OBJECT Q_ENUMS(MeshStyle) Q_ENUMS(CameraPreset) - Q_ENUMS(ColorTheme) + Q_ENUMS(Theme) Q_ENUMS(SelectionMode) Q_ENUMS(ShadowQuality) Q_ENUMS(LabelTransparency) @@ -83,7 +83,7 @@ public: PresetDirectlyBelow }; - enum ColorTheme { + enum Theme { ThemeDefault = -1, ThemeQt, ThemePrimaryColors, diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc index c5f48412..d92ca7c0 100644 --- a/src/datavisualization/global/qtdatavisualizationenums.qdoc +++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc @@ -99,9 +99,9 @@ */ /*! - \enum QtDataVisualization::QDataVis::ColorTheme + \enum QtDataVisualization::QDataVis::Theme - Predefined color themes. + Predefined themes. \value ThemeDefault Used only in QML to indicate a theme has not been set. diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 47f13f29..25d7e39d 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -46,15 +46,15 @@ QDataVis::CameraPreset AbstractDeclarative::cameraPreset() const return m_controller->cameraPreset(); } -void AbstractDeclarative::setTheme(QDataVis::ColorTheme theme) +void AbstractDeclarative::setTheme(QDataVis::Theme theme) { // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented - m_controller->setColorTheme(theme); + m_controller->setTheme(theme); } -QDataVis::ColorTheme AbstractDeclarative::theme() const +QDataVis::Theme AbstractDeclarative::theme() const { - return m_controller->theme().colorTheme(); + return m_controller->theme().theme(); } void AbstractDeclarative::setSelectionMode(QDataVis::SelectionMode mode) diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index a7f03cc7..843e4fad 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -45,7 +45,7 @@ class AbstractDeclarative : public QQuickItem Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) - Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme) + Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible) @@ -53,7 +53,7 @@ class AbstractDeclarative : public QQuickItem Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency) Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) - Q_ENUMS(QtDataVisualization::QDataVis::ColorTheme) + Q_ENUMS(QtDataVisualization::QDataVis::Theme) Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat) public: @@ -65,8 +65,8 @@ public: virtual void setCameraPreset(QDataVis::CameraPreset preset); virtual QDataVis::CameraPreset cameraPreset() const; - virtual void setTheme(QDataVis::ColorTheme theme); - virtual QDataVis::ColorTheme theme() const; + virtual void setTheme(QDataVis::Theme theme); + virtual QDataVis::Theme theme() const; virtual void setSelectionMode(QDataVis::SelectionMode mode); virtual QDataVis::SelectionMode selectionMode() const; diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 578ac258..89c472fa 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -455,7 +455,7 @@ void ChartModifier::changeTheme() { static int theme = QDataVis::ThemeQt; - m_chart->setTheme((QDataVis::ColorTheme)theme); + m_chart->setTheme((QDataVis::Theme)theme); if (++theme > QDataVis::ThemeIsabelle) theme = QDataVis::ThemeQt; diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 1ddf61cd..7c45a336 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -127,7 +127,7 @@ void ScatterDataModifier::changeTheme() { static int theme = QDataVis::ThemeQt; - m_chart->setTheme((QDataVis::ColorTheme)theme); + m_chart->setTheme((QDataVis::Theme)theme); if (++theme > QDataVis::ThemeIsabelle) theme = QDataVis::ThemeQt; |