aboutsummaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/AddressBookTable.qml3
-rw-r--r--components/CheckBox.qml3
-rw-r--r--components/DashboardTable.qml4
-rw-r--r--components/DatePicker.qml3
-rw-r--r--components/HistoryTable.qml9
-rw-r--r--components/SearchInput.qml2
-rw-r--r--components/StandardButton.qml4
-rw-r--r--components/StandardDropdown.qml3
-rw-r--r--components/TableDropdown.qml9
-rw-r--r--components/TableHeader.qml9
-rw-r--r--components/TipItem.qml1
-rw-r--r--components/TitleBar.qml1
12 files changed, 23 insertions, 28 deletions
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
}
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 8df364d1..ffe585c3 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 {
@@ -74,7 +76,6 @@ Item {
anchors.leftMargin: 25 + 12
font.family: "Arial"
font.pixelSize: checkBox.fontSize
- font.letterSpacing: -1
color: "#525252"
}
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
}
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
}
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index 711bc289..f4115435 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
@@ -228,7 +226,6 @@ ListView {
//elide: Text.ElideRight
font.family: "Arial"
font.pixelSize:13
- font.letterSpacing: -1
color: "#545454"
text: "(" + lookupPaymentID(paymentId) + ")"
visible: text !== "()"
@@ -250,7 +247,6 @@ ListView {
width: 86
font.family: "Arial"
font.pixelSize: 12
- font.letterSpacing: -1
color: "#535353"
text: qsTr("BlockHeight:") + translationManager.emptyString
}
@@ -312,7 +308,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: date
}
@@ -320,7 +315,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: time
}
@@ -345,7 +339,6 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#000000"
text: balance
}
@@ -380,7 +373,6 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: isOut ? "#FF4F41" : "#36B05B"
text: displayAmount
}
@@ -406,7 +398,6 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 18
- font.letterSpacing: -1
color: "#FF4F41"
text: fee
}
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
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("<b>Copy address to clipboard</b>") + translationManager.emptyString
+ property string stringSend: qsTr("<b>Send to same destination</b>") + translationManager.emptyString
+ property string stringFind: qsTr("<b>Find similar transactions</b>") + translationManager.emptyString
+ property string stringRemove: qsTr("<b>Remove from address book</b>") + 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 {
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"
}
}
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