diff options
Diffstat (limited to 'share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets')
4 files changed, 35 insertions, 34 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml index 8725ba6979..2b97df0646 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml @@ -34,6 +34,7 @@ Section { id: root + property int labelWidth: 42 property int spinBoxWidth: 96 SectionLayout { @@ -173,13 +174,13 @@ Section { Label { text: "W" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.contentWidth minimumValue: 0 - maximumValue: 8000 + maximumValue: 10000 implicitWidth: root.spinBoxWidth Layout.fillWidth: true } @@ -191,13 +192,13 @@ Section { Label { text: "H" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.contentHeight minimumValue: 0 - maximumValue: 8000 + maximumValue: 10000 implicitWidth: root.spinBoxWidth Layout.fillWidth: true } @@ -213,12 +214,12 @@ Section { Label { text: "X" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.contentX - minimumValue: 0 + minimumValue: -8000 maximumValue: 8000 implicitWidth: root.spinBoxWidth Layout.fillWidth: true @@ -231,12 +232,12 @@ Section { Label { text: "Y" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.contentY - minimumValue: 0 + minimumValue: -8000 maximumValue: 8000 implicitWidth: root.spinBoxWidth Layout.fillWidth: true @@ -254,13 +255,13 @@ Section { Label { text: "Top" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.topMargin - maximumValue: 0xffff - minimumValue: 0 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 implicitWidth: root.spinBoxWidth Layout.fillWidth: true @@ -273,13 +274,13 @@ Section { Label { text: "Bottom" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.bottomMargin - maximumValue: 0xffff - minimumValue: 0 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 implicitWidth: root.spinBoxWidth Layout.fillWidth: true @@ -297,13 +298,13 @@ Section { Label { text: "Left" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.leftMargin - maximumValue: 0xffff - minimumValue: 0 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 implicitWidth: root.spinBoxWidth Layout.fillWidth: true @@ -316,13 +317,13 @@ Section { Label { text: "Right" - width: 42 + width: root.labelWidth } SpinBox { backendValue: backendValues.rightMargin - maximumValue: 0xffff - minimumValue: 0 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 implicitWidth: root.spinBoxWidth Layout.fillWidth: true diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml index e4129c6dcf..ce1a0d4154 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml @@ -38,7 +38,7 @@ Controls.Label { property alias toolTip: toolTipArea.tooltip width: Math.max(Math.min(240, parent.width - 280), 50) - color: Theme.color(Theme.PanelTextColorLight) + color: StudioTheme.Values.themeTextColor elide: Text.ElideRight font.pixelSize: StudioTheme.Values.myFontSize diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml index 153d7cb27b..63b8f8702b 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml @@ -45,8 +45,8 @@ Section { width: 42 } SpinBox { - maximumValue: 9999999 - minimumValue: -9999999 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 backendValue: backendValues.topMargin Layout.fillWidth: true @@ -62,8 +62,8 @@ Section { width: 42 } SpinBox { - maximumValue: 9999999 - minimumValue: -9999999 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 backendValue: backendValues.bottomMargin Layout.fillWidth: true @@ -80,8 +80,8 @@ Section { width: 42 } SpinBox { - maximumValue: 9999999 - minimumValue: -9999999 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 backendValue: backendValues.leftMargin Layout.fillWidth: true @@ -97,8 +97,8 @@ Section { width: 42 } SpinBox { - maximumValue: 9999999 - minimumValue: -9999999 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 backendValue: backendValues.rightMargin Layout.fillWidth: true @@ -111,8 +111,8 @@ Section { } SecondColumnLayout { SpinBox { - maximumValue: 9999999 - minimumValue: -9999999 + minimumValue: -10000 + maximumValue: 10000 decimals: 0 backendValue: backendValues.margins Layout.fillWidth: true diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml index 10b09287b7..583b11ee9a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.1 as Controls +import QtQuick.Controls 2.12 as Controls import QtQuick.Layouts 1.0 import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme @@ -52,7 +52,7 @@ Item { Controls.Label { id: label anchors.verticalCenter: parent.verticalCenter - color: Theme.color(Theme.PanelTextColorLight) + color: StudioTheme.Values.themeTextColor x: 22 font.bold: true font.pixelSize: StudioTheme.Values.myFontSize @@ -75,7 +75,7 @@ Item { } - color: Theme.color(Theme.BackgroundColorDark) + color: StudioTheme.Values.themeSectionHeadBackground Rectangle { visible: false |