aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-312-1/+12
|\ | | | | | | Change-Id: I697f98d5214f487c915032d744ec593da05368a8
| * Explain the benefits of customizing a control vs creating a styleMitch Curtis2018-01-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | Mention that customizing a control is nice because you don't need to start from scratch with a template. Add a third requirement for "Definition of a Style" that mentions that the top level item must be a template, and why. Change-Id: I4db4ec8311baed46fb45271d107204808ba42592 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Link to Customizing doc from Styling docMitch Curtis2018-01-191-0/+1
| | | | | | | | | | | | | | These two things are closely related. Change-Id: I1b4586f7835af6bd9f82aaa6eeb75fe1ef6ba65d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: provide examples of setting Imagine pathMitch Curtis2018-01-241-0/+28
| | | | | | | | | | | | | | Remove any ambiguity about how the paths might be specified. Change-Id: I004e13349a54ded9a41586a8f5a564731a821585 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-181-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Tumbler.qml src/quicktemplates2/qquicktumbler.cpp src/quicktemplates2/qquicktumbler_p.h src/quicktemplates2/qquicktumbler_p_p.h Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
| * Tumbler: qualify references to visibleItemCount with "control"Mitch Curtis2018-01-171-1/+1
| | | | | | | | | | | | | | | | This code currently works, but we prefer to use control.<property> to access properties directly. Change-Id: Ieba95bffdd0b0a9b33373524248d0ac06e9f2a3d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-1011-14/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/CheckBox.qml src/imports/controls/CheckDelegate.qml src/imports/controls/ComboBox.qml src/imports/controls/DelayButton.qml src/imports/controls/Dial.qml src/imports/controls/ItemDelegate.qml src/imports/controls/MenuItem.qml src/imports/controls/RadioButton.qml src/imports/controls/RadioDelegate.qml src/imports/controls/SwipeDelegate.qml src/imports/controls/Switch.qml src/imports/controls/SwitchDelegate.qml src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc src/imports/controls/material/CheckDelegate.qml src/imports/controls/material/ItemDelegate.qml src/imports/controls/material/MenuItem.qml src/imports/controls/material/RadioDelegate.qml src/imports/controls/material/SwipeDelegate.qml src/imports/controls/material/SwitchDelegate.qml src/imports/controls/qquickdefaultbusyindicator.cpp src/imports/controls/qquickdefaultbusyindicator_p.h src/imports/controls/qtquickcontrols2plugin.cpp src/imports/controls/universal/CheckDelegate.qml src/imports/controls/universal/ItemDelegate.qml src/imports/controls/universal/MenuItem.qml src/imports/controls/universal/RadioDelegate.qml src/imports/controls/universal/SwipeDelegate.qml src/imports/controls/universal/SwitchDelegate.qml src/quickcontrols2/quickcontrols2.pri src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickmenu.cpp src/quicktemplates2/qquickpopup_p.h Change-Id: Ib25c8b4a7fe018b7c0ade9b02bfaaa6980118c15
| * Doc: improve Style/FallbackStyle documentationMitch Curtis2018-01-041-2/+29
| | | | | | | | | | | | | | | | | | Link to relevant documentation and add entries for the Controls section to the configuration file docs. Task-number: QTBUG-65445 Change-Id: I175866167e36403475520ea4de0cb299aae542d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Document license and attribute third party codeKai Koehne2018-01-041-0/+13
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Document constants from AngularJS in src/imports/controls/material/ElevationEffect.qml Task-number: QTBUG-65409 Change-Id: Ibd0dcf643abe036f34cea364f267fde8510057ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Examples: cleanup unnecessary/wrong property assignmentsJ-P Nurmi2017-12-209-11/+0
| | | | | | | | | | Change-Id: Id7c65c9493c0e70512f3f2b167a091ece06ee5d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-12-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro src/imports/controls/ComboBox.qml src/quicktemplates2/qquickabstractbutton.cpp src/quicktemplates2/qquickabstractbutton_p.h src/quicktemplates2/qquickapplicationwindow_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p.h src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquicklabel_p.h src/quicktemplates2/qquicklabel_p_p.h src/quicktemplates2/qquickslider_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquicktextarea_p.h src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p.h src/quicktemplates2/qquicktextfield_p_p.h tests/auto/auto.pro tests/auto/controls/data/tst_combobox.qml Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
| * Doc: mention indicator in customizing ComboBoxJ-P Nurmi2017-12-111-1/+1
| | | | | | | | | | Change-Id: I24ae2872dd74c682e24dbeda563c0fa281ae5522 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: link to Imagine examples from index and Imagine pagesMitch Curtis2017-12-132-0/+4
| | | | | | | | | | Change-Id: I8dfe1ddca7d06553450bd3b7906a05e3530c3a85 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix outdated FDL license headerLiang Qi2017-11-163-12/+12
| | | | | | | | | | Change-Id: I969a911c3e66aff502188ff9a103f16dc6544ba5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Visualize mnemonicsJ-P Nurmi2017-11-021-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately this comes a bit late in the 5.10 cycle, but this should be released together with the rest of the mnemonics stuff going out in 5.10, because it affects the value of AbstractButton/Menu(Bar)Item::text. As the removed TODO comments and altered tests indicate, previously the ampersand was blatantly stripped out. It would be worse to change it later once people have already started using mnemonics and rely on the behavior in custom styles. The necessary modifications to QQuickText were added in qtdeclarative commit 65ef4ba. Task-number: QTBUG-61422 Change-Id: Iaa73da8c012e9a6019743cf98f5bdc02527064e5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: update the MenuBar snippet to use ApplicationWindow::menuBarJ-P Nurmi2017-11-021-3/+3
| | | | | | | | | | | | | | The property was added in commit 19e7fb3. Change-Id: Iae5e9f1076bc3312d78ffaf15027206ebd65046b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Wearable Demo: make use of the icon supportJ-P Nurmi2017-11-021-2/+2
| | | | | | | | | | Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Document palette as a basic QML typeJ-P Nurmi2017-10-272-65/+109
| | | | | | | | | | | | | | | | | | | | Unfortunately we need to manually add some \sa "palette QML Basic Type" links as a workaround until auto-linking to basic QML types in QML property headers is fixed in QDoc. Task-number: QTBUG-63469 Change-Id: I2ea853bfeda31905468741eb720f4daa242e703d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Docs: promote the icon docs on its own pageJ-P Nurmi2017-10-232-0/+170
| | | | | | | | | | | | | | | | | | | | - other controls (textfield, combobox, ...) will eventually gain support for icons too - advertise icon support on the index page amongst other important topics - document the steps for building an icon theme with high-dpi support Change-Id: I35ed76ef005d7e273beb5f5147ca92849adc0d90 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-221-4/+4
|\| | | | | | | Change-Id: I9188f94e40e2ecb4da1963ce2fcf915ab7a4b4fb
| * Fix outdated FDL license headerKai Koehne2017-10-181-4/+4
| | | | | | | | | | Change-Id: Ifbbc0695023d238f2066f3412e563fb663cdec74 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Docs: fix qtquickcontrols2-customize.qdocJ-P Nurmi2017-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | qtquickcontrols2-customize.qdoc:558: warning: Command '\skipto' failed at end of file 'qtquickcontrols2-menu-custom.qml' qtquickcontrols2-customize.qdoc:573: warning: Command '\skipto' failed at end of file 'qtquickcontrols2-menubar-custom.qml' Change-Id: Ica50d42e53522bdcb31fbc38f870856aa036f549 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Docs: remove bogus example image links for the Imagine styleJ-P Nurmi2017-10-201-96/+0
| | | | | | | | | | | | | | | | These assets were removed in cd7aae. Task-number: QTBUG-63895 Change-Id: I6f7c6d179723191708403f90f99e5c11b9f84fa7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-123-2/+10
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/quicktemplates2/qquickbuttongroup.cpp src/quicktemplates2/qquickoverlay.cpp tests/auto/controls/data/tst_buttongroup.qml Change-Id: Iae23aaf039c6095007966475294e93220dbead84
| * Doc: add missing title customization for GroupBoxMitch Curtis2017-10-102-0/+8
| | | | | | | | | | | | Task-number: QTBUG-63618 Change-Id: I6a32158726e4425dc24c24f4f9dc9cc80aa462bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: remove stray semicolons from SwipeDelegate snippetMitch Curtis2017-09-281-2/+2
| | | | | | | | | | Change-Id: I859b61880da16f6c58967700b179f35df656ed77 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: Remove reference to $PWD variable in the doc configVenugopal Shivashankar2017-10-112-6/+6
| | | | | | | | | | | | | | | | | | | | Apparently the environment variable is not resolved on Windows platform, leading to documentation build failure. Task-number: QTBUG-63626 Change-Id: Ia37a3f7f35007f6756f1b99422d7d6b70b9ae10f Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: add cover flow screenshot of stylesMitch Curtis2017-09-291-0/+0
| | | | | | | | | | Change-Id: I4ffcdbc519bd3e997552b5f4c1c81e01d5b1185c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: fix imagine style screenshotMitch Curtis2017-09-221-0/+0
| | | | | | | | | | | | | | It had some unrelated junk at the top. Change-Id: Ie6c394d3e8355e6117339d646e6384336b735bdc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: add section to styles docMitch Curtis2017-09-222-0/+7
| | | | | | | | | | Change-Id: I5d8a68d44dcfd1e3ed92361cc4706557ae253e3a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: Maintain highlighted examples list locallyVenugopal Shivashankar2017-09-202-0/+36
| | | | | | | | | | | | | | | | | | | | Added more examples to the list. Task-number: QTBUG-60647 Change-Id: Ia63ffde2749fb85b8c4f2f8e06183863ce15726a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: ":/imagine" shouldn't be used in the same dir as the conf fileMitch Curtis2017-09-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Quoting JP: "To support qtquick designer, the style is allowed to be a folder relative to the location of the .conf. Location of the conf is ":/" and there's a folder called "imagine" which matches the name of the qqc2 style so it tries to use that as the style folder for the .qml files." Change-Id: I35d8bd4dadc62430bc70cd744e7084b1c0dba4bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add Imagine style screenshotMitch Curtis2017-09-121-0/+0
| | | | | | | | | | Change-Id: I7814182f7026f7d93f96a6166889e0d71bc67338 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add "Asset Examples" section to Imagine docsMitch Curtis2017-09-122-1/+1887
| | | | | | | | | | | | | | | | This change adds a table of assets that designers can use as a reference when creating assets. Change-Id: I3de39889d14ccc87095d58a3582181349298fdcf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: clean up detailed descriptionMitch Curtis2017-09-121-7/+17
| | | | | | | | | | | | | | | | - Use the same format as the rest of the table. - Remove TODO, replace with section header Change-Id: Ic7ed6c4b5f297c3a5ac99bc17d1d6312690046b9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Bump QtQuick 2.9 imports to 2.10Mitch Curtis2017-09-0615-15/+15
| | | | | | | | | | Change-Id: I274146911cd8a204fcbf439da9259b0a38c8092e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: move qtquickcontrols2-applicationwindow-wireframe.pngJ-P Nurmi2017-09-041-0/+0
| | | | | | | | | | | | | | | | d375a74 accidentally placed the image to a wrong place. Move it together with the other doc files. Change-Id: Ibdc35c8fad25ee4a8da4875c6e1ce494cfd3a570 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-151-2/+2
|\| | | | | | | | | | | | | Conflicts: tests/auto/popup/tst_popup.cpp Change-Id: I32e6c6b646a00f8805cb82d181417db60a6fe6c8
| * Doc: fix custom SpinBox snippetMitch Curtis2017-07-311-2/+2
| | | | | | | | | | | | | | | | The snippet fails when pasted to a file where its not the root item, so qualify the binding with the control's id. Change-Id: Ibd16beaddafb112d1d9ecfad6914021ca9bdeede Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: add missing information to .qdocinc includesMitch Curtis2017-08-021-2/+11
| | | | | | | | | | | | | | | | - Supported environment variables - Supported configuration file options Change-Id: I0324f410fcf89667ea42d3fcf5a3749c2c3779fb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Improve "Qt Quick Controls 2 Configuration File" documentationMitch Curtis2017-08-021-4/+21
| | | | | | | | | | | | | | | | | | - Added sections to make it possible to link to them from other pages - Added section for the Imagine style - Improved wording Change-Id: I3e5e01a73d7411ee5e156f8f934d699ce57e00d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Imagine: document supported animated image formatsMitch Curtis2017-08-021-1/+2
| | | | | | | | | | Change-Id: I0c7b788c79882d25c74b95e54a9d1f0ce67f29a5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Imagine: create image for customization doc sectionMitch Curtis2017-08-023-1/+1
| | | | | | | | | | Change-Id: I28b80f65404003281825d04ec26d9be8886c0ed9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Imagine: document 9-patch imagesMitch Curtis2017-08-028-2/+63
| | | | | | | | | | Change-Id: I3791c48128aef011a89446ef443ba15ee990b112 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 00:28:00 +0000