aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
Commit message (Collapse)AuthorAgeFilesLines
* Make styles configurable featuresJ-P Nurmi2017-02-063-0/+6
| | | | | | | | | | | | | | | ./configure [...] Qt Quick Controls 2: Styles ................................. Default Material Universal Supports both syntaxes: -(no-)style-[material|universal] -(no-)feature-quickcontrols2-[material|universal] Change-Id: I011cc38e5752d2c718376ca7493940271920b3e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add missing information to "Attached properties" sectionMitch Curtis2017-02-021-15/+61
| | | | | | | | | A lot of details were left out, which makes it hard to follow along. Task-number: QTBUG-56013 Change-Id: Ia21dd43e0d6e260463a2a91b28c248b962dd3401 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Tumbler requires ListView and PathViewJ-P Nurmi2017-02-021-0/+6
| | | | | Change-Id: Ieb40f536cc5d68fdf13075df2c9b3e09d5077de3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge dev into 5.9Oswald Buddenhagen2017-02-0117-16/+390
|\ | | | | | | Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
| * Make TextArea work out of the box inside ScrollViewJ-P Nurmi2017-01-272-8/+5
| | | | | | | | | | | | | | | | [ChangeLog][Controls][TextArea] TextArea has been made to work inside ScrollView, providing necessary scroll bars out of the box. Change-Id: I212ee4c60912c961cbb9683540848141dcba29a5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Add ScrollViewJ-P Nurmi2017-01-2715-8/+385
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Fix build with -no-feature-settingsJ-P Nurmi2017-01-312-0/+4
| | | | | | | | | | Change-Id: I204c50539288df16c4d4010e91c8ecc60f202ec6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Doc: correct PageIndicator descriptionMitch Curtis2017-01-311-3/+4
| | | | | | | | | | | | | | | | The BusyIndicator and PageIndicator sections got mixed up in f043b64c3. Task-number: QTBUG-58343 Change-Id: I08d8d7319660923aa4333739882ae376bf368abb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Default QQuickSlider::live to trueJ-P Nurmi2017-01-271-53/+0
|/ | | | | | | | | [ChangeLog][Important Behavior Changes] On a popular demand, Slider has been changed to report live value updates. This can be disabled by setting Slider::live to false. Change-Id: I48c6a92eb794d2846cfff96d8784c53c22843573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-01-241-47/+166
| | | | | Change-Id: Ic16c8e0796178bd99fc7dd8c965c0ed1de8da9d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies.jsonJ-P Nurmi2017-01-241-2/+2
| | | | | Change-Id: I5da3186533ae018da655e58078de18377d5113d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update IMPORT_VERSION in the .pro filesJ-P Nurmi2017-01-243-3/+3
| | | | | Change-Id: I9546ee274e5376151e9f5faffda87182f2e10188 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add ScrollBar::policyJ-P Nurmi2017-01-204-6/+58
| | | | | | | | [ChangeLog][Controls][ScrollBar] Added a policy-property, which holds whether the scroll bar is shown always/never/as needed (default). Change-Id: Ibe25edaef04a7926bc12c59913efa7a3d43a5ccf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-2010-0/+48
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswitch.cpp src/quicktemplates2/qquickswitchdelegate.cpp tests/auto/controls/data/tst_dialogbuttonbox.qml tests/auto/controls/data/tst_toolbutton.qml Change-Id: I1da1d6de83c1d9ac854dfce1d6c9d6ba2c460404
| * Adding stack view and swipe view to designer item libraryThomas Hartmann2017-01-185-0/+32
| | | | | | | | | | | | | | | | Adding stack view and swipe view to the view category. The icons are taken from stack layout and have no high dpi versions. Change-Id: I4009a9d06117bdd5d725c1c05c46ce7f99c368b5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Adding round button to designer item libraryThomas Hartmann2017-01-175-0/+14
| | | | | | | | | | | | Change-Id: I6409a7036392af7bd160583a9d92982ce9876eac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-141-0/+2
| |\ | | | | | | | | | Change-Id: Ibad627dfcd3389aeddfe08a10d13097c88f081a1
| | * Material: fix ComboBox drop indicator size on high-DPIJ-P Nurmi2017-01-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative commit f8c53e88 (Fix high-DPI image and svg providers) changed the way high-DPI image providers work. For images using an image provider, we must now set the source size to get the desired device pixel ratio... The same was done for other indicators in qqc2 commit ca87ab8. Change-Id: I31f24786a6d3d3d06c3255864ed443cf8852a8de Task-number: QTBUG-57800 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add ScrollBar::interactiveJ-P Nurmi2017-01-203-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollBar] Added an interactive-property. A non-interactive ScrollBar is visually and behaviorally similar to ScrollIndicator. This property is useful for switching between typical mouse- and touch-orientated UIs with interactive and non- interactive scroll bars, respectively. Change-Id: Ie98bfa0b5bba94a9751baf3c65f17b850b58fd1f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QtQuickControls2: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I94123464b12b30a4ba085cfb7b606bc26df9b76e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add attached StackView.visible propertyJ-P Nurmi2017-01-122-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][StackView] Added attached StackView.visible property that can be used to control whether items below the top- most item are kept visible. Task-number: QTBUG-56801 Change-Id: Ieead0d476f254886cff5f8457bb5c5d23cb7de8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add SwipeView::orientationJ-P Nurmi2017-01-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][SwipeView] Added orientation property. Task-number: QTBUG-56031 Change-Id: I4ed47d659ef83cb48f63b703b681bdf1b8662fe8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update the remaining copyright yearsJ-P Nurmi2017-01-115-5/+5
| | | | | | | | | | | | | | | | | | | | | Already done in 5.8 (00a0626) - these files are new in dev. Change-Id: I534c7512a69d4c24ed9ce8191325556beb0fb1f7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-11338-338/+338
|\| | | | | | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * | Welcome to 2017J-P Nurmi2017-01-09341-341/+341
| | | | | | | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Editors: fix placeholder text alignmentJ-P Nurmi2017-01-107-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal QQuickPlaceholderText creates an "implicit binding" to the editor's horizontalAlignment, meaning that the placeholder respects the editor's horizontal alignment when explicitly set, and otherwise determines the alignment from the placeholder text's visual direction. [ChangeLog][Controls][TextField] Fixed the horizontal alignment of the placeholder text in right-to-left UIs. [ChangeLog][Controls][TextArea] Fixed the horizontal alignment of the placeholder text in right-to-left UIs. Task-number: QTBUG-55999 Change-Id: If1a8596c35c1920874996277520f1c54430c5f69 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add ScrollBar::snapModeJ-P Nurmi2017-01-103-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollBar] Added snapMode property incremental or discrete scrolling. Task-number: QTBUG-56569 Change-Id: Id0d463b85063a62b7df6307af8fe8b203155a5de Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickTabBar: fix implicit size calculationJ-P Nurmi2017-01-103-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the implicit size of TabBar was calculated based on the content size of the ListView that TabBar uses internally. The problem was that ListView calculates the content size based on the explicit size of the items. There was a circular dependency, because TabBar resized the tabs to the size of the view. To avoid the circular dependency, TabBar now calculates the content size based on the total implicit size of the tabs. As before, explicit size is respected for tabs that have it set. [ChangeLog][Controls][TabBar] Added contentWidth and contentHeight properties that are automatically calculated based on the total size of the tab items, but can be manually overridden if desired. This fixes an issue that TabBar was not able to reliably calculate an implicit size, and could in certain scenarios enter an infinite loop due to a circular dependency between the items' sizes and the tabbar's size. Task-number: QTBUG-57858 Change-Id: Ie303cbc54247e87b0affc6bf32c7bf99acea4571 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-051-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
| * | Add screenshot snippets to OTHER_FILES to make them visible in CreatorJ-P Nurmi2017-01-021-0/+1
| | | | | | | | | | | | | | | Change-Id: I6befd6e65a1abc38e0de4ed10abf41dad677744b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | qmldir: update the versions of the module dependenciesJ-P Nurmi2017-01-053-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia4675c1937df2bfa797bc8d0e34d4a9c58232588 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add DelayButtonJ-P Nurmi2017-01-0213-1/+460
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][DelayButton] Added DelayButton. Change-Id: I94820dfb41ba9b90f0a29cda01ac476b54cf3de8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-028-5/+7
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/platform/qquickplatformmenuitem.cpp Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d
| * | Material|SpinBox: Fix trivial C&P typoKonstantin Ritt2016-12-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I8bdd973f69ae246220b58a312f5d82d9134f35f6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Material: Optimize "check" icon imagesKonstantin Ritt2016-12-283-0/+0
| | | | | | | | | | | | | | | | | | | | | Size decrease: 7630 -> 6614 (bytes) Change-Id: I14eefbb60e0246dd260977acb01a79e4fb4c9584 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Material: set default ToolBar's spacing to 16Konstantin Ritt2016-12-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | According to the Material design guidelines, it is an appropriate spacing value for most use cases Change-Id: Ie72c63b3ca2e1a5b7457a38b460cf2bc4acbecb2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Bump style plugin dependencies to QtQuick.Controls 2.1Konstantin Ritt2016-12-283-3/+3
| | | | | | | | | | | | | | | Change-Id: I316ec8deab791c0e8ebf0bbb9bb1a07e8aacad6b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | SwipeDelegate: rename swipe.rebound to swipe.transitionJ-P Nurmi2016-12-214-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "rebound" name originates from Flickable::rebound, but for swipe delegate the transition is not only applied on release, but also when calling swipe.open() or swipe.close(). Therefore the "rebound" name feels a bit off in this context. Furthermore, this patch adds the missing docs and a changelog entry. [ChangeLog][Controls][SwipeDelegate] Added a swipe.transition property that holds the transition that is applied when a swipe is released, or swipe.open() or swipe.close() is called. Change-Id: Ic38ec850c64dd21b8d9deb08609172c6cb0f6d71 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-12-208-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/DialogButtonBox.qml src/imports/controls/universal/DialogButtonBox.qml Change-Id: I16cbf9912a3526783c21a6f30996f83fce9e02c3
| * | Merge remote-tracking branch 'origin/5.8.0' into 5.8J-P Nurmi2016-12-202-0/+2
| |\| | | | | | | | | | Change-Id: I8544063279de0ce12438e867e6b7767b00e72f11
| | * DialogButtonBox: add missing importv5.8.0-rc1J-P Nurmi2016-12-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | DialogButtonBox uses the Button-type from the QtQuick.Controls namespace, but did not import it. Change-Id: Ibe635461e280a8f8a78a52a2454fd8524a90a7e1 Task-number: QTBUG-57618 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Remove unused doc imagesMitch Curtis2016-12-026-0/+0
| | | | | | | | | | | | | | | | | | | | | These controls have GIFs now. Change-Id: I5bb931666f169840ebdbe369c179c2d8ca612a21 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Bump the QtQuick import versions in the stylesJ-P Nurmi2016-12-19147-147/+147
| | | | | | | | | | | | | | | | | | | | | Qt 5.9 == QtQuick 2.9 Change-Id: I7d4f749645011c4e78bdafe80824b83bd166e7c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | SwipeDelegate: transition swipe.positionJ-P Nurmi2016-12-143-48/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the value of swipe.position jumped on mouse/touch release, or when open() or close() was called. Transitioning the swipe.position value smoothly to the target value makes it possible to use it as opacity/scale/etc. for the side items. Notice that this is backwards compatible with the old behavior. If no transition is set, the value jumps the same way it did before. In that case, Behavior on x makes the movement smooth. Task-number: QTBUG-57242 Change-Id: Id9c06b5b08fa73f2f575787e16dc6e20e4ccb545 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Material: prevent ripples from getting stuck in disabled stateJ-P Nurmi2016-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ripples don't trigger when the ripple item itself is disabled. This is used in SwipeDelegate to prevent ripples when a swipe is open. Now that swipe.position is transitioned, a release event comes before the swipe position reaches 0, so we must ensure that the wave exits even if it's not yet enabled. Change-Id: Ib4d58ff974262331898db2133e06624eb890f9ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-12-011-95/+399
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/SpinBox.qml src/imports/controls/material/SpinBox.qml src/imports/controls/universal/SpinBox.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5
| * | SpinBox: fix input method hints to get the appropriate VKBJ-P Nurmi2016-11-293-3/+3
| |/ | | | | | | | | | | | | | | SpinBox operates on integers. Task-number: QTBUG-56837 Change-Id: Ib77cded8c4483fa78816d004692cacb3532deedd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-5/+11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc sync.profile Change-Id: I554c40516030075142f9af1dd5c66fdca2b78b9a
| | * Doc: clarify the feature comparison tableJ-P Nurmi2016-11-231-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | Changing styles at runtime is not possible in QQC2. Add also footnotes that QQC1 may not provide optimal performance on embedded and mobile. Change-Id: Iea691116eacdcf73482ecd52fd1e9c945a788f9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: refactor the type comparison tableJ-P Nurmi2016-11-251-90/+388
| | | | | | | | | | | | | | | Change-Id: I2267dcd15bcbcbdee8708208dc5f92eb69b745d6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>