Merge pull request #2506

f47335f Wizard, AddressBook, SettingsNode: prevent undesired text selection (xiphon)

6 files changed, 10 insertions, 67 deletions

diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index 270ae298..210b24f2 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -158,7 +158,7 @@ Rectangle {
                 }
             }
 
-            TextArea {
+            Text {
                 id: errorMsg
                 text: qsTr("Error writing wallet from hardware device. Check application logs.") + translationManager.emptyString;
                 visible: errorMsg.text !== ""
@@ -167,16 +167,10 @@ Rectangle {
                 color: MoneroComponents.Style.errorColor
                 font.pixelSize: 16
 
-                selectionColor: MoneroComponents.Style.textSelectionColor
-                selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-                selectByMouse: true
                 wrapMode: Text.WordWrap
-                textMargin: 0
                 leftPadding: 0
                 topPadding: 0
                 bottomPadding: 0
-                readOnly: true
             }
 
             WizardNav {
diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml
index c4985f77..9ab9fefc 100644
--- a/wizard/WizardDaemonSettings.qml
+++ b/wizard/WizardDaemonSettings.qml
@@ -91,7 +91,7 @@ ColumnLayout {
             Layout.topMargin: 6
             spacing: 0
 
-            TextArea {
+            Text {
                 text: qsTr("Bootstrap node") + translationManager.emptyString
                 Layout.topMargin: 10
                 Layout.fillWidth: true
@@ -105,19 +105,13 @@ ColumnLayout {
                     }
                 }
 
-                selectionColor: MoneroComponents.Style.textSelectionColor
-                selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-                selectByMouse: true
                 wrapMode: Text.WordWrap
-                textMargin: 0
                 leftPadding: 0
                 topPadding: 0
                 bottomPadding: 0
-                readOnly: true
             }
 
-            TextArea {
+            Text {
                 text: qsTr("Additionally, you may specify a bootstrap node to use Monero immediately.") + translationManager.emptyString
                 Layout.topMargin: 4
                 Layout.fillWidth: true
@@ -133,16 +127,10 @@ ColumnLayout {
                     }
                 }
 
-                selectionColor: MoneroComponents.Style.textSelectionColor
-                selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-                selectByMouse: true
                 wrapMode: Text.WordWrap
-                textMargin: 0
                 leftPadding: 0
                 topPadding: 0
                 bottomPadding: 0
-                readOnly: true
             }
         }
 
diff --git a/wizard/WizardHeader.qml b/wizard/WizardHeader.qml
index 71061a5b..1e10683d 100644
--- a/wizard/WizardHeader.qml
+++ b/wizard/WizardHeader.qml
@@ -41,7 +41,7 @@ ColumnLayout {
     spacing: 4
     Layout.maximumWidth: wizardController.wizardSubViewWidth
 
-    TextArea {
+    Text {
         text: title
         Layout.fillWidth: true
         font.family: MoneroComponents.Style.fontRegular.name
@@ -55,19 +55,13 @@ ColumnLayout {
             }
         }
 
-        selectionColor: MoneroComponents.Style.textSelectionColor
-        selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-        selectByMouse: true
         wrapMode: Text.WordWrap
-        textMargin: 0
         leftPadding: 0
         topPadding: 0
         bottomPadding: 0
-        readOnly: true
     }
 
-    TextArea {
+    Text {
         Layout.fillWidth: true
         Layout.alignment: Qt.AlignCenter
         visible: parent.subtitle !== ""
@@ -84,14 +78,8 @@ ColumnLayout {
             }
         }
 
-        selectionColor: MoneroComponents.Style.textSelectionColor
-        selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-        selectByMouse: true
         wrapMode: Text.WordWrap
-        textMargin: 0
         leftPadding: 0
         topPadding: 0
-        readOnly: true
     }
 }
diff --git a/wizard/WizardLang.qml b/wizard/WizardLang.qml
index 19c63ba3..63d380d7 100644
--- a/wizard/WizardLang.qml
+++ b/wizard/WizardLang.qml
@@ -67,7 +67,7 @@ Rectangle {
         width: parent.width - 100
         anchors.horizontalCenter: parent.horizontalCenter;
 
-        TextArea {
+        Text {
             text: qsTr("Language settings") + translationManager.emptyString
             Layout.fillWidth: true
             font.family: MoneroComponents.Style.fontRegular.name
@@ -80,19 +80,13 @@ Rectangle {
                 }
             }
 
-            selectionColor: MoneroComponents.Style.textSelectionColor
-            selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-            selectByMouse: true
             wrapMode: Text.WordWrap
-            textMargin: 0
             leftPadding: 0
             topPadding: 0
             bottomPadding: 0
-            readOnly: true
         }
 
-        TextArea {
+        Text {
             Layout.fillWidth: true
             visible: parent.subtitle !== ""
 
@@ -108,15 +102,9 @@ Rectangle {
                 }
             }
 
-            selectionColor: MoneroComponents.Style.textSelectionColor
-            selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-            selectByMouse: true
             wrapMode: Text.WordWrap
-            textMargin: 0
             leftPadding: 0
             topPadding: 0
-            readOnly: true
         }
 
         Flow {
diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
index 2d6d37b4..58b5cd21 100644
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -57,7 +57,7 @@ Rectangle {
             color: "transparent"
         }
 
-        TextArea {
+        Text {
             id: textWelcome
             opacity: 0
             Layout.preferredWidth: parent.width / 1.3
@@ -69,12 +69,9 @@ Rectangle {
             font.bold: true
             font.pixelSize: 18
             horizontalAlignment: TextInput.AlignHCenter
-            selectByMouse: false
             wrapMode: Text.WordWrap
-            textMargin: 0
             leftPadding: 0
             topPadding: 0
-            readOnly: true
 
             Behavior on opacity {
                 NumberAnimation {
diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml
index e0d93a05..466accf2 100644
--- a/wizard/WizardOpenWallet1.qml
+++ b/wizard/WizardOpenWallet1.qml
@@ -198,7 +198,7 @@ Rectangle {
                                     Layout.fillWidth: true
                                 }
 
-                                TextArea {
+                                Text {
                                     text: {
                                         // truncate on window width
                                         var maxLength = wizardController.layoutScale <= 1 ? 12 : 16
@@ -214,19 +214,13 @@ Rectangle {
                                     color: MoneroComponents.Style.defaultFontColor
                                     font.pixelSize: 16
 
-                                    selectionColor: MoneroComponents.Style.dimmedFontColor
-                                    selectedTextColor: MoneroComponents.Style.defaultFontColor
-
-                                    selectByMouse: false
                                     wrapMode: Text.WordWrap
-                                    textMargin: 0
                                     leftPadding: 0
                                     topPadding: networktype !== -1 ? 8 : 4
                                     bottomPadding: 0
-                                    readOnly: true
                                 }
 
-                                TextArea {
+                                Text {
                                     visible: networktype !== -1
                                     Layout.preferredHeight: 24
                                     Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
@@ -236,16 +230,10 @@ Rectangle {
                                     color: MoneroComponents.Style.dimmedFontColor
                                     font.pixelSize: 14
 
-                                    selectionColor: MoneroComponents.Style.textSelectionColor
-                                    selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-                                    selectByMouse: false
                                     wrapMode: Text.WordWrap
-                                    textMargin: 0
                                     leftPadding: 0
                                     topPadding: 0
                                     bottomPadding: 0
-                                    readOnly: true
                                 }
 
                                 Item {