From 0b017ff9546951248bd5ed8d28a9227634f739fe Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 17:02:33 -0500 Subject: [PATCH 1/8] Transfer.qml: Keep buttons mixed case --- pages/Transfer.qml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 6f0079a9..8d187cc7 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -168,7 +168,7 @@ Rectangle { //anchors.top: amountLine.top //anchors.bottom: amountLine.bottom width: 60 - text: qsTr("ALL") + translationManager.emptyString + text: qsTr("All") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -182,11 +182,11 @@ Rectangle { id: priorityModel // ListElement: cannot use script for property value, so // code like this wont work: - // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low } + // ListElement { column1: qsTr("Low") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low } - ListElement { column1: qsTr("LOW (x1 fee)") ; column2: ""; priority: PendingTransaction.Priority_Low } - ListElement { column1: qsTr("MEDIUM (x20 fee)") ; column2: ""; priority: PendingTransaction.Priority_Medium } - ListElement { column1: qsTr("HIGH (x166 fee)") ; column2: ""; priority: PendingTransaction.Priority_High } + ListElement { column1: qsTr("Low (x1 fee)") ; column2: ""; priority: PendingTransaction.Priority_Low } + ListElement { column1: qsTr("Medium (x20 fee)") ; column2: ""; priority: PendingTransaction.Priority_Medium } + ListElement { column1: qsTr("High (x166 fee)") ; column2: ""; priority: PendingTransaction.Priority_High } } StandardDropdown { @@ -300,7 +300,7 @@ Rectangle { anchors.topMargin: 17 anchors.rightMargin: 17 width: 60 - text: qsTr("RESOLVE") + translationManager.emptyString + text: qsTr("Resolve") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -414,7 +414,7 @@ Rectangle { anchors.leftMargin: 17 anchors.topMargin: 17 width: 60 - text: qsTr("SEND") + translationManager.emptyString + text: qsTr("Send") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -471,7 +471,7 @@ Rectangle { RowLayout { StandardButton { id: sweepUnmixableButton - text: qsTr("SWEEP UNMIXABLE") + translationManager.emptyString + text: qsTr("Sweep Unmixable") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" From 9ac8e26a48b2ef47ad193126ccdb8e2d8f25729f Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 17:03:51 -0500 Subject: [PATCH 2/8] TickDelegate.qml: Keep text mixed case --- components/TickDelegate.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/TickDelegate.qml b/components/TickDelegate.qml index 01c51e19..2dfbddd9 100644 --- a/components/TickDelegate.qml +++ b/components/TickDelegate.qml @@ -52,9 +52,9 @@ Item { font.pixelSize: 12 color: "#4A4949" text: { - if(currentIndex === 0) return qsTr("NORMAL") + translationManager.emptyString - if(currentIndex === 3) return qsTr("MEDIUM") + translationManager.emptyString - if(currentIndex === 13) return qsTr("HIGH") + translationManager.emptyString + if(currentIndex === 0) return qsTr("Normal") + translationManager.emptyString + if(currentIndex === 3) return qsTr("Medium") + translationManager.emptyString + if(currentIndex === 13) return qsTr("High") + translationManager.emptyString return "" } } From 92a5781b6a0640c4d9d58e3c21ce8d2d1d416134 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 17:06:05 -0500 Subject: [PATCH 3/8] Addressbook.qml: Keep text mixed case --- pages/AddressBook.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index 0af5dba1..3dc2a407 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -150,7 +150,7 @@ Rectangle { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - text: qsTr("ADD") + text: qsTr("Add") enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) onClicked: { From 08d5730fbe9a7f2eafadf83d738b7d0230a074cd Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 17:08:07 -0500 Subject: [PATCH 4/8] History.qml: Keep text mixed case --- pages/History.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/History.qml b/pages/History.qml index b1c99076..601e8800 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -270,7 +270,7 @@ Rectangle { anchors.left: toDatePicker.right anchors.leftMargin: 17 width: 60 - text: qsTr("FILTER") + text: qsTr("Filter") shadowReleasedColor: "#4D0051" shadowPressedColor: "#2D002F" releasedColor: "#6B0072" @@ -333,9 +333,9 @@ Rectangle { ListModel { id: transactionsModel - ListElement { column1: "ALL"; column2: ""; value: TransactionInfo.Direction_Both } - ListElement { column1: "SENT"; column2: ""; value: TransactionInfo.Direction_Out } - ListElement { column1: "RECEIVED"; column2: ""; value: TransactionInfo.Direction_In } + ListElement { column1: "All"; column2: ""; value: TransactionInfo.Direction_Both } + ListElement { column1: "Sent"; column2: ""; value: TransactionInfo.Direction_Out } + ListElement { column1: "Received"; column2: ""; value: TransactionInfo.Direction_In } } From d1202e44ebd88919611b92c9c88c2ee25d68c9a5 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 17:09:23 -0500 Subject: [PATCH 5/8] TxKey.qml: Keep text mixed case --- pages/TxKey.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/TxKey.qml b/pages/TxKey.qml index cc44625c..a22d56e4 100644 --- a/pages/TxKey.qml +++ b/pages/TxKey.qml @@ -209,7 +209,7 @@ Rectangle { anchors.top: txKeyRow.bottom anchors.topMargin: 17 width: 60 - text: qsTr("CHECK") + translationManager.emptyString + text: qsTr("Check") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" From d354d4aa545c3bf01293bb8d63d9e96fb5f5c0d9 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 17:12:13 -0500 Subject: [PATCH 6/8] Sign Verify: keep text mixed case --- pages/Sign.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/Sign.qml b/pages/Sign.qml index f77508bc..a5ace1a4 100644 --- a/pages/Sign.qml +++ b/pages/Sign.qml @@ -164,7 +164,7 @@ Rectangle { id: signMessageButton anchors.right: parent.right width: 60 - text: qsTr("SIGN") + translationManager.emptyString + text: qsTr("Sign") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -205,7 +205,7 @@ Rectangle { id: loadFileToSignButton anchors.rightMargin: 17 width: 60 - text: qsTr("SELECT") + translationManager.emptyString + text: qsTr("Select") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -239,7 +239,7 @@ Rectangle { id: signFileButton anchors.right: parent.right width: 60 - text: qsTr("SIGN") + translationManager.emptyString + text: qsTr("Sign") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -349,7 +349,7 @@ Rectangle { id: verifyMessageButton anchors.right: parent.right width: 60 - text: qsTr("VERIFY") + translationManager.emptyString + text: qsTr("Verify") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -390,7 +390,7 @@ Rectangle { id: loadFileToVerifyButton anchors.rightMargin: 17 width: 60 - text: qsTr("SELECT") + translationManager.emptyString + text: qsTr("Select") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -423,7 +423,7 @@ Rectangle { id: verifyFileButton anchors.right: parent.right width: 60 - text: qsTr("VERIFY") + translationManager.emptyString + text: qsTr("Verify") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" From e8875e0e1f93faab0e25f58e5c0dea9183d08b6a Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Mon, 27 Feb 2017 18:58:17 -0500 Subject: [PATCH 7/8] PrivacyLevelSmall.qml: mixed case for Wizard --- components/PrivacyLevelSmall.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/PrivacyLevelSmall.qml b/components/PrivacyLevelSmall.qml index cf9169f8..ebca0c30 100644 --- a/components/PrivacyLevelSmall.qml +++ b/components/PrivacyLevelSmall.qml @@ -99,7 +99,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[0] !== undefined ? row.positions[0].currentX - 3 : 0) - width - text: qsTr("LOW") + translationManager.emptyString + text: qsTr("Low") + translationManager.emptyString } Text { @@ -110,7 +110,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[4] !== undefined ? row.positions[4].currentX - 3 : 0) - width - text: qsTr("MEDIUM") + translationManager.emptyString + text: qsTr("Medium") + translationManager.emptyString } Text { @@ -121,7 +121,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[13] !== undefined ? row.positions[13].currentX - 3 : 0) - width - text: qsTr("HIGH") + translationManager.emptyString + text: qsTr("High") + translationManager.emptyString } MouseArea { From 44bcb3d06c171a74edd8c36e88590a1714fd1c08 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Wed, 1 Mar 2017 18:45:55 -0500 Subject: [PATCH 8/8] Update PrivacyLevelSmall.qml --- components/PrivacyLevelSmall.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/PrivacyLevelSmall.qml b/components/PrivacyLevelSmall.qml index ebca0c30..cf9169f8 100644 --- a/components/PrivacyLevelSmall.qml +++ b/components/PrivacyLevelSmall.qml @@ -99,7 +99,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[0] !== undefined ? row.positions[0].currentX - 3 : 0) - width - text: qsTr("Low") + translationManager.emptyString + text: qsTr("LOW") + translationManager.emptyString } Text { @@ -110,7 +110,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[4] !== undefined ? row.positions[4].currentX - 3 : 0) - width - text: qsTr("Medium") + translationManager.emptyString + text: qsTr("MEDIUM") + translationManager.emptyString } Text { @@ -121,7 +121,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[13] !== undefined ? row.positions[13].currentX - 3 : 0) - width - text: qsTr("High") + translationManager.emptyString + text: qsTr("HIGH") + translationManager.emptyString } MouseArea {