diff --git a/components/AddressBookTable.qml b/components/AddressBookTable.qml
index 43f277c3..2a8ed11a 100644
--- a/components/AddressBookTable.qml
+++ b/components/AddressBookTable.qml
@@ -17,7 +17,8 @@ ListView {
anchors.verticalCenter: parent.verticalCenter
width: 37
anchors.leftMargin: 3
- shadowColor: "#FF4304"
+ shadowReleasedColor: "#FF4304"
+ shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
icon: "../images/goToTransferIcon.png"
@@ -29,7 +30,8 @@ ListView {
anchors.verticalCenter: parent.verticalCenter
width: 37
anchors.rightMargin: 3
- shadowColor: "#DBDBDB"
+ shadowReleasedColor: "#DBDBDB"
+ shadowPressedColor: "#888888"
releasedColor: "#F0EEEE"
pressedColor: "#DBDBDB"
icon: "../images/deleteIcon.png"
diff --git a/components/DashboardTable.qml b/components/DashboardTable.qml
index 12c699a1..cbd1c8d0 100644
--- a/components/DashboardTable.qml
+++ b/components/DashboardTable.qml
@@ -37,7 +37,7 @@ ListView {
Text {
id: paymentIdText
- width: text.length ? 122 : 0
+ width: text.length ? 120 : 0
anchors.verticalCenter: dot.verticalCenter
font.family: "Arial"
font.bold: true
@@ -76,7 +76,7 @@ ListView {
Column {
anchors.top: parent.top
- width: 202
+ width: 215
Text {
anchors.left: parent.left
@@ -86,11 +86,26 @@ ListView {
text: qsTr("Date")
}
- Text {
- font.family: "Arial"
- font.pixelSize: 18
- color: "#000000"
- text: date
+ Row {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ spacing: 33
+
+ 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 {
font.family: "Arial"
font.pixelSize: 18
+ font.letterSpacing: -1
color: "#000000"
text: amount
}
@@ -141,6 +157,7 @@ ListView {
anchors.bottom: parent.bottom
font.family: "Arial"
font.pixelSize: 18
+ font.letterSpacing: -1
color: out ? "#FF4F41" : "#36B05B"
text: balance
}
diff --git a/components/Label.qml b/components/Label.qml
index eee9c211..46197718 100644
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -43,7 +43,7 @@ Item {
tipItem.visible = true
}
onExited: {
- icon.visible = true
+ icon.visible = Qt.binding(function(){ return appWindow.whatIsEnable; })
tipItem.visible = false
}
}
diff --git a/components/SearchInput.qml b/components/SearchInput.qml
index d1fb57f5..4c1b6666 100644
--- a/components/SearchInput.qml
+++ b/components/SearchInput.qml
@@ -70,6 +70,8 @@ Item {
anchors.verticalCenter: parent.verticalCenter
font.family: "Arial"
font.pixelSize: 12
+ font.bold: true
+ font.letterSpacing: -1
color: "#4A4747"
text: "NAME"
}
@@ -150,6 +152,8 @@ Item {
anchors.leftMargin: 12
anchors.rightMargin: 12
font.family: "Arial"
+ font.bold: true
+ font.letterSpacing: -1
font.pixelSize: 12
color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646"
text: name
@@ -177,7 +181,8 @@ Item {
anchors.margins: 6
width: 80
- shadowColor: "#8C0B00"
+ shadowReleasedColor: "#C60F00"
+ shadowPressedColor: "#8C0B00"
pressedColor: "#C60F00"
releasedColor: "#FF4F41"
text: qsTr("SEARCH")
diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index 0eeb5c2b..28bee9be 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -2,7 +2,8 @@ import QtQuick 2.0
Item {
height: 37
- property string shadowColor
+ property string shadowPressedColor
+ property string shadowReleasedColor
property string pressedColor
property string releasedColor
property string icon: ""
@@ -14,16 +15,16 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: parent.height - 1
- y: buttonArea.pressed ? 1 : 0
+ y: buttonArea.pressed ? 0 : 1
radius: 4
- color: parent.shadowColor
+ color: buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor
}
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
height: parent.height - 1
- y: buttonArea.pressed ? 0 : 1
+ y: buttonArea.pressed ? 1 : 0
color: buttonArea.pressed ? parent.pressedColor : parent.releasedColor
radius: 4
}
@@ -35,6 +36,9 @@ Item {
anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
+ font.family: "Arial"
+ font.bold: true
+ font.letterSpacing: -1
font.pixelSize: 12
color: parent.textColor
visible: parent.icon === ""
diff --git a/components/TableDropdown.qml b/components/TableDropdown.qml
index 6386fe90..89cec3de 100644
--- a/components/TableDropdown.qml
+++ b/components/TableDropdown.qml
@@ -27,19 +27,41 @@ Item {
anchors.fill: parent
Rectangle {
- anchors.fill: parent
- anchors.topMargin: dropdown.expanded || dropArea.height > 0 ? 0 : 1
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: parent.height - 1
+ y: dropdown.expanded || dropArea.height > 0 ? 0 : 1
radius: 3
color: dropdown.expanded || dropArea.height > 0 ? "#888888" : "#DBDBDB"
}
Rectangle {
- anchors.fill: parent
- anchors.bottomMargin: dropdown.expanded || dropArea.height > 0 ? 0 : 1
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: parent.height - 1
+ y: dropdown.expanded || dropArea.height > 0 ? 1 : 0
radius: 3
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 {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
diff --git a/components/TableHeader.qml b/components/TableHeader.qml
index 93c5c96a..f01da098 100644
--- a/components/TableHeader.qml
+++ b/components/TableHeader.qml
@@ -5,6 +5,7 @@ Rectangle {
signal sortRequest(bool desc, int column)
property alias dataModel: columnsRepeater.model
property int activeSortColumn: -1
+ property int offset: 0
height: 31
color: "#FFFFFF"
@@ -18,7 +19,10 @@ Rectangle {
}
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 {
height: 31
diff --git a/main.qml b/main.qml
index 21c7983e..b85a8cae 100644
--- a/main.qml
+++ b/main.qml
@@ -49,7 +49,7 @@ ApplicationWindow {
visible: true
width: 1269
- height: 900
+ height: 800
color: "#FFFFFF"
x: (Screen.width - width) / 2
y: (Screen.height - height) / 2
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index d84c1e9b..d333710c 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -91,9 +91,10 @@ Rectangle {
// anchors.topMargin: 5
// width: 60
-// shadowColor: "#8C0B00"
-// pressedColor: "#C60F00"
-// releasedColor: "#FF4F41"
+// shadowReleasedColor: "#FF4304"
+// shadowPressedColor: "#B32D00"
+// releasedColor: "#FF6C3C"
+// pressedColor: "#FF4304"
// text: qsTr("ADD")
// }
diff --git a/pages/Dashboard.qml b/pages/Dashboard.qml
index da5f3f11..9bbaf3c6 100644
--- a/pages/Dashboard.qml
+++ b/pages/Dashboard.qml
@@ -57,7 +57,8 @@ Rectangle {
id: sendButton
width: 60
text: qsTr("SEND")
- shadowColor: "#FF4304"
+ shadowReleasedColor: "#FF4304"
+ shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
}
@@ -93,7 +94,7 @@ Rectangle {
ListModel {
id: columnsModel
- ListElement { columnName: "Date"; columnWidth: 92 }
+ ListElement { columnName: "Date"; columnWidth: 97 }
ListElement { columnName: "Amount"; columnWidth: 158 }
ListElement { columnName: "Balance"; columnWidth: 168 }
}
@@ -107,21 +108,22 @@ Rectangle {
anchors.leftMargin: 14
anchors.rightMargin: 14
dataModel: columnsModel
+ offset: 145
onSortRequest: console.log("column: " + column + " desc: " + desc)
}
ListModel {
id: testModel
- ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: "Client from Australia"; out: false }
- ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: true }
- ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: true }
- ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
- ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: "Client from Australia"; out: false }
- ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
- ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
- ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
- ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: "Client from Australia"; out: false }
- ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014 12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
+ ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: "Client from Australia"; out: false }
+ ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: true }
+ ListElement { paymentId: "Martin"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: true }
+ ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
+ ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: "Client from Australia"; out: false }
+ ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
+ ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
+ ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
+ ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: "Client from Australia"; out: false }
+ ListElement { paymentId: "Malkolm T."; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "19301.870709159241"; balance: "0.000709159241"; description: ""; out: false }
}
Scroll {