aboutsummaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorSander Ferdinand <sa.ferdinand@gmail.com>2018-03-24 20:48:19 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-29 23:04:04 +0100
commitc001e312410efe8f883bb5163e5554d84126c034 (patch)
treeac37a3679b9e15f2b558ea2438d60c1caf759b41 /components
parent3f9926487d37e5338ac6490fc81fdcf35caa708d (diff)
downloadmonzero-gui-c001e312410efe8f883bb5163e5554d84126c034.tar.gz
monzero-gui-c001e312410efe8f883bb5163e5554d84126c034.tar.xz
monzero-gui-c001e312410efe8f883bb5163e5554d84126c034.zip
Fixes runtime QML warning
Diffstat (limited to 'components')
-rw-r--r--components/CheckBox2.qml2
-rw-r--r--components/DatePicker.qml2
-rw-r--r--components/InputDialog.qml4
-rw-r--r--components/InputMulti.qml2
-rw-r--r--components/Label.qml2
-rw-r--r--components/LineEdit.qml4
-rw-r--r--components/LineEditMulti.qml4
-rw-r--r--components/NetworkStatusItem.qml5
-rw-r--r--components/NewPasswordDialog.qml8
-rw-r--r--components/PasswordDialog.qml4
-rw-r--r--components/ProgressBar.qml5
-rw-r--r--components/StandardDialog.qml8
-rw-r--r--components/StandardDropdown.qml2
-rw-r--r--components/SubaddressTable.qml4
14 files changed, 30 insertions, 26 deletions
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