aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Doc: fix review findings for ToolButtonJ-P Nurmi2016-11-014-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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-313-11/+528
| | | | | | | | | | | | | | | | | | | | | | | | 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-314-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Update plugins.qmltypesJ-P Nurmi2016-11-012-10/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: I859bcc03f3f980fd37df756c2922378c0d8c0827 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | QQuickStyle::availableStyles()J-P Nurmi2016-11-103-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to introduce platform-specific styles, such as the iOS style, and make them appear correctly in the Gallery example so that we don't have to hard-code the lists separately for different platforms. [ChangeLog][Controls][QQuickStyle] Added availableStyles() method that returns the list of available built-in styles. Change-Id: Ieea88577f402cbc52a844d6777e64c6bd55c5ab9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | QQuickComboBox: ensure a parent for delegatesJ-P Nurmi2016-11-094-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to replace the "width: control.popup.width" expressions with "width: parent.width" to avoid explicit references to the popup. Next, we are ready to defer the execution of the popup until it becomes visible or is accessed by the user. Without the parent item fix, ComboBox throws an error: ComboBox.qml:58: TypeError: Cannot read property of null ...and tst_snippets fails => tested implicitly. :) Change-Id: Ib9cfcf7558addbe3403d835d3ae11b6c11c2f0cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | | Add QQuickComboBox::downJ-P Nurmi2016-11-096-13/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to replace all "control.pressed || popup.visible" expressions with "control.down", and takes us one step closer to deferred popop execution as mentioned in the previous commit. In order to be able to defer the popup execution, we must get rid of such explicit references to the popup. Change-Id: Ifa7ecf8201912d3ec1bca232e2cf600e3886715e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Improve the custom ComboBox exampleJ-P Nurmi2016-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cut the dependency between the popup and its content item. The same was done for all the built-in styles in 50148c6. Task-number: QTBUG-56297 Change-Id: I18d83bd5dd92cd4f2798ac17b469725d08368da9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Material ComboBox: remove last explicit references to the popupJ-P Nurmi2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I072079b1fdd0e36fd316d44f3f63a9a4bb29acd9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Default: prepare ComboBox for deferred popup executionJ-P Nurmi2016-11-041-4/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plan is to defer the QML execution of the whole ComboBox popup until the popup is made visible or accessed by the user. This can slice off roughly half of the creation time. The QML engine refuses to defer the execution if there are any child objects that have an identifier, because those child objects could be referenced from outside the deferred/missing parent object. For this reason, we must kill the unnecessary ID. This change alone does not defer anything, but is a prerequisite for enabling deferred execution later. Flickable overrides Item's default property to flickableData, which ensures that children get re-parented to Flickable::contentItem, but ListView overrides the default property back to Item::data, so the parent assignment is not necessary at all. The rest can be done by referencing parent instead of the ID. The other styles do not have ID's within the popup. Change-Id: Iac58bae7e99252fb03bed2228153483300901720 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Whitespace cleanupsJ-P Nurmi2016-11-0313-13/+6
| | | | | | | | | | | | | | | Change-Id: Ia075694a7dc43d72d07221b569467fcebdb411fb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | ComboBox: prepare the internal layouts for editable combosJ-P Nurmi2016-11-0111-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text field of an editable ComboBox must cover the whole control excluding the indicator button. This ensures that user interaction works as expected over the whole editor area (there must be no "dead" paddings), and that the whole editor area gets the appropriate caret or ibeam mouse cursor. Previously, the indicator was laid out inside/over the content item. To help with getting the layout right, this change injects empty padding into the indicator images of the Universal and Material styles (the Default style already had padding). Task-number: QTBUG-53876 Change-Id: I62e10ffb7f5ed4559523513f04ff7e2ea0e57ef5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-10-3151-177/+356
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h Change-Id: I33241dfd15a320e6ae2f0c056252b0ec6be7c6f6
| * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-3127-48/+123
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Material: fix blurry ComboBox drop indicatorsJ-P Nurmi2016-10-285-0/+5
| | | | | | | | | | | | | | | Change-Id: I2c3f101182f8b985180695f6cf3c6baabe9969ed 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>
| | * Default: move opacity assignments to individual delegatesMitch Curtis2016-10-264-2/+4
| | | | | | | | | | | | | | | | | | | | | This way, users have control over the opacity of child items. Change-Id: Ie7c0b08eb0b22d11319f8c2f1807e6a3a68790ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Default: make disable controls easier to seeMitch Curtis2016-10-268-9/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-56698 Change-Id: I8e82ee2f2f9c38755e49b6f1b46e9f83a1363463 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Replace QStringLiteral with QLatin1String in the proxy themesJ-P Nurmi2016-10-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us, in theory, to test multiple styles in the same process by calling qmlClearTypeRegistrations() between each style test round. When QML types are cleared, QML plugins are unloaded, and the current style plugin's proxy platform theme is destroyed. It leads to a nasty crash if there are fonts stored in the Qt font database that have their family names stored in the read-only data of an unloaded plugin. Change-Id: I32a70077ac4502e16a753fb68f7efeef35d239b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Popup: add spacing support for Dialogv5.8.0-beta1J-P Nurmi2016-10-269-6/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Doc: fallback styleJ-P Nurmi2016-10-263-3/+25
| | | | | | | | | | | | | | | Change-Id: I03996d592de4b7db29b671fa73ab44036a80fa2f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Page: support spacingJ-P Nurmi2016-10-268-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-0/+8
| | | | | | | | | | | | | | | Change-Id: I91b578e6e7956feadb0a9f874fa0c1f4d97f02bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Add QQuickDialog::titleJ-P Nurmi2016-10-267-1/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-266-110/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Material: share the CursorDelegateJ-P Nurmi2016-10-286-74/+73
| | | | | | | | | | | | | | | | | | | | | | | | Duplicate code in TextField, TextArea, and SpinBox. The next one is editable ComboBox. Change-Id: Ibbd054d2f945f4964ee0007f9e9dc8a9450902e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Rename QQuickStackAttached to QQuickStackViewAttachedJ-P Nurmi2016-10-275-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QQC1 the attached property was called "Stack", purely because we couldn't have both QML and C++ types with the same name. Now the attached properties are provided by StackView itself, so this is the correct name. Change-Id: I0f98d73735cff14c444a9e843b7cb56dc8a45cd8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickStackTransition into its own filesJ-P Nurmi2016-10-276-134/+241
| | | | | | | | | | | | | | | Change-Id: I87fdef1c2cc5bb2b04c38b54cca316ace8814f2c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickStackElement into its own filesJ-P Nurmi2016-10-276-292/+403
| | | | | | | | | | | | | | | Change-Id: I4fce147f125d4641e1eb3a6534f57d68000dbfc7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickPopup: move the implementation of reposition() to the positionerJ-P Nurmi2016-10-264-143/+152
| | | | | | | | | | | | | | | | | | | | | | | | In the future, the exact type of positioner might vary depending on whether the popup is an item or a window. Change-Id: Id17d1976c7bca72cecb3e9567355264526527286 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickPopupItem out of qquickpopup.*J-P Nurmi2016-10-2610-227/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll start slowly refactoring all QQuickPopupItem-specific things out of QQuickPopup. In the future the presentation/backend of a popup could be, under certain circumstances, a native menu popup window, for example. Change-Id: I8508da14ab52c65221afc3a9b7f07c371f0416d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickPopupPositioner: use QQuickItem::isAncestorOf()J-P Nurmi2016-10-262-18/+1
| | | | | | | | | | | | | | | | | | | | | It was introduced in Qt 5.7, but wasn't taken into use yet... Change-Id: Ib18f7e09a2de7bcd8fa51fd272cd555dc83103c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickPopupPositioner out of qquickpopup.*J-P Nurmi2016-10-265-128/+236
| | | | | | | | | | | | | | | | | | | | | qquickpopup.cpp has grown massive. Change-Id: Ibbc83331b642d854d4f7dc2aebe8b3fc46ec7bee Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-10-2545-194/+1079
|\| | | | | | | | | | | Change-Id: If48d66d89172db94ee1839063396156a3a947601
| * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-2529-153/+826
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-material.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc src/imports/controls/material/ComboBox.qml Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
| | * Doc: fix typo in QQuickStyle briefMitch Curtis2016-10-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I629871ac8a077fda900f69d788d612bc3688728f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Doc: remove a redundant QQuickStyle exampleJ-P Nurmi2016-10-251-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The "Styling Qt Quick Controls 2" -page is already overloaded with content. Give a minimal one-liner example and link to QQuickStyle for more details, which contains the same snippet that was removed. Change-Id: I77e196aeb8d407fcf05a264232dd83c2e28f97b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: configuration fileJ-P Nurmi2016-10-258-43/+178
| | | | | | | | | | | | | | | Change-Id: I3de16850673488a8c67afc6b45a79d5bb86f9013 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 19:37:25 +0000