aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Example: Made the SpinBox editableVenugopal Shivashankar2016-08-021-0/+1
| | | | | | | | | | | The text on the SpinBoxPage mentions that the control value can be changed using the keyboard, which is possible only if the control is 'editable'. Task-number: QTBUG-55033 Change-Id: I5a01321d4677a298608f7fb88960301eb8bf1518 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Improve gallery example for Qt Quick DesignerThomas Hartmann2016-07-012-2/+2
| | | | | | | | | The Qt Quick Designer does not support the usage of unqualified properties of the root item. I guess there is no reason to not fully qualify them in examples. Change-Id: I962833bbc051551f2f0518975713c906f343337d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* Gallery: fix the default style settingJ-P Nurmi2016-06-151-1/+1
| | | | | | | | | | | | | | | | A problem noticed in release testing: Run the Gallery example without explicitly specifying any style. The Gallery runs with the Default style, but the settings dialog wrongly claims that it's running with the Universal style. The situation is easy to emulate by removing ~/.config/QtProject/Gallery.conf (to clear the previously stored style setting). => Fix the wrong default value (it was wrong because back in the days the Universal style was used by default). Change-Id: I7eb7565cb78e68cf5e85527e53724af217973584 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Gallery: update logos, icons, colors & screenshotsJ-P Nurmi2016-05-2426-3/+13
| | | | | Change-Id: I4b1bec349b3141cabd1882ae28a5ad53ae2cb029 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SwipeDelegate: rename exposure to swipe, active to completeMitch Curtis2016-05-231-4/+4
| | | | | | | | | "swipe" is both shorter and easier to understand. "complete" is easier to understand. Task-number: QTBUG-53519 Change-Id: I87ecba4ac878f033111ee56fa618b80b227858a7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Gallery: fix main page label text colorNikita Krupenko2016-05-061-1/+0
| | | | | Change-Id: Id822c3f80ef488ce08fd4ffe70eee103a92a4ecc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: Add proper elevation supportMichael Spencer2016-05-041-0/+9
| | | | | | | | | | | | - Added an ElevationEffect component based on elevation shadows from Angular Material - Use it on Button, ToolBar, ComboBox, Drawer, Pane, Popup, Menu, and Switch - Add an elevation property to the Material attached object - Update the button colors based on the elevation property Change-Id: I5152e1a56bdcb1016cc4f945a16ef510e0cdece6 Task-number: QTBUG-51276 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove TODO from Chat Tutorial documentationMitch Curtis2016-04-291-3/+0
| | | | | | | The image doesn't need to be regenerated. Change-Id: I47e089c0474b819308465e35dd1b0d1dc306d384 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Hide SwipeDelegate text when removingMitch Curtis2016-04-261-0/+1
| | | | | | | | | This avoids the issue where the delegate's height is animated to 0, but the text within the delegate goes outside the bounds of the delegate. Change-Id: Ic7ec64bfb6801dc23a3f65972a9acf18c0dbce1f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-2142-46/+46
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Chat Tutorial: update the install pathJ-P Nurmi2016-04-215-5/+5
| | | | | Change-Id: Ib4bd465d6c5d2f81f7dcce2f3eb547fe1cdc2360 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename qtquickcontrols.conf to qtquickcontrols2.confJ-P Nurmi2016-04-215-3/+3
| | | | | | | | Use the 2-suffix consistently everywhere to avoid any potential confusion with the old controls. Change-Id: I83aa212a15ed78b8694fb7d3db80fc8430aea969 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-20129-2/+2
|\ | | | | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
| * Flatten and rename example install path and directory structureMitch Curtis2016-04-1952-2/+2
| | | | | | | | | | | | | | Change-Id: Ib04e79d72c37fa4507517da2d3b1c28ccd73eaed Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
* | Use font from theme for list delegatesNikita Krupenko2016-04-141-0/+1
| | | | | | | | | | Change-Id: I48208fb6b5f7df6e1e824d36a256d9b1643cd16d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: add 2-suffix to the image assets and snippetsJ-P Nurmi2016-04-1324-22/+22
| | | | | | | | | | Change-Id: Ib8050cb3baefe07d28c7e2dcec64af155d2d7c9b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-131-1/+1
| | | | | | | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add SwitchDelegateMitch Curtis2016-04-131-1/+13
| | | | | | | | | | | | | | | | | | | | | | SwitchDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to Switch) to reflect what is most commonly seen on mobile. Change-Id: I6f8fca8d1a8c91f2cb9d8bbbb685ad163712dfa1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Remove mentions of tech previewMitch Curtis2016-04-131-4/+4
| | | | | | | | | | Change-Id: Ic1fe26207488fb15423c44ddbbb5447cb1edd662 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add RadioDelegateMitch Curtis2016-04-111-1/+18
| | | | | | | | | | | | | | | | | | | | | | RadioDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to RadioButton) to reflect what is most commonly seen on mobile. Change-Id: I143ee9a30cd8ce1d624354f4cb981c41dfddc2d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add CheckDelegateMitch Curtis2016-04-111-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | CheckDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to CheckBox) to reflect what is most commonly seen on mobile. Change-Id: I6fdac226fe87247052389b2e49f6cf20d7be44fb Task-number: QTBUG-52208 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | gallery: Add vertical slider to RangeSliderPageKonstantin Ritt2016-04-101-0/+8
| | | | | | | | | | Change-Id: I42a68accfbc493b1047a473ab786fe5d417b2265 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | gallery: Add vertical slider to SliderPageKonstantin Ritt2016-04-071-0/+7
| | | | | | | | | | Change-Id: I1e175917b12c5f41c2e43a5317da1220b24f296e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: Rename Qt Labs Controls to Qt Quick Controls 2Nico Vertriest2016-04-073-20/+20
| | | | | | | | | | | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iab8ca27d98a16a7c99bd364c66efc8b98d93eacc Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Inherit QQuickDrawer from QQuickPopupJ-P Nurmi2016-03-231-52/+47
| | | | | | | | | | | | Change-Id: Icf71270e63aedd93ba975ab9743de68c3a54e849 Task-number: QTBUG-51007 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Introduce ToolTipJ-P Nurmi2016-03-223-0/+70
| | | | | | | | | | | | Change-Id: I917f7e83219788fc63389773eb07ee39757bed7f Task-number: QTBUG-51003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: moved Gallery files to examples/controls/galleryNico Vertriest2016-03-224-0/+61
| | | | | | | | | | Change-Id: I5e15631a51fe01e2ff7ecc6ea4b464b3522b7882 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: moved chat tutorial to examples folderNico Vertriest2016-03-2220-0/+855
| | | | | | | | | | | | Change-Id: I152f29bfe9a202e9c0723e7aa2ebc8fa3c18e2d6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Change the default value of QQuickPopup::closePolicyJ-P Nurmi2016-03-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Popup::ClosePolicy was introduced, I thought that it would be better to not set OnPressOutside by default, because not all popups necessarily want to close on press outside. However, I've realized that every time I do Button { onClicked: popup.open() Popup { } } ...there's literally no interactive way to close the popup (popups don't take focus by default, so Esc doesn't work). Provided that a top-level QWidget with the Qt::Popup flag set also closes automatically on press outside, it probably makes more sense for us to follow the same pattern so that poor new users don't have to lookup the docs just to figure out how to make a popup close. :) In this case it's less troublesome to specify a different default value in those special scenarios/subclasses where closing on press outside is not desired (eg. the upcoming Popup-based Drawer). Change-Id: Iaeab4c548d63728df12232d8b65d469f0a2d80f5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | gallery.pro: add pages/*.qml to OTHER_FILESJ-P Nurmi2016-03-211-1/+2
| | | | | | | | | | | | | | So they show up in the QML tree in Qt Creator. Change-Id: I58d7e3c37a3d20451b48bcee7aaced3fb3461d9a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - config fileJ-P Nurmi2016-03-194-2/+2
| | | | | | | | | | Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Gallery: remove hard-coded Universal style from qtlabscontrols.confMitch Curtis2016-03-181-3/+0
| | | | | | | | | | | | | | This conflicts with the runtime settings menu in the app. Change-Id: If48205cada7eb9bedce3021160f4e6fb189138df Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-1/+1
| | | | | | | | | | | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Chat Tutorial: fix install targetsMitch Curtis2016-03-1810-79/+10
| | | | | | | | | | | | Change-Id: I6651ecffcc76953c06bc70e81b38c72aa1da9b02 Task-number: QTBUG-51918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-181-0/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/controls/qquickstyleattached_p.h src/imports/controls/material/qquickmaterialstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickpopup.cpp Change-Id: I17c3c4d1040b89838f0903e0a17069b835895199
| * Material: use proper shades for dark theme colorsNikita Krupenko2016-03-171-0/+1
| | | | | | | | | | | | | | | | This fixes colors for checked switch dark theme and raised highlighted button in both themes. Change-Id: I3c485fb1b779104d6d7f682921b34cb535312f7c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Gallery: use QQuickStyle to set the style in C++J-P Nurmi2016-03-173-3/+8
| | | | | | | | | | | | | | | | | | This consequently fixes Gallery to respect the -style command line argument and the QT_LABS_CONTROLS_STYLE environment variable. Change-Id: I0e92d1a51e539026a66b821ac425348c87a922c3 Task-number: QTBUG-50787 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add SwipeDelegateMitch Curtis2016-03-153-0/+166
| | | | | | | | | | | | | | | | | | | | SwipeDelegate presents a view item that can be swiped left or right to expose more options or information. It is used as a delegate in views such as ListView. Change-Id: I7533a2b223f652993b6cee730930ea6dc125c869 Task-number: QTBUG-51610 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add Chat TutorialMitch Curtis2016-02-2957-1/+2327
| | | | | | | | | | | | | | | | | | | | This is useful for beginners who may have not even used Qt Quick Controls before. It goes step-by-step (and in detail) to show how and why things are done the way they are. Change-Id: I527ff2ce429279e37b7cebb765588cb89b5c5e89 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Material TabBar: highlight at the top when the bar is at the bottomJ-P Nurmi2016-02-221-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Even though the Material Design Guidelines recommend against placing tabs at the bottom, we cannot prevent our users from doing that. It is the standard convention on iOS, for instance. Coincidentally, the official Google Translate app for iOS uses Material design, has tabs at the bottom, and has tab highlight at the top of the bar. A screen- shot is attached to QTBUG-50043. Change-Id: Id7c9398b8b4bc9d270f0d908b1a68d68f49d32f0 Task-number: QTBUG-50043 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-02-201-1/+0
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickapplicationwindow.cpp src/templates/qquickcontrol_p.h src/templates/qquickpage.cpp src/templates/qquickpopup.cpp src/templates/qquickpopup_p_p.h Change-Id: I265e0267afb22e3d3f80801191f1a810cd2be312
| * Gallery: remove conflicting anchorsJ-P Nurmi2016-02-191-1/+0
| | | | | | | | | | | | | | Exposed thanks to e19a9044. Change-Id: I9dea1af8e9a9d47391ddaf1fd9c8f7e0c210e9d5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Review text captions in Gallery exampleNico Vertriest2016-02-096-7/+11
| | | | | | | | | | | | Change-Id: Ife516e363938a50ce84cd6e3ce6aefcb37cd6e7d Task-number: QTBUG-50933 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Remove remaining references to AbstractButton::labelJ-P Nurmi2016-02-061-4/+8
|/ | | | | Change-Id: Ib9fb690dbaa27bb5d0ba2345ed7ba9b47c167a8e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Gallery: make the "restart required" label more visibleJ-P Nurmi2016-01-281-0/+1
| | | | | | | The red color is one of the secondary colors listed at brand.qt.io. Change-Id: Iea8afe0afe06ea033cb0ece864b6049d74765dfa Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Popup::closePolicyJ-P Nurmi2016-01-281-4/+2
| | | | | Change-Id: Ie3d0f50a59aeaab36ec388af897cbf2596269ce3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Popup::transformOriginJ-P Nurmi2016-01-251-0/+1
| | | | | Change-Id: I4a52468234f0479c1b8feb102e07686e3235ba3f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Popup: add implicit & content sizesJ-P Nurmi2016-01-231-5/+5
| | | | | | | Behaves the same way than the Pane/Frame/GroupBox container controls. Change-Id: I370f3961b77a363a63a0a64fc629cc5da6dfd53f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Popup::parentJ-P Nurmi2016-01-231-14/+14
| | | | | | | | | | | | | | | The parent defaults to the QML parent object where Popup is declared. Popup::x/y are relative to the parent, and the popup also automatically follows the parent as appropriate. QQuickPopupPositioner has been adapted from Qt Quick Controls 1. It was called QQuickScenePosListener, and it was implemented for the text selection handle popups. ComboBox's popup now follows the control eg. when scrolling, but the below/above positioning feature is temporarily gone missing. It will be restored in a follow up commit. Change-Id: I8a6b58cd74e07f33930abc35d0ab9da056685128 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Refactor PopupJ-P Nurmi2016-01-221-91/+78
| | | | | | | | | | | Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>