aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-08 12:10:53 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-04 15:42:07 +0000
commit528a7a535430803312d02ad036cbebac709bb772 (patch)
tree9cb582f8844a58f582ddb85cfe4da2236ba74795
parente80e59061822013cc4857d58bcf8acaeafc1ad63 (diff)
Docs: Universal style
Change-Id: Ifd5e3d0d25384310b358c5e3bd0d82e8cdef7b53 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
-rw-r--r--src/imports/controls/doc/images/qtlabscontrols-universal-button.pngbin0 -> 2172 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscontrols-universal-dark.pngbin0 -> 5450 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscontrols-universal.pngbin0 -> 18382 bytes
-rw-r--r--src/imports/controls/doc/qtlabscontrols.qdocconf11
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-universal.qdoc184
5 files changed, 195 insertions, 0 deletions
diff --git a/src/imports/controls/doc/images/qtlabscontrols-universal-button.png b/src/imports/controls/doc/images/qtlabscontrols-universal-button.png
new file mode 100644
index 00000000..6ddec823
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-universal-button.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png b/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png
new file mode 100644
index 00000000..98701550
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscontrols-universal.png b/src/imports/controls/doc/images/qtlabscontrols-universal.png
new file mode 100644
index 00000000..89a0f069
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-universal.png
Binary files differ
diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf
index 78cfc560..a8fcb049 100644
--- a/src/imports/controls/doc/qtlabscontrols.qdocconf
+++ b/src/imports/controls/doc/qtlabscontrols.qdocconf
@@ -49,3 +49,14 @@ navigation.landingpage = "Qt Labs Controls"
navigation.qmltypespage = "Qt Labs Controls QML Types"
tagfile = qtlabscontrols.tags
+
+# \styleimport {Qt.labs.controls.universal 1.0}
+macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr></tbody></table>"
+
+# \styleproperty {Universal.accent} {enumeration} {html-target-id}
+# \target html-target-id
+# This property holds ...
+# (empty line)
+# \endstyleproperty
+macro.styleproperty.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\3\"><td class=\"tblQmlPropNode\"><p><span class=\"name\">\1</span> : <span class=\"type\">\2</span></p></td></tr></tbody></table></div>"
+macro.endstyleproperty = "\\br"
diff --git a/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc b/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc
new file mode 100644
index 00000000..80e32e92
--- /dev/null
+++ b/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc
@@ -0,0 +1,184 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \page qtlabscontrols-universal.html
+ \title Universal Style
+
+ The Universal Style is based on the Microsoft Universal Design Guidelines.
+ \l {detailed-description}{More...}
+
+ \styleimport {Qt.labs.controls.universal 1.0}
+
+ \section1 Attached Properties
+
+ \list
+ \li \l {accent-attached-prop}{\b accent} : enumeration
+ \li \l {theme-attached-prop}{\b theme} : enumeration
+ \endlist
+
+ \section1 Detailed Description
+
+ The Universal style is a device-agnostic style based on the
+ \l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines}.
+ The Universal style has been designed to look good on all devices, from
+ phones and tablets to PCs.
+
+ \image qtlabscontrols-universal.png
+ \caption The Universal style in light and dark themes
+
+ \note The Universal style is not a native Windows 10 style. The Universal
+ style is a 100% cross-platform Qt Labs Controls style implementation that
+ follows the Microsoft Universal Design Guidelines. The style runs on any
+ platform, and looks more or less identical everywhere. Minor differences
+ may occur due to differences in available system fonts and font rendering
+ engines.
+
+ \section2 Usage
+
+ In order to run an application with the Universal style, either pass
+ a \c -style command line argument, or set the \c QT_LABS_CONTROLS_STYLE
+ environment variable.
+
+ \code
+ ./app -style universal
+ \endcode
+
+ or
+
+ \code
+ QT_LABS_CONTROLS_STYLE=universal ./app
+ \endcode
+
+ \section2 Customization
+
+ The Universal style allows customizing two attributes, \l {theme-attached-prop}{theme}
+ and \l {accent-attached-prop}{accent}. The following example illustrates how to create
+ a red \e stop button with light text:
+
+ \table
+ \row
+ \li
+ \qml
+ import QtQuick 2.0
+ import Qt.labs.controls 1.0
+ import Qt.labs.controls.universal 1.0
+
+ Button {
+ text: "Stop"
+ highlighted: true
+
+ Universal.accent: Universal.Red
+ Universal.theme: Universal.Dark
+ }
+ \endqml
+ \li
+ \image qtlabscontrols-universal-button.png
+ \endtable
+
+ Both attributes can be specified for any window or item, and they automatically
+ propagate to children in the same manner as \l {Control::font}{fonts}. In the
+ following example, the window and all three radio buttons appear in the dark
+ theme using a violet accent color:
+
+ \table
+ \row
+ \li
+ \qml
+ import QtQuick 2.0
+ import Qt.labs.controls 1.0
+ import Qt.labs.controls.universal 1.0
+
+ ApplicationWindow {
+ visible: true
+
+ Universal.theme: Universal.Dark
+ Universal.accent: Universal.Violet
+
+ Column {
+ anchors.centerIn: parent
+
+ RadioButton { text: qsTr("Small") }
+ RadioButton { text: qsTr("Medium"); checked: true }
+ RadioButton { text: qsTr("Large") }
+ }
+ }
+ \endqml
+ \li
+ \image qtlabscontrols-universal-dark.png
+ \endtable
+
+ \note The Universal style must be separately imported to gain access to
+ these style-specific attributes. It should be noted that regardless of the
+ references to the Universal style, the same application code runs with any
+ other style. The Universal style-specific attributes only have an effect
+ when the application is run with the Universal style. Furthermore, in case
+ of explicit Universal style-specific references, the Universal style must
+ be deployed with the application.
+
+ \section1 Attached Property Documentation
+
+ \styleproperty {Universal.accent} {enumeration} {accent-attached-prop}
+ \target accent-attached-prop
+ This attached property holds the accent color of the theme. The property
+ can be attached to any window or item. The value is propagated to children.
+
+ Available accents:
+ \value Universal.Lime Lime (#A4C400)
+ \value Universal.Green Green (#60A917)
+ \value Universal.Emerald Emerald (#008A00)
+ \value Universal.Teal Teal (#00ABA9)
+ \value Universal.Cyan Cyan (#1BA1E2)
+ \value Universal.Cobalt Cobalt (#3E65FF, default)
+ \value Universal.Indigo Indigo (#6A00FF)
+ \value Universal.Violet Violet (#AA00FF)
+ \value Universal.Pink Pink (#F472D0)
+ \value Universal.Magenta Magenta (#D80073)
+ \value Universal.Crimson Crimson (#A20025)
+ \value Universal.Red Red (#E51400)
+ \value Universal.Orange Orange (#FA6800)
+ \value Universal.Amber Amber (#F0A30A)
+ \value Universal.Yellow Yellow (#E3C800)
+ \value Universal.Brown Brown (#825A2C)
+ \value Universal.Olive Olive (#6D8764)
+ \value Universal.Steel Steel (#647687)
+ \value Universal.Mauve Mauve (#76608A)
+ \value Universal.Taupe Taupe (#87794E)
+
+ \endstyleproperty
+
+ \styleproperty {Universal.theme} {enumeration} {theme-attached-prop}
+ \target theme-attached-prop
+ This attached property holds whether the theme is light or dark. The property
+ can be attached to any window or item. The value is propagated to children.
+
+ Available themes:
+ \value Universal.Light Light theme (default)
+ \value Universal.Dark Dark theme
+
+ \endstyleproperty
+*/