diff --git a/LeftPanel.qml b/LeftPanel.qml
index 27ac3e5a..0869e63b 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -27,6 +27,7 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.2
+import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import moneroComponents.Wallet 1.0
import moneroComponents.NetworkType 1.0
@@ -101,7 +102,7 @@ Rectangle {
// @TODO: customDecorations?
anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0
- Row {
+ RowLayout {
visible: true
Item {
anchors.left: parent.left
diff --git a/components/CheckBox2.qml b/components/CheckBox2.qml
index dd48624e..667a950f 100644
--- a/components/CheckBox2.qml
+++ b/components/CheckBox2.qml
@@ -59,7 +59,7 @@ RowLayout {
Text {
id: label
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: checkBox.fontSize
color: Style.defaultFontColor
wrapMode: Text.Wrap
diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index ace95d2d..45d21406 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -73,7 +73,7 @@ Item {
anchors.top: parent.top
anchors.topMargin: 2
anchors.left: parent.left
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: 14
font.bold: false
textFormat: Text.RichText
diff --git a/components/InputDialog.qml b/components/InputDialog.qml
index 34e9a6e2..37354b35 100644
--- a/components/InputDialog.qml
+++ b/components/InputDialog.qml
@@ -81,7 +81,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@@ -94,7 +94,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
KeyNavigation.tab: okButton
bottomPadding: 10
diff --git a/components/InputMulti.qml b/components/InputMulti.qml
index 24c019b4..2839db3a 100644
--- a/components/InputMulti.qml
+++ b/components/InputMulti.qml
@@ -40,7 +40,7 @@ TextArea {
property int fontSize: 18 * scaleRatio
id: textArea
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: fontSize
font.bold: false
horizontalAlignment: TextInput.AlignLeft
diff --git a/components/Label.qml b/components/Label.qml
index ac0ff487..79b83a5d 100644
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -57,7 +57,7 @@ Item {
if(fontFamily){
return fontFamily;
} else {
- return Style.fontLight;
+ return Style.fontRegular.name;
}
}
font.pixelSize: fontSize
diff --git a/components/LineEdit.qml b/components/LineEdit.qml
index 9afb5ebc..1711ee56 100644
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -61,7 +61,7 @@ Item {
property alias labelTextFormat: inputLabel.textFormat
property string backgroundColor: "transparent"
property string tipText: ""
- property int labelFontSize: 14 * scaleRatio
+ property int labelFontSize: 16 * scaleRatio
property bool labelFontBold: false
property alias labelWrapMode: inputLabel.wrapMode
property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
@@ -99,7 +99,7 @@ Item {
anchors.top: parent.top
anchors.left: parent.left
anchors.topMargin: 2 * scaleRatio
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: labelFontSize
font.bold: labelFontBold
textFormat: Text.RichText
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index 758755d0..b0669aaa 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -63,8 +63,8 @@ ColumnLayout {
id: inputLabel
anchors.top: parent.top
anchors.left: parent.left
- font.family: Style.fontLight
- font.pixelSize: 14 * scaleRatio
+ font.family: Style.fontRegular.name
+ font.pixelSize: 16 * scaleRatio
font.bold: labelFontBold
textFormat: Text.RichText
color: Style.defaultFontColor
diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml
index 984ffd03..39ca8f0d 100644
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.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
import moneroComponents.Wallet 1.0
import "." 1.0
@@ -50,8 +51,8 @@ Rectangle {
return qsTr("Invalid connection status")
}
- Row {
- height: 40 * scaleRatio
+ RowLayout {
+ Layout.preferredHeight: 40 * scaleRatio
Item {
id: iconItem
diff --git a/components/NewPasswordDialog.qml b/components/NewPasswordDialog.qml
index b1d39f56..9d4e4d20 100644
--- a/components/NewPasswordDialog.qml
+++ b/components/NewPasswordDialog.qml
@@ -104,7 +104,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@@ -116,7 +116,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password
bottomPadding: 10
@@ -162,7 +162,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@@ -174,7 +174,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password
KeyNavigation.tab: okButton
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index b313874a..dabf233a 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -85,7 +85,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@@ -97,7 +97,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password
KeyNavigation.tab: okButton
diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml
index f9bb315f..6e691d6e 100644
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -52,6 +52,7 @@ Rectangle {
}
Item {
+ anchors.top: item.top
anchors.topMargin: 10 * scaleRatio
anchors.leftMargin: 15 * scaleRatio
anchors.rightMargin: 15 * scaleRatio
@@ -59,7 +60,7 @@ Rectangle {
Text {
id: progressText
- anchors.top: item.top
+ anchors.top: parent.top
anchors.topMargin: 6
font.family: Style.fontMedium.name
font.pixelSize: 13 * scaleRatio
@@ -71,7 +72,7 @@ Rectangle {
Text {
id: progressTextValue
- anchors.top: item.top
+ anchors.top: parent.top
anchors.topMargin: 6
anchors.right: parent.right
font.family: Style.fontMedium.name
diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index 44c7c784..5f761ae4 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -34,6 +34,8 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0
import "../components" as MoneroComponents
+import "." 1.0
+
Rectangle {
id: root
@@ -105,8 +107,8 @@ Rectangle {
Label {
id: dialogTitle
horizontalAlignment: Text.AlignHCenter
- font.pixelSize: 18 * scaleRatio
- font.family: "Arial"
+ fontSize: 18 * scaleRatio
+ fontFamily: "Arial"
color: Style.defaultFontColor
}
@@ -118,7 +120,7 @@ Rectangle {
Layout.fillWidth: true
Layout.fillHeight: true
renderType: Text.QtRendering
- font.family: Style.fontLight
+ font.family: Style.fontLight.name
textFormat: TextEdit.AutoText
readOnly: true
font.pixelSize: 14 * scaleRatio
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index 0d6e771d..9ab90f4b 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -90,7 +90,7 @@ Item {
anchors.left: parent.left
anchors.leftMargin: 12 * scaleRatio
elide: Text.ElideRight
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.bold: dropdown.headerFontBold
font.pixelSize: dropdown.fontHeaderSize
color: "#FFFFFF"
diff --git a/components/SubaddressTable.qml b/components/SubaddressTable.qml
index 88856ad3..811d1199 100644
--- a/components/SubaddressTable.qml
+++ b/components/SubaddressTable.qml
@@ -42,7 +42,7 @@ ListView {
delegate: Rectangle {
id: delegate
- height: 74
+ height: 80
color: 'transparent';
anchors.topMargin: 0
width: listView.width
@@ -57,7 +57,7 @@ ListView {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
- anchors.leftMargin: 5
+ anchors.leftMargin: 10
anchors.topMargin: 12
anchors.rightMargin: 54
anchors.bottomMargin: 0
diff --git a/pages/Mining.qml b/pages/Mining.qml
index 983fc880..f27a2b19 100644
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -74,7 +74,7 @@ Rectangle {
text: qsTr("Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.
Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 774f92c6..497851e7 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -211,7 +211,7 @@ Rectangle {
Rectangle {
id: tableRect
- property int table_max_height: 240
+ property int table_max_height: 260
Layout.fillWidth: true
Layout.preferredHeight: table.contentHeight < table_max_height ? table.contentHeight : table_max_height
color: "transparent"
diff --git a/pages/Settings.qml b/pages/Settings.qml
index a5896689..e24d05dd 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -256,7 +256,14 @@ Rectangle {
daemonAddrLabelText: qsTr("Address")
daemonPortLabelText: qsTr("Port")
daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
- daemonPortText: (persistentSettings.bootstrapNodeAddress.split(":")[1].trim() == "") ? "18081" : persistentSettings.bootstrapNodeAddress.split(":")[1]
+ daemonPortText: {
+ var node_split = persistentSettings.bootstrapNodeAddress.split(":");
+ if(node_split.length == 2){
+ (node_split[1].trim() == "") ? "18081" : node_split[1];
+ } else {
+ return ""
+ }
+ }
onEditingFinished: {
persistentSettings.bootstrapNodeAddress = daemonAddrText ? bootstrapNodeEdit.getAddress() : "";
console.log("setting bootstrap node to " + persistentSettings.bootstrapNodeAddress)
diff --git a/pages/Sign.qml b/pages/Sign.qml
index 287846f2..e86ac71a 100644
--- a/pages/Sign.qml
+++ b/pages/Sign.qml
@@ -107,7 +107,7 @@ Rectangle {
text: qsTr("This page lets you sign/verify a message (or file contents) with your address.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index c6a4ea5b..f9c91396 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -140,7 +140,7 @@ Rectangle {
Layout.preferredHeight: warningText.height + 40
Image {
- anchors.verticalCenter: statusRect.verticalCenter
+ Layout.alignment: Qt.AlignVCenter
Layout.preferredHeight: 33
Layout.preferredWidth: 33
Layout.leftMargin: 10
@@ -155,7 +155,7 @@ Rectangle {
Layout.leftMargin: 6
text: qsTr("This page lets you sign/verify a message (or file contents) with your address.") + translationManager.emptyString
wrapMode: Text.Wrap
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
textFormat: Text.RichText
@@ -210,7 +210,7 @@ Rectangle {
Layout.topMargin: 14
text: qsTr("Transaction priority") + translationManager.emptyString
fontBold: false
- fontSize: 14
+ fontSize: 16
}
// Note: workaround for translations in listElements
// ListElement: cannot use script for property value, so
@@ -408,7 +408,7 @@ Rectangle {
Layout.fillWidth: true
Label {
id: privacyLabel
- fontSize: 14
+ fontSize: 15
text: ""
}
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index febcb31b..7432aee2 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -71,7 +71,7 @@ Rectangle {
"For the case of outgoing payments, you can get a 'Spend Proof' that proves the authorship of a transaction. In this case, you don't need to specify the recipient address.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
@@ -145,7 +145,7 @@ Rectangle {
"For the case with Spend Proof, you don't need to specify the recipient address.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
@@ -228,7 +228,7 @@ Rectangle {
text: qsTr("If a payment had several transactions then each must be checked and the results combined.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
- font.family: Style.fontRegular
+ font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}