diff options
19 files changed, 129 insertions, 11 deletions
diff --git a/src/imports/controls/doc/images/qtlabscontrols-dial.png b/src/imports/controls/doc/images/qtlabscontrols-dial.png Binary files differnew file mode 100644 index 00000000..4d53c817 --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-dial.png diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider.png Binary files differnew file mode 100644 index 00000000..c7772a40 --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider.png diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider.png b/src/imports/controls/doc/images/qtlabscontrols-slider.png Binary files differnew file mode 100644 index 00000000..9cbb194b --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-slider.png diff --git a/src/imports/controls/doc/images/qtlabscontrols-textarea.png b/src/imports/controls/doc/images/qtlabscontrols-textarea.png Binary files differnew file mode 100644 index 00000000..b4183df9 --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-textarea.png diff --git a/src/imports/controls/doc/images/qtlabscontrols-textfield.png b/src/imports/controls/doc/images/qtlabscontrols-textfield.png Binary files differnew file mode 100644 index 00000000..14092c69 --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-textfield.png diff --git a/src/imports/controls/doc/images/qtlabscontrols-tumbler.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler.png Binary files differnew file mode 100644 index 00000000..01d4f2d3 --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-tumbler.png diff --git a/src/imports/controls/doc/src/qtlabscontrols-input.qdoc b/src/imports/controls/doc/src/qtlabscontrols-input.qdoc new file mode 100644 index 00000000..3de8d5c6 --- /dev/null +++ b/src/imports/controls/doc/src/qtlabscontrols-input.qdoc @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** 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-input.html + \title Input + + Qt Labs Controls offers a variety of input controls for both numeric + and textual input. + + \annotatedlist qtlabscontrols-input + + Each type of input control has its own specific target use case. The + following sections offer guidelines for choosing the appropriate type + of input control, depending on the use case. + + \section1 Dial + + \image qtlabscontrols-dial.png + + \l {Qt.labs.controls::Dial}{Dial} is a circular dial that is rotated + to set a value. + + \section1 TextArea + + \image qtlabscontrols-textarea.png + + \l {Qt.labs.controls::TextArea}{TextArea} is a multi-line text editor. + + \section1 TextField + + \image qtlabscontrols-textfield.png + + \l {Qt.labs.controls::TextField}{TextField} is a single line text editor. + + \section1 Slider + + \image qtlabscontrols-slider.png + + \l {Qt.labs.controls::Slider}{Slider} is used to select a value by + sliding a handle along a track. + + \section1 RangeSlider + + \image qtlabscontrols-rangeslider.png + + \l {Qt.labs.controls::RangeSlider}{RangeSlider} is used to select a + range specified by two values, by sliding each handle along a track. + + \section1 Tumbler + + \image qtlabscontrols-tumbler.png + + \l {Qt.labs.controls::Tumbler}{Tumbler} is a spinnable wheel of items + that can be selected. +*/ diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp index 084497d1..0b533020 100644 --- a/src/templates/qquickdial.cpp +++ b/src/templates/qquickdial.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \inherits Control \instantiates QQuickDial \inqmlmodule Qt.labs.controls - \ingroup sliders + \ingroup qtlabscontrols-input \brief A circular dial that is rotated to set a value. The Dial is similar to a traditional dial knob that is found on devices @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE \row \li Set \l value to \l to \li \c Qt.Key_End \endtable - \sa {Customizing Dial} + \sa {Customizing Dial}, Input */ static const qreal startAngle = -140; diff --git a/src/templates/qquickrangeslider.cpp b/src/templates/qquickrangeslider.cpp index cdfc0a2e..fbdedeb1 100644 --- a/src/templates/qquickrangeslider.cpp +++ b/src/templates/qquickrangeslider.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \inherits Control \instantiates QQuickRangeSlider \inqmlmodule Qt.labs.controls - \ingroup sliders + \ingroup qtlabscontrols-input \brief A slider control used to select a range of values. \image qtlabscontrols-rangeslider.gif @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE } \endcode - \sa {Customizing RangeSlider} + \sa {Customizing RangeSlider}, Input */ class QQuickRangeSliderNodePrivate : public QObjectPrivate diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index 7327ebe9..b036c839 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \inherits Control \instantiates QQuickSlider \inqmlmodule Qt.labs.controls - \ingroup sliders + \ingroup qtlabscontrols-input \brief A slider control. \image qtlabscontrols-slider.gif @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE } \endcode - \sa {Customizing Slider} + \sa {Customizing Slider}, Input */ class QQuickSliderPrivate : public QQuickControlPrivate diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index 890e9437..c749ba00 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \inherits TextEdit \instantiates QQuickTextArea \inqmlmodule Qt.labs.controls - \ingroup editors + \ingroup qtlabscontrols-input \brief A multi line text input control. TextArea is a multi-line text editor. TextArea extends TextEdit @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE } \endcode - \sa TextField, {Customizing TextArea} + \sa TextField, {Customizing TextArea}, Input */ void QQuickTextAreaPrivate::resizeBackground() diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp index 1abe0992..30a830cb 100644 --- a/src/templates/qquicktextfield.cpp +++ b/src/templates/qquicktextfield.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \inherits TextInput \instantiates QQuickTextField \inqmlmodule Qt.labs.controls - \ingroup editors + \ingroup qtlabscontrols-input \brief A single line text input control. TextField is a single line text editor. TextField extends TextInput @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE } \endcode - \sa TextArea, {Customizing TextField} + \sa TextArea, {Customizing TextField}, Input */ /*! diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index cf1aac9b..25c79471 100644 --- a/src/templates/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \inherits Control \instantiates QQuickTumbler \inqmlmodule Qt.labs.controls - \ingroup containers + \ingroup qtlabscontrols-input \brief A spinnable wheel of items that can be selected. \code @@ -65,6 +65,8 @@ QT_BEGIN_NAMESPACE \snippet tst_tumbler.qml contentItem \image qtlabscontrols-tumbler-wrap.gif + + \sa {Customizing Tumbler}, Input */ class QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener diff --git a/tests/auto/snippets/data/qtlabscontrols-dial.qml b/tests/auto/snippets/data/qtlabscontrols-dial.qml new file mode 100644 index 00000000..0883e393 --- /dev/null +++ b/tests/auto/snippets/data/qtlabscontrols-dial.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Dial { +} diff --git a/tests/auto/snippets/data/qtlabscontrols-rangeslider.qml b/tests/auto/snippets/data/qtlabscontrols-rangeslider.qml new file mode 100644 index 00000000..51cdacd2 --- /dev/null +++ b/tests/auto/snippets/data/qtlabscontrols-rangeslider.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RangeSlider { + first.value: 0.25 + second.value: 0.75 +} diff --git a/tests/auto/snippets/data/qtlabscontrols-slider.qml b/tests/auto/snippets/data/qtlabscontrols-slider.qml new file mode 100644 index 00000000..8467aa59 --- /dev/null +++ b/tests/auto/snippets/data/qtlabscontrols-slider.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 +} diff --git a/tests/auto/snippets/data/qtlabscontrols-textarea.qml b/tests/auto/snippets/data/qtlabscontrols-textarea.qml new file mode 100644 index 00000000..5fc141a7 --- /dev/null +++ b/tests/auto/snippets/data/qtlabscontrols-textarea.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextArea { + text: "Text\nArea..." +} diff --git a/tests/auto/snippets/data/qtlabscontrols-textfield.qml b/tests/auto/snippets/data/qtlabscontrols-textfield.qml new file mode 100644 index 00000000..11e8f3aa --- /dev/null +++ b/tests/auto/snippets/data/qtlabscontrols-textfield.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextField { + text: "TextField" +} diff --git a/tests/auto/snippets/data/qtlabscontrols-tumbler.qml b/tests/auto/snippets/data/qtlabscontrols-tumbler.qml new file mode 100644 index 00000000..5edb9617 --- /dev/null +++ b/tests/auto/snippets/data/qtlabscontrols-tumbler.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Tumbler { + model: 5 +} |
