aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
| * Doc: supported environment variablesJ-P Nurmi2016-10-257-49/+138
| | | | | | | | | | Change-Id: I2ad1767c1066a07a86e0f5889b350aa4500d685e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add snippets and screenshots for the Universal attached propertiesJ-P Nurmi2016-10-249-26/+219
| | | | | | | | | | | | | | | | | | Ideas and descriptions shamelessly stolen from f26f855, which did the same for the Material style. Change-Id: Ibab47d1370c56de4104dc2bf549870335c639257 Task-number: QTBUG-55904 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: minor tweaks to the Material style pageJ-P Nurmi2016-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | Fix the value used in the foreground example, and mention the default accent value right after the brief description, before the example snippet, to make it more visible. The same order is used for all other properties. Change-Id: I10613b6ed2417eb886602d40e90cc74e2dbaf484 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: sync ComboBox with ButtonJ-P Nurmi2016-10-241-1/+7
| | | | | | | | | | | | | | | | | | | | ComboBox is modeled after Material design's drop-down Button, but it was never updated to have the same external padding that was added to the Material style Button. Both should have the same visual size to make them look sensible when laid out next to each other. Change-Id: I350f4acb2ea29ba292dbfaea874c348ae57750a2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: add snippets and screenshots for attached propertiesMitch Curtis2016-10-2012-25/+279
| | | | | | | | | | | | Change-Id: I4b388f374452c6894fe47c4feb5779fea7776708 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Page: provide implicit sizeJ-P Nurmi2016-10-256-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Let specifying the fallback style for custom stylesJ-P Nurmi2016-10-255-24/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, you can call QQuickStyle::setStyle(":/mycontrols") and QQuickStyle::setFallbackStyle("Material") to select a custom style so that the missing files will fallback to the Material style. Notice that the Material and Universal styles do not contain all files. For example, the non-visual Control.qml, Container.qml are not duplicated. For these, we must fallback to the Default style that is guaranteed to contain them all. [ChangeLog][Controls] Added support for specifying the fallback style for custom styles via :/qtquickcontrols2.conf, QT_QUICK_CONTROLS_FALLBACK_STYLE or QQuickStyle::setFallbackStyle(). Change-Id: I00be1c8c6aaca875ef851c90d018e9b5e2f501b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: fix SwipeDelegate detailed descriptionJ-P Nurmi2016-10-252-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Universal: fix the size of a footer-less dialogJ-P Nurmi2016-10-242-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gallery example's About dialog is broken in the Universal style. The dialog doesn't have any bottom padding. Dialog cannot have bottom padding hard-coded to 0. It was assuming that there would be a DialogButtonBox that provides top padding. Set a suitable padding in the dialog instead, so that the dialog content gets padded without a footer. Due to this, we must tweak the top and bottom paddings of DialogButtonBox so that the total spacing between the dialog content and the buttons becomes 24 as it is in the specs. Change-Id: I77e2c3f66c5166391f9be595121f23bc95debde8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: promote also the Text Editor example on the landing pageJ-P Nurmi2016-10-241-0/+1
| | | | | | | | | | | | | | This example is so nice that it deserves to be promoted... :) Change-Id: I82212803aea4239ad39b52ecd8d1b494bdc87c33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dialog: fix implicit size calculationJ-P Nurmi2016-10-243-9/+9
| | | | | | | | | | | | | | Header and footer visibility must be taken into account. Change-Id: Id9bab1d66c126247df77effb153fefa3a78a1d79 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-1928-104/+228
|\| | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml src/imports/controls/material/qquickmaterialstyle.cpp Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
| * Material: introduce an active and disabled icon colorsKonstantin Ritt2016-10-172-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://material.google.com/style/icons.html#icons-system-icons > The standard opacity for an active icon on a light background is 54% (#000000). An inactive icon, which is lower in the visual hierarchy, should have an opacity of 26% (#000000). > The standard opacity for an active icon on a dark background is 100% (#FFFFFF). An inactive icon, which is lower in the visual hierarchy, should have an opacity of 30% (#FFFFFF). Change-Id: I5916855cd0a4005ee55ac781207ac9cf4d078a34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * SwipeDelegate: fix documentation review findingsMitch Curtis2016-10-172-3/+74
| | | | | | | | | | | | 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-175-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-144-8/+50
| | | | | | | | | | | | 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-132-1/+8
| | | | | | | | | | | | 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-134-44/+19
| | | | | | | | | | | | Change-Id: Icf4feb1e29c40f10f483be63581f178fdc1cbd12 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Share Control::background notes with TextArea and TextFieldMitch Curtis2016-10-134-15/+16
| | | | | | | | | | | | Change-Id: I4150dbbc272d63cd842e19a30138c9b734d260ee Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ToolTip: fix screenshot in detailed descriptionMitch Curtis2016-10-072-3/+3
| | | | | | | | | | | | Task-number: QTBUG-55904 Change-Id: If8cda6ea0369bae248de63d50b8a667c239e6fb2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | ScrollBar: keep active while hoveredJ-P Nurmi2016-10-174-4/+24
| | | | | | | | | | | | | | Improves usability on desktop, when hover is enabled. Change-Id: Ib67db80e278a9369da73d81946a9001d432376aa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make hoverEnabled propagate to childrenJ-P Nurmi2016-10-1752-102/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hover effects can be sometimes a bit disturbing. This change makes it possible to conveniently disable hover effects for a tree of controls in one go. For example, to disable hover effects for a page including its header, footer, and all list items: Page { hoverEnabled: false header: ... footer: ... ListView { delegate: ... } } [ChangeLog][Controls][Important Behavior Changes] Control::hoverEnabled has been made to inherit to children, to make it possible to disable hover effects for a tree of controls in one place. Change-Id: Ia87144f2cc04957a32f89d3313816b91d97db635 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix QQuickStyle::name() lookupJ-P Nurmi2016-10-131-0/+2
| | | | | | | | | | | | Change-Id: I428baf8988abf51a032e21c369ca021c2da84257 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-0779-577/+191
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml src/quicktemplates2/qquickmenu.cpp tests/auto/controls/data/tst_buttongroup.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
| * Slider: fix documentation review findingsMitch Curtis2016-10-0710-111/+13
| | | | | | | | | | | | | | | | | | | | Expand detailed description. Also updated the GIF after the styling changes, and removed the PNGs. Change-Id: I6dee232f6766d6ee9595b1043a4bca78c2a09d78 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Slider: add GIFs to demonstrate snap modesMitch Curtis2016-10-074-0/+12
| | | | | | | | | | | | Change-Id: I19d436cd9b48e3ab2498029d4b306f6a0e9ff977 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * RadioDelegate: fix documentation review findingsMitch Curtis2016-10-071-2/+16
| | | | | | | | | | | | Change-Id: If865baabc54406a51b00abe61197bda4a1370953 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * RadioButton: fix documentation review findingsMitch Curtis2016-10-071-2/+13
| | | | | | | | | | | | Change-Id: I018038b41f05244876c6d18a4015a18a1b65fbc0 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix some of the ApplicationWindow documentation review findingsMitch Curtis2016-10-072-1/+63
| | | | | | | | | | | | Change-Id: Ifa4ae65923f3073ced1c46dd56725e00b34a689d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * SwipeDelegate: fix comment referring to code that has since been movedMitch Curtis2016-10-061-1/+1
| | | | | | | | | | Change-Id: I2d4fbb65a151a62c32a1cf1b7907bdbf4e4ae2d6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ScrollIndicator: replace PNGs with GIFsMitch Curtis2016-10-064-3/+3
| | | | | | | | | | | | Change-Id: I04d55b0e2e089cb55c26b921409ff2e5e58f55d9 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve CheckBox GIF and add RadioButton GIFMitch Curtis2016-10-0614-148/+4
| | | | | | | | | | | | | | | | | | - Make the presses a bit more obvious. - Remove unused QML/PNG files. Change-Id: Id5e64c737d4c2c72aeca953f8e876c287f5e426d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Delegates: update GIFs and add CheckDelegate tri-state GIFMitch Curtis2016-10-066-0/+4
| | | | | | | | | | | | | | | | There have been some styling improvements since the last GIFs were taken. Change-Id: I84db1a588f42eb5ceb8899b959150b009d2269ed Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ProgressBar: replace PNGs with GIFsMitch Curtis2016-10-068-76/+3
| | | | | | | | | | | | Change-Id: I8d11eae7e853b0aa8175e4cffd3520777713d50b Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 21:59:39 +0000