aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/templates/plugins.qmltypes
Commit message (Collapse)AuthorAgeFilesLines
* Add ScrollViewJ-P Nurmi2017-01-271-0/+11
| | | | | | | | [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update plugins.qmltypesJ-P Nurmi2017-01-241-39/+143
| | | | | Change-Id: Ic16c8e0796178bd99fc7dd8c965c0ed1de8da9d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Restore AbstractButton::checkableJ-P Nurmi2016-11-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In 7a8f055, we hid the checkable property from QQuickAbstractButton and exposed it only in QQuickButton and QQuickMenuItem. The reasoning was that QQuickCheckBox, QQuickRadioButton, QQuickSwitch and their delegate counterparts are inherently checkable, so having the checkable property available in QML didn't seem to make sense. While this still holds true, there are other factors to take into consideration. AbstractButton is meant to be a generic base class for all types of buttons, but the lack of a checkable property makes it unusable as a base class for custom QML-based checkable buttons. If we want to a hide the checkable property from CheckBox, RadioButton, and Switch to avoid having it popup in the auto-completion list, we can probably do it in a less disruptive way via tooling. [ChangeLog][Controls][AbstractButton] The checkable property has been made accessible from QML. Previously it was only exposed for Button and MenuItem, but it is now available for any AbstractButton to make it possible to create custom QML-based checkable buttons. Task-number: QTBUG-51554 Change-Id: I19e29fc87cd15811c43c9b9ebb29701d66cde72f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-11-011-5/+14
| | | | | Change-Id: I859bcc03f3f980fd37df756c2922378c0d8c0827 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-10-051-11/+2
| | | | | Change-Id: I276dbd1464577fdee9c6920deb38e890c1a18daf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update .qmltypesMarco Benelli2016-09-121-875/+2
| | | | | Change-Id: I9551e7606cb1bda67058295cccd4a418a418bd24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-09-031-0/+17
| | | | | Change-Id: I0a2996deb02d873dc970f15ce6f6416b64baeab7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add ComboBox::flatJ-P Nurmi2016-08-111-2/+6
| | | | | | | | | [ChangeLog][ComboBox] Added a flat property that provides more suitable looks for using ComboBox in a ToolBar. Task-number: QTBUG-54935 Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypes for templates and controlsJ-P Nurmi2016-07-221-31/+235
| | | | | | | | | | | | | | | | | | | | | For src/imports/templates, simply running 'make qmltypes' does the job. With src/imports/controls, we must help qmlplugindump a bit: - pass the correct dependencies in a JSON file (or else qmlimportscanner will find .impl imports, which qmlplugindump will fail to import as stand-alone modules) - merge with the plugins.qmltypes from templates to achieve proper type hierarchy The full command for dumping QtQuick.Controls 2.1 types, also seen at the top of src/imports/controls/plugins.qmltypes: qmlplugindump -nonrelocatable QtQuick.Controls 2.1 \ -merge ../templates/plugins.qmltypes \ -dependencies dependencies.json Change-Id: I2d8a24e47e70dd8dd27a2f48fe640faeea8761e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SwipeView: add isNextItem and isPreviousItem attached propertiesJ-P Nurmi2016-06-061-0/+2
| | | | | | | | | [ChangeLog][SwipeView] Added isNextItem and isPreviousItem attached properties to make it straight-forward to use Loader for unloading pages that are outside the reach. Change-Id: Idb97d64282afaef58cc3302d3f558900a0d7d4b5 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>
* 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>
* 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>
* Update plugins.qmltypesJ-P Nurmi2016-04-211-52/+318
| | | | | Change-Id: I38729bb888c4a8df797dfac056c5b025a6d9a67f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* 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>
* 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>
* Update plugins.qmltypesJ-P Nurmi2016-01-301-3/+10
| | | | | Change-Id: I1b7c15c57ca491561bf082ab53967455a6299529 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* 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>
* Replace Popup::pressed|releasedOutside with close policy flagsJ-P Nurmi2016-01-281-3/+0
| | | | | Change-Id: I3e09c4e2b6cbbe39bdf9e943905664e5dc1fe954 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Popup::closePolicyJ-P Nurmi2016-01-281-0/+10
| | | | | Change-Id: Ie3d0f50a59aeaab36ec388af897cbf2596269ce3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2016-01-251-6/+54
| | | | | Change-Id: I26a8ae03e57df79fa87e26c3b650a49f2b89aeac Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Popup transitionsJ-P Nurmi2015-12-191-2/+2
| | | | | | | | | Use Android-inspired enter & exit, which eliminates the need of using a "transition" suffix, and also less prone to appear in auto-completion when new users try to open/show/close/hide popups. Change-Id: I3a448d3e9be33fbfffbf08488858aa63a70233f2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-12-171-10/+149
| | | | | | | | | The contents of templates/plugins.qmltypes has been manually copied to controls/plugins.qmltypes as suggested in the linked bug report. Change-Id: I6b71af2aa85f6e87f42689018f7814e5c139b7c8 Task-number: QTCREATORBUG-15137 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-11-031-4/+8
| | | | | Change-Id: Ia404b3a89088231f242838f3964e666016351e83 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Simplify TextField & TextArea placeholderJ-P Nurmi2015-10-301-2/+2
| | | | | | | | | | Better not expose the extra Text item in the API. Ideally it should be implemented as a scenegraph node. We might even want to promote the placeholderText property (and add placeholderColor) to TextInput and TextEdit in Qt Quick core. Change-Id: I4f443c77d1c696b87a50ee184f868713dd50316f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-10-291-0/+25
| | | | | Change-Id: I195aa7e2a6146298159f3364f7f651aa3e3996ba Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-10-161-15/+71
| | | | | | Change-Id: Ide6a6166398f82e93f42ca830b074284c5127c8c Task-number: QTBUG-48808 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update plugins.qmltypesJ-P Nurmi2015-10-011-259/+102
| | | | | Change-Id: I6ab27aec6ac86203a64d42482a7327b69b075554 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QtQuick.Templates QML pluginJ-P Nurmi2015-09-091-0/+1480
Change-Id: I32e7fa8b3610b793ca88cb17bd3fbc4f447838ff Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>