Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Explicitly import MoneroComponents; prevent namespace pollution

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
components/HistoryTable.qml
View File

@@ -29,9 +29,9 @@
import QtQuick 2.0
import moneroComponents.Clipboard 1.0
import moneroComponents.AddressBookModel 1.0
import "../components" as MoneroComponents
import "../js/TxUtils.js" as TxUtils
import "." 1.0
ListView {
id: listView
@@ -149,7 +149,7 @@ ListView {
id: txrxLabel
anchors.left: arrowImage.right
anchors.leftMargin: 18 * scaleRatio
font.family: Style.fontLight.name
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 14 * scaleRatio
text: isOut ? "Sent" : "Received"
color: "#808080"
@@ -161,7 +161,7 @@ ListView {
anchors.leftMargin: 18 * scaleRatio
anchors.top: txrxLabel.bottom
anchors.topMargin: 0 * scaleRatio
font.family: Style.fontBold.name
font.family: MoneroComponents.Style.fontBold.name
font.pixelSize: 18 * scaleRatio
font.bold: true
text: {
@@ -187,7 +187,7 @@ ListView {
Text {
id: dateLabel
anchors.left: parent.left
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
text: date
color: "#808080"
@@ -211,7 +211,7 @@ ListView {
anchors.left: parent.left
anchors.top: dateLabel.bottom
anchors.topMargin: 0
font.family: Style.fontRegular.name
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
text: {
if(isOut){
@@ -289,7 +289,7 @@ ListView {
visible: delegate.collapsed
// left column
HistoryTableInnerColumn{
MoneroComponents.HistoryTableInnerColumn{
anchors.left: parent.left
anchors.leftMargin: 30 * scaleRatio
@@ -299,7 +299,7 @@ ListView {
}
// right column
HistoryTableInnerColumn{
MoneroComponents.HistoryTableInnerColumn{
anchors.right: parent.right
anchors.rightMargin: 100 * scaleRatio
width: 200 * scaleRatio
@@ -337,7 +337,7 @@ ListView {
visible: delegate.collapsed
// left column
HistoryTableInnerColumn{
MoneroComponents.HistoryTableInnerColumn{
anchors.left: parent.left
anchors.leftMargin: 30 * scaleRatio
labelHeader: qsTr("Blockheight")
@@ -357,7 +357,7 @@ ListView {
}
// right column
HistoryTableInnerColumn {
MoneroComponents.HistoryTableInnerColumn {
visible: currentWallet.getUserNote(hash)
anchors.right: parent.right
anchors.rightMargin: 80 * scaleRatio
@@ -425,7 +425,7 @@ ListView {
}
Text {
color: Style.defaultFontColor
color: MoneroComponents.Style.defaultFontColor
text: "P"
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
@@ -470,7 +470,7 @@ ListView {
}
Text {
color: Style.defaultFontColor
color: MoneroComponents.Style.defaultFontColor
text: "?"
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter