forked from Public/monero-gui
Merge pull request #574
a9e975fMail.qml (xmr-eric)1d74fa6Titlebar.qml (xmr-eric)d920b20SearchInput.qml (xmr-eric)ec5c73eCheckbox.qml (xmr-eric)f3dfd18DatePicker.qml (xmr-eric)3ecffbcAddressbookTable.qml (xmr-eric)b75fee7TipItem.qml (xmr-eric)94ca32aMiddlePanel.qml (xmr-eric)2839bccBasicPanel.qml (xmr-eric)91e01d5HistoryTable.qml (xmr-eric)760f345DashboardTable.qml (xmr-eric)1915759HistoryTable.qml (xmr-eric)172243cBasicPanel.qml (xmr-eric)
This commit is contained in:
@@ -90,7 +90,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
@@ -104,7 +103,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
@@ -142,7 +140,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 14
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
|
||||
@@ -206,7 +206,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
@@ -220,7 +219,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
@@ -245,7 +243,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
@@ -259,7 +256,6 @@ Rectangle {
|
||||
height: 20
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 14
|
||||
font.letterSpacing: -1
|
||||
elide: Text.ElideRight
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignBottom
|
||||
|
||||
@@ -87,7 +87,6 @@ ListView {
|
||||
anchors.rightMargin: 40
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 16
|
||||
font.letterSpacing: -1
|
||||
color: "#545454"
|
||||
text: address
|
||||
}
|
||||
@@ -101,7 +100,6 @@ ListView {
|
||||
width: 139
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
color: "#535353"
|
||||
text: qsTr("Payment ID:") + translationManager.emptyString
|
||||
}
|
||||
@@ -117,7 +115,6 @@ ListView {
|
||||
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 13
|
||||
font.letterSpacing: -1
|
||||
color: "#545454"
|
||||
text: paymentId
|
||||
}
|
||||
|
||||
@@ -76,7 +76,6 @@ Item {
|
||||
anchors.leftMargin: 25 + 12
|
||||
font.family: "Arial"
|
||||
font.pixelSize: checkBox.fontSize
|
||||
font.letterSpacing: -1
|
||||
color: "#525252"
|
||||
}
|
||||
|
||||
|
||||
@@ -145,7 +145,6 @@ ListView {
|
||||
Text {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#000000"
|
||||
text: date
|
||||
}
|
||||
@@ -153,7 +152,6 @@ ListView {
|
||||
Text {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#000000"
|
||||
text: time
|
||||
}
|
||||
@@ -175,7 +173,6 @@ ListView {
|
||||
Text {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#000000"
|
||||
text: balance
|
||||
}
|
||||
@@ -208,7 +205,6 @@ ListView {
|
||||
anchors.bottom: parent.bottom
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: out ? "#FF4F41" : "#36B05B"
|
||||
text: amount
|
||||
}
|
||||
|
||||
@@ -285,7 +285,6 @@ Item {
|
||||
anchors.centerIn: parent
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
font.bold: dayArea.pressed
|
||||
text: styleData.date.getDate()
|
||||
color: {
|
||||
@@ -322,7 +321,6 @@ Item {
|
||||
elide: Text.ElideRight
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 9
|
||||
font.letterSpacing: -1
|
||||
color: "#535353"
|
||||
text: {
|
||||
var locale = Qt.locale()
|
||||
@@ -339,7 +337,6 @@ Item {
|
||||
anchors.centerIn: parent
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
color: "#4A4646"
|
||||
text: styleData.title
|
||||
}
|
||||
|
||||
@@ -199,7 +199,6 @@ ListView {
|
||||
anchors.bottom: parent.bottom
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
color: "#535353"
|
||||
text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : ""
|
||||
}
|
||||
@@ -213,7 +212,6 @@ ListView {
|
||||
//elide: Text.ElideRight
|
||||
font.family: "Arial"
|
||||
font.pixelSize:13
|
||||
font.letterSpacing: -1
|
||||
color: "#545454"
|
||||
text: paymentId
|
||||
|
||||
@@ -228,7 +226,6 @@ ListView {
|
||||
//elide: Text.ElideRight
|
||||
font.family: "Arial"
|
||||
font.pixelSize:13
|
||||
font.letterSpacing: -1
|
||||
color: "#545454"
|
||||
text: "(" + lookupPaymentID(paymentId) + ")"
|
||||
visible: text !== "()"
|
||||
@@ -250,7 +247,6 @@ ListView {
|
||||
width: 86
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
color: "#535353"
|
||||
text: qsTr("BlockHeight:") + translationManager.emptyString
|
||||
}
|
||||
@@ -312,7 +308,6 @@ ListView {
|
||||
Text {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#000000"
|
||||
text: date
|
||||
}
|
||||
@@ -320,7 +315,6 @@ ListView {
|
||||
Text {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#000000"
|
||||
text: time
|
||||
}
|
||||
@@ -345,7 +339,6 @@ ListView {
|
||||
Text {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#000000"
|
||||
text: balance
|
||||
}
|
||||
@@ -380,7 +373,6 @@ ListView {
|
||||
anchors.bottom: parent.bottom
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: isOut ? "#FF4F41" : "#36B05B"
|
||||
text: displayAmount
|
||||
}
|
||||
@@ -406,7 +398,6 @@ ListView {
|
||||
anchors.bottom: parent.bottom
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 18
|
||||
font.letterSpacing: -1
|
||||
color: "#FF4F41"
|
||||
text: fee
|
||||
}
|
||||
|
||||
@@ -100,7 +100,6 @@ Item {
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.bold: true
|
||||
font.letterSpacing: -1
|
||||
color: "#4A4747"
|
||||
text: "NAME"
|
||||
}
|
||||
@@ -195,7 +194,6 @@ Item {
|
||||
anchors.rightMargin: 12
|
||||
font.family: "Arial"
|
||||
font.bold: true
|
||||
font.letterSpacing: -1
|
||||
font.pixelSize: 12
|
||||
color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646"
|
||||
text: name
|
||||
|
||||
@@ -65,7 +65,6 @@ Window {
|
||||
lineHeight: 0.7
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 12
|
||||
font.letterSpacing: -1
|
||||
color: "#FFFFFF"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,6 @@ Rectangle {
|
||||
anchors.centerIn: parent
|
||||
font.family: "Arial"
|
||||
font.pixelSize: 15
|
||||
font.letterSpacing: -1
|
||||
color: "#FFFFFF"
|
||||
text: titleBar.title
|
||||
visible: customDecorations
|
||||
|
||||
Reference in New Issue
Block a user