aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/templates
Commit message (Collapse)AuthorAgeFilesLines
* Fix Shortcut to respect modal popupsJ-P Nurmi2016-10-311-0/+19
| | | | | | | | | | | | | | | In the Gallery example, the back navigation shortcut no longer activates when the settings dialog or the about dialog is open. Notice that the back navigation shortcut still activates while the options menu is open. [ChangeLog][Controls][Popup] The QML Shortcut type from QtQuick has been fixed to respect modal popups from QtQuick Controls 2. Task-number: QTBUG-56562 Change-Id: I4c3c762e9db0935ef250ff9f8c553e7d211220c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Templates: add missing QML type registrationsJ-P Nurmi2016-05-271-0/+6
| | | | | Change-Id: Ida61ff0290e92fd1df230636b558480d4831051f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesMitch Curtis2016-05-231-10/+10
| | | | | Change-Id: I289b31aa989ef1b3eb172394a94ce9ae81e02098 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* SwipeDelegate: rename exposure to swipe, active to completeMitch Curtis2016-05-231-1/+1
| | | | | | | | | "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>
* ComboBox: increase/decrease() => increment/decrementCurrentIndex()J-P Nurmi2016-05-201-2/+2
| | | | | | | | | ComboBox does not have a value-property, unlike Slider, SpinBox, Dial, and ScrollBar. Change-Id: I9832ef8df1532d4cb85b981b164c7c85e8a82135 Task-number: QTBUG-53519 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/doc/qtlabscontrols.qdocconf src/imports/controls/doc/qtquickcontrols2.qdocconf src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp src/imports/controls/qtlabscontrolsplugin.cpp src/imports/controls/qtquickcontrols2plugin.cpp src/imports/templates/qtlabstemplatesplugin.cpp src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I6159e681b77e4a0a293b6bd7fb11a46d58873da0
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: Ie2b5a93f0b6ed16276b80fcb9e118a49a055194c Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Add support for flat ButtonsJ-P Nurmi2016-05-181-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-51054 Change-Id: Ib4b23b624bc34d16c5acc1568881b609d3fd64b8 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Templates: update plugins.qmltypesJ-P Nurmi2016-05-041-11/+24
| | | | | | | | | | Change-Id: Iba946a30ed91f2885b109cf07d343257aff8b5b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Revert Tumbler::displacement to position changesJ-P Nurmi2016-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 150d8fcc7f97e4a5d56bdcf608fa22533d807677 and 0905066bcbb967d3344d399383d0ea4b30e1d489 that broke Tumbler. The normalized position calculation did not work in some corner cases (eg. when the total amount of model items is just 2). Therefore, just go back to "displacement"; and if we ever get this working correctly, we can call it position and deprecate displacement. Task-number: QTBUG-53061 Change-Id: Ic721f8a96c250dd5d40f881ff991fae687311996 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ComboBox: separate indicatorJ-P Nurmi2016-04-281-0/+1
| | | | | | | | | | | | | | | | This makes it possible to hide or replace either ComboBox background or content item without losing the built-in indicator. Change-Id: I308bbaa8190eba04ff3048a20c2d2ed0431a24f2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Tumbler: rename displacement to positionJ-P Nurmi2016-04-271-1/+1
| | | | | | | | | | Change-Id: Ifd44408b896343bdf77ea7b890360917944e2018 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Popup: separate modal and modeless background dimmingJ-P Nurmi2016-04-271-1/+3
| | | | | | | | | | | | | | | | | | | | iOS generally has white popups on white background, so it must dim the overlay background also for modeless popups to make them stand out. Make it possible to have modal and modeless background dimming separately, because both might be visible at the same time (eg. in Gallery settings). Change-Id: Id990675c8d06ceb8f8a26e6505d4bd020069f297 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Control: rename activeKeyFocus to visualFocusJ-P Nurmi2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | This is a bit more flexible, because the name is not strictly coupled with key focus. We can even add a (re)setter later if we want. This change only renames the property. Change-Id: I6707e44040f584480a8712df1af0915ae2829d57 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Allow attaching TextArea to a FlickableJ-P Nurmi2016-04-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | It is not always possible to let TextArea grow infinitely, but in some cases it should be scrollable on its own. Even though it is not a built-in feature of TextArea like in Qt Quick Controls 1, this change makes it straight-forward to attach TextArea to a Flickable. This makes TextArea behave like a standalone scrollable editor. Change-Id: I8181e8ebe0edbcdfef2c30c9e102db7cbe4ff705 Task-number: QTBUG-51677 Task-number: QTBUG-52169 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Register the latest revisions of all template/control base classesJ-P Nurmi2016-04-251-3/+5
| | | | | | | | | | Change-Id: I06dd52c7792a790b7525792e9831c70baec0f40b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update plugins.qmltypesJ-P Nurmi2016-04-211-52/+318
| | | | | | | | | | Change-Id: I38729bb888c4a8df797dfac056c5b025a6d9a67f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | import Qt.labs.templates 1.0 => QtQuick.Templates 2.0J-P Nurmi2016-04-213-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though there never was such thing is QtQuick.Templates 1.0, we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0 (next step). The templates define (and in the future, revision) the API of the controls, so the two must have the same version or it will get messy. Docs and plugins.qmltypes will be updated in follow up commits. Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Templates: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | | | | | | | | This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. Change-Id: I39ef9cbb00f55a32b7a43f11ffbdfbb40b84e124 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Templates: rename the plugin to QtQuickTemplates2PluginJ-P Nurmi2016-04-133-9/+9
| | | | | | | | | | Change-Id: I1e17d682cfbd2c7b1d6246a9fedf805f5b514cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-132-44/+44
| | | | | | | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add SwitchDelegateMitch Curtis2016-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Add RadioDelegateMitch Curtis2016-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Introduce ToolTipJ-P Nurmi2016-03-221-0/+3
| | | | | | | | | | | | Change-Id: I917f7e83219788fc63389773eb07ee39757bed7f Task-number: QTBUG-51003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove RangeSlider::track in favor of Control::backgroundJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I11e519f5226bf44d18b42fd31276c5528b18ec46 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove Slider::track in favor of Control::backgroundJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I664f4227ff55876be2594c8855dacc7c92eddc94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | ProgressBar: use contentItem instead of indicatorJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | Change-Id: I8bd21b32b6f3d333c119d77b629b46fe411c06eb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: add increase(), decrease() and stepSizeJ-P Nurmi2016-03-211-0/+3
| | | | | | | | | | Change-Id: I052b650fee7ae94cc826446d285d653a41bd1e75 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: use contentItem instead of handleJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | | | | | | | Thanks to virtual resizeContent() we can finally use contentItem like everywhere else, and cleanup the special handle item. Change-Id: I9e52ec3ff327d19cda3d85d2e2d9b73d80442bbc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollIndicator: use contentItem instead of indicatorJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | | | | | | | Thanks to virtual resizeContent() we can finally use contentItem like everywhere else, and cleanup the special indicator item. Change-Id: Ia2bd62684d49a05c199e490750a31c13d2c22182 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Correct generated resource namesMitch Curtis2016-03-181-1/+1
| | | | | | | | | | | | | | | | a0d44a16535cc6e751045185e40bbd6c6edaf87a changed them when it shouldn't have. Change-Id: Ifadf02254a32618aa1490cb64278109a1098ff96 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-183-50/+50
| | | | | | | | | | | | | | | | | | 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>
* | Add SwipeDelegateMitch Curtis2016-03-151-0/+3
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-041-0/+1
|\| | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp Change-Id: Ic5cdde7a2d9daa0e616de999969a4399db23245b
| * Register QQuickItem revision 2J-P Nurmi2016-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This makes the following revisioned properties and invokable methods in QQuickItem available to QQuickControl and its subclasses: - activeFocusOnTab - rev1 - nextItemInFocusChain() - rev1 - grabToImage() - rev2 Change-Id: Id7ce43630c1f8d76dd58cc0944ec8a0b1e77c3ef Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add ApplicationWindow::backgroundJ-P Nurmi2016-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convenient for setting a stylish background that covers the whole window, that is, goes below the header and footer. The same already works with Page, since it inherits Control. import QtQuick 2.6 import Qt.labs.controls 1.0 ApplicationWindow { visible: true width: 400; height: 400 header: ToolBar { opacity: 0.5 } footer: ToolBar { opacity: 0.5 } background: Rectangle { gradient: Gradient { GradientStop { position: 0.0; color: "lightsalmon" } GradientStop { position: 1.0; color: "salmon" } } } } Change-Id: I57219779913c178cacfe4cbc4bf3a524b213d2c0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Control: add hoverEnabled and hovered propertiesJ-P Nurmi2016-02-251-0/+2
| | | | | | | | | | | | Change-Id: I35946b9f13ef78ce7bdfbad9706de3e96bd48ea4 Task-number: QTBUG-50003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add Control::wheelEnabledJ-P Nurmi2016-02-241-0/+1
| | | | | | | | | | | | | | | | Change-Id: I1ea2c93e908c98119ba25e3e40e02ab96eca8dd2 Task-number: QTBUG-50220 Task-number: QTBUG-50221 Task-number: QTBUG-50222 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add SpinBox::editable propertyJ-P Nurmi2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | The default value is false, which is more mobile/embedded/touch friendly choice, and will be also in line with ComboBox::editable when it gets introduced sometime in the future. Change-Id: Iaaad8f5533100c2d5c4b49d1ef8ee849cf31feff Task-number: QTBUG-51114 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update plugins.qmltypesJ-P Nurmi2016-02-221-1/+23
| | | | | | | | | | | | Change-Id: I54d19667a4f72c34174b8235f9ae24b533be2209 Task-number: QTBUG-51278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-121-0/+1
|\| | | | | | | | | | | | | Conflicts: src/templates/qquickabstractbutton.cpp Change-Id: Icfd472451a150524dded704b4be5d286da21a6da
| * Add AbstractButton::pressAndHold() signalJ-P Nurmi2016-02-071-0/+1
| | | | | | | | | | Change-Id: I41e96a61bfb25b81bad748f559894bf8e2984427 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-02-071-0/+5
|\| | | | | | | | | | | | | Conflicts: src/imports/controls/universal/ToolButton.qml Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
| * QQuickPopup: add some missing propertiesJ-P Nurmi2016-02-061-0/+5
| | | | | | | | | | Change-Id: I7df64587bf3ba289ba027f6dbe9872362532ec41 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Remove AbstractButton::label in favor of contentItemJ-P Nurmi2016-02-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been on the TODO list for a long time and should have been done earlier. It's time to cleanup the API and remove all the delegate properties that became redundant when Control::contentItem was introduced. The biggest benefit of using Control::contentItem is that it is resized and positioned automatically, so we save a few QML bindings. Furthemore, contentItem is a common naming pattern in Qt Quick (Window, Flickable) and therefore less likely to conflict with IDs in user code (a thing that always bothered me with "label"). Change-Id: I8143a9f08d726db31cf4618670af48bd37f80b89 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-311-3/+10
|\| | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp src/templates/qquickpopup_p_p.h src/templates/qquickspinbox_p.h Change-Id: Ief25ad2d27410f62e90879f60499ed87359406c3
| * Update plugins.qmltypesJ-P Nurmi2016-01-301-3/+10
| | | | | | | | | | Change-Id: I1b7c15c57ca491561bf082ab53967455a6299529 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-281-179/+68
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/templates/qquickapplicationwindow_p.h src/templates/qquickcombobox.cpp src/templates/qquickcombobox_p.h src/templates/qquickpopup.cpp Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
| * AbstractButton: remove the mouse params from signalsJ-P Nurmi2016-01-281-170/+4
| | | | | | | | | | | | | | | | If we ever want to expose these, the name would be something else than "mouse"... :) Change-Id: Ie9dad16e84708059fd0b43d4764925db7b014d64 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 03:03:48 +0000