aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pages/AddressBook.qml10
-rw-r--r--pages/settings/SettingsNode.qml11
-rw-r--r--wizard/WizardCreateDevice1.qml8
-rw-r--r--wizard/WizardDaemonSettings.qml16
-rw-r--r--wizard/WizardHeader.qml16
-rw-r--r--wizard/WizardLang.qml16
-rw-r--r--wizard/WizardLanguage.qml5
-rw-r--r--wizard/WizardOpenWallet1.qml16
8 files changed, 14 insertions, 84 deletions
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index 6c910f4c..caaf9d5d 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -67,21 +67,18 @@ Rectangle {
spacing: 0
Layout.fillWidth: true
- TextArea {
+ Text {
id: titleLabel
Layout.fillWidth: true
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 32
horizontalAlignment: TextInput.AlignLeft
- selectByMouse: false
wrapMode: Text.WordWrap;
- textMargin: 0
leftPadding: 0
topPadding: 0
text: qsTr("Save your most used addresses here") + translationManager.emptyString
width: parent.width
- readOnly: true
// @TODO: Legacy. Remove after Qt 5.8.
// https://stackoverflow.com/questions/41990013
@@ -91,20 +88,17 @@ Rectangle {
}
}
- TextArea {
+ Text {
Layout.fillWidth: true
color: MoneroComponents.Style.dimmedFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16
horizontalAlignment: TextInput.AlignLeft
- selectByMouse: false
wrapMode: Text.WordWrap;
- textMargin: 0
leftPadding: 0
topPadding: 0
text: qsTr("This makes it easier to send or receive Monero and reduces errors when typing in addresses manually.") + translationManager.emptyString
width: parent.width
- readOnly: true
// @TODO: Legacy. Remove after Qt 5.8.
// https://stackoverflow.com/questions/41990013
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index bf8cece2..424f51cf 100644
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -119,7 +119,7 @@ Rectangle{
text: qsTr("Local node") + translationManager.emptyString
}
- TextArea {
+ Text {
id: localNodeArea
anchors.top: localNodeHeader.bottom
anchors.topMargin: 4
@@ -129,14 +129,11 @@ Rectangle{
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 15
horizontalAlignment: TextInput.AlignLeft
- selectByMouse: false
wrapMode: Text.WordWrap;
- textMargin: 0
leftPadding: 0
topPadding: 0
text: qsTr("The blockchain is downloaded to your computer. Provides higher security and requires more local storage.") + translationManager.emptyString
width: parent.width - (localNodeIcon.width + localNodeIcon.anchors.leftMargin + anchors.leftMargin)
- readOnly: true
// @TODO: Legacy. Remove after Qt 5.8.
// https://stackoverflow.com/questions/41990013
@@ -221,7 +218,7 @@ Rectangle{
text: qsTr("Remote node") + translationManager.emptyString
}
- TextArea {
+ Text {
id: remoteNodeArea
anchors.top: remoteNodeHeader.bottom
anchors.topMargin: 4
@@ -230,16 +227,12 @@ Rectangle{
color: MoneroComponents.Style.dimmedFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 15
- activeFocusOnPress: false
horizontalAlignment: TextInput.AlignLeft
- selectByMouse: false
wrapMode: Text.WordWrap;
- textMargin: 0
leftPadding: 0
topPadding: 0
text: qsTr("Uses a third-party server to connect to the Monero network. Less secure, but easier on your computer.") + translationManager.emptyString
width: parent.width - (remoteNodeIcon.width + remoteNodeIcon.anchors.leftMargin + anchors.leftMargin)
- readOnly: true
// @TODO: Legacy. Remove after Qt 5.8.
// https://stackoverflow.com/questions/41990013
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 {