From 2b24c91bc58ad1f80eb5f07a995458d60401814e Mon Sep 17 00:00:00 2001 From: Roy Jacobs Date: Tue, 14 Mar 2017 15:05:47 +0100 Subject: Add missing, fix and improve translations --- components/CheckBox.qml | 2 ++ components/StandardButton.qml | 4 ++-- components/StandardDropdown.qml | 3 +++ components/TableDropdown.qml | 9 ++++++++- components/TableHeader.qml | 9 ++++++++- 5 files changed, 23 insertions(+), 4 deletions(-) (limited to 'components') diff --git a/components/CheckBox.qml b/components/CheckBox.qml index 8df364d1..b9bfe3ec 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -27,6 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.0 +import QtQuick.Layouts 1.1 Item { id: checkBox @@ -40,6 +41,7 @@ Item { signal clicked() height: 25 width: label.x + label.width + Layout.minimumWidth: label.x + label.contentWidth clip: true Rectangle { diff --git a/components/StandardButton.qml b/components/StandardButton.qml index bb2f4d94..14f33e8f 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -43,7 +43,7 @@ Item { signal clicked() // Dynamic label width - Layout.minimumWidth: (label.contentWidth > 100)? label.contentWidth + 20 : 100 + Layout.minimumWidth: (label.contentWidth > 80)? label.contentWidth + 20 : 100 @@ -88,7 +88,7 @@ Item { font.pixelSize: button.fontSize color: parent.textColor visible: parent.icon === "" - font.capitalization : Font.Capitalize +// font.capitalization : Font.Capitalize } Image { diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml index 8b2c9d41..34d63f87 100644 --- a/components/StandardDropdown.qml +++ b/components/StandardDropdown.qml @@ -197,6 +197,9 @@ Item { property string stringLow: qsTr("Low (x1 fee)") + translationManager.emptyString property string stringMedium: qsTr("Medium (x20 fee)") + translationManager.emptyString property string stringHigh: qsTr("High (x166 fee)") + translationManager.emptyString + property string stringAll: qsTr("All") + translationManager.emptyString + property string stringSent: qsTr("Sent") + translationManager.emptyString + property string stringReceived: qsTr("Received") + translationManager.emptyString delegate: Rectangle { diff --git a/components/TableDropdown.qml b/components/TableDropdown.qml index c4396008..0a1148df 100644 --- a/components/TableDropdown.qml +++ b/components/TableDropdown.qml @@ -177,6 +177,13 @@ Item { Repeater { id: repeater + + // Workaround for translations in listElements. All translated strings needs to be listed in this file. + property string stringCopy: qsTr("Copy address to clipboard") + translationManager.emptyString + property string stringSend: qsTr("Send to same destination") + translationManager.emptyString + property string stringFind: qsTr("Find similar transactions") + translationManager.emptyString + property string stringRemove: qsTr("Remove from address book") + translationManager.emptyString + delegate: Rectangle { id: delegate property bool containsMouse: index === mouseArea.currentIndex @@ -211,7 +218,7 @@ Item { onContainsMouseChanged: { if(containsMouse) { var pos = rootItem.mapFromItem(delegate, 30, -25) - appWindow.toolTip.text = name + appWindow.toolTip.text = qsTr(name) + translationManager.emptyString appWindow.toolTip.x = pos.x - appWindow.toolTip.width // if(appWindow.toolTip.height > 30) // pos.y -= appWindow.toolTip.height - 30 diff --git a/components/TableHeader.qml b/components/TableHeader.qml index dbc9f36f..c90a7b10 100644 --- a/components/TableHeader.qml +++ b/components/TableHeader.qml @@ -60,6 +60,13 @@ Rectangle { Repeater { id: columnsRepeater + + // Workaround for translations in listElements. All translated strings needs to be listed in this file. + property string stringPaymentID: qsTr("Payment ID") + translationManager.emptyString + property string stringDate: qsTr("Date") + translationManager.emptyString + property string stringBlockHeight: qsTr("Block height") + translationManager.emptyString + property string stringAmount: qsTr("Amount") + translationManager.emptyString + delegate: Rectangle { id: delegate property bool desc: false @@ -81,7 +88,7 @@ Rectangle { return "#FF4304" return index === header.activeSortColumn || delegateArea.containsMouse ? "#FF6C3C" : "#4A4949" } - text: columnName + text: qsTr(columnName) + translationManager.emptyString } MouseArea { -- cgit v1.2.3 From 19157590a55eea0cdff24fc503155746648a5d65 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:40:36 -0400 Subject: HistoryTable.qml --- components/HistoryTable.qml | 3 --- 1 file changed, 3 deletions(-) (limited to 'components') diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 711bc289..0cfea50c 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -199,7 +199,6 @@ ListView { anchors.bottom: parent.bottom font.family: "Arial" font.pixelSize: 12 - font.letterSpacing: -1 color: "#535353" text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : "" } @@ -213,7 +212,6 @@ ListView { //elide: Text.ElideRight font.family: "Arial" font.pixelSize:13 - font.letterSpacing: -1 color: "#545454" text: paymentId @@ -250,7 +248,6 @@ ListView { width: 86 font.family: "Arial" font.pixelSize: 12 - font.letterSpacing: -1 color: "#535353" text: qsTr("BlockHeight:") + translationManager.emptyString } -- cgit v1.2.3 From 760f34579f6d474c36411c82941dbdf825395438 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:41:43 -0400 Subject: DashboardTable.qml --- components/DashboardTable.qml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'components') diff --git a/components/DashboardTable.qml b/components/DashboardTable.qml index 1dc0d3b4..ad0b57b6 100644 --- a/components/DashboardTable.qml +++ b/components/DashboardTable.qml @@ -145,7 +145,6 @@ ListView { Text { font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#000000" text: date } @@ -153,7 +152,6 @@ ListView { Text { font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#000000" text: time } @@ -175,7 +173,6 @@ ListView { Text { font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#000000" text: balance } @@ -208,7 +205,6 @@ ListView { anchors.bottom: parent.bottom font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: out ? "#FF4F41" : "#36B05B" text: amount } -- cgit v1.2.3 From 91e01d547010907f24453ccff8de329785d9f427 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:43:36 -0400 Subject: HistoryTable.qml --- components/HistoryTable.qml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'components') diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 0cfea50c..f4115435 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -226,7 +226,6 @@ ListView { //elide: Text.ElideRight font.family: "Arial" font.pixelSize:13 - font.letterSpacing: -1 color: "#545454" text: "(" + lookupPaymentID(paymentId) + ")" visible: text !== "()" @@ -309,7 +308,6 @@ ListView { Text { font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#000000" text: date } @@ -317,7 +315,6 @@ ListView { Text { font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#000000" text: time } @@ -342,7 +339,6 @@ ListView { Text { font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#000000" text: balance } @@ -377,7 +373,6 @@ ListView { anchors.bottom: parent.bottom font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: isOut ? "#FF4F41" : "#36B05B" text: displayAmount } @@ -403,7 +398,6 @@ ListView { anchors.bottom: parent.bottom font.family: "Arial" font.pixelSize: 18 - font.letterSpacing: -1 color: "#FF4F41" text: fee } -- cgit v1.2.3 From b75fee7a68e3e1f079dfac6c7ab5d4b50f000f49 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:45:59 -0400 Subject: TipItem.qml --- components/TipItem.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'components') diff --git a/components/TipItem.qml b/components/TipItem.qml index f309b172..b0e09cb7 100644 --- a/components/TipItem.qml +++ b/components/TipItem.qml @@ -65,7 +65,6 @@ Window { lineHeight: 0.7 font.family: "Arial" font.pixelSize: 12 - font.letterSpacing: -1 color: "#FFFFFF" } } -- cgit v1.2.3 From 3ecffbc767fec940023392c3f59fe0591a0cfd4e Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:46:39 -0400 Subject: AddressbookTable.qml --- components/AddressBookTable.qml | 3 --- 1 file changed, 3 deletions(-) (limited to 'components') diff --git a/components/AddressBookTable.qml b/components/AddressBookTable.qml index 77b9dfe2..b8de57a9 100644 --- a/components/AddressBookTable.qml +++ b/components/AddressBookTable.qml @@ -87,7 +87,6 @@ ListView { anchors.rightMargin: 40 font.family: "Arial" font.pixelSize: 16 - font.letterSpacing: -1 color: "#545454" text: address } @@ -101,7 +100,6 @@ ListView { width: 139 font.family: "Arial" font.pixelSize: 12 - font.letterSpacing: -1 color: "#535353" text: qsTr("Payment ID:") + translationManager.emptyString } @@ -117,7 +115,6 @@ ListView { font.family: "Arial" font.pixelSize: 13 - font.letterSpacing: -1 color: "#545454" text: paymentId } -- cgit v1.2.3 From f3dfd1864108dc1005664eeef62eaaec99d90421 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:47:37 -0400 Subject: DatePicker.qml --- components/DatePicker.qml | 3 --- 1 file changed, 3 deletions(-) (limited to 'components') diff --git a/components/DatePicker.qml b/components/DatePicker.qml index ac67f8ed..6485fa14 100644 --- a/components/DatePicker.qml +++ b/components/DatePicker.qml @@ -285,7 +285,6 @@ Item { anchors.centerIn: parent font.family: "Arial" font.pixelSize: 12 - font.letterSpacing: -1 font.bold: dayArea.pressed text: styleData.date.getDate() color: { @@ -322,7 +321,6 @@ Item { elide: Text.ElideRight font.family: "Arial" font.pixelSize: 9 - font.letterSpacing: -1 color: "#535353" text: { var locale = Qt.locale() @@ -339,7 +337,6 @@ Item { anchors.centerIn: parent font.family: "Arial" font.pixelSize: 12 - font.letterSpacing: -1 color: "#4A4646" text: styleData.title } -- cgit v1.2.3 From ec5c73e8aa0ffab9e031f77592907236be122b83 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:48:09 -0400 Subject: Checkbox.qml --- components/CheckBox.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'components') diff --git a/components/CheckBox.qml b/components/CheckBox.qml index b9bfe3ec..ffe585c3 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -76,7 +76,6 @@ Item { anchors.leftMargin: 25 + 12 font.family: "Arial" font.pixelSize: checkBox.fontSize - font.letterSpacing: -1 color: "#525252" } -- cgit v1.2.3 From d920b20168d49c17196ffd32da0e9c428a09a42a Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:48:52 -0400 Subject: SearchInput.qml --- components/SearchInput.qml | 2 -- 1 file changed, 2 deletions(-) (limited to 'components') diff --git a/components/SearchInput.qml b/components/SearchInput.qml index 35be896f..cc1a875b 100644 --- a/components/SearchInput.qml +++ b/components/SearchInput.qml @@ -100,7 +100,6 @@ Item { font.family: "Arial" font.pixelSize: 12 font.bold: true - font.letterSpacing: -1 color: "#4A4747" text: "NAME" } @@ -195,7 +194,6 @@ Item { anchors.rightMargin: 12 font.family: "Arial" font.bold: true - font.letterSpacing: -1 font.pixelSize: 12 color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646" text: name -- cgit v1.2.3 From 1d74fa6f47013d3acbc3effc048bd80354fa4f4a Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Sun, 19 Mar 2017 13:49:26 -0400 Subject: Titlebar.qml --- components/TitleBar.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'components') diff --git a/components/TitleBar.qml b/components/TitleBar.qml index bcbc0e64..4a8bbb7c 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -47,7 +47,6 @@ Rectangle { anchors.centerIn: parent font.family: "Arial" font.pixelSize: 15 - font.letterSpacing: -1 color: "#FFFFFF" text: titleBar.title visible: customDecorations -- cgit v1.2.3