Remove out-of-palette use of blue color, improve constraints label

opengisch · Nov 14, 2024 · 35c166e · 35c166e · qfield-fairy · Nov 14, 2024
1 parent a6066da
commit 35c166e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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'
           }
         }