monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-24 12:39:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #574

Browse source 
a9e975f Mail.qml (xmr-eric)
1d74fa6 Titlebar.qml (xmr-eric)
d920b20 SearchInput.qml (xmr-eric)
ec5c73e Checkbox.qml (xmr-eric)
f3dfd18 DatePicker.qml (xmr-eric)
3ecffbc AddressbookTable.qml (xmr-eric)
b75fee7 TipItem.qml (xmr-eric)
94ca32a MiddlePanel.qml (xmr-eric)
2839bcc BasicPanel.qml (xmr-eric)
91e01d5 HistoryTable.qml (xmr-eric)
760f345 DashboardTable.qml (xmr-eric)
1915759 HistoryTable.qml (xmr-eric)
172243c BasicPanel.qml (xmr-eric)
This commit is contained in:
Riccardo Spagni 2017-03-19 23:52:06 +02:00
commit deb75afb7e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
11 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BasicPanel.qml
View file

@ -90,7 +90,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
@ -104,7 +103,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
@ -142,7 +140,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 14 font.pixelSize: 14
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom

4
MiddlePanel.qml
View file

@ -206,7 +206,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
@ -220,7 +219,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
@ -245,7 +243,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
@ -259,7 +256,6 @@ Rectangle {
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
font.pixelSize: 14 font.pixelSize: 14
font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom

3
components/AddressBookTable.qml
View file

@ -87,7 +87,6 @@ ListView {
anchors.rightMargin: 40 anchors.rightMargin: 40
font.family: "Arial" font.family: "Arial"
font.pixelSize: 16 font.pixelSize: 16
font.letterSpacing: -1
color: "#545454" color: "#545454"
text: address text: address
} }
@ -101,7 +100,6 @@ ListView {
width: 139 width: 139
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
color: "#535353" color: "#535353"
text: qsTr("Payment ID:") + translationManager.emptyString text: qsTr("Payment ID:") + translationManager.emptyString
} }
@ -117,7 +115,6 @@ ListView {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 13 font.pixelSize: 13
font.letterSpacing: -1
color: "#545454" color: "#545454"
text: paymentId text: paymentId
} }

1
components/CheckBox.qml
View file

@ -76,7 +76,6 @@ Item {
anchors.leftMargin: 25 + 12 anchors.leftMargin: 25 + 12
font.family: "Arial" font.family: "Arial"
font.pixelSize: checkBox.fontSize font.pixelSize: checkBox.fontSize
font.letterSpacing: -1
color: "#525252" color: "#525252"
} }

4
components/DashboardTable.qml
View file

@ -145,7 +145,6 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: date text: date
} }
@ -153,7 +152,6 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: time text: time
} }
@ -175,7 +173,6 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: balance text: balance
} }
@ -208,7 +205,6 @@ ListView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: out ? "#FF4F41" : "#36B05B" color: out ? "#FF4F41" : "#36B05B"
text: amount text: amount
} }

3
components/DatePicker.qml
View file

@ -285,7 +285,6 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
font.bold: dayArea.pressed font.bold: dayArea.pressed
text: styleData.date.getDate() text: styleData.date.getDate()
color: { color: {
@ -322,7 +321,6 @@ Item {
elide: Text.ElideRight elide: Text.ElideRight
font.family: "Arial" font.family: "Arial"
font.pixelSize: 9 font.pixelSize: 9
font.letterSpacing: -1
color: "#535353" color: "#535353"
text: { text: {
var locale = Qt.locale() var locale = Qt.locale()
@ -339,7 +337,6 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
color: "#4A4646" color: "#4A4646"
text: styleData.title text: styleData.title
} }

9
components/HistoryTable.qml
View file

@ -199,7 +199,6 @@ ListView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
color: "#535353" color: "#535353"
text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : "" text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : ""
} }
@ -213,7 +212,6 @@ ListView {
//elide: Text.ElideRight //elide: Text.ElideRight
font.family: "Arial" font.family: "Arial"
font.pixelSize:13 font.pixelSize:13
font.letterSpacing: -1
color: "#545454" color: "#545454"
text: paymentId text: paymentId
@ -228,7 +226,6 @@ ListView {
//elide: Text.ElideRight //elide: Text.ElideRight
font.family: "Arial" font.family: "Arial"
font.pixelSize:13 font.pixelSize:13
font.letterSpacing: -1
color: "#545454" color: "#545454"
text: "(" + lookupPaymentID(paymentId) + ")" text: "(" + lookupPaymentID(paymentId) + ")"
visible: text !== "()" visible: text !== "()"
@ -250,7 +247,6 @@ ListView {
width: 86 width: 86
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
color: "#535353" color: "#535353"
text: qsTr("BlockHeight:") + translationManager.emptyString text: qsTr("BlockHeight:") + translationManager.emptyString
} }
@ -312,7 +308,6 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: date text: date
} }
@ -320,7 +315,6 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: time text: time
} }
@ -345,7 +339,6 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: balance text: balance
} }
@ -380,7 +373,6 @@ ListView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: isOut ? "#FF4F41" : "#36B05B" color: isOut ? "#FF4F41" : "#36B05B"
text: displayAmount text: displayAmount
} }
@ -406,7 +398,6 @@ ListView {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#FF4F41" color: "#FF4F41"
text: fee text: fee
} }

2
components/SearchInput.qml
View file

@ -100,7 +100,6 @@ Item {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.bold: true font.bold: true
font.letterSpacing: -1
color: "#4A4747" color: "#4A4747"
text: "NAME" text: "NAME"
} }
@ -195,7 +194,6 @@ Item {
anchors.rightMargin: 12 anchors.rightMargin: 12
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
font.letterSpacing: -1
font.pixelSize: 12 font.pixelSize: 12
color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646" color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646"
text: name text: name

1
components/TipItem.qml
View file

@ -65,7 +65,6 @@ Window {
lineHeight: 0.7 lineHeight: 0.7
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
color: "#FFFFFF" color: "#FFFFFF"
} }
} }

1
components/TitleBar.qml
View file

@ -47,7 +47,6 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
font.family: "Arial" font.family: "Arial"
font.pixelSize: 15 font.pixelSize: 15
font.letterSpacing: -1
color: "#FFFFFF" color: "#FFFFFF"
text: titleBar.title text: titleBar.title
visible: customDecorations visible: customDecorations

1
main.qml
View file

@ -1253,7 +1253,6 @@ ApplicationWindow {
lineHeight: 0.7 lineHeight: 0.7
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.letterSpacing: -1
color: "#FFFFFF" color: "#FFFFFF"
} }
} }