aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
Commit message (Collapse)AuthorAgeFilesLines
* Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-08222-387/+388
| | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Tumbler GIFMitch Curtis2016-07-011-0/+0
| | | | | | | It was too big and had visual artefacts. Change-Id: I650f50f4758891feb39cdbd07b72ef2180e4edb9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Tumbler: make wrap property depend on count by defaultMitch Curtis2016-07-011-1/+0
| | | | | | | | | | [ChangeLog][Important Behavior Changes][Tumbler] Changed the default value of wrap to be false when count is less than visibleItemCount. Explicitly setting wrap overrides this behavior. Change-Id: I0089f517a25a606625c245df52b0db5fd859ffc0 Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove DialogButtonBox::flatJ-P Nurmi2016-06-301-1/+0
| | | | | | | | | | | | The Material Design allows mixing standard flat buttons with non-flat custom buttons. It is enough that the delegate provides flat standard buttons by default. It is better to not force all buttons to be flat, but let the user freely specify whether custom buttons are flat. This API has not yet been released, so it is still safe to remove. Change-Id: Iec400553ccefb47f20fb98d64919491d9bb27cbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Universal: implement hover effectsJ-P Nurmi2016-06-3019-47/+100
| | | | | | | | [ChangeLog][Universal] Implemented hover effects Task-number: QTBUG-50003 Change-Id: I67d382b0aaef06fc9c16b734f735dcc62262b6f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-297-8/+8
|\ | | | | | | Change-Id: Ifd118c11fd6034d03b98c961313280b7098c5f84
| * Universal: fix Dial press effectJ-P Nurmi2016-06-291-1/+1
| | | | | | | | | | | | | | It doesn't have a 'down' property like buttons do. Change-Id: I3b6eb0d0d302914888eccdd76fda886b78a30465 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: fix radiusJ-P Nurmi2016-06-276-7/+7
| | | | | | | | | | | | | | | | There's barely any visual difference, but follow the Material Design specs that use 2dp corner radius. Change-Id: I9f1462eeb89c2462abb07a76949710d11881c4ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: improve the module descriptionsJ-P Nurmi2016-06-291-1/+2
| | | | | | | | | | | | | | | | | | Mention the Qt version that each QML module was introduced in, and emphasize the experimental status of the Qt Labs Calendar module. Qt Labs Platform already does both of these. Change-Id: I103e564b6f7746116a3d40eefb7f2f978e644546 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add hover support to TextArea & TextFieldJ-P Nurmi2016-06-297-6/+8
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: change default visibleItemCount to 5Mitch Curtis2016-06-283-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looks much better than 3; it looks more like an actual Tumbler, partly because the displacement shading is made more visible. This should make it less confusing to interact with for first-time users. In addition, we were previously setting it to 5 in several places. [ChangeLog][Important Behavior Changes][Tumbler] Changed the default value of visibleItemCount to 5 to make it visually clearer that it's a Tumbler. Change-Id: I7c16e05aa73f58e3405caa1826453cb824efae11 Reviewed-by: J-P Nurmi <jpnurmi@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>
* | ComboBox: make delegates respect hoverEnabled of the controlJ-P Nurmi2016-06-283-0/+3
| | | | | | | | | | | | | | | | The actual hover effects are coming in separate patches. Task-number: QTBUG-50003 Change-Id: I191cebf299998046a89b5653bd2858f65a7bca34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: add wrap propertyMitch Curtis2016-06-2810-48/+247
| | | | | | | | | | | | | | | | | | [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>
* | Migrate to new scenegraphng APILaszlo Agocs2016-06-226-76/+55
| | | | | | | | | | | | Change-Id: I9b0c05edacd4e6f1be6f692e77476097d1f99bc0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add SwipeView::interactiveJ-P Nurmi2016-06-222-0/+2
| | | | | | | | | | | | | | | | | | [ChangeLog][SwipeView] Added interactive property for controlling whether swipe interaction is enabled. Task-number: QTBUG-54268 Change-Id: I1f03e4958defe52c8a15c808567424c85f07f8bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make import version 2.1 available for Material & UniversalJ-P Nurmi2016-06-212-0/+2
| | | | | | | | | | Change-Id: Ia3ab14fdb67e32907396329ab9034a429c7b536e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Reorganize templates & calendar docsJ-P Nurmi2016-06-215-229/+5
| | | | | | | | | | Change-Id: I0e7a20805fe4823564ee2b312a635d08fa978327 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: bump import versions to 2.1J-P Nurmi2016-06-216-7/+7
| | | | | | | | | | Change-Id: Ia7a1ed2df09c58d052e67a611c3fd18f1d188dc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: move the basic example snippet to gettingstarted.qdocJ-P Nurmi2016-06-212-44/+16
| | | | | | | | | | Change-Id: Id6e80f4966f164bd767fe0c0930665015205745e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-206-170/+9
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontainer.cpp Change-Id: I7c41619a81b4fdd0d8ccaa4f0bb489a9b84e3865
| * Make Material style SpinBox text respect enabled stateMitch Curtis2016-06-201-1/+1
| | | | | | | | | | | | Task-number: QTBUG-54207 Change-Id: Ic4a871147bde046d402dac1fe25913abfa8da0ba Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Document the equivalent of MenuBarMitch Curtis2016-06-171-0/+3
| | | | | | | | | | | | Task-number: QTBUG-54173 Change-Id: I740dcc0edd2d7abb617fef8249a03264df3418c2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-167/+1
| |\ | | | | | | | | | Change-Id: I5954150d06519d7058716124580ee7fe73afb810
| | * Update plugins.qmltypes to avoid race condition in code modelv5.7.0Thomas Hartmann2016-06-011-167/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The duplicated definition of QQuickItem creates a race condition in Qt Creator and the prototype chain of types is not resolved correctly. The prototype becomes QtQuick.Templates.QQuickItem instead of QtQuick.Item. Also the explicit dependency on QtQuick 2.7 is required to resolve the prototype chain in all cases. Qt Quick Designer only shows items derived from QtQuick.Item and will ignore items that are reported as derived from QtQuick.Templates.QQuickItem. Task-number: QTCREATORBUG-16371 Change-Id: I4dede55a2753e5d807ceb837cc4cd7e4d2f02d06 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | Default: fill TextField backgroundJ-P Nurmi2016-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Sync with SpinBox, which fills the background with white. Change-Id: Ic3aae664615d45873542ebaf56a848a10263611b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: add missing link to "Container Controls" on the guidelines pageJ-P Nurmi2016-06-151-0/+2
| | | | | | | | | | | | | | | Change-Id: I27ad7904c3c099a1cfd4b0666a5d368a8ee748a1 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
| * | Doc: improve the "labs" noteJ-P Nurmi2016-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | There is no such QML module as Qt.labs, but there are various experimental Qt.labs.foo modules. Change-Id: I9b21d0a0cdb9b8143ecbb461e5a2b87a6724d7ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add QQuickContainer::increment|decrementCurrentIndex()J-P Nurmi2016-06-206-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | [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-1511-0/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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>
* | | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-1413-40/+51
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickslider.cpp Change-Id: Idefd7b77b1937d423ee2db5064ff09c36b240ef0
| * | Doc: adapted images to new style/color requirementsNico Vertriest2016-06-142-0/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: I78da942e29915b3aa67b7e06e8a0f8d78cb44302 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
| * | Material: fix elevation effect for Frame, GroupBox, Pane & TabBarJ-P Nurmi2016-06-134-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Material] Fixed (optional) elevation effects for Frame, GroupBox, Pane, and TabBar. Change-Id: Ic725049d7023175a6c00765fb85b944bc250c4c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Material: increase ScrollBar's touch areaJ-P Nurmi2016-06-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8px is hard to hit on touch. A total padding of 16px, so a total size of 20px is still nowhere near the Material design minimum touch target size 48px, but that feels so massive area stealing touches on the screen edge that let's try something a little bit smaller first... Task-number: QTBUG-51527 Change-Id: I2d095d8aa851e99a406286640d2b835cac52c47f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Material: fix sliders to respect minimum touch target size 48pxJ-P Nurmi2016-06-132-8/+8
| | | | | | | | | | | | | | | Change-Id: If3674854264b1941002c61bba7f42792ea50de68 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Sliders: fix implicit size calculationsJ-P Nurmi2016-06-136-30/+18
| | | | | | | | | | | | | | | | | | | | | | | | Background size was in the bindings twice: once without and once with paddings. Change-Id: I863d1fe29f1d79017bad410b31f961e4d1238e3b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Slider: expose valueAt(pos) for getting continuous value updatesJ-P Nurmi2016-06-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | [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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1192-356/+469
|\| | | | | | | | | | | Change-Id: If502b986cc8d6729ebea64cedfdf97b9b612e7c0
| * | Material: remove qdoc markersJ-P Nurmi2016-06-0836-173/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original plan was to include the default implementation (of all styles, if we could make the snippets collapsiple) in the customization docs. Since the default implementations tend to include internal types, in the end we went the other way and wrote dedicated example snippets for the customization docs. Therefore these markers no longer server a purpose, but just add unnecessary extra bytes for the QML parser to read. Change-Id: Ic511d7ce7a032429626ee75517d69d21b21412a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Universal: remove qdoc markersJ-P Nurmi2016-06-0835-167/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original plan was to include the default implementation (of all styles, if we could make the snippets collapsiple) in the customization docs. Since the default implementations tend to include internal types, in the end we went the other way and wrote dedicated example snippets for the customization docs. Therefore these markers no longer server a purpose, but just add unnecessary extra bytes for the QML parser to read. Change-Id: I5740192b0a3e80614a795d32dabeb753f86bbd68 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: Collect a list of guidelines pagesNico Vertriest2016-06-0710-0/+88
| | | | | | | | | | | | | | | Change-Id: Ie64486275b7fc39005cc6f86f33f04444474c07e Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | Adding "forwards" for ApplicationWindowThomas Hartmann2016-06-071-0/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without these declarations from QtQuick.Window 2.0 the code model will not know about the properties of ApplicationWindow. Because of the high visibility we should fix this. Change-Id: Icce7ef1c60731045e1b7a4dfda5f39361c872100 Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Update QML Designer supportJ-P Nurmi2016-06-079-2/+64
| | | | | | | | | | | | | | | Change-Id: I916ab905ade9c6c83cf4cb8bcf121bdd99e84974 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: Updated doc on usage Controls 2.Nico Vertriest2016-06-027-14/+81
| | | | | | | | | | | | | | | | | | Change-Id: If256dafc53d63b174b5cfd03eb91635e062d7c69 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> 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.7' into devLiang Qi2016-06-01231-2281/+2172
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing colors in tst_material.qml works fine now. Conflicts: examples/quickcontrols2/gallery/qtquickcontrols2.conf tests/auto/material/data/tst_material.qml Task-number: QTBUG-53556 Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
| * | Material: fix disabled and tristate CheckBoxJ-P Nurmi2016-05-311-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | Somehow these changes went missing when CheckIndicator was introduced in bb06d89. It was probably a copy-paste from an outdated CheckBox.qml. Change-Id: I9e5f3801f627de71f80620b5615771f7730b906c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>