Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-01 23:07:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
marcin
2014-07-09 17:44:13 +02:00
parent 92c594ca8c
commit 692b8532d7
10 changed files with 93 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/AddressBookTable.qml
View File

@@ -17,7 +17,8 @@ ListView {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 37 width: 37
anchors.leftMargin: 3 anchors.leftMargin: 3
shadowColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
icon: "../images/goToTransferIcon.png" icon: "../images/goToTransferIcon.png"
@@ -29,7 +30,8 @@ ListView {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 37 width: 37
anchors.rightMargin: 3 anchors.rightMargin: 3
shadowColor: "#DBDBDB" shadowReleasedColor: "#DBDBDB"
shadowPressedColor: "#888888"
releasedColor: "#F0EEEE" releasedColor: "#F0EEEE"
pressedColor: "#DBDBDB" pressedColor: "#DBDBDB"
icon: "../images/deleteIcon.png" icon: "../images/deleteIcon.png"

31
components/DashboardTable.qml
View File

@@ -37,7 +37,7 @@ ListView {
Text { Text {
id: paymentIdText id: paymentIdText
width: text.length ? 122 : 0 width: text.length ? 120 : 0
anchors.verticalCenter: dot.verticalCenter anchors.verticalCenter: dot.verticalCenter
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
@@ -76,7 +76,7 @@ ListView {
Column { Column {
anchors.top: parent.top anchors.top: parent.top
width: 202 width: 215
Text { Text {
anchors.left: parent.left anchors.left: parent.left
@@ -86,11 +86,26 @@ ListView {
text: qsTr("Date") text: qsTr("Date")
} }
Text { Row {
font.family: "Arial" anchors.left: parent.left
font.pixelSize: 18 anchors.right: parent.right
color: "#000000" spacing: 33
text: date
Text {
font.family: "Arial"
font.pixelSize: 18
font.letterSpacing: -1
color: "#000000"
text: date
}
Text {
font.family: "Arial"
font.pixelSize: 18
font.letterSpacing: -1
color: "#000000"
text: time
}
} }
} }
@@ -109,6 +124,7 @@ ListView {
Text { Text {
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18
font.letterSpacing: -1
color: "#000000" color: "#000000"
text: amount text: amount
} }
@@ -141,6 +157,7 @@ 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: balance text: balance
} }

2
components/Label.qml
View File

@@ -43,7 +43,7 @@ Item {
tipItem.visible = true tipItem.visible = true
} }
onExited: { onExited: {
icon.visible = true icon.visible = Qt.binding(function(){ return appWindow.whatIsEnable; })
tipItem.visible = false tipItem.visible = false
} }
} }

7
components/SearchInput.qml
View File

@@ -70,6 +70,8 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12
font.bold: true
font.letterSpacing: -1
color: "#4A4747" color: "#4A4747"
text: "NAME" text: "NAME"
} }
@@ -150,6 +152,8 @@ Item {
anchors.leftMargin: 12 anchors.leftMargin: 12
anchors.rightMargin: 12 anchors.rightMargin: 12
font.family: "Arial" font.family: "Arial"
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
@@ -177,7 +181,8 @@ Item {
anchors.margins: 6 anchors.margins: 6
width: 80 width: 80
shadowColor: "#8C0B00" shadowReleasedColor: "#C60F00"
shadowPressedColor: "#8C0B00"
pressedColor: "#C60F00" pressedColor: "#C60F00"
releasedColor: "#FF4F41" releasedColor: "#FF4F41"
text: qsTr("SEARCH") text: qsTr("SEARCH")

12
components/StandardButton.qml
View File

@@ -2,7 +2,8 @@ import QtQuick 2.0
Item { Item {
height: 37 height: 37
property string shadowColor property string shadowPressedColor
property string shadowReleasedColor
property string pressedColor property string pressedColor
property string releasedColor property string releasedColor
property string icon: "" property string icon: ""
@@ -14,16 +15,16 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: parent.height - 1 height: parent.height - 1
y: buttonArea.pressed ? 1 : 0 y: buttonArea.pressed ? 0 : 1
radius: 4 radius: 4
color: parent.shadowColor color: buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor
} }
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: parent.height - 1 height: parent.height - 1
y: buttonArea.pressed ? 0 : 1 y: buttonArea.pressed ? 1 : 0
color: buttonArea.pressed ? parent.pressedColor : parent.releasedColor color: buttonArea.pressed ? parent.pressedColor : parent.releasedColor
radius: 4 radius: 4
} }
@@ -35,6 +36,9 @@ Item {
anchors.right: parent.right anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight elide: Text.ElideRight
font.family: "Arial"
font.bold: true
font.letterSpacing: -1
font.pixelSize: 12 font.pixelSize: 12
color: parent.textColor color: parent.textColor
visible: parent.icon === "" visible: parent.icon === ""

30
components/TableDropdown.qml
View File

@@ -27,19 +27,41 @@ Item {
anchors.fill: parent anchors.fill: parent
Rectangle { Rectangle {
anchors.fill: parent anchors.left: parent.left
anchors.topMargin: dropdown.expanded || dropArea.height > 0 ? 0 : 1 anchors.right: parent.right
height: parent.height - 1
y: dropdown.expanded || dropArea.height > 0 ? 0 : 1
radius: 3 radius: 3
color: dropdown.expanded || dropArea.height > 0 ? "#888888" : "#DBDBDB" color: dropdown.expanded || dropArea.height > 0 ? "#888888" : "#DBDBDB"
} }
Rectangle { Rectangle {
anchors.fill: parent anchors.left: parent.left
anchors.bottomMargin: dropdown.expanded || dropArea.height > 0 ? 0 : 1 anchors.right: parent.right
height: parent.height - 1
y: dropdown.expanded || dropArea.height > 0 ? 1 : 0
radius: 3 radius: 3
color: dropdown.expanded || dropArea.height > 0 ? "#DBDBDB" : "#F0EEEE" color: dropdown.expanded || dropArea.height > 0 ? "#DBDBDB" : "#F0EEEE"
} }
Rectangle {
anchors.left: parent.left
anchors.bottom: parent.bottom
height: 3
width: 3
color: "#DBDBDB"
visible: dropdown.expanded || dropArea.height > 0
}
Rectangle {
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 3
width: 3
color: "#DBDBDB"
visible: dropdown.expanded || dropArea.height > 0
}
Image { Image {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left

6
components/TableHeader.qml
View File

@@ -5,6 +5,7 @@ Rectangle {
signal sortRequest(bool desc, int column) signal sortRequest(bool desc, int column)
property alias dataModel: columnsRepeater.model property alias dataModel: columnsRepeater.model
property int activeSortColumn: -1 property int activeSortColumn: -1
property int offset: 0
height: 31 height: 31
color: "#FFFFFF" color: "#FFFFFF"
@@ -18,7 +19,10 @@ Rectangle {
} }
Row { Row {
anchors.horizontalCenter: parent.horizontalCenter id: row
anchors.horizontalCenter: header.offset !== 0 ? undefined: parent.horizontalCenter
anchors.left: header.offset !== 0 ? parent.left : undefined
anchors.leftMargin: header.offset
Rectangle { Rectangle {
height: 31 height: 31

2
main.qml
View File

@@ -49,7 +49,7 @@ ApplicationWindow {
visible: true visible: true
width: 1269 width: 1269
height: 900 height: 800
color: "#FFFFFF" color: "#FFFFFF"
x: (Screen.width - width) / 2 x: (Screen.width - width) / 2
y: (Screen.height - height) / 2 y: (Screen.height - height) / 2

7
pages/AddressBook.qml
View File

@@ -91,9 +91,10 @@ Rectangle {
// anchors.topMargin: 5 // anchors.topMargin: 5
// width: 60 // width: 60
// shadowColor: "#8C0B00" // shadowReleasedColor: "#FF4304"
// pressedColor: "#C60F00" // shadowPressedColor: "#B32D00"
// releasedColor: "#FF4F41" // releasedColor: "#FF6C3C"
// pressedColor: "#FF4304"
// text: qsTr("ADD") // text: qsTr("ADD")
// } // }

26
pages/Dashboard.qml
View File

@@ -57,7 +57,8 @@ Rectangle {
id: sendButton id: sendButton
width: 60 width: 60
text: qsTr("SEND") text: qsTr("SEND")
shadowColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
} }
@@ -93,7 +94,7 @@ Rectangle {
ListModel { ListModel {
id: columnsModel id: columnsModel
ListElement { columnName: "Date"; columnWidth: 92 } ListElement { columnName: "Date"; columnWidth: 97 }
ListElement { columnName: "Amount"; columnWidth: 158 } ListElement { columnName: "Amount"; columnWidth: 158 }
ListElement { columnName: "Balance"; columnWidth: 168 } ListElement { columnName: "Balance"; columnWidth: 168 }
} }
@@ -107,21 +108,22 @@ Rectangle {
anchors.leftMargin: 14 anchors.leftMargin: 14
anchors.rightMargin: 14 anchors.rightMargin: 14
dataModel: columnsModel dataModel: columnsModel
offset: 145
onSortRequest: console.log("column: " + column + " desc: " + desc) onSortRequest: console.log("column: " + column + " desc: " + desc)
} }
ListModel { ListModel {
id: testModel id: testModel
ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: "Client from Australia"; out: false } ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: "Client from Australia"; out: false }
ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: true } ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: true }
ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: true } ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: true }
ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false } ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false }
ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: "Client from Australia"; out: false } ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: "Client from Australia"; out: false }
ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false } ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false }
ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false } ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false }
ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false } ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false }
ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: "Client from Australia"; out: false } ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: "Client from Australia"; out: false }
ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false } ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 <font size='2'>AM</font>"; amount: "19301.<font size='2'>870709159241</font>"; balance: "0.<font size='2'>000709159241</font>"; description: ""; out: false }
} }
Scroll { Scroll {