summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2016-07-21 13:12:14 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-07-21 12:18:31 +0000
commitb63f98a592e7a5d9bb8f1d63c0633a8a832601e5 (patch)
treebc798ceb570d42f859a5c7241d49525895e2f7a6 /share
parent23168e93ae6f18d1fdc2170dfb1745e9c6e9c8e3 (diff)
downloadqt-creator-b63f98a592e7a5d9bb8f1d63c0633a8a832601e5.tar.gz
QmlDesigner: fix warning if colorLogic does not exist
The idea that these spinboxes should be a mashup with a slider was never completely implented. Change-Id: I049f0db595fcce0fb59fad550ceb1a4ca2b415bb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml24
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml (renamed from share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml)6
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir2
3 files changed, 10 insertions, 22 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
index a606fc97f7..80272e25c3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
@@ -298,13 +298,9 @@ Item {
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
}
- SliderSpinBox {
+ DoubleSpinBox {
id: hueSlider2
//value: colorButton.hue
- decimals: 2
- stepSize: 0.1
- minimumValue: 0
- maximumValue: 1
onValueChanged: {
if (colorButton.hue !== value && !colorButton.block) {
colorButton.hue = value
@@ -325,13 +321,9 @@ Item {
anchors.verticalCenter: parent.verticalCenter
}
- SliderSpinBox {
+ DoubleSpinBox {
id: saturationSlider
//value: colorButton.saturation
- decimals: 2
- stepSize: 0.1
- minimumValue: 0
- maximumValue: 1
onValueChanged: {
if (colorButton.saturation !== value && !colorButton.block) {
colorButton.saturation = value
@@ -351,13 +343,9 @@ Item {
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
}
- SliderSpinBox {
+ DoubleSpinBox {
id: lightnessSlider
//value: colorButton.lightness
- decimals: 2
- stepSize: 0.1
- minimumValue: 0
- maximumValue: 1
onValueChanged: {
if (colorButton.lightness !== value && !colorButton.block) {
colorButton.lightness = value
@@ -378,13 +366,9 @@ Item {
anchors.verticalCenter: parent.verticalCenter
}
- SliderSpinBox {
+ DoubleSpinBox {
id: alphaSlider
- decimals: 2
- stepSize: 0.1
//value: colorButton.alpha
- minimumValue: 0
- maximumValue: 1
onValueChanged: {
if (colorButton.alpha !== value && !colorButton.block) {
colorButton.alpha = value
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml
index 9bd286769e..c80054b14f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/DoubleSpinBox.qml
@@ -29,8 +29,12 @@ import QtQuick.Controls 1.0
SpinBox {
id: spinBox
width: 76
+ decimals: 2
+ stepSize: 0.1
+ minimumValue: 0
+ maximumValue: 1
- property color textColor: colorLogic.textColor
+ property color textColor: creatorTheme.PanelTextColorLight
style: CustomSpinBoxStyle {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir
index 5aa64e7d68..b4ee6dda7f 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/qmldir
@@ -31,7 +31,7 @@ ScrollView 2.0 ScrollView.qml
SecondColumnLayout 2.0 SecondColumnLayout.qml
Section 2.0 Section.qml
SectionLayout 2.0 SectionLayout.qml
-SliderSpinBox 2.0 SliderSpinBox.qml
+DoubleSpinBox 2.0 DoubleSpinBox.qml
SpinBox 2.0 SpinBox.qml
StandardTextSection 2.0 StandardTextSection.qml
Tab 2.0 Tab.qml