Theme documented

Task-number: QTRD-2633

Change-Id: Ib274ec236f50145df8fd4c2d83f62d4a9154687a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

3 files changed, 116 insertions, 23 deletions

diff --git a/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp b/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp
new file mode 100644
index 00000000..5a539e62
--- /dev/null
+++ b/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#include <QtDataVisualization/Q3DBars>
+#include <QtDataVisualization/Q3DTheme>
+
+using namespace QtDataVisualization;
+
+int main(int argc, char **argv)
+{
+    //! [0]
+    Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeQt);
+    //! [0]
+
+    //! [1]
+    Q3DTheme *theme = new Q3DTheme(Q3DTheme::ThemeQt);
+    theme->setBackgroundEnabled(false);
+    theme->setLabelBackgroundEnabled(false);
+    //! [1]
+
+    //! [2]
+    Q3DTheme *theme = new Q3DTheme();
+    theme->setAmbientLightStrength(0.3f);
+    theme->setBackgroundColor(QColor(QRgb(0x99ca53)));
+    theme->setBackgroundEnabled(true);
+    theme->setBaseColor(QColor(QRgb(0x209fdf)));
+    theme->setColorStyle(Q3DTheme::ColorStyleUniform);
+    theme->setFont(QFont(QStringLiteral("Impact"), 35));
+    theme->setGridEnabled(true);
+    theme->setGridLineColor(QColor(QRgb(0x99ca53)));
+    theme->setHighlightLightStrength(7.0f);
+    theme->setLabelBackgroundColor(QColor(0xf6, 0xa6, 0x25, 0xa0));
+    theme->setLabelBackgroundEnabled(true);
+    theme->setLabelBorderEnabled(true);
+    theme->setLabelTextColor(QColor(QRgb(0x404044)));
+    theme->setLightColor(Qt::white);
+    theme->setLightStrength(6.0f);
+    theme->setMultiHighlightColor(QColor(QRgb(0x6d5fd5)));
+    theme->setSingleHighlightColor(QColor(QRgb(0xf6a625)));
+    theme->setWindowColor(QColor(QRgb(0xffffff)));
+    //! [2]
+
+    //! [3]
+    Q3DBars *graph = new Q3DBars();
+    graph->setTheme(new Q3DTheme(Q3DTheme::ThemePrimaryColors));
+    graph->theme()->setBaseColor(Qt::red);
+    graph->theme()->setSingleHighlightColor(Qt::yellow);
+    //! [3]
+}
+
+//! [4]
+Scatter3D {
+    ...
+    theme: Theme3D { type: Theme3D.ThemeRetro }
+    ...
+}
+//! [4]
+
+//! [5]
+Bars3D {
+    ...
+    theme: Theme3D {
+        type: Theme3D.ThemeRetro
+        labelBorderEnabled: true
+        font.pointSize: 35
+        labelBackgroundEnabled: false
+    }
+    ...
+}
+//! [5]
+
+//! [6]
+Surface3D {
+    ...
+    theme: Theme3D {
+        ambientLightStrength: 0.5
+        backgroundColor: "red"
+        backgroundEnabled: true
+        baseColor: "blue"
+        colorStyle: Theme3D.ColorStyleUniform
+        font.family: "Lucida Handwriting"
+        font.pointSize: 35
+        gridEnabled: false
+        gridLineColor: "black"
+        highlightLightStrength: 0.5
+        labelBackgroundColor: "black"
+        labelBackgroundEnabled: true
+        labelBorderEnabled: false
+        labelTextColor: "white"
+        lightColor: "yellow"
+        lightStrength: 0.4
+        multiHighlightColor: "green"
+        singleHighlightColor: "darkRed"
+        windowColor: "white"
+    }
+    ...
+}
+//! [6]
diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
index 456f8ac5..e09ef7dc 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
@@ -35,7 +35,7 @@
         \li Customizable input handling (upcoming feature - not supported in technology preview)
         \li Customizable scene handling - full control of cameras and lights (upcoming feature -
             not supported in technology preview)
-        \li Customizable themes (upcoming feature - not supported in technology preview)
+        \li Customizable themes
     \endlist
 
     \section1 Getting Started
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
index 989bcc9b..f0fa9e29 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
@@ -35,10 +35,6 @@
   \qmlproperty AbstractGraph3D.SelectionMode AbstractGraph3D::selectionMode
   Active selection mode in the visualization.
  */
-/*!
-  \qmlproperty AbstractGraph3D.LabelStyle AbstractGraph3D::labelStyle
-  Label style.
- */
 
 /*!
   \qmlproperty AbstractGraph3D.ShadowQuality AbstractGraph3D::shadowQuality
@@ -51,22 +47,6 @@
  */
 
 /*!
-  \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.
- */
-
-/*!
-  \qmlproperty font AbstractGraph3D::font
-  Font used for labels.
- */
-
-/*!
-  \qmlproperty bool AbstractGraph3D::gridVisible
-  Grid visibility. If false, grid lines are not drawn.
- */
-
-/*!
-  \qmlproperty bool AbstractGraph3D::backgroundVisible
-  Background visibility. If false, background is not drawn.
+  \qmlproperty Theme3D AbstractGraph3D::theme
+  Theme of the graph.
  */