Fixes runtime QML warning

This commit is contained in:
Sander Ferdinand
2018-03-24 20:48:19 +01:00
committed by moneromooo-monero
parent 3f9926487d
commit c001e31241
21 changed files with 50 additions and 38 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -57,7 +57,7 @@ Item {
if(fontFamily){
return fontFamily;
} else {
return Style.fontLight;
return Style.fontRegular.name;
}
}
font.pixelSize: fontSize

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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"

View File

@@ -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