aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc
Commit message (Collapse)AuthorAgeFilesLines
* Add Imagine styleJ-P Nurmi2017-07-314-0/+608
| | | | | | | | | | | | | The Imagine style is based on image assets. The style comes with a default set of images, but the images can be easily changed by providing a directory with images using a predefined naming convention. [ChangeLog][Controls] Added the Imagine style, which is based on image assets that can be provided using a predefined naming convention. Task-number: QTPM-517 Change-Id: I550d7dac9a9686d60bec15655ac92dea9f36149c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix qdoc linking errorJ-P Nurmi2017-07-271-1/+1
| | | | | | | | | qtbase commit 237c867 removed the "Fusion Style Widget Gallery" topic. Link to "Qt Widget Gallery" which contains a screenshot of the Fusion style. Change-Id: I59a7fe238ea2090fed76a1ce022e7b844083e925 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: update MenuBar in the type comparison tableJ-P Nurmi2017-07-271-1/+3
| | | | | Change-Id: Icb63953315926d0126d2154ef2942791726621fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Introduce MenuBarJ-P Nurmi2017-07-266-0/+179
| | | | | | | | | | | | | | MenuBar is an ordinary Item. It can be located basically anywhere, but the idea is to introduce a new ApplicationWindow::menuBar property in a follow-up commit. Currently the example snippets are using the header property. [ChangeLog][Controls][MenuBar] Introduced a MenuBar control. Task-number: QTBUG-60350 Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: revise the custom menu exampleJ-P Nurmi2017-07-043-51/+106
| | | | | | | | | Use a single example for the whole menu. We can now use Actions and the delegate property to use the styled menu item for the whole menu. The same structure will be used for the upcoming MenuBar example. Change-Id: Idbaa38cc536b27a4d64eb9ad72c07936bf160d6e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* qtquickcontrols2-menus.qdoc: fix indentationJ-P Nurmi2017-07-041-7/+7
| | | | | Change-Id: Iaa20b703985b09200e4e5972b68a031b535d98dc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add missing qtquickcontrols2-fusion-thumbnail.pngJ-P Nurmi2017-06-221-0/+0
| | | | | Change-Id: I20c5c13d77d4adecebdcefcf074954ad923ee3d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-0816-95/+46
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-index.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/quicktemplates2/qquickapplicationwindow.cpp src/quicktemplates2/qquickmenu.cpp src/quicktemplates2/qquickmenu_p.h src/quicktemplates2/qquickpopup.cpp tests/auto/auto.pro Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d
| * Doc: reorganize the style imagesJ-P Nurmi2017-06-0716-71/+40
| | | | | | | | | | | | Task-number: QTBUG-60995 Change-Id: I3083a7a2bb39d242f31a9c5d0bfed66dbdb88202 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-062-140/+420
|\| | | | | | | | | | | | | | | | | | | | | | | | | Fusion style ComboBox popup height was adjusted according to 90a0d402 to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass with the Fusion style. Conflicts: src/imports/controls/ComboBox.qml src/imports/controls/material/ComboBox.qml src/imports/controls/universal/ComboBox.qml Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
| * Doc: improve margin documentationMitch Curtis2017-05-312-140/+420
| | | | | | | | | | | | | | | | | | | | - Add margins to the Popup Layout diagram. - For each margin property, mention that margins are the distance between the popup edge and the window edge. - Link to Popup Layout from each margin property. Change-Id: I8226ea341f6825b7cfe67e1427ce853671e5a54e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add support for configurable palettesJ-P Nurmi2017-06-021-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A style's default palette is specified in qtquickcontrols2.conf in a "Palette" group under the style's section. QSettings supports the following two alternative syntaxes: [Fusion] Palette\Window=#dedede Palette\WindowText=#212121 or [Fusion\Palette] Window=#dedede WindowText=#212121 Change-Id: I01bf44d9e332064e955e95f619de634fcb79f010 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add support for configurable fontsJ-P Nurmi2017-05-311-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A style's default font is specified in qtquickcontrols2.conf in a "Font" group under the style's section. QSettings supports the following two alternative syntaxes: [Default] Font\Family=Open Sans Font\PixelSize=20 or [Default\Font] Family=Open Sans PixelSize=20 [ChangeLog][Controls] Added support for specifying the default font for different styles in qtquickcontrols2.conf. Change-Id: I54e1efb79a2913eab35174dbf09b6956fe740e28 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Say hello to the Fusion styleJ-P Nurmi2017-05-306-11/+129
| | | | | | | | | | | | | | | | [ChangeLog][Controls] Introduced a Fusion style that offers a platform agnostic desktop-oriented look'n'feel. Change-Id: Id1c1baf10f4b3a79e89bcc72f6d170ed0b2cc8b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-203-11/+11
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ApplicationWindow.qml src/imports/controls/material/ApplicationWindow.qml src/imports/controls/universal/ApplicationWindow.qml src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
| * Doc: add missing "is" to the Default style docsJ-P Nurmi2017-05-191-1/+1
| | | | | | | | | | Change-Id: I85d28c1a0651317a684b2cc34f1f032e8221b27c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * qtquickcontrols2-styles.qdoc: align indentationJ-P Nurmi2017-05-191-1/+1
| | | | | | | | | | Change-Id: I42bbc0f491653f45a19455a2e4c5afbd7be008ef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: make the list of topic pages lighter to readJ-P Nurmi2017-05-151-9/+9
| | | | | | | | | | Change-Id: I9b46b32f0f2dc48c45c4e83d44cdc8bf3fc56184 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add Qt 5.10 to the version tableJ-P Nurmi2017-05-121-0/+5
| | | | | | | | | | Change-Id: I14d29514e75d9f0821106261380d6cd28f6450fc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-111-2/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5c6398e4146e62109bef231fe358b7ed69fa9488
| * Cleanup obsolete references to doc/snippets/screenshotsJ-P Nurmi2017-05-041-2/+1
| | | | | | | | | | Change-Id: Ia631cd493d695aaac44d612f234756b4e5b558dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: improve the button icon docsJ-P Nurmi2017-05-111-0/+6
| | | | | | | | | | Change-Id: I597e133146f5a7f2c6bc26a43361391f80a44fdd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-0386-2/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/universal/CheckDelegate.qml src/imports/controls/universal/RadioDelegate.qml src/imports/controls/universal/Switch.qml src/imports/controls/universal/SwitchDelegate.qml Change-Id: I9bca4b8d9ce3f6c5c7589daa0ced7d0353f42efc
| * tst_snippets: take screenshots only when requestedJ-P Nurmi2017-05-0383-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The component loading code has been adjusted so that it can load snippets that use either a Window root element too. This speeds up the test a lot in the CI, and allows us to flatten the snippet-structure. Set SCREENSHOTS=1 environment variable to take screenshots. Change-Id: Ibd9e76befe62044dd1374899f18ea3d8c7ad454b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Use strict comparisonFrederik Schwarzer2017-05-031-1/+1
| | | | | | | | | | Change-Id: I4829480765c96cf7a2ad94a223f9078f70703db4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add Action & ActionGroup to the type comparison tableJ-P Nurmi2017-04-191-10/+12
| | | | | | | | | | Change-Id: Ida65087787e132c3a82b33135fea01b00deda4fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-111-3/+1
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontrol.cpp Change-Id: I73a9946da4214dcb8c877e716af5a8bb64335f69
| * Doc: update the type comparison tableJ-P Nurmi2017-04-111-3/+1
| | | | | | | | | | | | | | ComboBox::editable was added in Qt Quick Controls 2.2 in Qt 5.9. Change-Id: I5db1a6448a23d0e4f539f11c074270670b83899f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add ActionJ-P Nurmi2017-04-101-0/+56
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Action] Introduced Action, an abstract user interface action that can have shortcuts and be assigned to buttons. Task-number: QTBUG-50705 Change-Id: I1986cc7ed13cdf428d51ae38cd196a20493fde8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-061-8/+35
|\| | | | | | | | | | | | | Conflicts: src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
| * Doc: highlight the Wearable Demo on the index pageJ-P Nurmi2017-04-061-0/+1
| | | | | | | | | | Change-Id: Ib7eb50df859ea598aac806dbd44f150f2b77e4e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: replace "released" with "introduced" on the index pageJ-P Nurmi2017-04-031-1/+1
| | | | | | | | | | | | | | | | To use the same "was introduced in Qt 5.7" phrasing already used at the top of the page. Change-Id: I3736a1c3e87aa91e7fa3b8a41370f4b2252e793d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add style screenshots on the index pageJ-P Nurmi2017-04-031-0/+30
| | | | | | | | | | | | | | To make it more clear what the controls are and how they look. Change-Id: I6ce9a56a1692d90900952be798d7b254bc067dbb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: merge controls & styles columns in the version tableJ-P Nurmi2017-04-031-7/+3
| | | | | | | | | | | | | | | | | | | | The version table added in c9cd624 looked fine in locally generated docs, but it seems to get a bit too wide in the online snapshots (the table becomes horizontally scrollable). => Merge the controls and styles columns that all have the same version. Change-Id: Icb8387f95211ddee030cb410594adc9a6fad5c97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-032-2/+44
|\| | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ComboBox.qml src/imports/controls/material/ComboBox.qml src/imports/controls/universal/ComboBox.qml Change-Id: Ib900bb6298c32245399f52980b44575b64b7409f
| * Doc: Correct two link errorsv5.9.0-beta1Nico Vertriest2017-03-301-2/+2
| | | | | | | | | | | | | | | | qtquickcontrols2-customize.qdoc:28: Can't link to 'Creating Qt Quick Projects' qtquickcontrols2-customize.qdoc:28: warning: Can't link to 'Creating C++ Classes' Change-Id: I5ddc57215fd65fa6a80819ee694b5e031676f5a7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: list available import versions in each Qt releaseJ-P Nurmi2017-03-291-0/+42
| | | | | | | | | | Change-Id: I5bce83d66615f11588988947d088d4b6ce5240b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-305-9/+59
|\| | | | | | | | | | | | | Conflicts: src/imports/controls/RangeSlider.qml Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
| * Doc: restore the slider tooltip snippetJ-P Nurmi2017-03-141-0/+53
| | | | | | | | | | | | | | | | The snippet was removed in b026ebf67 when Slider::live was added, but it was not noticed that the snippet was also used in Tooltip docs. Change-Id: I8dac3bb90bc44ca447f9e34d0015443e6245d894 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
| * Default: visually indicate RangeSlider’s rangeMitch Curtis2017-03-061-0/+0
| | | | | | | | | | | | | | | | This makes the range that the user has selected clear, and is already done by other styles. Change-Id: Ib8f2c81e823193fa9934587d04fc011aafc0bd65 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve qtquickcontrols2-buttons.qdocMitch Curtis2017-03-061-8/+5
| | | | | | | | | | Change-Id: Ie417f6377016e1a28122efefcc9fcef5e642d027 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve qtquickcontrols2-popups.qdocMitch Curtis2017-03-061-1/+1
| | | | | | | | | | Change-Id: Iaf3159b993ada20a30a8208f7cfe92731966a3f7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix Button GIFMitch Curtis2017-03-021-0/+0
| | | | | | | | | | | | | | | | The background didn't show up unless setHighQuality(true) was used. Task-number: QTBUG-59233 Change-Id: Ief04c48b7c82d5c6be2e63de5c515cdf763a2064 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | AbstractButton: add display propertyMitch Curtis2017-03-286-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This property allows control over how icons and text are displayed within buttons, without having to implement custom delegates. It is also necessary for the upcoming Action type. [ChangeLog][Controls][AbstractButton] Added display property to allow control over how icons and text are displayed within buttons, without having to implement custom delegates. Task-number: QTBUG-49820 Change-Id: Ie924e2c54ed49961fd40129999875c8175606ecd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | AbstractButton: add support for iconsMitch Curtis2017-03-241-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the following properties to AbstractButton: - icon.name - icon.source - icon.width - icon.height - icon.color Derived types implement the behavior behind these properties using the new private IconImage type. [ChangeLog][Controls][AbstractButton] Added support for icons. The following properties are now available for derived types to use: icon.name, icon.source, icon.width, icon.height, icon.color. Task-number: QTBUG-49820 Change-Id: I3b5e4eaac390543deef60883e13539646a6bb060 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-01141-686/+680
|\| | | | | | | Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
| * Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-24141-671/+619
| | | | | | | | | | | | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff 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>
* | Update the QML module versions from 2.2 to 2.3J-P Nurmi2017-02-204-5/+5
|/ | | | | Change-Id: Iefb73973e7950246cd364dbb7e47dc096508e4d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge dev into 5.9Oswald Buddenhagen2017-02-0113-16/+303
|\ | | | | | | Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 11:37:44 +0000