diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/BusyIndicator.qml | 22 | ||||
-rw-r--r-- | templates/Button.qml | 24 | ||||
-rw-r--r-- | templates/CheckBox.qml | 36 | ||||
-rw-r--r-- | templates/ComboBox.qml | 40 | ||||
-rw-r--r-- | templates/Frame.qml | 20 | ||||
-rw-r--r-- | templates/GroupBox.qml | 38 | ||||
-rw-r--r-- | templates/ItemDelegate.qml | 24 | ||||
-rw-r--r-- | templates/PageIndicator.qml | 22 | ||||
-rw-r--r-- | templates/Popup.qml | 20 | ||||
-rw-r--r-- | templates/ProgressBar.qml | 24 | ||||
-rw-r--r-- | templates/RadioButton.qml | 32 | ||||
-rw-r--r-- | templates/RangeSlider.qml | 24 | ||||
-rw-r--r-- | templates/RoundButton.qml | 24 | ||||
-rw-r--r-- | templates/ScrollBar.qml | 22 | ||||
-rw-r--r-- | templates/ScrollIndicator.qml | 22 | ||||
-rw-r--r-- | templates/Slider.qml | 18 | ||||
-rw-r--r-- | templates/SpinBox.qml | 42 | ||||
-rw-r--r-- | templates/Switch.qml | 46 | ||||
-rw-r--r-- | templates/TabBar.qml | 24 | ||||
-rw-r--r-- | templates/TabButton.qml | 24 | ||||
-rw-r--r-- | templates/TextArea.qml | 24 | ||||
-rw-r--r-- | templates/TextField.qml | 24 | ||||
-rw-r--r-- | templates/ToolBar.qml | 22 | ||||
-rw-r--r-- | templates/ToolButton.qml | 24 | ||||
-rw-r--r-- | templates/ToolTip.qml | 24 | ||||
-rw-r--r-- | templates/impl/ComboBoxPopup.qml | 22 | ||||
-rw-r--r-- | templates/impl/PageIndicatorDelegate.qml | 4 |
27 files changed, 346 insertions, 346 deletions
diff --git a/templates/BusyIndicator.qml b/templates/BusyIndicator.qml index 99d3652..a5fd183 100644 --- a/templates/BusyIndicator.qml +++ b/templates/BusyIndicator.qml @@ -10,21 +10,21 @@ T.BusyIndicator { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: !control.enabled ? "disabled" : "normal" - readonly property var config: Config.controls.busyindicator[__currentState] || {} + readonly property var __config: Config.controls.busyindicator[__currentState] || {} contentItem: StyleImage { - imageConfig: control.config.indicator + imageConfig: control.__config.indicator transformOrigin: Item.Center NumberAnimation on rotation { running: control.visible && control.running @@ -35,7 +35,7 @@ T.BusyIndicator { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/Button.qml b/templates/Button.qml index d98afc3..ba28744 100644 --- a/templates/Button.qml +++ b/templates/Button.qml @@ -10,17 +10,17 @@ T.Button { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 icon.width: 17 icon.height: 17 @@ -33,7 +33,7 @@ T.Button { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: (control.flat && Config.controls.flatbutton + readonly property var __config: (control.flat && Config.controls.flatbutton ? Config.controls.flatbutton[__currentState] : Config.controls.button[__currentState]) || {} @@ -41,7 +41,7 @@ T.Button { spacing: control.spacing mirrored: control.mirrored display: control.display - alignment: control.config.label.textVAlignment | control.config.label.textHAlignment + alignment: control.__config.label.textVAlignment | control.__config.label.textHAlignment icon: control.icon text: control.text font: control.font @@ -49,6 +49,6 @@ T.Button { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/CheckBox.qml b/templates/CheckBox.qml index c10592f..3e4c86a 100644 --- a/templates/CheckBox.qml +++ b/templates/CheckBox.qml @@ -11,17 +11,17 @@ T.CheckBox { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checkState === Qt.Checked && "checked", @@ -30,28 +30,28 @@ T.CheckBox { control.checkState === Qt.PartiallyChecked && "partiallyChecked", control.down && "pressed", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.checkbox[__currentState] || {} - readonly property bool mirroredIndicator: control.mirrored !== (config.mirrored || false) + readonly property var __config: Config.controls.checkbox[__currentState] || {} + readonly property bool __mirroredIndicator: control.mirrored !== (__config.mirrored || false) indicator: Image { - x: control.text ? (control.mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + x: control.text ? (control.__mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - source: Qt.resolvedUrl(control.config.indicator.filePath) + source: Qt.resolvedUrl(control.__config.indicator.filePath) } contentItem: Text { - leftPadding: control.indicator && !control.mirroredIndicator ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirroredIndicator ? control.indicator.width + control.spacing : 0 + leftPadding: control.indicator && !control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 + rightPadding: control.indicator && control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText elide: Text.ElideRight - horizontalAlignment: control.config.label.textHAlignment - verticalAlignment: control.config.label.textVAlignment + horizontalAlignment: control.__config.label.textHAlignment + verticalAlignment: control.__config.label.textVAlignment } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/ComboBox.qml b/templates/ComboBox.qml index bc629df..32abcde 100644 --- a/templates/ComboBox.qml +++ b/templates/ComboBox.qml @@ -12,17 +12,17 @@ T.ComboBox { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: (config.leftPadding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 - rightPadding: (config.rightPadding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: (__config.leftPadding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 + rightPadding: (__config.rightPadding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", @@ -30,7 +30,7 @@ T.ComboBox { control.popup.visible && "open", control.pressed && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: (control.editable ? Config.controls.editablecombobox[__currentState] : Config.controls.combobox[__currentState]) || {} + readonly property var __config: (control.editable ? Config.controls.editablecombobox[__currentState] : Config.controls.combobox[__currentState]) || {} delegate: ItemDelegate { @@ -47,18 +47,18 @@ T.ComboBox { } indicator: Image { - x: control.mirrored ? control.config.leftPadding : control.width - width - control.config.rightPadding + x: control.mirrored ? control.__config.leftPadding : control.width - width - control.__config.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - source: Qt.resolvedUrl(control.config.indicator.filePath) + source: Qt.resolvedUrl(control.__config.indicator.filePath) } contentItem: T.TextField { text: control.editable ? control.editText : control.displayText - topPadding: control.config.label_contentItem.topPadding || 0 - leftPadding: control.config.label_contentItem.leftPadding || 0 - rightPadding: control.config.label_contentItem.rightPadding || 0 - bottomPadding: control.config.label_contentItem.bottomPadding || 0 + topPadding: control.__config.label_contentItem.topPadding || 0 + leftPadding: control.__config.label_contentItem.leftPadding || 0 + rightPadding: control.__config.label_contentItem.rightPadding || 0 + bottomPadding: control.__config.label_contentItem.bottomPadding || 0 implicitWidth: (implicitBackgroundWidth + leftInset + rightInset) || contentWidth + leftPadding + rightPadding @@ -75,16 +75,16 @@ T.ComboBox { color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - horizontalAlignment: control.config.label_text.textHAlignment - verticalAlignment: control.config.label_text.textVAlignment + horizontalAlignment: control.__config.label_text.textHAlignment + verticalAlignment: control.__config.label_text.textVAlignment background: StyleImage { - imageConfig: control.config.label_background + imageConfig: control.__config.label_background } } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } popup: ComboBoxPopup { diff --git a/templates/Frame.qml b/templates/Frame.qml index 83ed836..a3c0736 100644 --- a/templates/Frame.qml +++ b/templates/Frame.qml @@ -12,20 +12,20 @@ T.Frame { + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: !control.enabled ? "disabled" : "normal"; - readonly property var config: Config.controls.frame[__currentState] || {} + readonly property var __config: Config.controls.frame[__currentState] || {} background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/GroupBox.qml b/templates/GroupBox.qml index f9fc733..4b196c3 100644 --- a/templates/GroupBox.qml +++ b/templates/GroupBox.qml @@ -12,51 +12,51 @@ T.GroupBox { + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - readonly property real __deltaY: (config.background.y - config.label.y) || 0 - readonly property real __deltaX: (config.background.x - config.label.x) || 0 - spacing: (__deltaY - config.label.height) || 0 + readonly property real __deltaY: (__config.background.y - __config.label.y) || 0 + readonly property real __deltaX: (__config.background.x - __config.label.x) || 0 + spacing: (__deltaY - __config.label.height) || 0 - topPadding: (config.topPadding || 0) + (spacing >= 0 ? (label.height + spacing) : __deltaY) - bottomPadding: config.bottomPadding || 0 - leftPadding: (config.leftPadding || 0) + (__deltaX >= 0 ? __deltaX : 0) - rightPadding: config.rightPadding || 0 + topPadding: (__config.topPadding || 0) + (spacing >= 0 ? (label.height + spacing) : __deltaY) + bottomPadding: __config.bottomPadding || 0 + leftPadding: (__config.leftPadding || 0) + (__deltaX >= 0 ? __deltaX : 0) + rightPadding: __config.rightPadding || 0 topInset: __deltaY > 0 ? __deltaY : 0 - bottomInset: -config.bottomInset || 0 + bottomInset: -__config.bottomInset || 0 leftInset: __deltaX > 0 ? __deltaX : 0 - rightInset: -config.rightInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && control.hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.groupbox[__currentState] || {} + readonly property var __config: Config.controls.groupbox[__currentState] || {} label: T.Label { x: control.__deltaX > 0 ? 0 : -__deltaX y: control.__deltaY > 0 ? 0 : -__deltaY - topPadding: control.config.label_contentItem.topPadding || 0 - leftPadding: control.config.label_contentItem.leftPadding || 0 - rightPadding: control.config.label_contentItem.rightPadding || 0 - bottomPadding: control.config.label_contentItem.bottomPadding || 0 + topPadding: control.__config.label_contentItem.topPadding || 0 + leftPadding: control.__config.label_contentItem.leftPadding || 0 + rightPadding: control.__config.label_contentItem.rightPadding || 0 + bottomPadding: control.__config.label_contentItem.bottomPadding || 0 - height: Math.max(implicitHeight, config.label.height) + height: Math.max(implicitHeight, control.__config.label.height) text: control.title font: control.font color: control.palette.windowText elide: Text.ElideRight - horizontalAlignment: control.config.label_text.textHAlignment - verticalAlignment: control.config.label_text.textVAlignment + horizontalAlignment: control.__config.label_text.textHAlignment + verticalAlignment: control.__config.label_text.textVAlignment background: StyleImage { - imageConfig: control.config.label_background + imageConfig: control.__config.label_background } } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background height: parent.height - control.topPadding + control.bottomPadding } } diff --git a/templates/ItemDelegate.qml b/templates/ItemDelegate.qml index cb371f3..fd8210b 100644 --- a/templates/ItemDelegate.qml +++ b/templates/ItemDelegate.qml @@ -10,17 +10,17 @@ T.ItemDelegate { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 - bottomPadding: config.bottomPadding || 0 + topPadding: __config.topPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 + bottomPadding: __config.bottomPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 icon.width: 17 icon.height: 17 @@ -32,13 +32,13 @@ T.ItemDelegate { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.itemdelegate[__currentState] || {} + readonly property var __config: Config.controls.itemdelegate[__currentState] || {} contentItem: IconLabel { spacing: control.spacing mirrored: control.mirrored display: control.display - alignment: control.config.label.textVAlignment | config.label.textHAlignment + alignment: control.__config.label.textVAlignment | control.__config.label.textHAlignment icon: control.icon text: control.text @@ -47,6 +47,6 @@ T.ItemDelegate { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/PageIndicator.qml b/templates/PageIndicator.qml index fbc1d85..eb0a3c2 100644 --- a/templates/PageIndicator.qml +++ b/templates/PageIndicator.qml @@ -10,23 +10,23 @@ T.PageIndicator { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && control.hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.pageindicator[__currentState] || {} + readonly property var __config: Config.controls.pageindicator[__currentState] || {} delegate: PageIndicatorDelegate { pageIndicator: control @@ -42,6 +42,6 @@ T.PageIndicator { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/Popup.qml b/templates/Popup.qml index 99927ff..4c34941 100644 --- a/templates/Popup.qml +++ b/templates/Popup.qml @@ -10,20 +10,20 @@ T.Popup { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: control.modal ? "modal" : "normal"; - readonly property var config: Config.controls.popup[__currentState] || {} + readonly property var __config: Config.controls.popup[__currentState] || {} background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/ProgressBar.qml b/templates/ProgressBar.qml index df79079..a452cb5 100644 --- a/templates/ProgressBar.qml +++ b/templates/ProgressBar.qml @@ -10,21 +10,21 @@ T.ProgressBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.indeterminate && "indeterminate" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.progressbar[__currentState] || {} + readonly property var __config: Config.controls.progressbar[__currentState] || {} contentItem: Item { parent: control.background @@ -37,7 +37,7 @@ T.ProgressBar { visible: !control.indeterminate && control.value width: control.position * parent.width height: parent.height - imageConfig: control.config.track + imageConfig: control.__config.track } readonly property StyleImage animatedProgress: StyleImage { @@ -45,7 +45,7 @@ T.ProgressBar { visible: control.indeterminate width: implicitWidth height: parent.height - imageConfig: control.config.track + imageConfig: control.__config.track SequentialAnimation on x { loops: Animation.Infinite @@ -56,6 +56,6 @@ T.ProgressBar { } background: StyleImage { - imageConfig: control.config.groove + imageConfig: control.__config.groove } } diff --git a/templates/RadioButton.qml b/templates/RadioButton.qml index bf89c1c..5368ce5 100644 --- a/templates/RadioButton.qml +++ b/templates/RadioButton.qml @@ -11,17 +11,17 @@ T.RadioButton { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checked && "checked", @@ -29,13 +29,13 @@ T.RadioButton { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.radiobutton[__currentState] || {} - readonly property bool mirroredIndicator: control.mirrored !== (config.mirrored || false) + readonly property var __config: Config.controls.radiobutton[__currentState] || {} + readonly property bool __mirroredIndicator: control.mirrored !== (__config.mirrored || false) indicator: Image { - x: control.text ? (control.mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + x: control.text ? (control.__mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - source: Qt.resolvedUrl(control.config.indicator.filePath) + source: Qt.resolvedUrl(control.__config.indicator.filePath) } contentItem: Text { @@ -46,11 +46,11 @@ T.RadioButton { font: control.font color: control.palette.windowText elide: Text.ElideRight - horizontalAlignment: control.config.label.textHAlignment - verticalAlignment: control.config.label.textVAlignment + horizontalAlignment: control.__config.label.textHAlignment + verticalAlignment: control.__config.label.textVAlignment } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/RangeSlider.qml b/templates/RangeSlider.qml index e735d12..6340e1e 100644 --- a/templates/RangeSlider.qml +++ b/templates/RangeSlider.qml @@ -12,29 +12,29 @@ T.RangeSlider { first.implicitHandleHeight + topPadding + bottomPadding, second.implicitHandleHeight + topPadding + bottomPadding) - topPadding: horizontal ? config.topPadding : config.leftPadding || 0 - leftPadding: horizontal ? config.leftPadding : config.bottomPadding || 0 - rightPadding: horizontal ? config.rightPadding : config.topPadding || 0 - bottomPadding: horizontal ? config.bottomPadding : config.rightPadding || 0 + topPadding: horizontal ? __config.topPadding : __config.leftPadding || 0 + leftPadding: horizontal ? __config.leftPadding : __config.bottomPadding || 0 + rightPadding: horizontal ? __config.rightPadding : __config.topPadding || 0 + bottomPadding: horizontal ? __config.bottomPadding : __config.rightPadding || 0 property string __controlState: [ !control.enabled && "disabled", control.enabled && control.hovered && !(first.pressed || second.pressed) && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.rangeslider[__controlState] || {} + readonly property var __config: Config.controls.rangeslider[__controlState] || {} property string __firstHandleState: [ first.hovered && !first.pressed && "hovered", first.pressed && "handle_pressed", ].filter(Boolean).join("_") || "normal" - readonly property var firstHandleConfig: Config.controls.rangeslider[__firstHandleState] || {} + readonly property var __firstHandleConfig: Config.controls.rangeslider[__firstHandleState] || {} property string __secondHandleState: [ second.hovered && !second.pressed && "hovered", second.pressed && "handle_pressed", ].filter(Boolean).join("_") || "normal" - readonly property var secondHandleConfig: Config.controls.rangeslider[__secondHandleState] || {} + readonly property var __secondHandleConfig: Config.controls.rangeslider[__secondHandleState] || {} first.handle: StyleImage { x: Math.round(control.leftPadding + (control.horizontal @@ -44,7 +44,7 @@ T.RangeSlider { ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height))) - imageConfig: control.firstHandleConfig.first_handle + imageConfig: control.__firstHandleConfig.first_handle } second.handle: StyleImage { @@ -55,7 +55,7 @@ T.RangeSlider { ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height))) - imageConfig: control.secondHandleConfig.second_handle + imageConfig: control.__secondHandleConfig.second_handle } background: Item { @@ -69,7 +69,7 @@ T.RangeSlider { property Item _background: StyleImage { parent: control.background anchors.fill: parent - imageConfig: control.config.background + imageConfig: control.__config.background property Item groove: StyleImage { parent: control.background._background @@ -88,7 +88,7 @@ T.RangeSlider { ? implicitHeight : control.availableHeight - (control.first.handle.width / 2) - (control.second.handle.width / 2) - imageConfig: control.config.groove + imageConfig: control.__config.groove horizontal: control.horizontal property Item track: StyleImage { @@ -101,7 +101,7 @@ T.RangeSlider { height: horizontal ? parent.height : parent.height * (control.second.position - control.first.position) - imageConfig: control.config.track + imageConfig: control.__config.track horizontal: control.horizontal minimumWidth: 0 minimumHeight: 0 diff --git a/templates/RoundButton.qml b/templates/RoundButton.qml index 769fdb0..643e98f 100644 --- a/templates/RoundButton.qml +++ b/templates/RoundButton.qml @@ -10,17 +10,17 @@ T.RoundButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 icon.width: 17 icon.height: 17 @@ -36,13 +36,13 @@ T.RoundButton { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.roundbutton[__currentState] || {} + readonly property var __config: Config.controls.roundbutton[__currentState] || {} contentItem: IconLabel { spacing: control.spacing mirrored: control.mirrored display: control.display - alignment: control.config.label.textVAlignment | control.config.label.textHAlignment + alignment: control.__config.label.textVAlignment | control.__config.label.textHAlignment icon: control.icon text: control.text font: control.font @@ -50,6 +50,6 @@ T.RoundButton { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/ScrollBar.qml b/templates/ScrollBar.qml index 2910a74..63b2555 100644 --- a/templates/ScrollBar.qml +++ b/templates/ScrollBar.qml @@ -13,25 +13,25 @@ T.ScrollBar { visible: control.policy !== T.ScrollBar.AlwaysOff minimumSize: orientation === Qt.Horizontal ? height / width : width / height - topPadding: (horizontal ? config.topPadding : config.leftPadding) || 0 - leftPadding: (horizontal ? config.leftPadding : config.bottomPadding) || 0 - rightPadding: (horizontal ? config.rightPadding : config.topPadding) || 0 - bottomPadding: (horizontal ? config.bottomPadding : config.rightPadding) || 0 + topPadding: (horizontal ? __config.topPadding : __config.leftPadding) || 0 + leftPadding: (horizontal ? __config.leftPadding : __config.bottomPadding) || 0 + rightPadding: (horizontal ? __config.rightPadding : __config.topPadding) || 0 + bottomPadding: (horizontal ? __config.bottomPadding : __config.rightPadding) || 0 - topInset: (horizontal ? -config.topInset : -config.leftInset) || 0 - leftInset: (horizontal ? -config.leftInset : -config.bottomInset) || 0 - rightInset: (horizontal ? -config.rightInset : -config.topInset) || 0 - bottomInset: (horizontal ? -config.bottomInset : -config.rightInset) || 0 + topInset: (horizontal ? -__config.topInset : -__config.leftInset) || 0 + leftInset: (horizontal ? -__config.leftInset : -__config.bottomInset) || 0 + rightInset: (horizontal ? -__config.rightInset : -__config.topInset) || 0 + bottomInset: (horizontal ? -__config.bottomInset : -__config.rightInset) || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && !control.pressed && control.hovered && "hovered", control.pressed && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.scrollbar[__currentState] || {} + readonly property var __config: Config.controls.scrollbar[__currentState] || {} contentItem: StyleImage { - imageConfig: control.config.handle + imageConfig: control.__config.handle horizontal: control.horizontal width: control.availableWidth height: control.availableHeight @@ -39,7 +39,7 @@ T.ScrollBar { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background horizontal: control.horizontal opacity: 0.0 } diff --git a/templates/ScrollIndicator.qml b/templates/ScrollIndicator.qml index 47a6d13..c184c02 100644 --- a/templates/ScrollIndicator.qml +++ b/templates/ScrollIndicator.qml @@ -10,20 +10,20 @@ T.ScrollIndicator { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - topPadding: (horizontal ? config.topPadding : config.leftPadding) || 0 - leftPadding: (horizontal ? config.leftPadding : config.bottomPadding) || 0 - rightPadding: (horizontal ? config.rightPadding : config.topPadding) || 0 - bottomPadding: (horizontal ? config.bottomPadding : config.rightPadding) || 0 + topPadding: (horizontal ? __config.topPadding : __config.leftPadding) || 0 + leftPadding: (horizontal ? __config.leftPadding : __config.bottomPadding) || 0 + rightPadding: (horizontal ? __config.rightPadding : __config.topPadding) || 0 + bottomPadding: (horizontal ? __config.bottomPadding : __config.rightPadding) || 0 - topInset: (horizontal ? -config.topInset : -config.leftInset) || 0 - leftInset: (horizontal ? -config.leftInset : -config.bottomInset) || 0 - rightInset: (horizontal ? -config.rightInset : -config.topInset) || 0 - bottomInset: (horizontal ? -config.bottomInset : -config.rightInset) || 0 + topInset: (horizontal ? -__config.topInset : -__config.leftInset) || 0 + leftInset: (horizontal ? -__config.leftInset : -__config.bottomInset) || 0 + rightInset: (horizontal ? -__config.rightInset : -__config.topInset) || 0 + bottomInset: (horizontal ? -__config.bottomInset : -__config.rightInset) || 0 - readonly property var config: Config.controls.scrollindicator["normal"] || {} + readonly property var __config: Config.controls.scrollindicator["normal"] || {} contentItem: StyleImage { - imageConfig: control.config.handle + imageConfig: control.__config.handle horizontal: control.horizontal width: control.availableWidth height: control.availableHeight @@ -31,7 +31,7 @@ T.ScrollIndicator { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background horizontal: control.horizontal opacity: 0.0 } diff --git a/templates/Slider.qml b/templates/Slider.qml index 4d775ff..f69cb24 100644 --- a/templates/Slider.qml +++ b/templates/Slider.qml @@ -10,17 +10,17 @@ T.Slider { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitHandleHeight + topPadding + bottomPadding) - topPadding: horizontal ? config.topPadding : config.leftPadding || 0 - leftPadding: horizontal ? config.leftPadding : config.bottomPadding || 0 - rightPadding: horizontal ? config.rightPadding : config.topPadding || 0 - bottomPadding: horizontal ? config.bottomPadding : config.rightPadding || 0 + topPadding: horizontal ? __config.topPadding : __config.leftPadding || 0 + leftPadding: horizontal ? __config.leftPadding : __config.bottomPadding || 0 + rightPadding: horizontal ? __config.rightPadding : __config.topPadding || 0 + bottomPadding: horizontal ? __config.bottomPadding : __config.rightPadding || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && !control.pressed && control.hovered && "hovered", control.pressed && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.slider[__currentState] || {} + readonly property var __config: Config.controls.slider[__currentState] || {} handle: StyleImage { x: Math.round(control.leftPadding + (control.horizontal @@ -30,7 +30,7 @@ T.Slider { ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))) - imageConfig: control.config.handle + imageConfig: control.__config.handle } background: Item { @@ -44,7 +44,7 @@ T.Slider { property Item _background: StyleImage { parent: control.background anchors.fill: parent - imageConfig: control.config.background + imageConfig: control.__config.background property Item groove: StyleImage { parent: control.background._background @@ -61,7 +61,7 @@ T.Slider { height: control.horizontal ? implicitHeight : control.availableHeight - control.handle.width - imageConfig: control.config.groove + imageConfig: control.__config.groove horizontal: control.horizontal property Item track: StyleImage { @@ -69,7 +69,7 @@ T.Slider { y: horizontal ? 0 : parent.height - (parent.height * control.position) width: horizontal ? parent.width * control.position : parent.width height: horizontal ? parent.height : parent.height * control.position - imageConfig: control.config.track + imageConfig: control.__config.track horizontal: control.horizontal minimumWidth: 0 minimumHeight: 0 diff --git a/templates/SpinBox.qml b/templates/SpinBox.qml index a5a79f5..0afc061 100644 --- a/templates/SpinBox.qml +++ b/templates/SpinBox.qml @@ -17,21 +17,21 @@ T.SpinBox { enabled && (down.pressed || up.pressed) && "pressed", enabled && hovered && !(down.pressed || up.pressed) && "hovered" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.spinbox[__controlState] || {} - readonly property var downConfig: value == from ? Config.controls.spinbox["atlimit"] : config - readonly property var upConfig: value == to ? Config.controls.spinbox["atlimit"] : config + readonly property var __config: Config.controls.spinbox[__controlState] || {} + readonly property var __downConfig: value == from ? Config.controls.spinbox["atlimit"] : __config + readonly property var __upConfig: value == to ? Config.controls.spinbox["atlimit"] : __config - readonly property bool mirroredIndicators: control.mirrored !== (config.mirrored || false) + readonly property bool __mirroredIndicators: control.mirrored !== (__config.mirrored || false) - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 - topPadding: config.topPadding || 0 - bottomPadding: config?.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config?.bottomPadding || 0 - topInset: -config?.topInset || 0 - bottomInset: -config?.bottomInset || 0 - leftInset: -config?.leftInset || 0 - rightInset: -config?.rightInset || 0 + topInset: -__config?.topInset || 0 + bottomInset: -__config?.bottomInset || 0 + leftInset: -__config?.leftInset || 0 + rightInset: -__config?.rightInset || 0 validator: IntValidator { locale: control.locale.name @@ -48,8 +48,8 @@ T.SpinBox { color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - horizontalAlignment: control.config.textInput.textHAlignment - verticalAlignment: control.config.textInput.textVAlignment + horizontalAlignment: control.__config.textInput.textHAlignment + verticalAlignment: control.__config.textInput.textVAlignment readOnly: !control.editable validator: control.validator @@ -58,32 +58,32 @@ T.SpinBox { down.indicator: StyleImage { height: control.height - imageConfig: control.downConfig.indicator_down_background + imageConfig: control.__downConfig.indicator_down_background StyleImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 imageConfig: control.mirrored - ? control.upConfig.indicator_up_icon - : control.downConfig.indicator_down_icon + ? control.__upConfig.indicator_up_icon + : control.__downConfig.indicator_down_icon } } up.indicator: StyleImage { x: control.width - width height: control.height - imageConfig: control.upConfig.indicator_up_background + imageConfig: control.__upConfig.indicator_up_background StyleImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 imageConfig: control.mirrored - ? control.downConfig.indicator_down_icon - : control.upConfig.indicator_up_icon + ? control.__downConfig.indicator_down_icon + : control.__upConfig.indicator_up_icon } } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/Switch.qml b/templates/Switch.qml index cb72f85..7666435 100644 --- a/templates/Switch.qml +++ b/templates/Switch.qml @@ -12,17 +12,17 @@ T.Switch { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 - bottomPadding: config.bottomPadding || 0 + topPadding: __config.topPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 + bottomPadding: __config.bottomPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checked && "checked", @@ -30,11 +30,11 @@ T.Switch { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.switch_[__currentState] || {} - readonly property bool mirroredIndicator: control.mirrored !== (config.mirrored || false) + readonly property var __config: Config.controls.switch_[__currentState] || {} + readonly property bool __mirroredIndicator: control.mirrored !== (__config.mirrored || false) indicator: Item { - x: control.mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding + x: control.__mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding y: control.topPadding + (control.availableHeight - height) / 2 // If handleBackground is not generated, use the size of the handle implicitWidth: handleBackground.width > 0 ? handleBackground.width : handleBackground.handle.width * 2 @@ -42,17 +42,17 @@ T.Switch { property Item handleBackground: StyleImage { parent: control.indicator - imageConfig: control.config.handle_background + imageConfig: control.__config.handle_background property Item handle: StyleImage { parent: control.indicator.handleBackground - x: control.config.handle_contentItem.leftPadding + x: control.__config.handle_contentItem.leftPadding + (control.visualPosition * (parent.width - width - - control.config.handle_contentItem.leftPadding - - control.config.handle_contentItem.rightPadding)) - y: control.config.handle_contentItem.topPadding + - control.__config.handle_contentItem.leftPadding + - control.__config.handle_contentItem.rightPadding)) + y: control.__config.handle_contentItem.topPadding - imageConfig: control.config.handle + imageConfig: control.__config.handle Behavior on x { enabled: !control.down @@ -65,17 +65,17 @@ T.Switch { } contentItem: Text { - leftPadding: control.indicator && !control.mirroredIndicator ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirroredIndicator ? control.indicator.width + control.spacing : 0 + leftPadding: control.indicator && !control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 + rightPadding: control.indicator && control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText elide: Text.ElideRight - horizontalAlignment: control.config.label.textHAlignment - verticalAlignment: control.config.label.textVAlignment + horizontalAlignment: control.__config.label.textHAlignment + verticalAlignment: control.__config.label.textVAlignment } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/TabBar.qml b/templates/TabBar.qml index 7188b19..3e8f575 100644 --- a/templates/TabBar.qml +++ b/templates/TabBar.qml @@ -10,28 +10,28 @@ T.TabBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: position === TabBar.Header ? (enabled ? "normal" : "disabled") : (enabled ? "normal_footer" : "disabled_footer") - readonly property var config: Config.controls.tabbar[__currentState] || {} + readonly property var __config: Config.controls.tabbar[__currentState] || {} contentItem: ListView { model: control.contentModel currentIndex: control.currentIndex - spacing: control.config.spacing + spacing: control.__config.spacing orientation: ListView.Horizontal boundsBehavior: Flickable.StopAtBounds flickableDirection: Flickable.AutoFlickIfNeeded @@ -44,6 +44,6 @@ T.TabBar { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/TabButton.qml b/templates/TabButton.qml index bce7a57..3535d82 100644 --- a/templates/TabButton.qml +++ b/templates/TabButton.qml @@ -10,17 +10,17 @@ T.TabButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ checked && "checked", @@ -28,13 +28,13 @@ T.TabButton { enabled && !down && hovered && "hovered", down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.tabbutton[__currentState] || {} + readonly property var __config: Config.controls.tabbutton[__currentState] || {} contentItem: IconLabel { spacing: control.spacing mirrored: control.mirrored display: control.display - alignment: control.config.label.textVAlignment | control.config.label.textHAlignment + alignment: control.__config.label.textVAlignment | control.__config.label.textHAlignment icon: control.icon text: control.text font: control.font @@ -42,6 +42,6 @@ T.TabButton { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/TextArea.qml b/templates/TextArea.qml index 478dfdc..3538f08 100644 --- a/templates/TextArea.qml +++ b/templates/TextArea.qml @@ -12,21 +12,21 @@ T.TextArea { + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - verticalAlignment: control.config.label.textVAlignment - horizontalAlignment: control.config.label.textHAlignment + verticalAlignment: control.__config.label.textVAlignment + horizontalAlignment: control.__config.label.textHAlignment placeholderTextColor: control.palette.placeholderText readonly property string __currentState: [ @@ -34,7 +34,7 @@ T.TextArea { activeFocus && "focused", enabled && !activeFocus && hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.textarea[__currentState] || {} + readonly property var __config: Config.controls.textarea[__currentState] || {} PlaceholderText { id: placeholder @@ -54,6 +54,6 @@ T.TextArea { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/TextField.qml b/templates/TextField.qml index da3bfec..2b15415 100644 --- a/templates/TextField.qml +++ b/templates/TextField.qml @@ -16,24 +16,24 @@ T.TextField { activeFocus && "focused", enabled && !activeFocus && hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.textfield[__currentState] || {} + readonly property var __config: Config.controls.textfield[__currentState] || {} - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText placeholderTextColor: control.palette.placeholderText - verticalAlignment: control.config.label.textVAlignment - horizontalAlignment: control.config.label.textHAlignment + verticalAlignment: control.__config.label.textVAlignment + horizontalAlignment: control.__config.label.textHAlignment PlaceholderText { id: placeholder @@ -53,6 +53,6 @@ T.TextField { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/ToolBar.qml b/templates/ToolBar.qml index 793413e..17104a5 100644 --- a/templates/ToolBar.qml +++ b/templates/ToolBar.qml @@ -10,24 +10,24 @@ T.ToolBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: position === ToolBar.Header ? (enabled ? "normal" : "disabled") : (enabled ? "normal_footer" : "disabled_footer") - readonly property var config: Config.controls.toolbar[__currentState] || {} + readonly property var __config: Config.controls.toolbar[__currentState] || {} background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/ToolButton.qml b/templates/ToolButton.qml index 3b9d463..4c8b205 100644 --- a/templates/ToolButton.qml +++ b/templates/ToolButton.qml @@ -10,17 +10,17 @@ T.ToolButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checked && "checked", @@ -28,9 +28,9 @@ T.ToolButton { control.enabled && !control.down && control.hovered && "hovered", down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.toolbutton[__currentState] || {} + readonly property var __config: Config.controls.toolbutton[__currentState] || {} - // TODO: Set this from the config? + // TODO: Set this from the __config? icon.width: 17 icon.height: 17 icon.color: control.palette.buttonText @@ -47,6 +47,6 @@ T.ToolButton { } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/ToolTip.qml b/templates/ToolTip.qml index fc8a551..fe55de0 100644 --- a/templates/ToolTip.qml +++ b/templates/ToolTip.qml @@ -13,17 +13,17 @@ T.ToolTip { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - readonly property var config: Config.controls.tooltip["normal"] || {} + readonly property var __config: Config.controls.tooltip["normal"] || {} - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent @@ -32,11 +32,11 @@ T.ToolTip { font: control.font wrapMode: Text.Wrap color: control.palette.toolTipText - horizontalAlignment: control.config.label.textHAlignment - verticalAlignment: control.config.label.textVAlignment + horizontalAlignment: control.__config.label.textHAlignment + verticalAlignment: control.__config.label.textVAlignment } background: StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/templates/impl/ComboBoxPopup.qml b/templates/impl/ComboBoxPopup.qml index aadf525..0128c32 100644 --- a/templates/impl/ComboBoxPopup.qml +++ b/templates/impl/ComboBoxPopup.qml @@ -9,15 +9,15 @@ T.Popup { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 - bottomPadding: config.bottomPadding || 0 + topPadding: __config.topPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 + bottomPadding: __config.bottomPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 required property T.ComboBox __combobox @@ -27,12 +27,12 @@ T.Popup { popup.visible && "open", __combobox.pressed && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.comboboxpopup[__currentState] || {} + readonly property var __config: Config.controls.comboboxpopup[__currentState] || {} contentItem: ListView { clip: true implicitHeight: contentHeight - spacing: config.contentItem.spacing + spacing: control.__config.contentItem.spacing highlightMoveDuration: 0 model: __combobox.delegateModel @@ -42,6 +42,6 @@ T.Popup { } background: StyleImage { - imageConfig: config.background + imageConfig: control.__config.background } } diff --git a/templates/impl/PageIndicatorDelegate.qml b/templates/impl/PageIndicatorDelegate.qml index 5085387..b36fe0f 100644 --- a/templates/impl/PageIndicatorDelegate.qml +++ b/templates/impl/PageIndicatorDelegate.qml @@ -13,7 +13,7 @@ StyleImage { pageIndicator.enabled && index === pageIndicator.currentIndex && "current", pageIndicator.enabled && pageIndicator.interactive && pressed && "pressed" ].filter(Boolean).join("_") || (pageIndicator.hovered ? "hovered" : "normal") - readonly property var config: Config.controls.pageindicatordelegate[__currentState].indicator || {} + readonly property var __config: Config.controls.pageindicatordelegate[__currentState].indicator || {} - imageConfig: config + imageConfig: __config } |