From 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 22 Nov 2013 07:56:04 +0200 Subject: User-modifiable themes, part 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2120 + old functionality remade - new functionality to be added + fixed a compilation error in qbarseries for mingw Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964 Signed-off-by: Tomi Korpipää --- src/datavisualizationqml2/abstractdeclarative.cpp | 8 +++----- src/datavisualizationqml2/abstractdeclarative_p.h | 8 ++++---- src/datavisualizationqml2/datavisualizationqml2.pro | 3 ++- src/datavisualizationqml2/datavisualizationqml2_plugin.cpp | 2 ++ src/datavisualizationqml2/datavisualizationqml2_plugin.h | 3 +++ src/datavisualizationqml2/declarativebars.cpp | 1 - src/datavisualizationqml2/declarativescatter.cpp | 1 - src/datavisualizationqml2/declarativesurface.cpp | 1 - 8 files changed, 14 insertions(+), 13 deletions(-) (limited to 'src/datavisualizationqml2') diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 80752019..06c68cb0 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -18,7 +18,6 @@ #include "abstractdeclarative_p.h" #include "q3dvalueaxis.h" -#include "theme_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -36,15 +35,14 @@ Q3DScene* AbstractDeclarative::scene() const return m_controller->scene(); } -void AbstractDeclarative::setTheme(QDataVis::Theme theme) +void AbstractDeclarative::setTheme(Q3DTheme *theme) { - // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented m_controller->setTheme(theme); } -QDataVis::Theme AbstractDeclarative::theme() const +Q3DTheme *AbstractDeclarative::theme() const { - return m_controller->theme().theme(); + return m_controller->theme(); } void AbstractDeclarative::setSelectionMode(QDataVis::SelectionFlags mode) diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 1740b816..27572f7b 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -47,7 +47,7 @@ class AbstractDeclarative : public QQuickItem Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) Q_PROPERTY(Q3DScene* scene READ scene) Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged) - Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme NOTIFY themeChanged) + Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible NOTIFY gridVisibleChanged) Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible NOTIFY backgroundVisibleChanged) @@ -61,8 +61,8 @@ public: virtual QAbstract3DInputHandler *inputHandler() const; virtual void setInputHandler(QAbstract3DInputHandler *inputHandler); - virtual void setTheme(QDataVis::Theme theme); - virtual QDataVis::Theme theme() const; + virtual void setTheme(Q3DTheme *theme); + virtual Q3DTheme *theme() const; virtual void setSelectionMode(QDataVis::SelectionFlags mode); virtual QDataVis::SelectionFlags selectionMode() const; @@ -96,7 +96,7 @@ signals: // Signals shadow quality changes. void shadowQualityChanged(QDataVis::ShadowQuality quality); void inputHandlerChanged(QAbstract3DInputHandler *inputHandler); - void themeChanged(QDataVis::Theme theme); + void themeChanged(Q3DTheme *theme); void fontChanged(QFont font); void selectionModeChanged(QDataVis::SelectionFlags mode); void labelStyleChanged(QDataVis::LabelStyle style); diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 073b1250..5a5ab476 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -15,7 +15,8 @@ INCLUDEPATH += ../../include \ ../../include/QtDataVisualization \ ../datavisualization/engine \ ../datavisualization/global \ - ../datavisualization/data + ../datavisualization/data \ + ../datavisualization/theme SOURCES += \ datavisualizationqml2_plugin.cpp \ diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 7e7f636a..e1a74691 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -73,6 +73,8 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "ColorGradientStop"); qmlRegisterType(uri, 1, 0, "ColorGradient"); + qmlRegisterType(uri, 1, 0, "Theme3D"); + qmlRegisterType(uri, 1, 0, "Bar3DSeries"); qmlRegisterType(uri, 1, 0, "Scatter3DSeries"); qmlRegisterType(uri, 1, 0, "Surface3DSeries"); diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index 2635dcbd..5552e94d 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -40,6 +40,7 @@ #include "qscatter3dseries.h" #include "qsurface3dseries.h" #include "declarativeseries_p.h" +#include "q3dtheme.h" #include @@ -84,6 +85,8 @@ QML_DECLARE_TYPE(DeclarativeSurface3DSeries) QML_DECLARE_TYPE(ColorGradientStop) QML_DECLARE_TYPE(ColorGradient) +QML_DECLARE_TYPE(Q3DTheme) + QT_DATAVISUALIZATION_BEGIN_NAMESPACE class Datavis3Dqml2Plugin : public QQmlExtensionPlugin diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 55c02cce..f229cfed 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -20,7 +20,6 @@ #include "declarativebarsrenderer_p.h" #include "q3dvalueaxis.h" #include "qitemmodelbardataproxy.h" -#include "theme_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index b71fb820..52c75962 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -19,7 +19,6 @@ #include "declarativescatter_p.h" #include "declarativescatterrenderer_p.h" #include "qitemmodelscatterdataproxy.h" -#include "theme_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 25f27f16..72dda752 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -20,7 +20,6 @@ #include "declarativesurfacerenderer_p.h" #include "q3dvalueaxis.h" #include "qitemmodelsurfacedataproxy.h" -#include "theme_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE -- cgit v1.2.3