| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I9b76da5ab1b4a56d78aa0b0beeb7e3d1428fce63
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Id1eaec0bef90b5c4e963c7868cace84db740e799
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ib8050cb3baefe07d28c7e2dcec64af155d2d7c9b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I7c7c11675f340ab8110f38041434a91f72c9552e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I087a39baebc296a340739161874636926adaa56c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: If482a20ec956e0ed01c00d5ada119b33d39de99f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I1e17d682cfbd2c7b1d6246a9fedf805f5b514cb3
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I146da903b46f5c2caf865e37291c25376b49021a
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I0a3fe3a5ded3467ca404bf5e632dad5f60b08e77
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QQuickCheckBox, QQuickRadioButton and QQuickSwitch are inherently
checkable, so having this property available to QML doesn't make
sense.
QQuickButton and QQuickMenuItem are the two classes that need
to expose the property.
Change-Id: Ic421c195295c4bef0fc934c98fa9e781d98c9b67
Task-number: QTBUG-51554
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-52448
Change-Id: I4ee2c16f3dccc61e07268f9e8ced530a06d2adf3
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/controls/ScrollBar.qml
src/imports/controls/material/ScrollBar.qml
src/imports/controls/universal/ScrollBar.qml
src/templates/qquickscrollbar.cpp
tests/auto/controls/data/tst_scrollbar.qml
Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Id78ef819c56d4639c33e7b4823c2c2600486befa
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Padding was not taken into account when calculating the new position,
which caused there to be small offset between the mouse press and the
resulting handle position by the amount of padding used.
Task-number: QTBUG-52233
Change-Id: Ibd8c4375b030a27a6124aefc4bc9af570d14d3a9
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The following comment in QQmlDelegateModel::object() helped to find
a solution ie. using createdItem() instead of initItem():
If asynchronous is true or the component is being loaded asynchronously due
to an ancestor being loaded asynchronously, item() may return 0. In this
case createdItem() will be emitted when the item is available. [...]
Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8
Task-number: QTBUG-51972
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce -force
Change-Id: I40e902a2ddff05684ff90b178728c562c2cd8cd1
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The position is defined as a percentage of the indicator's size, not
the control's.
Change-Id: I5f758aa432413c2d93e394f19a1b1109e356a31d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This makes the controls visualize focus only when interacting with
keys, so this basically allows us to set for example Qt.StrongFocus
policy by default on buttons and friends.
Change-Id: I6c81c58b7acfd2bc592bdd12d804e7e48ee65e95
Task-number: QTBUG-51796
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I7b4b34e77c2bee4890871615d31af2f52afb39ac
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using pluginBasePath() ensures that it finds the qml files in the expected
place so it needs to use this to work correctly when statically built.
Change-Id: I685a98efc284a7c7d2b6a182f269a09e381a3472
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Non-default plugins aren't located under
qrc:/qt-project.org/imports/Qt/labs/controls, but rather a
sub-directory of it.
Change-Id: I9b6e21da29dd50a4aeb7b080a0f7a1d45b744be9
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a convenience property that combines Item::activeFocus and
Control::focusReason. This allows us to solve QTBUG-51796 in an elegant
way - we can simply set Qt::StrongFocus policy on most of the interactive
controls, such as buttons. The only thing we need to make sure is to use
activeKeyFocus instead of activeFocus in the styles. This ensures that key
focus is only visualized when actually interacting with keys - not when
interacting via touch or mouse. This is a generalized version of the
solution that was already used in the Universal style ApplicationWindow.
Change-Id: Ifbf78e3e412f3791c8f7c369bb2de53af9ac6b0f
Task-number: QTBUG-51796
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a common base class for QtQuickMaterialStylePlugin and
QtQuickUniversalStylePlugin that takes care of the proxy theme
installation and manages its life time by using a scoped pointer.
Change-Id: I2cbe38287565d284b18fab4265456a41a2dbd8d4
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Iec1762d4abed06ee6713288af9007dbebd7bfa6a
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ic1f3ad7f931af87bf1e0fb2938ce8d61351238b4
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ie6fea8d57886ba2c6ed3b3016cd6402f86395f34
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
QQuickProxyTheme's destructor restores platform_theme,
so keep proxy theme around and destroy it when we don't need it anymore.
Change-Id: I2fef7c295251af1cd944cea27531c1c117d34d51
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Passing null to i.e. Page's header resets the header item to Page's
initial value, so that Page with unset header must look exactly like
Page that never had header set.
Change-Id: I553e5d2463e099723b74b0eec1b2224ae8ee970f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
When the header or footer item's visibility changes, contentItem's
geometry have to be adjusted.
Change-Id: I9e73c48ff2301f8b371fc797ac4972ef5937b22f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I07d1b255baa741ae7c12ae2a04a348c5559f757c
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is needed to register private QML files that are necessary for
the implementation of some controls. Previously, this information
was only available in registerTypes().
Change-Id: I9d0c293d6fad2afbf240771044165b048b77136c
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A custom-shaped Button's contains() could return false just anywhere
within the content rect, so we should handle this exactly the same way
as for the drag threshold overrun.
Change-Id: Ie1665933be228334c6f95e97bd42e2dcd892b947
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-52156
Change-Id: Ic299475adeef7142e717699ba787b35e66b552c1
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Vlad Stelmahovsky <vladstelmahovsky@gmail.com>
|
| |
| |
| |
| |
| |
| |
| | |
Replaced all remaining instances of "Qt Labs Controls"
Change-Id: Iad784417b9b4ce015c11b4737dab2105b338ff5f
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Add "Delegate Controls" doc page. This will list future delegate
controls, such as CheckDelegate, RadioDelegate and SwitchDelegate.
- Add GIF for ItemDelegate.
Change-Id: If8c66ab2178185f96d190f29ef7815beaa6e8d68
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ic1c8c678f24d2c17d34c1ea7df82bd92806e29b9
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I6525612814ff5f2d56db53c305aa4a6ea057dcea
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
Don't evaluate condition twice. Just use result of width.
Change-Id: I38152353e7a2a5f60430684d38eb61140075d56f
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
Just cache it.
Change-Id: Ibc1ec94331be6b019834f39c570b9ec43aabbae7
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
Just cache it.
Change-Id: I3055352378b14e6ccebb6de91163f01da0b0b0d3
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Change \title, \page, and \l instances that used "qtlabs" instead
of "qtquick".
- Renamed the qdocconf file and changed the qch parameters in it to use
"Qt Quick Controls 2".
- Added "2" as output suffix for the html filenames.
Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Don't allocate memory to extract name: use QStringRef.
Replace QStringLiteral with QL1S to use QStringBuilder.
Extract color only when it's needed.
Change-Id: Ic02315e95defcffecce0128fb175b1d4a08db817
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace QString::arg() chain with multi-arg overloaded function.
It's faster because of args are replaced in one pass.
While touching the code, also cache width and height of bound.
Change-Id: Id8d19143f426ed1998713204dc9c8d4b51e58db5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... with known size and known value by according ctor.
Don't use appending for this case.
Change-Id: Ib2bf9703bb03bdfa628d1ae78c6d0353e991b3e4
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|