feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add error mode to ColorLogic

Browse Source 
Task-number: QDS-1221
Change-Id: I95009dc3700f3e308280fadaea374e7ba6dfa08b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2019-12-19 11:29:44 +01:00
committed by Henning Gründl
parent f6659f24df
commit 91b491ffb9
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLogic.qml
View File

@@ -36,20 +36,28 @@ QtObject {
property bool isInModel: backendValue.isInModel; property bool isInModel: backendValue.isInModel;
property bool isInSubState: backendValue.isInSubState; property bool isInSubState: backendValue.isInSubState;
property bool highlight: textColor === __changedTextColor property bool highlight: textColor === __changedTextColor
property bool errorState: false
property color __defaultTextColor: StudioTheme.Values.themeTextColor readonly property color __defaultTextColor: StudioTheme.Values.themeTextColor
readonly property color __changedTextColor: StudioTheme.Values.themeInteraction readonly property color __changedTextColor: StudioTheme.Values.themeInteraction
readonly property color __errorTextColor: StudioTheme.Values.themeErrorColor
onBackendValueChanged: evaluate() onBackendValueChanged: evaluate()
onValueFromBackendChanged: evaluate() onValueFromBackendChanged: evaluate()
onBaseStateFlagChanged: evaluate() onBaseStateFlagChanged: evaluate()
onIsInModelChanged: evaluate() onIsInModelChanged: evaluate()
onIsInSubStateChanged: evaluate() onIsInSubStateChanged: evaluate()
onErrorStateChanged: evaluate()
function evaluate() { function evaluate() {
if (innerObject.backendValue === undefined) if (innerObject.backendValue === undefined)
return return
if (innerObject.errorState) {
innerObject.textColor = __errorTextColor
return
}
if (innerObject.baseStateFlag) { if (innerObject.baseStateFlag) {
if (innerObject.backendValue.isInModel) if (innerObject.backendValue.isInModel)
innerObject.textColor = __changedTextColor innerObject.textColor = __changedTextColor

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
View File

@@ -33,7 +33,7 @@ StudioControls.ComboBox {
property variant backendValue property variant backendValue
labelColor: edit ? StudioTheme.Values.themeTextColor : colorLogic.textColor labelColor: edit && !colorLogic.errorState ? StudioTheme.Values.themeTextColor : colorLogic.textColor
property string scope: "Qt" property string scope: "Qt"
property bool useInteger: false property bool useInteger: false
@@ -48,6 +48,8 @@ StudioControls.ComboBox {
property bool showExtendedFunctionButton: true property bool showExtendedFunctionButton: true
property alias colorLogic: colorLogic
ExtendedFunctionLogic { ExtendedFunctionLogic {
id: extFuncLogic id: extFuncLogic
backendValue: comboBox.backendValue backendValue: comboBox.backendValue

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
View File

@@ -108,6 +108,8 @@ QtObject {
property string themeSliderInactiveTrackFocus: "#606060" property string themeSliderInactiveTrackFocus: "#606060"
property string themeSliderHandleFocus: values.themeInteraction property string themeSliderHandleFocus: values.themeInteraction
property string themeErrorColor: "#df3a3a"
// NEW NEW NEW NEW NEW // NEW NEW NEW NEW NEW
property string themeControlBackgroundDisabled: "#363636" property string themeControlBackgroundDisabled: "#363636"
property string themeControlOutlineDisabled: "#404040" property string themeControlOutlineDisabled: "#404040"