From da96cb833c11594cf10fba73431ebbeb97bf2652 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 15 Feb 2022 15:16:16 +0100
Subject: [PATCH] Swap ReadOnlyTextfield to controls 2

CURA-8685
---
 .../qml/Preferences/ReadOnlyTextArea.qml      |  3 ++-
 .../qml/Preferences/ReadOnlyTextField.qml     | 25 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/resources/qml/Preferences/ReadOnlyTextArea.qml b/resources/qml/Preferences/ReadOnlyTextArea.qml
index 97a89ff080..e2a0da24f2 100644
--- a/resources/qml/Preferences/ReadOnlyTextArea.qml
+++ b/resources/qml/Preferences/ReadOnlyTextArea.qml
@@ -3,6 +3,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 2.15
+import UM 1.5 as UM
 
 ScrollView
 {
@@ -26,7 +27,7 @@ ScrollView
         background: Rectangle
         {
             radius: UM.Theme.getSize("setting_control_radius").width
-            color: enabled ? UM.Theme.getColor("setting_control_disabled") : UM.Theme.getColor("setting_control")
+            color: textArea.enabled ? UM.Theme.getColor("setting_control") : UM.Theme.getColor("setting_control_disabled")
         }
 
         color: UM.Theme.getColor("text")
diff --git a/resources/qml/Preferences/ReadOnlyTextField.qml b/resources/qml/Preferences/ReadOnlyTextField.qml
index 6f5a66d2a9..cc8e83647b 100644
--- a/resources/qml/Preferences/ReadOnlyTextField.qml
+++ b/resources/qml/Preferences/ReadOnlyTextField.qml
@@ -3,7 +3,8 @@
 // Different than the name suggests, it is not always read-only.
 
 import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
+import UM 1.5 as UM
 
 Item
 {
@@ -23,26 +24,18 @@ Item
         id: textField
 
         enabled: !base.readOnly
-        opacity: base.readOnly ? 0.5 : 1.0
 
+        color: UM.Theme.getColor("text")
+        font: UM.Theme.getFont("default")
         anchors.fill: parent
 
         onEditingFinished: base.editingFinished()
         Keys.onEnterPressed: base.editingFinished()
         Keys.onReturnPressed: base.editingFinished()
+        background: Rectangle
+        {
+            radius: UM.Theme.getSize("setting_control_radius").width
+            color: textField.enabled ? UM.Theme.getColor("setting_control") : UM.Theme.getColor("setting_control_disabled")
+        }
     }
-
-    Label
-    {
-        visible: base.readOnly
-        text: textField.text
-
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.leftMargin: textField.__panel ? textField.__panel.leftMargin : 0
-
-        color: palette.buttonText
-    }
-
-    SystemPalette { id: palette }
 }