diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 22:16:49 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 22:17:44 +0300 |
| commit | 93816ce5a52d112b610f8af21ba46d384005a464 (patch) | |
| tree | acc22367aa1619a170a679a94f3f6a31809131c6 /src | |
| parent | fb3e0ab4ef69166bfdadbecb158573b60cadfe18 (diff) | |
| parent | f2e06ce60a8822d844221e77ca0a66f690855452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: If4e13f09012c80c1043fd0ee82bbddab50b1fad5
Diffstat (limited to 'src')
180 files changed, 2182 insertions, 196 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 46c33a28..bff591c7 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -51,8 +51,8 @@ T.BusyIndicator { implicitWidth: 48 implicitHeight: 48 - pen: Default.textColor - fill: Default.textColor + pen: control.palette.dark + fill: control.palette.dark opacity: control.running ? 1 : 0 visible: control.running || animator.running Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } } diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 8457e9b8..9562c904 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -55,9 +55,9 @@ T.Button { icon.width: 24 icon.height: 24 - icon.color: Color.transparent(checked || highlighted ? Default.textLightColor : - visualFocus ? Default.focusColor : down ? Default.textDarkColor : Default.textColor, - enabled || highlighted || checked ? 1 : 0.3) + icon.color: control.checked || control.highlighted ? control.palette.brightText : + control.visualFocus ? control.palette.highlight : + control.flat && !control.down ? control.palette.windowText : control.palette.buttonText contentItem: IconLabel { spacing: control.spacing @@ -67,9 +67,9 @@ T.Button { icon: control.icon text: control.text font: control.font - color: Color.transparent(control.checked || control.highlighted ? Default.textLightColor : - control.visualFocus ? Default.focusColor : control.down ? Default.textDarkColor : Default.textColor, - enabled || control.highlighted || control.checked ? 1 : 0.3) + color: control.checked || control.highlighted ? control.palette.brightText : + control.visualFocus ? control.palette.highlight : + control.flat && !control.down ? control.palette.windowText : control.palette.buttonText } background: Rectangle { diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 52dedac9..94d9ebca 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -64,11 +64,10 @@ T.CheckBox { text: control.text font: control.font - color: control.down ? Default.textDarkColor : Default.textColor + color: control.palette.windowText elide: Text.ElideRight visible: control.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter - opacity: enabled ? 1 : 0.3 } } diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index a73a8567..cee40c21 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -54,7 +54,7 @@ T.CheckDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.text contentItem: IconLabel { leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 @@ -68,7 +68,7 @@ T.CheckDelegate { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.text } indicator: CheckIndicator { diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 5d3274ad..5bbe273b 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -84,12 +84,11 @@ T.ComboBox { validator: control.validator font: control.font - color: !control.editable && control.visualFocus ? Default.focusColor : Default.textColor - selectionColor: Default.focusColor - selectedTextColor: Default.textLightColor + color: !control.editable && control.visualFocus ? Default.focusColor : control.palette.text + selectionColor: control.palette.highlight + selectedTextColor: control.palette.highlightedText horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter - opacity: control.enabled ? 1 : 0.3 background: Rectangle { visible: control.editable && !control.flat diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml index 8f279391..835d6b25 100644 --- a/src/imports/controls/DelayButton.qml +++ b/src/imports/controls/DelayButton.qml @@ -79,7 +79,7 @@ T.DelayButton { text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor) + color: control.visualFocus ? control.palette.highlight : control.palette.buttonText horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -102,7 +102,7 @@ T.DelayButton { text: control.text font: control.font opacity: enabled ? 1 : 0.3 - color: Default.textLightColor + color: control.palette.brightText horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 24636ca3..dc529bd6 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -60,7 +60,7 @@ T.GroupBox { text: control.title font: control.font - color: control.enabled ? Default.textColor : Default.textDisabledColor + color: control.palette.windowText elide: Text.ElideRight horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index 7beaca12..a03deac0 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -54,7 +54,7 @@ T.ItemDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.text contentItem: IconLabel { spacing: control.spacing @@ -65,7 +65,7 @@ T.ItemDelegate { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.text } background: Rectangle { diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index a1533506..aa02918f 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -42,6 +42,6 @@ import QtQuick.Templates 2.4 as T T.Label { id: control - color: Default.textDarkColor - linkColor: Default.textLinkColor + color: control.palette.windowText + linkColor: control.palette.link } diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 088dfc85..e8d1d426 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -70,7 +70,7 @@ T.MenuItem { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.windowText } indicator: ColorImage { diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 34df4e94..9d048002 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -55,7 +55,7 @@ T.PageIndicator { implicitHeight: 8 radius: width / 2 - color: Default.pageIndicatorColor + color: control.palette.dark opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 Behavior on opacity { OpacityAnimator { duration: 100 } } diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 1b0a3394..8fa7ba21 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -53,7 +53,7 @@ T.ProgressBar { scale: control.mirrored ? -1 : 1 progress: control.position indeterminate: control.visible && control.indeterminate - color: Default.textColor + color: control.palette.dark } background: Rectangle { @@ -64,6 +64,6 @@ T.ProgressBar { width: control.availableWidth height: 6 - color: Default.progressBarColor + color: control.palette.light } } diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 41fc7025..747f3a9f 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -64,11 +64,10 @@ T.RadioButton { text: control.text font: control.font - color: control.down ? Default.textDarkColor : Default.textColor + color: control.palette.windowText elide: Text.ElideRight visible: control.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter - opacity: enabled ? 1 : 0.3 } } diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index e6e31e6c..9a84685d 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -54,7 +54,7 @@ T.RadioDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.text contentItem: IconLabel { leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0 @@ -68,7 +68,7 @@ T.RadioDelegate { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.text } indicator: RadioIndicator { diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml index 37b1b5b7..f4431132 100644 --- a/src/imports/controls/RoundButton.qml +++ b/src/imports/controls/RoundButton.qml @@ -53,10 +53,9 @@ T.RoundButton { icon.width: 24 icon.height: 24 - icon.color: Color.transparent(checked || highlighted ? Default.textLightColor - : visualFocus ? Default.focusColor - : down ? Default.textDarkColor : Default.textColor, - enabled || highlighted || checked ? 1 : 0.3) + icon.color: control.checked || control.highlighted ? control.palette.brightText : + control.visualFocus ? control.palette.highlight : + control.flat && !control.down ? control.palette.windowText : control.palette.buttonText contentItem: IconLabel { spacing: control.spacing @@ -66,10 +65,9 @@ T.RoundButton { icon: control.icon text: control.text font: control.font - color: Color.transparent(control.checked || control.highlighted ? Default.textLightColor - : control.visualFocus ? Default.focusColor - : control.down ? Default.textDarkColor : Default.textColor, - enabled || control.highlighted || control.checked ? 1 : 0.3) + color: control.checked || control.highlighted ? control.palette.brightText : + control.visualFocus ? control.palette.highlight : + control.flat && !control.down ? control.palette.windowText : control.palette.buttonText } background: Rectangle { diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index b5aee02b..0855d2f0 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -65,12 +65,11 @@ T.SpinBox { contentItem: TextInput { z: 2 text: control.textFromValue(control.value, control.locale) - opacity: control.enabled ? 1 : 0.3 font: control.font - color: Default.textColor - selectionColor: Default.focusColor - selectedTextColor: Default.textLightColor + color: control.palette.text + selectionColor: control.palette.highlight + selectedTextColor: control.palette.highlightedText horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index f9b2a153..bed2ed03 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -54,7 +54,7 @@ T.SwipeDelegate { icon.width: 24 icon.height: 24 - icon.color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.text swipe.transition: Transition { SmoothedAnimation { velocity: 3; easing.type: Easing.InOutCubic } } @@ -67,7 +67,7 @@ T.SwipeDelegate { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.text } background: Rectangle { diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 06959732..05f64124 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -64,7 +64,7 @@ T.Switch { text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.windowText elide: Text.ElideRight visible: control.text horizontalAlignment: Text.AlignLeft diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index c5626144..4fb5fa5c 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -54,7 +54,7 @@ T.SwitchDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.text indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 @@ -74,7 +74,7 @@ T.SwitchDelegate { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.text } background: Rectangle { diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 24b66f7a..af705c43 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -52,10 +52,9 @@ T.TextArea { padding: 6 leftPadding: padding + 4 - opacity: enabled ? 1 : 0.2 - color: Default.textColor - selectionColor: Default.textSelectionColor - selectedTextColor: color + color: control.palette.text + selectionColor: control.palette.highlight + selectedTextColor: control.palette.highlightedText PlaceholderText { id: placeholder @@ -66,7 +65,7 @@ T.TextArea { text: control.placeholderText font: control.font - color: Default.textDisabledLightColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index dd7b5237..7a8ffe45 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -52,10 +52,9 @@ T.TextField { padding: 6 leftPadding: padding + 4 - opacity: enabled ? 1 : 0.2 - color: Default.textColor - selectionColor: Default.textSelectionColor - selectedTextColor: color + color: control.palette.text + selectionColor: control.palette.highlight + selectedTextColor: control.palette.highlightedText verticalAlignment: TextInput.AlignVCenter PlaceholderText { @@ -67,7 +66,7 @@ T.TextField { text: control.placeholderText font: control.font - color: Default.textDisabledColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight @@ -77,7 +76,7 @@ T.TextField { implicitWidth: 200 implicitHeight: 40 border.width: control.activeFocus ? 2 : 1 - color: control.enabled ? Default.backgroundColor : Default.disabledDarkColor + color: control.enabled ? Default.backgroundColor : Default.indicatorFrameDisabledColor border.color: control.activeFocus ? Default.focusColor : (control.enabled ? Default.disabledLightColor : "transparent") } } diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml index 55b49644..46f7f577 100644 --- a/src/imports/controls/ToolTip.qml +++ b/src/imports/controls/ToolTip.qml @@ -58,10 +58,12 @@ T.ToolTip { contentItem: Text { text: control.text font: control.font + color: control.palette.toolTipText // TODO: wrapMode: Label.Wrap } background: Rectangle { - border.color: Default.frameDarkColor + border.color: control.palette.dark + color: control.palette.toolTipBase } } diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 5595a51f..25c00162 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -47,9 +47,9 @@ T.Tumbler { delegate: Text { id: label text: modelData - color: control.visualFocus ? Default.focusColor : Default.textDarkColor + color: control.visualFocus ? control.palette.highlight : control.palette.text font: control.font - opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) + opacity: 1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png Binary files differnew file mode 100644 index 00000000..b949ab7c --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-imagine-thumbnail.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-imagine.png b/src/imports/controls/doc/images/qtquickcontrols2-imagine.png Binary files differnew file mode 100644 index 00000000..1cf7a0f2 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-imagine.png diff --git a/src/imports/controls/doc/manifest-meta.qdocconf b/src/imports/controls/doc/manifest-meta.qdocconf new file mode 100644 index 00000000..74dbb41f --- /dev/null +++ b/src/imports/controls/doc/manifest-meta.qdocconf @@ -0,0 +1,35 @@ +# Additional meta information (attributes for matched entries, as well as tags) +# to be added to manifest.xml files. +# +# manifestmeta.filters = <filter1>,<filter2>,... +# +# manifestmeta.<filter>.names = <Module1>/<name1>,<Module2>/<name2>,.. +# manifestmeta.<filter>.attributes = <attribute1:value1>,<attribute2:value2>,.. +# manifestmeta.<filter>.tags = <tag1>,<tag2>,.. +# +# <filter>.names specify all the module/name combinations to apply the +# attributes/tags to. You can use simple wildcard matching by appending +# '*' at the end of name. +# +# Note: You cannot use operators (+, =, -) in the names. +# +# Examples: add a 'isHighlighted' attribute for two 'Analog Clock' examples, +# add a 'database' tag for QtSql examples, and a 'qt5' tag for all examples +# +# manifestmeta.filters = highlighted sql global +# +# manifestmeta.highlighted.names = "QtGui/Analog Clock Window Example" \ +# "QtWidgets/Analog Clock Example" +# manifestmeta.highlighted.attributes = isHighlighted:true +# +# manifestmeta.sql.names = "QtSql/*" +# manifestmeta.sql.tags = database +# +# manifestmeta.global.names = * +# manifestmeta.global.tags = qt5 + +manifestmeta.highlighted.names += "QtQuickControls2/Qt Quick Controls 2 - Gallery" \ + "QtQuickControls2/Qt Quick Controls 2 - Wearable Demo" \ + "QtQuickControls2/Qt Quick Controls 2 - Text Editor" \ + "QtQuickControls2/Qt Quick Controls 2 - Contact List" \ + "QtQuickControls2/Qt Quick Controls 2 - Side Panel" diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index 7f05247e..225b7bea 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($PWD/manifest-meta.qdocconf) project = QtQuickControls2 description = Qt Quick Controls 2 Reference Documentation @@ -48,7 +49,8 @@ sourcedirs += ../../../quicktemplates2 \ ../../templates/doc/src \ src -imagedirs += images +imagedirs += images \ + .. navigation.landingpage = "Qt Quick Controls 2" navigation.qmltypespage = "Qt Quick Controls 2 QML Types" diff --git a/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc b/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc index c5ffa9c1..8acec2a8 100644 --- a/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc +++ b/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc @@ -6,7 +6,10 @@ \row \li \c Path \li Specifies the \l {imagine-path-attached-prop}{path} to the directory that contains - the Imagine style assets. + the Imagine style assets. If not specified, the built-in assets are used. + + \note Due to a technical limitation, the path should not be named + \e "imagine" if it is relative to the \c qtquickcontrols2.conf file. \endtable //! [conf] @@ -19,5 +22,8 @@ \li \c QT_QUICK_CONTROLS_IMAGINE_PATH \li Specifies the path to the directory that contains the Imagine style assets. If not specified, the built-in assets are used. + + \note Due to a technical limitation, the path should not be named + \e "imagine" if it is relative to the \c qtquickcontrols2.conf file. \endtable //! [env] diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc index 8a3c3ebf..e1f974bd 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc @@ -67,7 +67,7 @@ possible, such as \c disabled, \c pressed, etc. This will ensure that interactive controls visually behave as the end user would expect them to. - TODO: mention priority order, scoring system? + \section2 Element Reference The following table lists which elements are supported for each control, along with the possible states for that element, and the file extension @@ -143,7 +143,7 @@ \li .9.png (or .png) \row \li \l DelayButton - \li background, progress, mask + \li background \li disabled, pressed, checked, checkable, focused, mirrored, hovered \li .9.png (or .png) \row @@ -248,10 +248,15 @@ \li .png \row \li \l MenuSeparator - \li background, separator + \li background \li disabled, mirrored \li .9.png (or .png) \row + \li + \li separator + \li same as above + \li .9.png (or .png) + \row \li \l Page \li background \li disabled, mirrored @@ -303,7 +308,7 @@ \li .9.png (or .png) \row \li \l RadioButton - \li background, indicator + \li background \li disabled, pressed, checked, focused, mirrored, hovered \li .9.png (or .png) \row @@ -413,7 +418,7 @@ \li .9.png (or .png) \row \li \l Switch - \li background, handle, indicator + \li background \li disabled, pressed, checked, focused, mirrored, hovered \li .9.png (or .png) \row @@ -428,7 +433,7 @@ \li .9.png (or .png) \row \li \l SwitchDelegate - \li background, handle, indicator + \li background \li disabled, pressed, checked, focused, highlighted, mirrored, hovered \li .9.png (or .png) \row @@ -473,10 +478,15 @@ \li .9.png (or .png) \row \li \l ToolSeparator - \li background, separator + \li background \li vertical, horizontal, disabled, mirrored \li .9.png (or .png) \row + \li + \li separator + \li same as above + \li .9.png (or .png) + \row \li \l ToolTip \li background \li @@ -488,6 +498,1891 @@ \li .9.png (or .png) \endtable + \section2 Asset Examples + + The following table lists examples of assets (taken from the default + Imagine style assets) for all controls. The list is not exhaustive, + as not all elements need assets, but it can be used as a guide + when creating your own assets. + + \table + \header + \li Control + \li Element + \li States + \li Asset + \li Notes + \row + \li \l ApplicationWindow + \li background + \li + \li \image imagine/images/applicationwindow-background.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li + \li overlay + \li + \li \image imagine/images/applicationwindow-overlay.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li + \li overlay + \li modal + \li \image imagine/images/applicationwindow-overlay-modal.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li \l Button + \li background + \li + \li \image imagine/images/button-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/button-background-disabled.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/button-background-focused.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/button-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/button-background-checked.9.png + \li + \row + \li + \li background + \li checked, disabled + \li \image imagine/images/button-background-checked-disabled.9.png + \li + \row + \li + \li background + \li checked, focused + \li \image imagine/images/button-background-checked-focused.9.png + \li + \row + \li + \li background + \li checked, hovered + \li \image imagine/images/button-background-checked-hovered.9.png + \li + \row + \li + \li background + \li highlighted + \li \image imagine/images/button-background-highlighted.9.png + \li + \row + \li + \li background + \li highlighted, disabled + \li \image imagine/images/button-background-highlighted-disabled.9.png + \li + \row + \li + \li background + \li highlighted, focused + \li \image imagine/images/button-background-highlighted-focused.9.png + \li + \row + \li + \li background + \li highlighted, hovered + \li \image imagine/images/button-background-highlighted-hovered.9.png + \li + \row + \li + \li background + \li highlighted, pressed + \li \image imagine/images/button-background-highlighted-pressed.9.png + \li + \row + \li + \li background + \li highlighted, checked + \li \image imagine/images/button-background-highlighted-checked.9.png + \li + \row + \li + \li background + \li highlighted, checkable, hovered + \li \image imagine/images/button-background-highlighted-checkable-hovered.9.png + \li + \row + \li + \li background + \li highlighted, checkable, pressed + \li \image imagine/images/button-background-highlighted-checkable-pressed.9.png + \li + \row + \li + \li background + \li highlighted, checkable, checked + \li \image imagine/images/button-background-highlighted-checkable-checked.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/button-background-hovered.9.png + \li + \row + \li + \li background + \li flat + \li \image imagine/images/button-background-flat.9.png + \li + \row + \li + \li background + \li flat, disabled + \li \image imagine/images/button-background-flat-disabled.9.png + \li + \row + \li + \li background + \li flat, hovered + \li \image imagine/images/button-background-flat-hovered.9.png + \li + \row + \li + \li background + \li flat, pressed + \li \image imagine/images/button-background-flat-pressed.9.png + \li + \row + \li + \li background + \li flat, checked + \li \image imagine/images/button-background-flat-checked.9.png + \li + \row + \li + \li background + \li flat, checkable + \li \image imagine/images/button-background-flat-checkable.9.png + \li + \row + \li + \li background + \li flat, checkable, hovered + \li \image imagine/images/button-background-flat-checkable-hovered.9.png + \li + \row + \li + \li background + \li flat, checkable, pressed + \li \image imagine/images/button-background-flat-checkable-pressed.9.png + \li + \row + \li + \li background + \li flat, checkable, checked, pressed + \li \image imagine/images/button-background-flat-checkable-checked-pressed.9.png + \li + \row + \li + \li background + \li flat, checkable, highlighted + \li \image imagine/images/button-background-flat-checkable-highlighted.9.png + \li + \row + \li + \li background + \li flat, checkable, highlighted, pressed + \li \image imagine/images/button-background-flat-checkable-highlighted-pressed.9.png + \li + \row + \li + \li background + \li flat, checkable, highlighted, checked + \li \image imagine/images/button-background-flat-checkable-highlighted-checked.9.png + \li + \row + \li \l CheckBox + \li indicator + \li + \li \image imagine/images/checkbox-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/checkbox-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/checkbox-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/checkbox-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/checkbox-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/checkbox-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/checkbox-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li partially, checked + \li \image imagine/images/checkbox-indicator-partially-checked.png + \li + \row + \li + \li indicator + \li partially, checked, pressed + \li \image imagine/images/checkbox-indicator-partially-checked-pressed.png + \li + \row + \li + \li indicator + \li partially, checked, focused + \li \image imagine/images/checkbox-indicator-partially-checked-focused.png + \li + \row + \li + \li indicator + \li partially, checked, hovered + \li \image imagine/images/checkbox-indicator-partially-checked-hovered.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/checkbox-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/checkbox-indicator-hovered.png + \li + \row + \li \l CheckDelegate + \li background + \li + \li \image imagine/images/checkdelegate-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/checkdelegate-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/checkdelegate-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/checkdelegate-background-checked.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/checkdelegate-background-focused.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/checkdelegate-background-hovered.9.png + \li + \row + \li + \li indicator + \li + \li \image imagine/images/checkdelegate-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/checkdelegate-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/checkdelegate-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/checkdelegate-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/checkdelegate-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/checkdelegate-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/checkdelegate-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/checkdelegate-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/checkdelegate-indicator-hovered.png + \li + \row + \li + \li indicator + \li partially, checked + \li \image imagine/images/checkdelegate-indicator-partially-checked.png + \li + \row + \li + \li indicator + \li partially, checked, pressed + \li \image imagine/images/checkdelegate-indicator-partially-checked-pressed.png + \li + \row + \li + \li indicator + \li partially, checked, focused + \li \image imagine/images/checkdelegate-indicator-partially-checked-focused.png + \li + \row + \li + \li indicator + \li partially, checked, hovered + \li \image imagine/images/checkdelegate-indicator-partially-checked-hovered.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/checkdelegate-indicator-hovered.png + \li + \row + \li \l ComboBox + \li background + \li + \li \image imagine/images/combobox-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/combobox-background-disabled.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/combobox-background-focused.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/combobox-background-hovered.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/combobox-background-pressed.9.png + \li + \row + \li + \li background + \li open + \li \image imagine/images/combobox-background-open.9.png + \li + \row + \li + \li background + \li editable + \li \image imagine/images/combobox-background-editable.9.png + \li + \row + \li + \li background + \li editable, focused + \li \image imagine/images/combobox-background-editable-focused.9.png + \li + \row + \li + \li background + \li editable, disabled + \li \image imagine/images/combobox-background-editable-disabled.9.png + \li + \row + \li + \li indicator + \li + \li \image imagine/images/combobox-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/combobox-indicator-disabled.png + \li + \row + \li + \li indicator + \li editable + \li \image imagine/images/combobox-indicator-editable.png + \li + \row + \li + \li indicator + \li editable, disabled + \li \image imagine/images/combobox-indicator-editable-disabled.png + \li + \row + \li + \li indicator + \li editable, mirrored + \li \image imagine/images/combobox-indicator-editable-mirrored.png + \li + \row + \li + \li indicator + \li editable, mirrored, disabled + \li \image imagine/images/combobox-indicator-editable-mirrored-disabled.png + \li + \row + \li + \li popup + \li + \li \image imagine/images/combobox-popup.9.png + \li + \row + \li \l DelayButton + \li background + \li + \li \image imagine/images/delaybutton-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/delaybutton-background-disabled.9.png + \li + \row + \li + \li background + \li disabled, checked + \li \image imagine/images/delaybutton-background-disabled-checked.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/delaybutton-background-focused.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/delaybutton-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/delaybutton-background-checked.9.png + \li + \row + \li + \li background + \li checked, focused + \li \image imagine/images/delaybutton-background-checked-focused.9.png + \li + \row + \li + \li background + \li checked, hovered + \li \image imagine/images/delaybutton-background-checked-hovered.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/delaybutton-background-hovered.9.png + \li + \row + \li + \li progress + \li + \li \image imagine/images/delaybutton-progress.9.png + \li + \row + \li + \li progress + \li disabled + \li \image imagine/images/delaybutton-progress-disabled.9.png + \li + \row + \li + \li mask + \li + \li \image imagine/images/delaybutton-mask.9.png + \li + \row + \li \l Dial + \li background + \li + \li \image imagine/images/dial-background.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/dial-background-disabled.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/dial-background-focused.png + \li + \row + \li + \li handle + \li + \li \image imagine/images/dial-handle.png + \li + \row + \li + \li handle + \li disabled + \li \image imagine/images/dial-handle-disabled.png + \li + \row + \li + \li handle + \li focused + \li \image imagine/images/dial-handle-focused.png + \li + \row + \li + \li handle + \li focused, pressed + \li \image imagine/images/dial-handle-focused-pressed.png + \li + \row + \li + \li handle + \li focused, hovered + \li \image imagine/images/dial-handle-focused-hovered.png + \li + \row + \li + \li handle + \li pressed + \li \image imagine/images/dial-handle-pressed.png + \li + \row + \li + \li handle + \li hovered + \li \image imagine/images/dial-handle-hovered.png + \li + \row + \li \l Dialog + \li background + \li + \li \image imagine/images/dialog-background.9.png + \li + \row + \li + \li overlay + \li + \li \image imagine/images/dialog-overlay.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li + \li overlay + \li modal + \li \image imagine/images/dialog-overlay-modal.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li \l DialogButtonBox + \li background + \li + \li \image imagine/images/dialogbuttonbox-background.9.png + \li + \row + \li \l Drawer + \li background + \li left + \li \image imagine/images/drawer-background-left.9.png + \li + \row + \li + \li background + \li right + \li \image imagine/images/drawer-background-right.9.png + \li + \row + \li + \li background + \li top + \li \image imagine/images/drawer-background-top.9.png + \li + \row + \li + \li background + \li bottom + \li \image imagine/images/drawer-background-bottom.9.png + \li + \row + \li + \li overlay + \li + \li \image imagine/images/drawer-overlay.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li + \li overlay + \li modal + \li \image imagine/images/drawer-overlay-modal.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li \l Frame + \li background + \li + \li \image imagine/images/frame-background.9.png + \li + \row + \li \l GroupBox + \li background + \li + \li \image imagine/images/groupbox-background.9.png + \li + \row + \li + \li title + \li + \li \image imagine/images/groupbox-title.9.png + \li + \row + \li \l ItemDelegate + \li background + \li + \li \image imagine/images/itemdelegate-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/itemdelegate-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/itemdelegate-background-pressed.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/itemdelegate-background-focused.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/itemdelegate-background-hovered.9.png + \li + \row + \li + \li background + \li highlighted + \li \image imagine/images/itemdelegate-background-highlighted.9.png + \li + \row + \li \l Menu + \li background + \li + \li \image imagine/images/menu-background.9.png + \li + \row + \li \l MenuItem + \li background + \li + \li \image imagine/images/menuitem-background.9.png + \li + \row + \li + \li background + \li highlighted + \li \image imagine/images/menuitem-background-highlighted.9.png + \li + \row + \li + \li arrow + \li + \li \image imagine/images/menuitem-arrow.png + \li + \row + \li + \li arrow + \li mirrored + \li \image imagine/images/menuitem-arrow-mirrored.png + \li + \row + \li + \li arrow + \li disabled + \li \image imagine/images/menuitem-arrow-disabled.png + \li + \row + \li + \li arrow + \li mirrored, disabled + \li \image imagine/images/menuitem-arrow-mirrored-disabled.png + \li + \row + \li + \li indicator + \li + \li \image imagine/images/menuitem-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/menuitem-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/menuitem-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/menuitem-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/menuitem-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/menuitem-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/menuitem-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/menuitem-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/menuitem-indicator-hovered.png + \li + \row + \li \l MenuSeparator + \li separator + \li + \li \image imagine/images/menuseparator-separator.9.png + \li + \row + \li \l Page + \li background + \li + \li \image imagine/images/page-background.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li \l PageIndicator + \li delegate + \li + \li \image imagine/images/pageindicator-delegate.png + \li + \row + \li + \li delegate + \li disabled + \li \image imagine/images/pageindicator-delegate-disabled.png + \li + \row + \li + \li delegate + \li disabled, current + \li \image imagine/images/pageindicator-delegate-disabled-current.png + \li + \row + \li + \li delegate + \li pressed + \li \image imagine/images/pageindicator-delegate-pressed.png + \li + \row + \li + \li delegate + \li current + \li \image imagine/images/pageindicator-delegate-current.png + \li + \row + \li + \li delegate + \li mirrored + \li \image imagine/images/pageindicator-delegate-mirrored.png + \li + \row + \li \l Pane + \li background + \li + \li \image imagine/images/pane-background.9.png + \li + \row + \li \l Popup + \li background + \li + \li \image imagine/images/popup-background.9.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li + \li overlay + \li + \li \image imagine/images/popup-overlay.png + \li \l {sup1}{See footnote} \sup 1 + \row + \li + \li overlay + \li modal + \li \image imagine/images/popup-overlay-modal.png + \li + \row + \li \l ProgressBar + \li background + \li + \li \image imagine/images/progressbar-background.9.png + \li + \row + \li + \li progress + \li + \li \image imagine/images/progressbar-progress.png + \li + \row + \li + \li mask + \li + \li \image imagine/images/progressbar-mask.9.png + \li + \row + \li \l RadioButton + \li indicator + \li + \li \image imagine/images/radiobutton-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/radiobutton-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/radiobutton-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/radiobutton-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/radiobutton-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/radiobutton-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/radiobutton-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/radiobutton-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/radiobutton-indicator-hovered.png + \li + \row + \li \l RadioDelegate + \li background + \li + \li \image imagine/images/radiodelegate-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/radiodelegate-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/radiodelegate-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/radiodelegate-background-checked.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/radiodelegate-background-focused.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/radiodelegate-background-hovered.9.png + \li + \row + \li + \li indicator + \li + \li \image imagine/images/radiodelegate-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/radiodelegate-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/radiodelegate-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/radiodelegate-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/radiodelegate-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/radiodelegate-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/radiodelegate-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/radiodelegate-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/radiodelegate-indicator-hovered.png + \li + \row + \li \l RangeSlider + \li background + \li vertical + \li \image imagine/images/rangeslider-background-vertical.9.png + \li + \row + \li + \li background + \li horizontal + \li \image imagine/images/rangeslider-background-horizontal.9.png + \li + \row + \li + \li progress + \li vertical + \li \image imagine/images/rangeslider-progress-vertical.9.png + \li + \row + \li + \li progress + \li vertical, disabled + \li \image imagine/images/rangeslider-progress-vertical-disabled.9.png + \li + \row + \li + \li progress + \li horizontal + \li \image imagine/images/rangeslider-progress-horizontal.9.png + \li + \row + \li + \li progress + \li horizontal, disabled + \li \image imagine/images/rangeslider-progress-horizontal-disabled.9.png + \li + \row + \li + \li handle + \li + \li \image imagine/images/rangeslider-handle.png + \li + \row + \li + \li handle + \li disabled + \li \image imagine/images/rangeslider-handle-disabled.png + \li + \row + \li + \li handle + \li focused + \li \image imagine/images/rangeslider-handle-focused.png + \li + \row + \li + \li handle + \li focused, hovered + \li \image imagine/images/rangeslider-handle-focused-hovered.png + \li + \row + \li + \li handle + \li focused, pressed + \li \image imagine/images/rangeslider-handle-focused-pressed.png + \li + \row + \li + \li handle + \li hovered + \li \image imagine/images/rangeslider-handle-hovered.png + \li + \row + \li + \li handle + \li pressed + \li \image imagine/images/rangeslider-handle-pressed.png + \li + \row + \li \l RoundButton + \li background + \li + \li \image imagine/images/roundbutton-background.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/roundbutton-background-disabled.png + \li + \row + \li + \li background + \li disabled, checked + \li \image imagine/images/roundbutton-background-disabled-checked.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/roundbutton-background-focused.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/roundbutton-background-pressed.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/roundbutton-background-checked.png + \li + \row + \li + \li background + \li checked, focused + \li \image imagine/images/roundbutton-background-checked-focused.png + \li + \row + \li + \li background + \li checked, hovered + \li \image imagine/images/roundbutton-background-checked-hovered.png + \li + \row + \li + \li background + \li highlighted + \li \image imagine/images/roundbutton-background-highlighted.png + \li + \row + \li + \li background + \li highlighted, pressed + \li \image imagine/images/roundbutton-background-highlighted-pressed.png + \li + \row + \li + \li background + \li highlighted, focused + \li \image imagine/images/roundbutton-background-highlighted-focused.png + \li + \row + \li + \li background + \li highlighted, hovered + \li \image imagine/images/roundbutton-background-highlighted-hovered.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/roundbutton-background-hovered.png + \li + \row + \li \l ScrollBar + \li handle + \li + \li \image imagine/images/scrollbar-handle.png + \li + \row + \li + \li handle + \li disabled + \li \image imagine/images/scrollbar-handle-disabled.png + \li + \row + \li + \li handle + \li interactive + \li \image imagine/images/scrollbar-handle-interactive.png + \li + \row + \li + \li handle + \li interactive, disabled + \li \image imagine/images/scrollbar-handle-interactive-disabled.png + \li + \row + \li + \li handle + \li interactive, pressed + \li \image imagine/images/scrollbar-handle-interactive-pressed.png + \li + \row + \li + \li handle + \li interactive, hovered + \li \image imagine/images/scrollbar-handle-interactive-hovered.png + \li + \row + \li \l ScrollIndicator + \li handle + \li + \li \image imagine/images/scrollindicator-handle.png + \li + \row + \li \l Slider + \li background + \li vertical + \li \image imagine/images/slider-background-vertical.9.png + \li + \row + \li + \li background + \li horizontal + \li \image imagine/images/slider-background-horizontal.9.png + \li + \row + \li + \li progress + \li vertical + \li \image imagine/images/slider-progress-vertical.9.png + \li + \row + \li + \li progress + \li vertical, disabled + \li \image imagine/images/slider-progress-vertical-disabled.9.png + \li + \row + \li + \li progress + \li horizontal + \li \image imagine/images/slider-progress-horizontal.9.png + \li + \row + \li + \li progress + \li horizontal, disabled + \li \image imagine/images/slider-progress-horizontal-disabled.9.png + \li + \row + \li + \li handle + \li + \li \image imagine/images/slider-handle.png + \li + \row + \li + \li handle + \li disabled + \li \image imagine/images/slider-handle-disabled.png + \li + \row + \li + \li handle + \li focused + \li \image imagine/images/slider-handle-focused.png + \li + \row + \li + \li handle + \li focused, hovered + \li \image imagine/images/slider-handle-focused-hovered.png + \li + \row + \li + \li handle + \li focused, pressed + \li \image imagine/images/slider-handle-focused-pressed.png + \li + \row + \li + \li handle + \li hovered + \li \image imagine/images/slider-handle-hovered.png + \li + \row + \li + \li handle + \li pressed + \li \image imagine/images/slider-handle-pressed.png + \li + \row + \li \l SpinBox + \li background + \li + \li \image imagine/images/spinbox-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/spinbox-background-disabled.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/spinbox-background-focused.9.png + \li + \row + \li + \li background + \li editable + \li \image imagine/images/spinbox-background-editable.9.png + \li + \row + \li + \li indicator + \li up + \li \image imagine/images/spinbox-indicator-up.9.png + \li + \row + \li + \li indicator + \li up, disabled + \li \image imagine/images/spinbox-indicator-up-disabled.9.png + \li + \row + \li + \li indicator + \li up, pressed + \li \image imagine/images/spinbox-indicator-up-pressed.9.png + \li + \row + \li + \li indicator + \li up, focused + \li \image imagine/images/spinbox-indicator-up-focused.9.png + \li + \row + \li + \li indicator + \li up, mirrored + \li \image imagine/images/spinbox-indicator-up-mirrored.9.png + \li + \row + \li + \li indicator + \li up, hovered + \li \image imagine/images/spinbox-indicator-up-hovered.9.png + \li + \row + \li + \li indicator + \li up, editable + \li \image imagine/images/spinbox-indicator-up-editable.9.png + \li + \row + \li + \li indicator + \li up, editable, pressed + \li \image imagine/images/spinbox-indicator-up-editable-pressed.9.png + \li + \row + \li + \li indicator + \li up, editable, focused + \li \image imagine/images/spinbox-indicator-up-editable-focused.9.png + \li + \row + \li + \li indicator + \li up, editable, mirrored + \li \image imagine/images/spinbox-indicator-up-editable-mirrored.9.png + \li + \row + \li + \li indicator + \li up, editable, hovered + \li \image imagine/images/spinbox-indicator-up-editable-hovered.9.png + \li + \row + \li + \li indicator + \li down + \li \image imagine/images/spinbox-indicator-down.9.png + \li + \row + \li + \li indicator + \li down, disabled + \li \image imagine/images/spinbox-indicator-down-disabled.9.png + \li + \row + \li + \li indicator + \li down, pressed + \li \image imagine/images/spinbox-indicator-down-pressed.9.png + \li + \row + \li + \li indicator + \li down, focused + \li \image imagine/images/spinbox-indicator-down-focused.9.png + \li + \row + \li + \li indicator + \li down, mirrored + \li \image imagine/images/spinbox-indicator-down-mirrored.9.png + \li + \row + \li + \li indicator + \li down, hovered + \li \image imagine/images/spinbox-indicator-down-hovered.9.png + \li + \row + \li + \li indicator + \li down, editable + \li \image imagine/images/spinbox-indicator-down-editable.9.png + \li + \row + \li + \li indicator + \li down, editable, pressed + \li \image imagine/images/spinbox-indicator-down-editable-pressed.9.png + \li + \row + \li + \li indicator + \li down, editable, focused + \li \image imagine/images/spinbox-indicator-down-editable-focused.9.png + \li + \row + \li + \li indicator + \li down, editable, mirrored + \li \image imagine/images/spinbox-indicator-down-editable-mirrored.9.png + \li + \row + \li + \li indicator + \li down, editable, hovered + \li \image imagine/images/spinbox-indicator-down-editable-hovered.9.png + \li + \row + \li \l SwipeDelegate + \li background + \li + \li \image imagine/images/swipedelegate-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/swipedelegate-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/swipedelegate-background-pressed.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/swipedelegate-background-focused.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/swipedelegate-background-hovered.9.png + \li + \row + \li \l Switch + \li indicator + \li + \li \image imagine/images/switch-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/switch-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/switch-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/switch-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/switch-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/switch-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/switch-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/switch-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/switch-indicator-hovered.png + \li + \row + \li + \li handle + \li + \li \image imagine/images/switch-handle.png + \li + \row + \li + \li handle + \li disabled + \li \image imagine/images/switch-handle-disabled.png + \li + \row + \li + \li handle + \li pressed + \li \image imagine/images/switch-handle-pressed.png + \li + \row + \li \l SwitchDelegate + \li background + \li + \li \image imagine/images/switchdelegate-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/switchdelegate-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/switchdelegate-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/switchdelegate-background-checked.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/switchdelegate-background-focused.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/switchdelegate-background-hovered.9.png + \li + \row + \li + \li indicator + \li + \li \image imagine/images/switchdelegate-indicator.png + \li + \row + \li + \li indicator + \li disabled + \li \image imagine/images/switchdelegate-indicator-disabled.png + \li + \row + \li + \li indicator + \li pressed + \li \image imagine/images/switchdelegate-indicator-pressed.png + \li + \row + \li + \li indicator + \li checked + \li \image imagine/images/switchdelegate-indicator-checked.png + \li + \row + \li + \li indicator + \li checked, focused + \li \image imagine/images/switchdelegate-indicator-checked-focused.png + \li + \row + \li + \li indicator + \li checked, hovered + \li \image imagine/images/switchdelegate-indicator-checked-hovered.png + \li + \row + \li + \li indicator + \li checked, pressed + \li \image imagine/images/switchdelegate-indicator-checked-pressed.png + \li + \row + \li + \li indicator + \li focused + \li \image imagine/images/switchdelegate-indicator-focused.png + \li + \row + \li + \li indicator + \li hovered + \li \image imagine/images/switchdelegate-indicator-hovered.png + \li + \row + \li + \li handle + \li + \li \image imagine/images/switchdelegate-handle.png + \li + \row + \li + \li handle + \li disabled + \li \image imagine/images/switchdelegate-handle-disabled.png + \li + \row + \li \l TabBar + \li background + \li + \li \image imagine/images/tabbar-background.png + \li + \row + \li \l TabButton + \li background + \li + \li \image imagine/images/tabbutton-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/tabbutton-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/tabbutton-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/tabbutton-background-checked.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/tabbutton-background-hovered.9.png + \li + \row + \li + \li background + \li disabled, checked + \li \image imagine/images/tabbutton-background-disabled-checked.9.png + \li + \row + \li \l TextArea + \li background + \li + \li \image imagine/images/textarea-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/textarea-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/textarea-background-pressed.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/textarea-background-focused.9.png + \li + \row + \li \l TextField + \li background + \li + \li \image imagine/images/textfield-background.9.png + \li + \row + \li + \li background + \li disabled + \li \image imagine/images/textfield-background-disabled.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/textfield-background-pressed.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/textfield-background-focused.9.png + \li + \row + \li \l ToolBar + \li background + \li + \li \image imagine/images/toolbar-background.png + \li + \row + \li \l ToolButton + \li background + \li + \li \image imagine/images/toolbutton-background.9.png + \li + \row + \li + \li background + \li disabled, checked + \li \image imagine/images/toolbutton-background-disabled-checked.9.png + \li + \row + \li + \li background + \li focused + \li \image imagine/images/toolbutton-background-focused.9.png + \li + \row + \li + \li background + \li pressed + \li \image imagine/images/toolbutton-background-pressed.9.png + \li + \row + \li + \li background + \li checked + \li \image imagine/images/toolbutton-background-checked.9.png + \li + \row + \li + \li background + \li checked, focused + \li \image imagine/images/toolbutton-background-checked-focused.9.png + \li + \row + \li + \li background + \li checked, hovered + \li \image imagine/images/toolbutton-background-checked-hovered.9.png + \li + \row + \li + \li background + \li hovered + \li \image imagine/images/toolbutton-background-hovered.9.png + \li + \row + \li \l ToolSeparator + \li separator + \li horizontal + \li \image imagine/images/toolseparator-separator-horizontal.9.png + \li + \row + \li + \li separator + \li vertical + \li \image imagine/images/toolseparator-separator-vertical.9.png + \li + \row + \li \l ToolTip + \li background + \li + \li \image imagine/images/tooltip-background.9.png + \li + \endtable + + \target sup1 + \sup 1 A 1x1 image containing one color, stretched to fill the control. + \section2 9-Patch Images The Imagine style uses \l diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index 97f5e926..21eca464 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -45,6 +45,13 @@ The \l {Fusion Style} is a platform-agnostic style that offers a desktop-oriented look'n'feel for Qt Quick Controls 2. + \section2 Imagine Style + + \image qtquickcontrols2-imagine-thumbnail.png + The \l {Imagine Style} is based on image assets. The style comes with a default + set of images which can easily be changed by providing a directory + with images using a predefined naming convention. + \section2 Material Style \image qtquickcontrols2-material-thumbnail.png diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/imports/controls/imagine/ApplicationWindow.qml index 59e706b8..8600e8d6 100644 --- a/src/imports/controls/imagine/ApplicationWindow.qml +++ b/src/imports/controls/imagine/ApplicationWindow.qml @@ -45,7 +45,7 @@ T.ApplicationWindow { // ### remove? overlay.modal: NinePatchImage { - source: Imagine.path + "applicationwindow-overlay" + source: Imagine.url + "applicationwindow-overlay" NinePatchImageSelector on source { states: [ {"modal": true} @@ -55,7 +55,7 @@ T.ApplicationWindow { // ### remove? overlay.modeless: NinePatchImage { - source: Imagine.path + "applicationwindow-overlay" + source: Imagine.url + "applicationwindow-overlay" NinePatchImageSelector on source { states: [ {"modal": false} @@ -67,7 +67,7 @@ T.ApplicationWindow { width: window.width height: window.height - source: Imagine.path + "applicationwindow-background" + source: Imagine.url + "applicationwindow-background" NinePatchImageSelector on source { states: [ {"active": window.active} diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml index 32e11314..d373dcfd 100644 --- a/src/imports/controls/imagine/BusyIndicator.qml +++ b/src/imports/controls/imagine/BusyIndicator.qml @@ -58,7 +58,7 @@ T.BusyIndicator { visible: control.running || animator.running Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } } - source: Imagine.path + "busyindicator-animation" + source: Imagine.url + "busyindicator-animation" AnimatedImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -74,7 +74,7 @@ T.BusyIndicator { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "busyindicator-background" + source: Imagine.url + "busyindicator-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml index 8a197d4e..7c8ab584 100644 --- a/src/imports/controls/imagine/Button.qml +++ b/src/imports/controls/imagine/Button.qml @@ -81,7 +81,7 @@ T.Button { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "button-background" + source: Imagine.url + "button-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml index 4774cd23..db0a6680 100644 --- a/src/imports/controls/imagine/CheckBox.qml +++ b/src/imports/controls/imagine/CheckBox.qml @@ -60,7 +60,7 @@ T.CheckBox { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - source: Imagine.path + "checkbox-indicator" + source: Imagine.url + "checkbox-indicator" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -92,7 +92,7 @@ T.CheckBox { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "checkbox-background" + source: Imagine.url + "checkbox-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/imports/controls/imagine/CheckDelegate.qml index 95000651..76cd89c4 100644 --- a/src/imports/controls/imagine/CheckDelegate.qml +++ b/src/imports/controls/imagine/CheckDelegate.qml @@ -66,7 +66,7 @@ T.CheckDelegate { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - source: Imagine.path + "checkdelegate-indicator" + source: Imagine.url + "checkdelegate-indicator" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -101,7 +101,7 @@ T.CheckDelegate { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "checkdelegate-background" + source: Imagine.url + "checkdelegate-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index 7f47eb57..fc9fce61 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -65,7 +65,7 @@ T.ComboBox { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 - source: Imagine.path + "combobox-indicator" + source: Imagine.url + "combobox-indicator" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -107,7 +107,7 @@ T.ComboBox { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "combobox-background" + source: Imagine.url + "combobox-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -155,7 +155,7 @@ T.ComboBox { width: control.popup.width + leftInset + rightInset height: control.popup.height + topInset + bottomInset - source: Imagine.path + "combobox-popup" + source: Imagine.url + "combobox-popup" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/imports/controls/imagine/DelayButton.qml index 4994dbb2..14db2b96 100644 --- a/src/imports/controls/imagine/DelayButton.qml +++ b/src/imports/controls/imagine/DelayButton.qml @@ -74,7 +74,7 @@ T.DelayButton { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "delaybutton-background" + source: Imagine.url + "delaybutton-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -92,7 +92,7 @@ T.DelayButton { height: parent.height visible: false - source: Imagine.path + "delaybutton-progress" + source: Imagine.url + "delaybutton-progress" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -111,7 +111,7 @@ T.DelayButton { height: parent.height visible: false - source: Imagine.path + "delaybutton-mask" + source: Imagine.url + "delaybutton-mask" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Dial.qml b/src/imports/controls/imagine/Dial.qml index 8f7054f5..e9652249 100644 --- a/src/imports/controls/imagine/Dial.qml +++ b/src/imports/controls/imagine/Dial.qml @@ -56,7 +56,7 @@ T.Dial { x: background.x + background.width / 2 - handle.width / 2 y: background.y + background.height / 2 - handle.height / 2 - source: Imagine.path + "dial-handle" + source: Imagine.url + "dial-handle" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -85,7 +85,7 @@ T.Dial { width: Math.max(64, Math.min(control.width, control.height)) height: width - source: Imagine.path + "dial-background" + source: Imagine.url + "dial-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml index d3d8a591..67215ec5 100644 --- a/src/imports/controls/imagine/Dialog.qml +++ b/src/imports/controls/imagine/Dialog.qml @@ -65,7 +65,7 @@ T.Dialog { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "dialog-background" + source: Imagine.url + "dialog-background" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -85,7 +85,7 @@ T.Dialog { width: parent.width height: parent.height - source: Imagine.path + "dialog-title" + source: Imagine.url + "dialog-title" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -100,7 +100,7 @@ T.Dialog { } T.Overlay.modal: NinePatchImage { - source: Imagine.path + "dialog-overlay" + source: Imagine.url + "dialog-overlay" NinePatchImageSelector on source { states: [ {"modal": true} @@ -109,7 +109,7 @@ T.Dialog { } T.Overlay.modeless: NinePatchImage { - source: Imagine.path + "dialog-overlay" + source: Imagine.url + "dialog-overlay" NinePatchImageSelector on source { states: [ {"modal": false} diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml index f14a6604..d24ad4ee 100644 --- a/src/imports/controls/imagine/DialogButtonBox.qml +++ b/src/imports/controls/imagine/DialogButtonBox.qml @@ -75,7 +75,7 @@ T.DialogButtonBox { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "dialogbuttonbox-background" + source: Imagine.url + "dialogbuttonbox-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Drawer.qml b/src/imports/controls/imagine/Drawer.qml index 77981b11..d4bf5a7c 100644 --- a/src/imports/controls/imagine/Drawer.qml +++ b/src/imports/controls/imagine/Drawer.qml @@ -63,7 +63,7 @@ T.Drawer { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "drawer-background" + source: Imagine.url + "drawer-background" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -77,7 +77,7 @@ T.Drawer { } T.Overlay.modal: NinePatchImage { - source: Imagine.path + "drawer-overlay" + source: Imagine.url + "drawer-overlay" NinePatchImageSelector on source { states: [ {"modal": true} @@ -86,7 +86,7 @@ T.Drawer { } T.Overlay.modeless: NinePatchImage { - source: Imagine.path + "drawer-overlay" + source: Imagine.url + "drawer-overlay" NinePatchImageSelector on source { states: [ {"modal": false} diff --git a/src/imports/controls/imagine/Frame.qml b/src/imports/controls/imagine/Frame.qml index 2d722f99..4c9b87d3 100644 --- a/src/imports/controls/imagine/Frame.qml +++ b/src/imports/controls/imagine/Frame.qml @@ -58,7 +58,7 @@ T.Frame { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "frame-background" + source: Imagine.url + "frame-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml index 3f72ed3b..88e8d21c 100644 --- a/src/imports/controls/imagine/GroupBox.qml +++ b/src/imports/controls/imagine/GroupBox.qml @@ -78,7 +78,7 @@ T.GroupBox { width: parent.width height: parent.height - source: Imagine.path + "groupbox-title" + source: Imagine.url + "groupbox-title" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -94,7 +94,7 @@ T.GroupBox { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - control.topPadding + control.padding - source: Imagine.path + "groupbox-background" + source: Imagine.url + "groupbox-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/imports/controls/imagine/ItemDelegate.qml index 85e9cbc1..6d1d7bbe 100644 --- a/src/imports/controls/imagine/ItemDelegate.qml +++ b/src/imports/controls/imagine/ItemDelegate.qml @@ -79,7 +79,7 @@ T.ItemDelegate { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "itemdelegate-background" + source: Imagine.url + "itemdelegate-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Label.qml b/src/imports/controls/imagine/Label.qml index 9d121db1..c73954b2 100644 --- a/src/imports/controls/imagine/Label.qml +++ b/src/imports/controls/imagine/Label.qml @@ -50,7 +50,7 @@ T.Label { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "label-background" + source: Imagine.url + "label-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index 1c7a2cbf..83953d05 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -76,7 +76,7 @@ T.Menu { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "menu-background" + source: Imagine.url + "menu-background" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -86,7 +86,7 @@ T.Menu { } T.Overlay.modal: NinePatchImage { - source: Imagine.path + "menu-overlay" + source: Imagine.url + "menu-overlay" NinePatchImageSelector on source { states: [ {"modal": true} @@ -95,7 +95,7 @@ T.Menu { } T.Overlay.modeless: NinePatchImage { - source: Imagine.path + "menu-overlay" + source: Imagine.url + "menu-overlay" NinePatchImageSelector on source { states: [ {"modal": false} diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/imports/controls/imagine/MenuItem.qml index ab242d2b..80d6f2cd 100644 --- a/src/imports/controls/imagine/MenuItem.qml +++ b/src/imports/controls/imagine/MenuItem.qml @@ -84,7 +84,7 @@ T.MenuItem { y: control.topPadding + (control.availableHeight - height) / 2 visible: control.subMenu - source: Imagine.path + "menuitem-arrow" + source: Imagine.url + "menuitem-arrow" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -103,7 +103,7 @@ T.MenuItem { y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checkable - source: Imagine.path + "menuitem-indicator" + source: Imagine.url + "menuitem-indicator" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -122,7 +122,7 @@ T.MenuItem { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "menuitem-background" + source: Imagine.url + "menuitem-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/imports/controls/imagine/MenuSeparator.qml index 2d83ffca..a14fe9a6 100644 --- a/src/imports/controls/imagine/MenuSeparator.qml +++ b/src/imports/controls/imagine/MenuSeparator.qml @@ -53,7 +53,7 @@ T.MenuSeparator { bottomPadding: background ? background.bottomPadding : 0 contentItem: NinePatchImage { - source: Imagine.path + "menuseparator-separator" + source: Imagine.url + "menuseparator-separator" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -67,7 +67,7 @@ T.MenuSeparator { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "menuseparator-background" + source: Imagine.url + "menuseparator-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml index 9c9dcc91..72f54830 100644 --- a/src/imports/controls/imagine/Page.qml +++ b/src/imports/controls/imagine/Page.qml @@ -64,7 +64,7 @@ T.Page { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "page-background" + source: Imagine.url + "page-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/imports/controls/imagine/PageIndicator.qml index 908ba5a2..156033e2 100644 --- a/src/imports/controls/imagine/PageIndicator.qml +++ b/src/imports/controls/imagine/PageIndicator.qml @@ -53,7 +53,7 @@ T.PageIndicator { bottomPadding: background ? background.bottomPadding : 0 delegate: Image { - source: Imagine.path + "pageindicator-delegate" + source: Imagine.url + "pageindicator-delegate" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -79,7 +79,7 @@ T.PageIndicator { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "pageindicator-background" + source: Imagine.url + "pageindicator-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Pane.qml b/src/imports/controls/imagine/Pane.qml index 3c2a232b..a1899149 100644 --- a/src/imports/controls/imagine/Pane.qml +++ b/src/imports/controls/imagine/Pane.qml @@ -58,7 +58,7 @@ T.Pane { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "pane-background" + source: Imagine.url + "pane-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/Popup.qml b/src/imports/controls/imagine/Popup.qml index da4d9618..a111df3a 100644 --- a/src/imports/controls/imagine/Popup.qml +++ b/src/imports/controls/imagine/Popup.qml @@ -60,7 +60,7 @@ T.Popup { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "popup-background" + source: Imagine.url + "popup-background" NinePatchImageSelector on source { states: [ {"modal": control.modal}, @@ -70,7 +70,7 @@ T.Popup { } T.Overlay.modal: NinePatchImage { - source: Imagine.path + "popup-overlay" + source: Imagine.url + "popup-overlay" NinePatchImageSelector on source { states: [ {"modal": true} @@ -79,7 +79,7 @@ T.Popup { } T.Overlay.modeless: NinePatchImage { - source: Imagine.path + "popup-overlay" + source: Imagine.url + "popup-overlay" NinePatchImageSelector on source { states: [ {"modal": false} diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/imports/controls/imagine/ProgressBar.qml index 5ddfcf03..5cfc292c 100644 --- a/src/imports/controls/imagine/ProgressBar.qml +++ b/src/imports/controls/imagine/ProgressBar.qml @@ -64,7 +64,7 @@ T.ProgressBar { height: parent.height visible: !control.indeterminate && mask.status === Image.Null - source: Imagine.path + "progressbar-progress" + source: Imagine.url + "progressbar-progress" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -82,7 +82,7 @@ T.ProgressBar { playing: control.indeterminate visible: control.indeterminate && mask.status === Image.Null - source: Imagine.path + "progressbar-animation" + source: Imagine.url + "progressbar-animation" AnimatedImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -98,7 +98,7 @@ T.ProgressBar { height: parent.height visible: false - source: Imagine.path + "progressbar-mask" + source: Imagine.url + "progressbar-mask" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -127,7 +127,7 @@ T.ProgressBar { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "progressbar-background" + source: Imagine.url + "progressbar-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml index 7ad2bd12..4a111bc3 100644 --- a/src/imports/controls/imagine/RadioButton.qml +++ b/src/imports/controls/imagine/RadioButton.qml @@ -60,7 +60,7 @@ T.RadioButton { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - source: Imagine.path + "radiobutton-indicator" + source: Imagine.url + "radiobutton-indicator" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -91,7 +91,7 @@ T.RadioButton { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "radiobutton-background" + source: Imagine.url + "radiobutton-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/imports/controls/imagine/RadioDelegate.qml index ced68e52..e7e37b0b 100644 --- a/src/imports/controls/imagine/RadioDelegate.qml +++ b/src/imports/controls/imagine/RadioDelegate.qml @@ -66,7 +66,7 @@ T.RadioDelegate { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - source: Imagine.path + "radiodelegate-indicator" + source: Imagine.url + "radiodelegate-indicator" ImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -100,7 +100,7 @@ T.RadioDelegate { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "radiodelegate-background" + source: Imagine.url + "radiodelegate-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/RangeSlider.qml b/src/imports/controls/imagine/RangeSlider.qml index e00b3eb0..5c7ee70e 100644 --- a/src/imports/controls/imagine/RangeSlider.qml +++ b/src/imports/controls/imagine/RangeSlider.qml @@ -58,7 +58,7 @@ T.RangeSlider { x: control.leftPadding + (control.horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) - source: Imagine.path + "rangeslider-handle" + source: Imagine.url + "rangeslider-handle" ImageSelector on source { states: [ {"first": true}, @@ -77,7 +77,7 @@ T.RangeSlider { x: control.leftPadding + (control.horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) - source: Imagine.path + "rangeslider-handle" + source: Imagine.url + "rangeslider-handle" ImageSelector on source { states: [ {"second": true}, @@ -98,7 +98,7 @@ T.RangeSlider { height: control.height + topInset + bottomInset scale: control.horizontal && control.mirrored ? -1 : 1 - source: Imagine.path + "rangeslider-background" + source: Imagine.url + "rangeslider-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, @@ -116,7 +116,7 @@ T.RangeSlider { width: control.horizontal ? control.second.position * (parent.width - control.first.handle.width) - control.first.position * (parent.width - control.first.handle.width) : parent.width height: control.vertical ? control.second.position * (parent.height - control.first.handle.height) - control.first.position * (parent.height - control.first.handle.height): parent.height - source: Imagine.path + "rangeslider-progress" + source: Imagine.url + "rangeslider-progress" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml index f0e6579d..b4d25343 100644 --- a/src/imports/controls/imagine/RoundButton.qml +++ b/src/imports/controls/imagine/RoundButton.qml @@ -72,7 +72,7 @@ T.RoundButton { height: control.height + topInset + bottomInset // ### TODO: radius? - source: Imagine.path + "roundbutton-background" + source: Imagine.url + "roundbutton-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/ScrollBar.qml b/src/imports/controls/imagine/ScrollBar.qml index 85c3730d..49c8d1f0 100644 --- a/src/imports/controls/imagine/ScrollBar.qml +++ b/src/imports/controls/imagine/ScrollBar.qml @@ -58,7 +58,7 @@ T.ScrollBar { width: control.availableWidth height: control.availableHeight - source: Imagine.path + "scrollbar-handle" + source: Imagine.url + "scrollbar-handle" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, @@ -78,7 +78,7 @@ T.ScrollBar { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "scrollbar-background" + source: Imagine.url + "scrollbar-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, diff --git a/src/imports/controls/imagine/ScrollIndicator.qml b/src/imports/controls/imagine/ScrollIndicator.qml index bafa4bc6..a2d0e94f 100644 --- a/src/imports/controls/imagine/ScrollIndicator.qml +++ b/src/imports/controls/imagine/ScrollIndicator.qml @@ -56,7 +56,7 @@ T.ScrollIndicator { width: control.availableWidth height: control.availableHeight - source: Imagine.path + "scrollindicator-handle" + source: Imagine.url + "scrollindicator-handle" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, @@ -74,7 +74,7 @@ T.ScrollIndicator { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "scrollindicator-background" + source: Imagine.url + "scrollindicator-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, diff --git a/src/imports/controls/imagine/Slider.qml b/src/imports/controls/imagine/Slider.qml index fc46ecdb..d42af8c6 100644 --- a/src/imports/controls/imagine/Slider.qml +++ b/src/imports/controls/imagine/Slider.qml @@ -56,7 +56,7 @@ T.Slider { x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) - source: Imagine.path + "slider-handle" + source: Imagine.url + "slider-handle" ImageSelector on source { states: [ {"vertical": control.vertical}, @@ -76,7 +76,7 @@ T.Slider { height: control.height + topInset + bottomInset scale: control.horizontal && control.mirrored ? -1 : 1 - source: Imagine.path + "slider-background" + source: Imagine.url + "slider-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, @@ -101,7 +101,7 @@ T.Slider { ? control.handle.height / 2 + control.position * (parent.height - control.handle.height) : parent.height - source: Imagine.path + "slider-progress" + source: Imagine.url + "slider-progress" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/imports/controls/imagine/SpinBox.qml index 0b92d2b3..db1ae992 100644 --- a/src/imports/controls/imagine/SpinBox.qml +++ b/src/imports/controls/imagine/SpinBox.qml @@ -85,7 +85,7 @@ T.SpinBox { height: control.height visible: control.editable - source: Imagine.path + "spinbox-editor" + source: Imagine.url + "spinbox-editor" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -102,7 +102,7 @@ T.SpinBox { x: control.mirrored ? 0 : parent.width - width height: parent.height - source: Imagine.path + "spinbox-indicator" + source: Imagine.url + "spinbox-indicator" NinePatchImageSelector on source { states: [ {"up": true}, @@ -121,7 +121,7 @@ T.SpinBox { x: control.mirrored ? parent.width - width : 0 height: parent.height - source: Imagine.path + "spinbox-indicator" + source: Imagine.url + "spinbox-indicator" NinePatchImageSelector on source { states: [ {"down": true}, @@ -140,7 +140,7 @@ T.SpinBox { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "spinbox-background" + source: Imagine.url + "spinbox-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/StackView.qml b/src/imports/controls/imagine/StackView.qml index 0c7cd4c8..8d749519 100644 --- a/src/imports/controls/imagine/StackView.qml +++ b/src/imports/controls/imagine/StackView.qml @@ -79,7 +79,7 @@ T.StackView { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "stackview-background" + source: Imagine.url + "stackview-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/SwipeDelegate.qml b/src/imports/controls/imagine/SwipeDelegate.qml index 7b9b2e19..23edfc58 100644 --- a/src/imports/controls/imagine/SwipeDelegate.qml +++ b/src/imports/controls/imagine/SwipeDelegate.qml @@ -81,7 +81,7 @@ T.SwipeDelegate { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "swipedelegate-background" + source: Imagine.url + "swipedelegate-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/SwipeView.qml b/src/imports/controls/imagine/SwipeView.qml index ba7f6e0c..f997be0d 100644 --- a/src/imports/controls/imagine/SwipeView.qml +++ b/src/imports/controls/imagine/SwipeView.qml @@ -73,7 +73,7 @@ T.SwipeView { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "swipeview-background" + source: Imagine.url + "swipeview-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml index c27bd36c..f9878851 100644 --- a/src/imports/controls/imagine/Switch.qml +++ b/src/imports/controls/imagine/Switch.qml @@ -62,7 +62,7 @@ T.Switch { width: Math.max(implicitWidth, handle.leftPadding && handle.rightPadding ? handle.implicitWidth : 2 * handle.implicitWidth) height: Math.max(implicitHeight, handle.implicitHeight) - source: Imagine.path + "switch-indicator" + source: Imagine.url + "switch-indicator" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -83,7 +83,7 @@ T.Switch { x: Math.max(minPos, Math.min(maxPos, control.visualPosition * parent.width - (width / 2))) y: (parent.height - height) / 2 - source: Imagine.path + "switch-handle" + source: Imagine.url + "switch-handle" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -120,7 +120,7 @@ T.Switch { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "switch-background" + source: Imagine.url + "switch-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/imports/controls/imagine/SwitchDelegate.qml index 150c9eca..497bc4e5 100644 --- a/src/imports/controls/imagine/SwitchDelegate.qml +++ b/src/imports/controls/imagine/SwitchDelegate.qml @@ -68,7 +68,7 @@ T.SwitchDelegate { width: Math.max(implicitWidth, handle.leftPadding && handle.rightPadding ? handle.implicitWidth : 2 * handle.implicitWidth) height: Math.max(implicitHeight, handle.implicitHeight) - source: Imagine.path + "switchdelegate-indicator" + source: Imagine.url + "switchdelegate-indicator" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -90,7 +90,7 @@ T.SwitchDelegate { x: Math.max(minPos, Math.min(maxPos, control.visualPosition * parent.width - (width / 2))) y: (parent.height - height) / 2 - source: Imagine.path + "switchdelegate-handle" + source: Imagine.url + "switchdelegate-handle" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, @@ -130,7 +130,7 @@ T.SwitchDelegate { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "switchdelegate-background" + source: Imagine.url + "switchdelegate-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/TabBar.qml b/src/imports/controls/imagine/TabBar.qml index 333c5f19..be143bf1 100644 --- a/src/imports/controls/imagine/TabBar.qml +++ b/src/imports/controls/imagine/TabBar.qml @@ -73,7 +73,7 @@ T.TabBar { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "tabbar-background" + source: Imagine.url + "tabbar-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/TabButton.qml b/src/imports/controls/imagine/TabButton.qml index 4665d356..d4098c9e 100644 --- a/src/imports/controls/imagine/TabButton.qml +++ b/src/imports/controls/imagine/TabButton.qml @@ -77,7 +77,7 @@ T.TabButton { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "tabbutton-background" + source: Imagine.url + "tabbutton-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/TextArea.qml b/src/imports/controls/imagine/TextArea.qml index 6287a0b0..49153b5d 100644 --- a/src/imports/controls/imagine/TextArea.qml +++ b/src/imports/controls/imagine/TextArea.qml @@ -82,7 +82,7 @@ T.TextArea { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "textarea-background" + source: Imagine.url + "textarea-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml index 0e5ddae5..09ef5bcb 100644 --- a/src/imports/controls/imagine/TextField.qml +++ b/src/imports/controls/imagine/TextField.qml @@ -82,7 +82,7 @@ T.TextField { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "textfield-background" + source: Imagine.url + "textfield-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/ToolBar.qml b/src/imports/controls/imagine/ToolBar.qml index 2b201f5d..289566ec 100644 --- a/src/imports/controls/imagine/ToolBar.qml +++ b/src/imports/controls/imagine/ToolBar.qml @@ -58,7 +58,7 @@ T.ToolBar { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "toolbar-background" + source: Imagine.url + "toolbar-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/ToolButton.qml b/src/imports/controls/imagine/ToolButton.qml index 373c2174..63260ff5 100644 --- a/src/imports/controls/imagine/ToolButton.qml +++ b/src/imports/controls/imagine/ToolButton.qml @@ -77,7 +77,7 @@ T.ToolButton { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "toolbutton-background" + source: Imagine.url + "toolbutton-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/ToolSeparator.qml b/src/imports/controls/imagine/ToolSeparator.qml index 8b28f766..88b645cb 100644 --- a/src/imports/controls/imagine/ToolSeparator.qml +++ b/src/imports/controls/imagine/ToolSeparator.qml @@ -53,7 +53,7 @@ T.ToolSeparator { bottomPadding: background ? background.bottomPadding : 0 contentItem: NinePatchImage { - source: Imagine.path + "toolseparator-separator" + source: Imagine.url + "toolseparator-separator" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, @@ -69,7 +69,7 @@ T.ToolSeparator { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "toolseparator-background" + source: Imagine.url + "toolseparator-background" NinePatchImageSelector on source { states: [ {"vertical": control.vertical}, diff --git a/src/imports/controls/imagine/ToolTip.qml b/src/imports/controls/imagine/ToolTip.qml index 917d22db..81a5e8aa 100644 --- a/src/imports/controls/imagine/ToolTip.qml +++ b/src/imports/controls/imagine/ToolTip.qml @@ -74,7 +74,7 @@ T.ToolTip { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "tooltip-background" + source: Imagine.url + "tooltip-background" NinePatchImageSelector on source { states: [ // ### diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml index ef6c29c9..7cd2b6a9 100644 --- a/src/imports/controls/imagine/Tumbler.qml +++ b/src/imports/controls/imagine/Tumbler.qml @@ -76,7 +76,7 @@ T.Tumbler { width: control.width + leftInset + rightInset height: control.height + topInset + bottomInset - source: Imagine.path + "tumbler-background" + source: Imagine.url + "tumbler-background" NinePatchImageSelector on source { states: [ {"disabled": !control.enabled}, diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled.png Binary files differindex 990c92ae..e9d77838 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png Binary files differindex 4bd03ef5..62a57de4 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png Binary files differindex 4748eb2a..37591d7c 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png Binary files differindex 9201c8c8..0abd7e80 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png Binary files differindex 5009cb4a..906392dd 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png Binary files differindex fbbe1fc0..446970de 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png Binary files differindex dd56d8df..54b63b9b 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png Binary files differindex 355b92d8..77e0894b 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png Binary files differindex 6f0dd408..5009cb4a 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png Binary files differindex cfa89e19..fbbe1fc0 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png Binary files differindex fc0a6837..dd56d8df 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png Binary files differindex 2cf90cdb..355b92d8 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow.png b/src/imports/controls/imagine/images/menuitem-arrow.png Binary files differindex 2fe97406..990c92ae 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow.png +++ b/src/imports/controls/imagine/images/menuitem-arrow.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow@2x.png b/src/imports/controls/imagine/images/menuitem-arrow@2x.png Binary files differindex 2db85315..4bd03ef5 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow@3x.png b/src/imports/controls/imagine/images/menuitem-arrow@3x.png Binary files differindex e37558da..4748eb2a 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow@4x.png b/src/imports/controls/imagine/images/menuitem-arrow@4x.png Binary files differindex 5a663103..9201c8c8 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow@4x.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png Binary files differnew file mode 100644 index 00000000..0b34d6c4 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png Binary files differnew file mode 100644 index 00000000..ae9c07c3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png Binary files differnew file mode 100644 index 00000000..9b862ef7 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png Binary files differnew file mode 100644 index 00000000..298d3996 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png Binary files differnew file mode 100644 index 00000000..0b34d6c4 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..ae9c07c3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png Binary files differnew file mode 100644 index 00000000..9b862ef7 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png Binary files differnew file mode 100644 index 00000000..298d3996 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored.9.png Binary files differnew file mode 100644 index 00000000..63e48ae2 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@2x.9.png Binary files differnew file mode 100644 index 00000000..eadedcd3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@3x.9.png Binary files differnew file mode 100644 index 00000000..140f0d33 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@4x.9.png Binary files differnew file mode 100644 index 00000000..5db63bc6 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png Binary files differnew file mode 100644 index 00000000..9a580be3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..8e8192d2 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png Binary files differnew file mode 100644 index 00000000..5a751c6a --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png Binary files differnew file mode 100644 index 00000000..80aff885 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png Binary files differindex f50434fc..63e48ae2 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png Binary files differindex 82a7b71e..eadedcd3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png Binary files differindex 91ae261d..140f0d33 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png Binary files differindex 7e93bd09..5db63bc6 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png Binary files differnew file mode 100644 index 00000000..5ca41cba --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..5efb47dd --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png Binary files differnew file mode 100644 index 00000000..4ff3d439 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png Binary files differnew file mode 100644 index 00000000..f2241ab3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png Binary files differnew file mode 100644 index 00000000..648b30c4 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png Binary files differnew file mode 100644 index 00000000..f87ce876 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png Binary files differnew file mode 100644 index 00000000..bea3eff1 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png Binary files differnew file mode 100644 index 00000000..44b9f81f --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png Binary files differnew file mode 100644 index 00000000..648b30c4 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..f87ce876 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png Binary files differnew file mode 100644 index 00000000..bea3eff1 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png Binary files differnew file mode 100644 index 00000000..44b9f81f --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png Binary files differnew file mode 100644 index 00000000..eb6a9812 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..51f20f47 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png Binary files differnew file mode 100644 index 00000000..00082963 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png Binary files differnew file mode 100644 index 00000000..6ae20279 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png Binary files differindex e7dd2bd8..0eb5528f 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png Binary files differindex 4ff2bc4e..7d234c78 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png Binary files differindex 7876005b..dee53c86 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png Binary files differindex b59c8501..df682f98 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png Binary files differnew file mode 100644 index 00000000..5f05bc73 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png Binary files differnew file mode 100644 index 00000000..c83d7574 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png Binary files differnew file mode 100644 index 00000000..f3cffa2b --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png Binary files differnew file mode 100644 index 00000000..4bda0ce3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png Binary files differnew file mode 100644 index 00000000..5f05bc73 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..c83d7574 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png Binary files differnew file mode 100644 index 00000000..f3cffa2b --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png Binary files differnew file mode 100644 index 00000000..4bda0ce3 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored.9.png Binary files differnew file mode 100644 index 00000000..0f946e4b --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@2x.9.png Binary files differnew file mode 100644 index 00000000..8e1a3f4d --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@3x.9.png Binary files differnew file mode 100644 index 00000000..e76b4a79 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@4x.9.png Binary files differnew file mode 100644 index 00000000..bd256696 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png Binary files differnew file mode 100644 index 00000000..243ebfca --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..79d87a9c --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png Binary files differnew file mode 100644 index 00000000..a644865d --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png Binary files differnew file mode 100644 index 00000000..45189533 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png Binary files differindex a1dfa8b3..0f946e4b 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png Binary files differindex f86efbd1..8e1a3f4d 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png Binary files differindex acd9d658..e76b4a79 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png Binary files differindex cf9d25d1..bd256696 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png Binary files differnew file mode 100644 index 00000000..b5c1c5c6 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..5246ee8e --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png Binary files differnew file mode 100644 index 00000000..466a7e19 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png Binary files differnew file mode 100644 index 00000000..1e510d84 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png Binary files differnew file mode 100644 index 00000000..314ed022 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png Binary files differnew file mode 100644 index 00000000..798f2e9c --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png Binary files differnew file mode 100644 index 00000000..447dfda6 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png Binary files differnew file mode 100644 index 00000000..b11cb7f2 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png Binary files differnew file mode 100644 index 00000000..314ed022 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..798f2e9c --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png Binary files differnew file mode 100644 index 00000000..447dfda6 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png Binary files differnew file mode 100644 index 00000000..b11cb7f2 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png Binary files differnew file mode 100644 index 00000000..56a6a992 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..d5329c51 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png Binary files differnew file mode 100644 index 00000000..1667bfdf --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png Binary files differnew file mode 100644 index 00000000..45b48332 --- /dev/null +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png Binary files differindex 9a76855d..222285e3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png Binary files differindex b883e239..5788f366 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png Binary files differindex b3efe0cc..1f8342c6 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png Binary files differindex 68b90337..b19c5629 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/qquickimaginestyle.cpp b/src/imports/controls/imagine/qquickimaginestyle.cpp index e103421e..7617fbf5 100644 --- a/src/imports/controls/imagine/qquickimaginestyle.cpp +++ b/src/imports/controls/imagine/qquickimaginestyle.cpp @@ -64,17 +64,16 @@ QQuickImagineStyle *QQuickImagineStyle::qmlAttachedProperties(QObject *object) QString QQuickImagineStyle::path() const { - return m_path; // ### TODO: url? + return m_path; } void QQuickImagineStyle::setPath(const QString &path) { - QString p = ensureSlash(path); m_explicitPath = true; - if (m_path == p) + if (m_path == path) return; - m_path = p; + m_path = path; propagatePath(); emit pathChanged(); @@ -110,6 +109,29 @@ void QQuickImagineStyle::resetPath() inheritPath(imagine ? imagine->path() : *GlobalPath()); } +QUrl QQuickImagineStyle::url() const +{ + // Using ApplicationWindow as an example, its NinePatchImage url + // was previously assigned like this: + // + // soruce: Imagine.path + "applicationwindow-background" + // + // If Imagine.path is set to ":/images" by the user, then the final URL would be: + // + // QUrl("file:///home/user/qt/qtbase/qml/QtQuick/Controls.2/Imagine/:/images/applicationwindow-background") + // + // To ensure that the correct URL is constructed, we do it ourselves here, + // and then the control QML files use the "url" property instead. + const QString path = ensureSlash(m_path); + if (path.startsWith(QLatin1String("qrc"))) + return QUrl(path); + + if (path.startsWith(QLatin1String(":/"))) + return QUrl(QLatin1String("qrc") + path); + + return QUrl::fromLocalFile(path); +} + void QQuickImagineStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) { Q_UNUSED(oldParent); diff --git a/src/imports/controls/imagine/qquickimaginestyle_p.h b/src/imports/controls/imagine/qquickimaginestyle_p.h index fc4b21b8..88b92c00 100644 --- a/src/imports/controls/imagine/qquickimaginestyle_p.h +++ b/src/imports/controls/imagine/qquickimaginestyle_p.h @@ -58,6 +58,7 @@ class QQuickImagineStyle : public QQuickAttachedObject { Q_OBJECT Q_PROPERTY(QString path READ path WRITE setPath RESET resetPath NOTIFY pathChanged FINAL) + Q_PROPERTY(QUrl url READ url NOTIFY pathChanged FINAL) public: explicit QQuickImagineStyle(QObject *parent = nullptr); @@ -70,6 +71,8 @@ public: void propagatePath(); void resetPath(); + QUrl url() const; + Q_SIGNALS: void pathChanged(); diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index 864a3df8..d5bdfefe 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -75,8 +75,6 @@ Module { Property { name: "textColor"; type: "QColor"; isReadonly: true } Property { name: "textDarkColor"; type: "QColor"; isReadonly: true } Property { name: "textLightColor"; type: "QColor"; isReadonly: true } - Property { name: "textLinkColor"; type: "QColor"; isReadonly: true } - Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true } Property { name: "focusColor"; type: "QColor"; isReadonly: true } @@ -103,8 +101,6 @@ Module { Property { name: "frameLightColor"; type: "QColor"; isReadonly: true } Property { name: "scrollBarColor"; type: "QColor"; isReadonly: true } Property { name: "scrollBarPressedColor"; type: "QColor"; isReadonly: true } - Property { name: "progressBarColor"; type: "QColor"; isReadonly: true } - Property { name: "pageIndicatorColor"; type: "QColor"; isReadonly: true } Property { name: "separatorColor"; type: "QColor"; isReadonly: true } Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true } Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true } diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp index 38c98a72..3f91eb58 100644 --- a/src/imports/controls/qquickdefaultstyle.cpp +++ b/src/imports/controls/qquickdefaultstyle.cpp @@ -73,16 +73,6 @@ QColor QQuickDefaultStyle::textLightColor() const return QColor::fromRgba(0xFFFFFFFF); } -QColor QQuickDefaultStyle::textLinkColor() const -{ - return QColor::fromRgba(0xFF45A7D7); -} - -QColor QQuickDefaultStyle::textSelectionColor() const -{ - return QColor::fromRgba(0xFFFDDD5C); -} - QColor QQuickDefaultStyle::textDisabledColor() const { return QColor::fromRgba(0xFFBDBEBF); @@ -93,6 +83,11 @@ QColor QQuickDefaultStyle::textDisabledLightColor() const return QColor::fromRgba(0xFFC2C2C2); } +QColor QQuickDefaultStyle::textPlaceholderColor() const +{ + return QColor::fromRgba(0xFF777777); +} + QColor QQuickDefaultStyle::focusColor() const { return QColor::fromRgba(0xFF0066FF); @@ -213,16 +208,6 @@ QColor QQuickDefaultStyle::scrollBarPressedColor() const return QColor::fromRgba(0xFF28282A); } -QColor QQuickDefaultStyle::progressBarColor() const -{ - return QColor::fromRgba(0xFFE4E4E4); -} - -QColor QQuickDefaultStyle::pageIndicatorColor() const -{ - return QColor::fromRgba(0xFF28282A); -} - QColor QQuickDefaultStyle::separatorColor() const { return QColor::fromRgba(0xFFCCCCCC); diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index d12587c6..e2f9bf4a 100644 --- a/src/imports/controls/qquickdefaultstyle_p.h +++ b/src/imports/controls/qquickdefaultstyle_p.h @@ -62,10 +62,9 @@ class QQuickDefaultStyle : public QObject Q_PROPERTY(QColor textColor READ textColor CONSTANT FINAL) Q_PROPERTY(QColor textDarkColor READ textDarkColor CONSTANT FINAL) Q_PROPERTY(QColor textLightColor READ textLightColor CONSTANT FINAL) - Q_PROPERTY(QColor textLinkColor READ textLinkColor CONSTANT FINAL) - Q_PROPERTY(QColor textSelectionColor READ textSelectionColor CONSTANT FINAL) Q_PROPERTY(QColor textDisabledColor READ textDisabledColor CONSTANT FINAL) Q_PROPERTY(QColor textDisabledLightColor READ textDisabledLightColor CONSTANT FINAL) + Q_PROPERTY(QColor textPlaceholderColor READ textPlaceholderColor CONSTANT FINAL) Q_PROPERTY(QColor focusColor READ focusColor CONSTANT FINAL) Q_PROPERTY(QColor focusLightColor READ focusLightColor CONSTANT FINAL) Q_PROPERTY(QColor focusPressedColor READ focusPressedColor CONSTANT FINAL) @@ -90,8 +89,6 @@ class QQuickDefaultStyle : public QObject Q_PROPERTY(QColor frameLightColor READ frameLightColor CONSTANT FINAL) Q_PROPERTY(QColor scrollBarColor READ scrollBarColor CONSTANT FINAL) Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor CONSTANT FINAL) - Q_PROPERTY(QColor progressBarColor READ progressBarColor CONSTANT FINAL) - Q_PROPERTY(QColor pageIndicatorColor READ pageIndicatorColor CONSTANT FINAL) Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL) Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL) Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL) @@ -109,6 +106,7 @@ public: QColor textSelectionColor() const; QColor textDisabledColor() const; QColor textDisabledLightColor() const; + QColor textPlaceholderColor() const; QColor focusColor() const; QColor focusLightColor() const; QColor focusPressedColor() const; @@ -133,8 +131,6 @@ public: QColor frameLightColor() const; QColor scrollBarColor() const; QColor scrollBarPressedColor() const; - QColor progressBarColor() const; - QColor pageIndicatorColor() const; QColor separatorColor() const; QColor disabledDarkColor() const; QColor disabledLightColor() const; diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index f9cdcddc..60d76556 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -41,6 +41,39 @@ QT_BEGIN_NAMESPACE QQuickDefaultTheme::QQuickDefaultTheme() : QQuickTheme(QStringLiteral("Default")) { + systemPalette.setColor(QPalette::ButtonText, QColor::fromRgba(0xFF26282A)); + systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgba(0x4D26282A)); + + systemPalette.setColor(QPalette::BrightText, QColor::fromRgba(0xFFFFFFFF)); + systemPalette.setColor(QPalette::Disabled, QPalette::BrightText, QColor::fromRgba(0x4DFFFFFF)); + + systemPalette.setColor(QPalette::Dark, QColor::fromRgba(0xFF353637)); + + systemPalette.setColor(QPalette::Highlight, QColor::fromRgba(0xFF0066FF)); + systemPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor::fromRgba(0xFFF0F6FF)); + + systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFFFFFFFF)); + + systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFE4E4E4)); + + systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7)); + + systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); + systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2)); + + systemPalette.setColor(QPalette::ToolTipBase, QColor::fromRgba(0xFFFFFFFF)); + systemPalette.setColor(QPalette::ToolTipText, QColor::fromRgba(0xFF000000)); + + systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A)); + systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF)); + + systemPalette = resolvePalette(systemPalette); +} + +const QPalette *QQuickDefaultTheme::palette(QPlatformTheme::Palette type) const +{ + Q_UNUSED(type); + return &systemPalette; } QT_END_NAMESPACE diff --git a/src/imports/controls/qquickdefaulttheme_p.h b/src/imports/controls/qquickdefaulttheme_p.h index e0811dcb..16e4d061 100644 --- a/src/imports/controls/qquickdefaulttheme_p.h +++ b/src/imports/controls/qquickdefaulttheme_p.h @@ -56,6 +56,11 @@ class QQuickDefaultTheme : public QQuickTheme { public: explicit QQuickDefaultTheme(); + + const QPalette *palette(Palette type) const override; + +private: + QPalette systemPalette; }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 872783bf..2ef84a17 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -194,6 +194,9 @@ static void layoutItem(QQuickItem *item, qreal y, qreal width) void QQuickApplicationWindowPrivate::relayout() { Q_Q(QQuickApplicationWindow); + if (!complete) + return; + QQuickItem *content = q->contentItem(); qreal hh = header && header->isVisible() ? header->height() : 0; qreal fh = footer && footer->isVisible() ? footer->height() : 0; @@ -810,6 +813,7 @@ void QQuickApplicationWindow::componentComplete() Q_D(QQuickApplicationWindow); d->complete = true; QQuickWindowQmlImpl::componentComplete(); + d->relayout(); } void QQuickApplicationWindow::resizeEvent(QResizeEvent *event) diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index dceda7d7..48d75f88 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1422,9 +1422,12 @@ bool QQuickComboBox::eventFilter(QObject *object, QEvent *event) d->hidePopup(false); break; case QEvent::KeyPress: { - const int key = static_cast<QKeyEvent *>(event)->key(); + QKeyEvent *ke = static_cast<QKeyEvent *>(event); + if (d->filterKeyEvent(ke, false)) + return true; + event->accept(); if (d->extra.isAllocated()) - d->extra->allowComplete = key != Qt::Key_Backspace && key != Qt::Key_Delete; + d->extra->allowComplete = ke->key() != Qt::Key_Backspace && ke->key() != Qt::Key_Delete; break; } case QEvent::FocusOut: |
