aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2
Commit message (Collapse)AuthorAgeFilesLines
...
* Wearable: merge MainContainer.qml into wearable.qmlJ-P Nurmi2017-03-133-108/+28
| | | | | | | Utilize the header-content-footer layout of AppWindow. Change-Id: I50a53fd5c372161af738e5d53085c669cf2614b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: add NaviButtonJ-P Nurmi2017-03-133-124/+98
| | | | | | | | Replace the hand-made home/back buttons with an AbstractButton-based custom type. Change-Id: Icc2555e9ef67ae7461a072caf2dae780aaeafba2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove unused importsJ-P Nurmi2017-03-132-3/+0
| | | | | | | | qmlimportscanner would detect these as dependencies and deploy them for nothing, which would be wasteful on a wearable device. Change-Id: I687a9f7e136210d1213eb6575429102bcb472d78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: set the application background in the windowJ-P Nurmi2017-03-133-19/+7
| | | | | | | ApplicationWindow comes with built-in support for custom backgrounds. Change-Id: I524d346a39f28e916d87bef738ad0492ee686c0c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: utilize the styling systemJ-P Nurmi2017-03-1319-66/+70
| | | | | Change-Id: I6b7068c0416cdd16a98752241f6c3105652c9c08 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: replace translucent borderless Rectangles with plain ItemsJ-P Nurmi2017-03-135-20/+6
| | | | | Change-Id: Ie27fe1f7181dd7aad49062d2a37eb3a4a7db3781 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove PageContainerJ-P Nurmi2017-03-1311-69/+8
| | | | | | | The init() function and done() signal were both unused. Change-Id: I302e196ad6b0da423f0efb3394e307f6c3ed8c8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add Wearable demoShrikant Dhumal2017-03-1374-1/+3278
| | | | | Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add missing includesJ-P Nurmi2017-02-241-0/+1
| | | | | | | Found while doing a -no-accessibility build. Change-Id: I9772316eed3d544b21926970371a590ef2c15bef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-2469-152/+772
| | | | | | | | | | 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: be consistent about the dot at the end of example descriptionsJ-P Nurmi2017-01-112-2/+2
| | | | | Change-Id: Ie20ad311623020a439ecb701b0360fd72640fcb7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update the remaining copyright yearsJ-P Nurmi2017-01-116-6/+6
| | | | | | | Already done in 5.8 (00a0626) - these files are new in dev. Change-Id: I534c7512a69d4c24ed9ce8191325556beb0fb1f7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-1173-73/+73
|\ | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * Welcome to 2017J-P Nurmi2017-01-0973-73/+73
| | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-0514-1/+889
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
| * Flat Style exampleThomas Hartmann2017-01-0514-1/+889
| | | | | | | | | | | | | | | | | | This example shows how to integrate custom styled components with tooling. The example uses states in the styling items, so they can be easily edited and checked in the designer. Change-Id: Ie665bb3938cdb1b135dbbd4163e1b901e61a6be0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add DelayButtonJ-P Nurmi2017-01-022-0/+65
| | | | | | | | | | | | | | [ChangeLog][Controls][DelayButton] Added DelayButton. Change-Id: I94820dfb41ba9b90f0a29cda01ac476b54cf3de8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add "Swipe to Remove" exampleJ-P Nurmi2016-12-208-1/+314
| | | | | | | | | | Change-Id: Ibab960ddd073ddcdfbf2b6e4492882662c7021b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Side Panel exampleJ-P Nurmi2016-12-0111-1/+321
| | | | | | | | | | | | Task-number: QTBUG-53169 Change-Id: I1d84d2fc9cbfce0fa71703f469bb6d5030e41d67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Drawer::interactiveJ-P Nurmi2016-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Drawer] Added interactive property that specifies whether the drawer reacts to swipes. This can be used to make drawer a non-closable persistent side-bar. Task-number: QTBUG-53169 Change-Id: I00a794b5ce47b86fcb28e0db784ca0488cd13a7d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-256-137/+89
|\| | | | | | | Change-Id: If528b9f4e502c50e0cd76df75404e257232f0d18
| * Overhaul the Contact List example - part IIJ-P Nurmi2016-11-226-137/+89
| | | | | | | | | | | | | | | | | | | | Move the Edit and Remove buttons from the delegate to a context menu that is triggered on press-and-hold. Get rid of a lot of custom font sizes and hardcoded geometries. This ensures that the example looks sensible on all platforms, styles, scale factors, system fonts... Change-Id: If03f917c98b71c93be9292117116e9fa48e3e6fe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ComboBox::editableJ-P Nurmi2016-11-241-1/+24
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-2114-270/+241
|\| | | | | | | Change-Id: If96a7e488b7964e56c06c9e367ff9c91f1bba526
| * Whitespace fixesJ-P Nurmi2016-11-201-1/+1
| | | | | | | | | | Change-Id: I4eab43944ec03b79d713db1c6756e76cbfa38b30 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * qtquickcontrols2-contactlist.qdoc: remove stray image-tagJ-P Nurmi2016-11-201-1/+1
| | | | | | | | | | Change-Id: I7c88bfbe8e7d3738302d859e4dafc2d0b5fdfee3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Overhaul the Contact List exampleJ-P Nurmi2016-11-186-89/+90
| | | | | | | | | | | | | | | | Some renames, API tweaks, and structural changes. Glue the pieces (view/model/dialog) together in contactlist.qml. Change-Id: Id3a31248b391838c6d39f2f0f355e1c35456ccf5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Contact List: tweak the section headerJ-P Nurmi2016-11-182-21/+8
| | | | | | | | | | | | | | | | | | Replace the old-fashioned gradient with a ToolBar. It stands out more than well enough, and is fully style-agnostic. Also, give descriptive IDs for better designer integration/preview. Change-Id: Ib2d4404e3c0fa769ac661645046a25e578f62d37 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Contact List: give the contact dialog focusJ-P Nurmi2016-11-172-0/+2
| | | | | | | | | | Change-Id: Id8d48a42e283e262c44a9f2c64268459a4a11050 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Contact List: add dialog titlesJ-P Nurmi2016-11-171-0/+2
| | | | | | | | | | Change-Id: Ia842791e28380fd672d3edfe0e6acad0613a64ae Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Contact List: cleanup the list viewJ-P Nurmi2016-11-171-4/+1
| | | | | | | | | | | | | | No clipping, current index, or x-coordinates needed. Change-Id: Ibfb4a8e1159072a84ee229607b28e7f4010eb925 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Contact List: fix model insertionJ-P Nurmi2016-11-171-3/+5
| | | | | | | | | | | | | | | | New contacts must be inserted in alphabetical order so the sections stay sane. Change-Id: I39279bbeb429198b38a2b4da1d76eb50bfab723c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Contact List: simplify the ContactModel gettersJ-P Nurmi2016-11-171-12/+4
| | | | | | | | | | | | | | QList::value() does the boundary checking for us. Change-Id: I6965e6be861da86d35e6f30f74c94ba39e4ad2ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Contact List: rename AddressModel to ContactModelJ-P Nurmi2016-11-178-53/+53
| | | | | | | | | | Change-Id: I2da41a5d108b5da23dc969d30c50138ef7e42cc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Contact List: cosmetic cleanupJ-P Nurmi2016-11-177-30/+18
| | | | | | | | | | Change-Id: I5782451235269cac8c4e6aaf319a30151cb599ef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-1725-108/+1029
|\| | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickstyle.cpp src/quicktemplates2/qquickslider.cpp Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
| * Contact List example: replace Qt Quick primitives with ControlsJ-P Nurmi2016-11-174-32/+25
| | | | | | | | | | | | | | | | This ensures that we get the correct colors when running with different styles. Change-Id: If249f9704fbe157aab1b121cf7d09ee05ab85c14 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Contact List example: make ContactDelegate.ui.qml designableJ-P Nurmi2016-11-171-19/+5
| | | | | | | | | | | | | | | | | | Replace the MouseArea and its onClicked signal handler with a checkable AbstractButton to achieve declarative bindings and that way make it possible to open ContactDelegate.ui.qml in Qt Quick Designer. Change-Id: I764e0adc23d4a0d44dd6660ed14e224a4e0e30c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Gallery: improve designer compatibilityJ-P Nurmi2016-11-179-27/+5
| | | | | | | | | | | | | | | | | | | | Get rid of some unnecessary Math.min/max() calculations, and let the controls just stay at their implicit size. As for the buttons, we can use ColumnLayout + Layout.fillWidth to ensure that they all have the same size. Change-Id: Iaed29b330d7edc1f5d2c05d8815a559d52d52bcc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Gallery: kill some useless pagesJ-P Nurmi2016-11-174-211/+0
| | | | | | | | | | | | | | | | | | | | | | | | The pages for drawer, menu, and popup were pretty useless, because they did not really illustrate how the respective controls are used. They were just opening the side drawer, options menu, and settings dialog from elsewhere in the app. Coincidentally, these pages also contained some imperative signal handlers, which prevents them from being opened in Qt Quick Designer. Change-Id: Iad606c05a1289d22e2f25c28a16581b979a58da6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Adding new example Contact ListThomas Hartmann2016-11-1715-1/+1176
| | | | | | | | | | | | | | | | | | | | This example shows how to integrate a C++ backend without disrupting the tooling. A custom list model is implemented in C++ and registered as a QML type. Change-Id: I958bc38797ef353cdb5ea23ec69ada67e132ced7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/devJ-P Nurmi2016-11-112-0/+217
|\|
| * Gallery: add a page for dialogsJ-P Nurmi2016-11-022-0/+217
| | | | | | | | | | Change-Id: Ib29a41d9d3fc4940e94ee59be109aefbb35db043 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickStyle::availableStyles()J-P Nurmi2016-11-102-1/+2
|/ | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-311-4/+13
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Gallery: make the drawer usable with keyboardJ-P Nurmi2016-10-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Give it focus, and remove the check for the current index. It's a leftover from the days when Gallery used to replace the current page instead of doing a push. It looked silly to replace a page with the same page. This can no longer happen, because the drawer is not even accessible when navigated to a control page. And when navigating the drawer with keyboard, it is exactly the current item that must be triggered when you hit the spacebar. :) Change-Id: I00b48fbe4dd61b06041cb0c3370dfa9c12505dcf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Gallery: add Escape shortcutJ-P Nurmi2016-10-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This does not work very well, yet. The purpose is to demonstrate the lack of co-operation between of QML Shortcuts vs. QQC2 Popups. For example, the back navigation shortcut activates in the background when the modal settings dialog is open. The consequent commits are going to fix these issues step by step. Task-number: QTBUG-56562 Change-Id: Iceafc175f4da8054b65d664a3e0faf0087d0dec5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickDialog::titleJ-P Nurmi2016-10-261-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Use relative paths for imagesThomas Hartmann2016-10-226-8/+8
| | | | | | | | | | | | | | This is easier to handle for tooling. Change-Id: Ib6b20f06426324bc5d1bd4b66f72d9b0e9a0da87 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Gallery: fix the height of the settings dialogJ-P Nurmi2016-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The settings dialog used to be a plain Popup, which does not provide buttons. There were manually created Ok and Cancel buttons in a column together with the other contents, and the height of the column was used to calculate the total height of the dialog. Now that the new Dialog type with support for standard buttons is used, the height of the column is no longer sufficient since the dialog buttons are not part of it. Just let the dialog calculate the appropriate height based on its width and content. Change-Id: Ib4edf6e525214429887ad4ec6371ac0b5624c2e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>