Explicitly import MoneroComponents; prevent namespace pollution

This commit is contained in:
Sander Ferdinand
2018-03-31 03:25:20 +02:00
parent 959c2fcc32
commit e638ed0272
28 changed files with 151 additions and 146 deletions

View File

@@ -31,6 +31,8 @@ import QtQuick.Layouts 1.1
import moneroComponents.Clipboard 1.0
import moneroComponents.AddressBookModel 1.0
import "../components" as MoneroComponents
ListView {
id: listView
clip: true
@@ -152,16 +154,16 @@ ListView {
Layout.topMargin: 20 * scaleRatio
Layout.leftMargin: 10 * scaleRatio
Text {
font.family: Style.fontMedium.name
font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
color: MoneroComponents.Style.defaultFontColor
text: date
}
Text {
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.dimmedFontColor
color: MoneroComponents.Style.dimmedFontColor
text: time
}
@@ -169,7 +171,7 @@ ListView {
Text {
visible: confirmations < confirmationsRequired || isPending
Layout.leftMargin: 5 * scaleRatio
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454"
text: {
@@ -193,7 +195,7 @@ ListView {
Text {
font.family: "Arial"
font.pixelSize: 14 * scaleRatio
color: isOut ? Style.defaultFontColor : "#2eb358"
color: isOut ? MoneroComponents.Style.defaultFontColor : "#2eb358"
text: isOut ? "↓" : "↑"
}
@@ -201,7 +203,7 @@ ListView {
id: amountText
font.family: "Arial"
font.pixelSize: 18 * scaleRatio
color: isOut ? Style.defaultFontColor : "#2eb358"
color: isOut ? MoneroComponents.Style.defaultFontColor : "#2eb358"
text: displayAmount
}
}