aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-0250-84/+676
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Drawer.qml src/imports/controls/Frame.qml src/imports/controls/GroupBox.qml src/imports/controls/Page.qml src/imports/controls/Pane.qml src/imports/controls/ToolBar.qml src/imports/controls/Tumbler.qml src/quicktemplates2/qquickapplicationwindow.cpp src/quicktemplates2/qquickpopup.cpp tests/auto/accessibility/data/busyindicator.qml tests/auto/accessibility/data/button.qml tests/auto/accessibility/data/checkbox.qml tests/auto/accessibility/data/control.qml tests/auto/accessibility/data/dial.qml tests/auto/accessibility/data/label.qml tests/auto/accessibility/data/menu.qml tests/auto/accessibility/data/pageindicator.qml tests/auto/accessibility/data/popup.qml tests/auto/accessibility/data/progressbar.qml tests/auto/accessibility/data/radiobutton.qml tests/auto/accessibility/data/rangeslider.qml tests/auto/accessibility/data/scrollbar.qml tests/auto/accessibility/data/scrollindicator.qml tests/auto/accessibility/data/slider.qml tests/auto/accessibility/data/spinbox.qml tests/auto/accessibility/data/switch.qml tests/auto/accessibility/data/tabbar.qml tests/auto/accessibility/data/tabbutton.qml tests/auto/accessibility/data/textarea.qml tests/auto/accessibility/data/textfield.qml tests/auto/accessibility/data/toolbar.qml tests/auto/accessibility/data/toolbutton.qml tests/auto/accessibility/tst_accessibility.cpp Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
| * | Doc: revise brief descriptionsJ-P Nurmi2016-11-0237-37/+37
| | | | | | | | | | | | | | | | | | Change-Id: If7bdd4c11aaeb2df87622c769b1a65ac82ac7e73 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: BusyIndicator vs. indeterminate ProgressBarJ-P Nurmi2016-11-022-0/+36
| | | | | | | | | | | | | | | | | | Change-Id: I48bb051bdfe18923749f71f9f0be39a0361723f5 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: show the non-wrapping Dial GIF in the detailed descriptionJ-P Nurmi2016-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | There was no screenshot in the detailed description. This helps to see right away what kind of control it is. Change-Id: I0ecc585a5e6f650112e88bb3b37a2f5140d41261 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Frame: fix accessibility supportJ-P Nurmi2016-11-022-0/+11
| | | | | | | | | | | | | | | Change-Id: I79f06e3a60151ab4e35b6290fbfe022ed20665e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | ToolTip: fix accessibility supportJ-P Nurmi2016-11-022-0/+11
| | | | | | | | | | | | | | | | | | Change-Id: I4623b1f1ee1e10c4233e89bf42e6720bbf3a5c73 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickPopup: let subclasses control accessibility attributesJ-P Nurmi2016-11-023-0/+44
| | | | | | | | | | | | | | | | | | | | | Required for QQuickToolTip (text) and QQuickDialog (title). Change-Id: Ia4a4c948548b05e69bd6319228d73c3baed44abe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | GroupBox: fix accessibility supportJ-P Nurmi2016-11-022-0/+22
| | | | | | | | | | | | | | | Change-Id: Ifbbc701a996ed9ddb13f7d16843d0af5ee480ca1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Page: fix accessibility supportJ-P Nurmi2016-11-012-0/+11
| | | | | | | | | | | | | | | Change-Id: If7d15d914e35a675dcd456a4aa561a3280c2308a Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | ComboBox: fix accessibility supportJ-P Nurmi2016-11-012-0/+24
| | | | | | | | | | | | | | | Change-Id: Icd196b3cd66b5b31a664c845e78953b4606022b7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Doc: add GIF to SwipeView detailed descriptionJ-P Nurmi2016-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The wireframe is still used on the "Navigation Controls" page. Change-Id: I8e8c2bf0f5d46179c115d548efda2ea114a4431e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Get rid of the remaining qdoc markers in the Default styleJ-P Nurmi2016-11-011-1/+10
| | | | | | | | | | | | | | | Change-Id: Id90911cbac46d2d68284abca08dc7165ace71113 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: add GIF animation for DrawerJ-P Nurmi2016-11-011-10/+6
| | | | | | | | | | | | | | | | | | Change-Id: Ib4c8b5f80e63a322c20caa837632739a3bfee3ee Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix review findings for ToolButtonJ-P Nurmi2016-11-012-7/+16
| | | | | | | | | | | | | | | | | | Change-Id: Id427520a390a2a8cb0bb4ac0f66fef5f96e5b39e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix review findings for ApplicationWindowJ-P Nurmi2016-11-011-2/+63
| | | | | | | | | | | | | | | | | | Change-Id: I6a164e1a306db960c1ac3012b72106425a380e75 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickPopup: use QShortcutMap to grab Back & Escape keysJ-P Nurmi2016-11-013-11/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes CloseOnEscape play well together with QML Shortcut, as illustrated by the Gallery example. For example, navigate to any control page, open the options menu, and hit escape twice. First, the options menu closes, and then the stackview navigates back. Another nice example is to open the style combobox in the settings dialog, while being navigated to one of the control pages, and hit escape three times. First, the combobox closes, then the settings dialog closes, and finally, the stackview navigates back. NOTE: tst_combobox had to be updated, because it was assuming that the popup is closed when escape is released. Now that the system is based on shortcut overrides, it gets closed on press instead. Task-number: QTBUG-56562 Change-Id: I8b8901bcba7deebd82b181af42f335d95a7cb469 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix review findings for PopupJ-P Nurmi2016-10-311-11/+137
| | | | | | | | | | | | | | | | | | Change-Id: I8494ffe1a46a05a01d31787783b5f8e9cc810f36 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: mention that some SwipeDelegate::swipe properties are read-onlyJ-P Nurmi2016-10-311-5/+5
| | | | | | | | | | | | | | | | | | Change-Id: Ie9eeecc73cd3fa6d4fd8aa17abb38c4dc03f2024 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: add links to ToolTip attached properties and methodsJ-P Nurmi2016-10-311-2/+14
| | | | | | | | | | | | | | | | | | Change-Id: Ia9edcf69ca4a36f9e50e03787fe82b79aca9d2a3 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix some review findings for TabBarJ-P Nurmi2016-10-311-3/+10
| | | | | | | | | | | | | | | | | | Change-Id: Ia5c8c4e4554f3171537184114c25724179843b5e Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fix Shortcut to respect modal popupsJ-P Nurmi2016-10-313-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Gallery example, the back navigation shortcut no longer activates when the settings dialog or the about dialog is open. Notice that the back navigation shortcut still activates while the options menu is open. [ChangeLog][Controls][Popup] The QML Shortcut type from QtQuick has been fixed to respect modal popups from QtQuick Controls 2. Task-number: QTBUG-56562 Change-Id: I4c3c762e9db0935ef250ff9f8c553e7d211220c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | Add missing QQuickDialog::accessibleRole()J-P Nurmi2016-11-012-0/+11
| | | | | | | | | | | | | | | Change-Id: I49ab38361e3165d4ee4722c5af1404cdd145246b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-3110-33/+106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/CheckIndicator.qml src/imports/controls/RadioIndicator.qml src/imports/controls/RangeSlider.qml src/imports/controls/Slider.qml src/imports/controls/SwitchIndicator.qml Change-Id: I32612d2f905ffa02dbaedbb1f84c8237fbd66db3
| * | Doc: fix review findings for TextAreaJ-P Nurmi2016-10-281-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: I0d9ff52d019bfae37e1fd191e914e61a1a07aee0 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix review findings for Switch & SwitchDelegateJ-P Nurmi2016-10-282-12/+10
| | | | | | | | | | | | | | | | | | Change-Id: I1626cb83d75e9b64fc5e274dc29fff04a157741b Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: add one more link to Text in the detailed description of LabelJ-P Nurmi2016-10-281-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic205fe6840274c12a3e4c3f1f355080aff8861d7 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: link to Control::contentItem in GroupBox detailed descriptionJ-P Nurmi2016-10-281-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I0f0a93a3ebf0a884e81f9c856490d564b30a90c8 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: fix review findings for DrawerJ-P Nurmi2016-10-281-8/+10
| | | | | | | | | | | | | | | | | | Change-Id: Ibdf3f1dee5664979cdf77ba7485e3d71110fc860 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Scrollers: give control over layouting if parent != flickableJ-P Nurmi2016-10-282-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows utilizing the convenient attached properties of ScrollBar and ScrollIndicator, but positioning the scrollers outside of a clipping Flickable. Change-Id: I46fe79110658f4797469d042c56f51548eef6c70 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | QQuickPopup: fix binding loops with size-dependent positioningJ-P Nurmi2016-10-272-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependencies between popup's size and position easily lead to recursion into reposition(). Blocking recursive reposition() calls messes up the positioning, so schedule polish events instead. Task-number: QTBUG-56755 Change-Id: I72afd14573e5cd57f8162df04e193d4c42fd7236 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Popup: add spacing support for Dialogv5.8.0-beta1J-P Nurmi2016-10-265-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to get the dialog layout right (a separate follow-up commit), because we don't need to mess with the paddings of the header, content, and footer, based on their existence and visibility, but we can also adjust the spacing which gets automatically added between the building blocks when they exist and are visible. Change-Id: Ie8b587eeb9d0fb4a8f42baf957879d40bbd3385c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Page: support spacingJ-P Nurmi2016-10-265-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spacing support into QQuickPageLayout. Having spacing and padding separately gives more fine-grained control over the layout. Spacing is inserted between the header, content, and footer, but only when the respective building blocks are visible. Change-Id: Ia26a4c33c2756a603ca6d53aefac3a66414b36d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: QT_QUICK_CONTROLS_HOVER_ENABLEDJ-P Nurmi2016-10-261-0/+4
| | | | | | | | | | | | | | | Change-Id: I91b578e6e7956feadb0a9f874fa0c1f4d97f02bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add QQuickDialog::titleJ-P Nurmi2016-10-263-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dialog is incomplete without built-in support for title. All dialogs in the examples, screenshots, webinars, and blog posts have had a custom title. The Material and Universal designs both have specs for dialog titles. This commit adds support for dialog titles with appropriate looks (padding & font) out of the box. Task-number: QTBUG-56711 Change-Id: I248150313f1ce629a7105fdbe1c70c8fcd69e1cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickDialog: simplify the button box handlingJ-P Nurmi2016-10-263-104/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just fill in the footer with a button box by default from the styles. This makes the next step easier, to provide also a default title bar in the header. Task-number: QTBUG-56711 Change-Id: I621a61f29f9ba2fe4b7e907d81da5988133a98c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Page: provide implicit sizeJ-P Nurmi2016-10-252-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the control was designed to be used as full-screen page, it can be sometimes useful to have non-fullscreen pages. In order to make Page behave well in layouts, it must provide a suitable implicit size. [ChangeLog][Controls][Page] Page has been made to calculate its implicit size based on the implicit size of the header, content, and footer plus paddings, and the implicit size of the background item. Task-number: QTBUG-56709 Change-Id: I0f40897df6e54d7bde01a464e24f0398b12bc865 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: fix SwipeDelegate detailed descriptionJ-P Nurmi2016-10-251-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest 5.7->5.8 merge messed up the detailed description of SwipeDelegate. In 5.7, the snippet was moved from the bottom to the top, but after the merge both were there. Also, the qdoc marker ('1' vs. 'file') did no longer match what was in the snippet file: warning: Command '\snippet (//! [file])' failed at end of file 'qtquickcontrols2-swipedelegate.qml' Change-Id: I77411b737fe0b95e6096a89bd3199bacc2d1c2ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-1914-100/+171
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml src/imports/controls/material/qquickmaterialstyle.cpp Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
| * | SwipeDelegate: fix documentation review findingsMitch Curtis2016-10-171-3/+9
| | | | | | | | | | | | | | | | | | Change-Id: I8ff60306fac53abefde6d8e9fe7727036f264799 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | SpinBox: fix documentation review findingsMitch Curtis2016-10-171-2/+19
| | | | | | | | | | | | | | | | | | Change-Id: Id2a2531dfb1d61b02e50ee11d0e67bed1e16e09f Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Improve StackView's documentationMitch Curtis2016-10-171-17/+42
| | | | | | | | | | | | | | | | | | | | | | | | Add more GIFs and restructure the text so that it's easier to follow. Change-Id: Ieb3136c306240dae44859a59e4451fce23275d47 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | ScrollBar::increase/decrease(): remember the previous active statusJ-P Nurmi2016-10-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | These methods toggle the active status to flash the scrollbar. The active status must not be inactivated if the scrollbar was already active while increasing or decreasing eg. via buttons. Change-Id: I2902f58a26ab5e56ff89aa921cae7a7ae8404ee3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Clear hover when moved outside while pressingJ-P Nurmi2016-10-172-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noticed in QTBUG-56269, QEvent::HoverLeave is not sent while there is an active mouse grabber item. Therefore we must hit test move events to figure out if the control is still effectively hovered. Task-number: QTBUG-56556 Change-Id: I8a5e3dbd77375aace7fc5594e4315288304d852f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | ComboBox: fix documentation review findingsMitch Curtis2016-10-141-7/+49
| | | | | | | | | | | | | | | | | | Change-Id: Iba9bdd74ab5b9865a2314ccc460fa44b9ea35be5 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | RangeSlider: fix documentation review findingsMitch Curtis2016-10-131-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Expand detailed description - link to Slider::snapMode documentation that has GIFs Change-Id: If05eeaef7b2df7dd64e57b0160e1c856dc4d013e Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | TabButton: fix documentation review findingsMitch Curtis2016-10-131-1/+5
| | | | | | | | | | | | | | | | | | Change-Id: I5c4671a07192979d3e8e600fcae3d05d3a103323 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | ProgressBar: add section to Indicator Controls page and link to itMitch Curtis2016-10-131-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ib6744c59f775aba3bc5132ad4ce721c71c3932dd Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | ToolBar: fix documentation review findingsMitch Curtis2016-10-131-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I96846723e1247dd825771add92b66c75c8dbb92a Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Tumbler: fix documentation review findingsMitch Curtis2016-10-131-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I96a7433856c3bcda51be7292b75f6da1f9dfd01f Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Share Control::focusReason notes with TextArea and TextFieldMitch Curtis2016-10-133-44/+4
| | | | | | | | | | | | | | | | | | Change-Id: Icf4feb1e29c40f10f483be63581f178fdc1cbd12 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 05:48:54 +0000