From 67377e5033473c0ec146e0e2f50da5c53e445f54 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Tue, 12 Nov 2024 09:08:48 +0700 Subject: [PATCH] Remove out-of-palette use of blue color, improve constraints label --- .../relationeditors/ordered_relation_editor.qml | 8 +++----- src/qml/editorwidgets/relationeditors/relation_editor.qml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml b/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml index 0116675fe9..025e495312 100644 --- a/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml +++ b/src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml @@ -77,16 +77,14 @@ EditorWidgetBase { Text { visible: isEnabled color: Theme.secondaryTextColor - text: isEnabled && !constraintsHardValid ? qsTr('Ensure contraints') : '' + text: isEnabled && !constraintsHardValid ? qsTr('Ensure contraints are met') : '' anchors { leftMargin: 10 left: parent.left right: addButtonRow.left verticalCenter: parent.verticalCenter } - font.bold: true - font.italic: true - font.pointSize: Theme.tipFont.pointSize + font: Theme.tipFont } Row { @@ -106,7 +104,7 @@ EditorWidgetBase { round: false iconSource: Theme.getThemeVectorIcon('ic_add_white_24dp') - bgcolor: parent.enabled ? nmRelationId ? 'blue' : 'black' : 'grey' + bgcolor: parent.enabled ? 'black' : 'grey' } } diff --git a/src/qml/editorwidgets/relationeditors/relation_editor.qml b/src/qml/editorwidgets/relationeditors/relation_editor.qml index 521c92a32e..902a7396c2 100644 --- a/src/qml/editorwidgets/relationeditors/relation_editor.qml +++ b/src/qml/editorwidgets/relationeditors/relation_editor.qml @@ -87,16 +87,14 @@ EditorWidgetBase { Text { visible: isEnabled color: Theme.secondaryTextColor - text: isEnabled && !constraintsHardValid ? qsTr('Ensure contraints') : '' + text: isEnabled && !constraintsHardValid ? qsTr('Ensure contraints are met') : '' anchors { leftMargin: 10 left: parent.left right: addButtonRow.left verticalCenter: parent.verticalCenter } - font.bold: true - font.italic: true - font.pointSize: Theme.tipFont.pointSize + font: Theme.tipFont } Row { @@ -116,7 +114,7 @@ EditorWidgetBase { round: false iconSource: Theme.getThemeVectorIcon('ic_add_white_24dp') - bgcolor: parent.enabled ? nmRelationId ? 'blue' : 'black' : 'grey' + bgcolor: parent.enabled ? 'black' : 'grey' } }