aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/qtquickcontrols2plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Add hover support to TextArea & TextFieldJ-P Nurmi2016-06-291-0/+2
| | | | | | Task-number: QTBUG-50003 Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* RangeSlider: add first.hovered and second.hovered propertiesJ-P Nurmi2016-06-281-0/+1
| | | | | | | | | | | The actual hover effects are coming in separate patches. [ChangeLog][RangeSlider] Added first.hovered and second.hovered properties that hold whether the respective handles are hovered. Change-Id: I3ffeed5de6c9a168534c8e9d4f1642161fc52caf Task-number: QTBUG-50003 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SpinBox: add up.hovered and down.hovered propertiesJ-P Nurmi2016-06-281-0/+1
| | | | | | | | | | | The actual hover effects are coming in separate patches. [ChangeLog][SpinBox] Added up.hovered and down.hovered properties that hold whether the respective buttons are hovered. Task-number: QTBUG-50003 Change-Id: Ie47329e23326f40e4c807703ff7a97437f68deb4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Tumbler: add wrap propertyMitch Curtis2016-06-281-0/+3
| | | | | | | | | [ChangeLog][Tumbler] Added wrap property to control whether or not tumbler wraps when it reaches the top and bottom. Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add QQuickContainer::increment|decrementCurrentIndex()J-P Nurmi2016-06-201-0/+1
| | | | | | | | | [ChangeLog][Container] Added incrementCurrentIndex() and decrementCurrentIndex() methods for changing the current index without losing its property binding. Change-Id: Id44e0db5e3d0951eb77b0124a83c5eb3df898012 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add DialogButtonBoxJ-P Nurmi2016-06-151-0/+1
| | | | | | | | | | | [ChangeLog][Controls] Added DialogButtonBox to provide convenience for handling dialog buttons. DialogButtonBox is able to create a set of standard buttons with a single line of QML code, and provides convenient accepted() and rejected() signals. Task-number: QTBUG-51090 Change-Id: I9b3c6ba1b2836dadf9a2ac9086be1eba214e7c4d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Slider: expose valueAt(pos) for getting continuous value updatesJ-P Nurmi2016-06-131-0/+1
| | | | | | | | | [ChangeLog][Slider] Added valueAt() method for getting continuous value updates. Task-number: QTBUG-53847 Change-Id: I0aa813c7105faa64b714ab0a0630f79d97a58854 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add ButtonGroup::clicked(AbstractButton) signalJ-P Nurmi2016-06-061-0/+1
| | | | | | | | [ChangeLog][ButtonGroup] Added clicked(AbstractButton) signal for centralized click handling for grouped buttons. Change-Id: Ib64d360db211d2763f6237e411152a2a395fd2b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* StackView: add attached activated() etc. signalsJ-P Nurmi2016-06-061-0/+1
| | | | | | | | | | | | For initializing and cleaning up item-specific resources, these are much more convenient than a StackView.onStatusChanged handler. [ChangeLog][StackView] Added attached activated(), deactivated(), activating(), and deactivating() signals that are convenient for initializing and cleaning up item-specific resources. Change-Id: If8df45b31a14cd2491db2c87eeb1c071af4e695f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SwipeView: add isNextItem and isPreviousItem attached propertiesJ-P Nurmi2016-06-061-0/+3
| | | | | | | | | [ChangeLog][SwipeView] Added isNextItem and isPreviousItem attached properties to make it straight-forward to use Loader for unloading pages that are outside the reach. Change-Id: Idb97d64282afaef58cc3302d3f558900a0d7d4b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/doc/qtlabscontrols.qdocconf src/imports/controls/doc/qtquickcontrols2.qdocconf src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp src/imports/controls/qtlabscontrolsplugin.cpp src/imports/controls/qtquickcontrols2plugin.cpp src/imports/templates/qtlabstemplatesplugin.cpp src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I6159e681b77e4a0a293b6bd7fb11a46d58873da0
* | Use a lowercase style name as a built-in file selectorJ-P Nurmi2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Be consistent with lowercase platform name, and match with the examples in the docs. Change-Id: I33dcc65e720b80f61277efe0aa13caecda6714c4 Task-number: QTBUG-53203 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Move resources to :/qt-project.org/imports/QtQuick/Controls.2J-P Nurmi2016-04-211-1/+1
| | | | | | | | | | | | Change-Id: I0e36bd0ce16465e648fffd3e172711f4ad2b870c Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-53/+53
| | | | | | | | | | | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Default: use QQuickColorImageProviderJ-P Nurmi2016-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we don't need to duplicate all images that are built into the main controls plugin's resources. In order to make them work with QQuickColorImageProvider, some of the images had to be converted from Format_Indexed8 to Format_ARGB32: QPainter::begin: Cannot paint on an image with the QImage::Format_Indexed8 format QPainter::setCompositionMode: Painter not active Change-Id: I67f8820e803ef7ff29ce60460ed4ca5bb2fad4cb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update Default style Dial to match new design specsMitch Curtis2016-04-201-0/+2
| | | | | | | | | | | | Change-Id: Id3a1ce6257ab999c08130549b43414b17df6168d Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge QQuickPluginUtils to QQuickStylePluginJ-P Nurmi2016-04-191-8/+7
| | | | | | | | | | | | | | | | | | | | | | Now that we have a common base class for the plugins, we don't need a separate utils namespace. QQuickStylePlugin::typeUrl() is based on the former QQuickPluginUtils::pluginBasePath(). It returns a URL to the internal composite types that must be explicitly registered for static builds. Change-Id: Icf28c27c84f6b58b1e7b34203dad39c852f0d362 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Controls: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | | | | | | | | This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: rename the plugin to QtQuickControls2PluginJ-P Nurmi2016-04-131-0/+156
|/ | | | | Change-Id: I7c7c11675f340ab8110f38041434a91f72c9552e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-108/+0
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove ToggleButtonJ-P Nurmi2015-09-251-1/+0
| | | | | | | | We don't have a sensible design. It's better not to have it at all than to have a confusing tiny bit tweaked clone of Switch. Change-Id: Ib0eabd075590100e9e49846c7172909525b54a57 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Add support for file selector based stylesJ-P Nurmi2015-09-251-28/+31
| | | | | | | | | | | unset QT_FILE_SELECTORS ./app # => selects qtbase/qml/QtQuick/Controls.2/Button.qml export QT_FILE_SELECTORS=Flat ./app # => selects qtbase/qml/QtQuick/Controls.2/+Flat/Button.qml Change-Id: Ib5d6fdcee89c14b2511dce90ea2ac5c077aafa0d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Templatize the former extrasJ-P Nurmi2015-09-231-32/+1
| | | | | Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Merge Qt Quick Extras into Qt Quick ControlsMitch Curtis2015-09-181-0/+14
| | | | | | | | | | | | The original split existed because the public and enterprise controls were developed separately. Now that all controls are public and developed together, the split no longer makes sense and is difficult for users to understand. Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-23/+23
| | | | | Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Register types in C++ (instead of qmldir)J-P Nurmi2015-09-141-0/+48
| | | | | | | | | | | | | | Later on, we can choose to register types from different style-subdirs based on a yet unknown style selector (app manifest file, env var, ...) This is also a step to the right direction to get QML types inherit enums and attached properties from the respective C++ base types. The qmlRegisterType(QUrl) overload for composite types probably needs a template argument to help figure out the missing meta-object link between the composite type and the C++ base type. Change-Id: I9b3c2afdd93fff56d1e7513879b3e9229f483cbf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use QtQuick.TemplatesJ-P Nurmi2015-09-091-55/+1
| | | | | Change-Id: I3d1822457efd740e7c9d91747e978d787c0dd4b8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Refactor ExclusiveGroupJ-P Nurmi2015-06-301-1/+1
| | | | | | | | | | | | | Add support for toggled() and toggled(bool) signals to bring ExclusiveGroup 2.0 on par with ExclusiveGroup 1.0. Furthermore, the attached property is now "ExclusiveGroup.group" to be consistent with all other attached properties like StackView.view, TabView.view, and others. It looks clumsy to repeat, but it's better to keep the type names to the minimum, and the documentation also stays in one place. Change-Id: Ic46f8d2ec4b58c5056e8b2bbca5c9f88968bfb80 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add qquicktoolbutton.cppJ-P Nurmi2015-06-251-0/+2
| | | | | Change-Id: Ida886850072a654dad97abd0ab930c9badbbe716 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickTheme -> QQuickThemeAttachedJ-P Nurmi2015-06-141-1/+1
| | | | | | | Follow the QtQuick conventions & make tst_sanity easier. Change-Id: Ic722383ca09de2bd53ee81177297ecafdf6a9cf7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove the old TabView implementationJ-P Nurmi2015-06-111-3/+0
| | | | | Change-Id: I8d8aa96f2f37f458577a5a3ec681e3c9174d0918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove "abstract" prefix from the C++ classesJ-P Nurmi2015-04-101-44/+44
| | | | | | | | | | The QML type registration is still using Abstract-prefix to avoid conflicts, until QTBUG-43581 & QTBUG-43582 have been resolved so that the public types can be used for accessing attached properties and enums. Change-Id: I469712461f706a83c226e4017282ca1d6914c670 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Style to ThemeJ-P Nurmi2015-04-081-2/+2
| | | | | Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Remove SpinBoxJ-P Nurmi2015-03-301-2/+0
| | | | | | | | | | SpinBox is a desktop centric control. It won't be provided in Qt Quick Controls 2.0, but maybe later when desktop support is re-considered. Qt Quick Controls 2.0 will focus on embedded and mobile. SpinBox is still available in 1.x Change-Id: I272b030734bad58de7e5b26c522189e0c520fca5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractLabel: inherit QQuickTextJ-P Nurmi2015-03-181-0/+3
| | | | | Change-Id: I98679c8f3dffde96531c41c8219b60050d1e33dd Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickStyle: fix build on Linux / GCC 4.9J-P Nurmi2015-03-111-1/+1
| | | | | Change-Id: Ic42631cdcb207df98fe0337398580c686605a8f6 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Implement Style as an attached propertyJ-P Nurmi2015-03-111-1/+1
| | | | | Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractTextArea: inherit QQuickTextEditJ-P Nurmi2015-03-061-0/+1
| | | | | Change-Id: I974dd801d3cd3cf3d7024e1c8727ec0607e084f3 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractTextField: inherit QQuickTextInputJ-P Nurmi2015-03-061-0/+2
| | | | | Change-Id: Ibd98bd712fa247b2c20c1099fa031ab8184b7f20 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Replace grouped padding property with top/left/right/bottomPaddingJ-P Nurmi2015-03-031-2/+0
| | | | | | | This is consistent with QQuickText, QQuickTextInput, QQuickTextEdit... Change-Id: I06aafa1bf73311cbb24ad9411872cac131863d47 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+128
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>