diff --git a/LeftPanel.qml b/LeftPanel.qml
index 72279c3b..d0e4c098 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -204,7 +204,7 @@ Rectangle {
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.top: column1.bottom
- anchors.topMargin: 50
+ anchors.topMargin: 25
color: "#1C1C1C"
Column {
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 {
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 889ee534..76845dc7 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -161,7 +161,8 @@ Rectangle {
/* main layout */
ColumnLayout {
id: mainLayout
- anchors.margins: 40
+ anchors.margins: 17
+ anchors.topMargin: 40
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
@@ -236,7 +237,6 @@ Rectangle {
StandardButton {
id: generatePaymentId
width: 80
- fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 1d6a4ca8..b0f7058c 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -127,6 +127,7 @@ Rectangle {
RowLayout {
Label {
id: manageDaemonLabel
+ Layout.fillWidth: true
color: "#4A4949"
text: qsTr("Manage daemon") + translationManager.emptyString
fontSize: 16
@@ -141,6 +142,9 @@ Rectangle {
}
RowLayout {
+ id: daemonStatusRow
+ Layout.fillWidth: true
+
StandardButton {
visible: true
enabled: !appWindow.daemonRunning