diff --git a/LeftPanel.qml b/LeftPanel.qml
index 16b1a8f9..8bfa2f0e 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -50,7 +50,6 @@ Rectangle {
property string copyValue: ""
Clipboard { id: clipboard }
- signal dashboardClicked()
signal historyClicked()
signal transferClicked()
signal receiveClicked()
@@ -65,8 +64,7 @@ Rectangle {
function selectItem(pos) {
menuColumn.previousButton.checked = false
- if(pos === "Dashboard") menuColumn.previousButton = dashboardButton
- else if(pos === "History") menuColumn.previousButton = historyButton
+ if(pos === "History") menuColumn.previousButton = historyButton
else if(pos === "Transfer") menuColumn.previousButton = transferButton
else if(pos === "Receive") menuColumn.previousButton = receiveButton
else if(pos === "Merchant") menuColumn.previousButton = merchantButton
@@ -338,34 +336,6 @@ Rectangle {
clip: true
property var previousButton: transferButton
- // ------------- Dashboard tab ---------------
-
- /*
- MenuButton {
- id: dashboardButton
- anchors.left: parent.left
- anchors.right: parent.right
- text: qsTr("Dashboard") + translationManager.emptyString
- symbol: qsTr("D") + translationManager.emptyString
- dotColor: "#FFE00A"
- checked: true
- onClicked: {
- parent.previousButton.checked = false
- parent.previousButton = dashboardButton
- panel.dashboardClicked()
- }
- }
-
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.leftMargin: 16
- color: dashboardButton.checked || transferButton.checked ? "#1C1C1C" : "#313131"
- height: 1
- }
- */
-
// top border
Rectangle {
anchors.left: parent.left
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 69d14d0f..c1f1f8ec 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -116,9 +116,6 @@ Rectangle {
states: [
State {
- name: "Dashboard"
- PropertyChanges { }
- }, State {
name: "History"
PropertyChanges { target: root; currentView: historyView }
PropertyChanges { target: historyView; model: appWindow.currentWallet ? appWindow.currentWallet.historyModel : null }
diff --git a/components/DashboardTable.qml b/components/DashboardTable.qml
deleted file mode 100644
index 07d68af9..00000000
--- a/components/DashboardTable.qml
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright (c) 2014-2018, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-// conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-// of conditions and the following disclaimer in the documentation and/or other
-// materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-// used to endorse or promote products derived from this software without specific
-// prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.0
-import moneroComponents.Clipboard 1.0
-
-ListView {
- id: listView
- clip: true
- boundsBehavior: ListView.StopAtBounds
-
- footer: Rectangle {
- height: 127
- width: listView.width
- color: "#FFFFFF"
-
- Text {
- anchors.centerIn: parent
- font.family: "Arial"
- font.pixelSize: 14
- color: "#545454"
- text: qsTr("No more results") + translationManager.emptyString
- }
- }
-
- property var previousItem
- delegate: Rectangle {
- id: delegate
- height: 90
- width: listView.width
- color: index % 2 ? "#F8F8F8" : "#FFFFFF"
- z: listView.count - index
- function collapseDropdown() { dropdown.expanded = false }
-
- Row {
- id: row1
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.topMargin: 14
-
- Rectangle {
- id: dot
- width: 14
- height: width
- radius: width / 2
- color: out ? "#FF4F41" : "#36B05B"
- }
-
- Item { //separator
- width: 12
- height: 14
- }
-
- Text {
- id: descriptionText
- width: text.length ? (descriptionArea.containsMouse ? parent.width - x - 12 : 120) : 0
- anchors.verticalCenter: dot.verticalCenter
- font.family: "Arial"
- font.bold: true
- font.pixelSize: 19
- color: "#444444"
- elide: Text.ElideRight
- text: description
-
- MouseArea {
- id: descriptionArea
- anchors.fill: parent
- hoverEnabled: true
- }
- }
-
- Item { //separator
- width: descriptionText.width ? 12 : 0
- height: 14
- visible: !descriptionArea.containsMouse
- }
-
- Text {
- id: addressText
- anchors.verticalCenter: dot.verticalCenter
- width: parent.width - x - 12
- elide: Text.ElideRight
- font.family: "Arial"
- font.pixelSize: 14
- color: "#545454"
- text: address
- visible: !descriptionArea.containsMouse
- }
- }
-
- Row {
- anchors.left: parent.left
- anchors.top: row1.bottom
- anchors.topMargin: 8
- spacing: 12
-
- Item { //separator
- width: 14
- height: 14
- }
-
- Column {
- anchors.top: parent.top
- width: 215
-
- Text {
- anchors.left: parent.left
- font.family: "Arial"
- font.pixelSize: 12
- color: "#545454"
- text: qsTr("Date") + translationManager.emptyString
- }
-
- Row {
- anchors.left: parent.left
- anchors.right: parent.right
- spacing: 33
-
- Text {
- font.family: "Arial"
- font.pixelSize: 18
- color: "#000000"
- text: date
- }
-
- Text {
- font.family: "Arial"
- font.pixelSize: 18
- color: "#000000"
- text: time
- }
- }
- }
-
- Column {
- anchors.top: parent.top
- width: 148
-
- Text {
- anchors.left: parent.left
- font.family: "Arial"
- font.pixelSize: 12
- color: "#545454"
- text: qsTr("Balance") + translationManager.emptyString
- }
-
- Text {
- font.family: "Arial"
- font.pixelSize: 18
- color: "#000000"
- text: balance
- }
- }
-
- Column {
- anchors.top: parent.top
- width: 148
-
- Text {
- anchors.left: parent.left
- font.family: "Arial"
- font.pixelSize: 12
- color: "#545454"
- text: qsTr("Amount") + translationManager.emptyString
- }
-
- Row {
- spacing: 2
- Text {
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 3
- font.family: "Arial"
- font.pixelSize: 16
- color: out ? "#FF4F41" : "#36B05B"
- text: out ? "↓" : "↑"
- }
-
- Text {
- anchors.bottom: parent.bottom
- font.family: "Arial"
- font.pixelSize: 18
- color: out ? "#FF4F41" : "#36B05B"
- text: amount
- }
- }
- }
- }
-
- ListModel {
- id: dropModel
- ListElement { name: "Copy address to clipboard"; icon: "../images/dropdownCopy.png" }
- ListElement { name: "Add to address book"; icon: "../images/dropdownAdd.png" }
- ListElement { name: "Send to this address"; icon: "../images/dropdownSend.png" }
- ListElement { name: "Find similar transactions"; icon: "../images/dropdownSearch.png" }
- }
-
- Clipboard { id: clipboard }
- TableDropdown {
- id: dropdown
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 11
- anchors.rightMargin: 5
- dataModel: dropModel
- z: 1
- onExpandedChanged: {
- if(expanded) {
- listView.previousItem = delegate
- listView.currentIndex = index
- }
- }
- onOptionClicked: {
- if(option === 0)
- clipboard.setText(address)
- }
- }
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- height: 1
- color: "#DBDBDB"
- }
- }
-}
diff --git a/components/SearchInput.qml b/components/SearchInput.qml
deleted file mode 100644
index 371f1698..00000000
--- a/components/SearchInput.qml
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) 2014-2018, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-// conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-// of conditions and the following disclaimer in the documentation and/or other
-// materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-// used to endorse or promote products derived from this software without specific
-// prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.0
-
-import "../components" as MoneroComponents
-
-Item {
- id: item
- signal searchClicked(string text, int option)
- height: 50
-
- Rectangle {
- anchors.fill: parent
- color: "#DBDBDB"
- //radius: 4
- }
-
- Rectangle {
- anchors.fill: parent
- anchors.topMargin: 1
- color: "#FFFFFF"
- //radius: 4
-
- Item {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- width: 45
-
- Image {
- anchors.centerIn: parent
- source: "../images/magnifier.png"
- }
- }
-
- Input {
- id: input
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.right: dropdown.left
- anchors.leftMargin: 45
- font.pixelSize: 18
- verticalAlignment: TextInput.AlignVCenter
- placeholderText: qsTr("Search by...") + translationManager.emptyString
- }
-
- Item {
- id: dropdown
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.right: button.left
- width: 154
-
- function hide() { droplist.height = 0 }
- function containsPoint(px, py) {
- if(px < 0)
- return false
- if(px > width)
- return false
- if(py < 0)
- return false
- if(py > height + droplist.height)
- return false
- return true
- }
-
- Row {
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
-
- Text {
- id: dropText
- width: 114 - 12
- anchors.verticalCenter: parent.verticalCenter
- font.family: "Arial"
- font.pixelSize: 12
- font.bold: true
- color: "#4A4747"
- text: "NAME"
- }
-
- Image {
- anchors.verticalCenter: parent.verticalCenter
- source: "../images/hseparator.png"
- }
-
- Item {
- height: dropdown.height
- width: 38
-
- Image {
- id: dropIndicator
- anchors.centerIn: parent
- source: "../images/dropIndicator.png"
- rotation: droplist.height === 0 ? 0 : 180
- }
- }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: {
- if(droplist.height === 0) {
- appWindow.currentItem = dropdown
- droplist.height = dropcolumn.height + 2
- } else {
- droplist.height = 0
- }
- }
- }
- }
-
- Rectangle {
- id: droplist
- property int currentOption: 0
-
- width: 154
- height: 0
- clip: true
- x: dropdown.x
- y: dropdown.height
- border.width: 1
- border.color: "#DBDBDB"
- color: "#FFFFFF"
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.leftMargin: 1
- anchors.rightMargin: 1
- height: 1
- color: "#FFFFFF"
- }
-
- Behavior on height {
- NumberAnimation { duration: 100; easing.type: Easing.InQuad }
- }
-
- ListModel {
- id: dropdownModel
- ListElement { name: "NAME" }
- ListElement { name: "DESCRIPTION" }
- ListElement { name: "ADDRESS" }
- }
-
- Column {
- id: dropcolumn
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.margins: 1
-
- Repeater {
- model: dropdownModel
- delegate: Rectangle {
- property bool isCurrent: name === dropText.text
- anchors.left: parent.left
- anchors.right: parent.right
- height: 30
- color: delegateArea.pressed || isCurrent ? "#4A4646" : "#FFFFFF"
-
- Text {
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.right: parent.right
- elide: Text.ElideRight
- anchors.leftMargin: 12
- anchors.rightMargin: 12
- font.family: "Arial"
- font.bold: true
- font.pixelSize: 12
- color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646"
- text: name
- }
-
- MouseArea {
- id: delegateArea
- anchors.fill: parent
- onClicked: {
- droplist.currentOption = index
- droplist.height = 0
- dropText.text = name
- }
- }
- }
- }
- }
- }
-
- MoneroComponents.StandardButton {
- id: button
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- anchors.margins: 6
- width: 80
- text: qsTr("SEARCH")
- onClicked: item.searchClicked(input.text, droplist.currentOption)
- }
- }
-}
diff --git a/components/TableHeader.qml b/components/TableHeader.qml
deleted file mode 100644
index 2936599e..00000000
--- a/components/TableHeader.qml
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright (c) 2014-2018, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-// conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-// of conditions and the following disclaimer in the documentation and/or other
-// materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-// used to endorse or promote products derived from this software without specific
-// prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.0
-
-Rectangle {
- id: header
- signal sortRequest(bool desc, int column)
- property alias dataModel: columnsRepeater.model
- property int activeSortColumn: -1
- property int offset: 0
-
- height: 31
- color: "transparent"
-
- Rectangle{
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: 1
- color: "#808080"
- }
-
- Rectangle{
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: 1
- color: "#808080"
- }
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- height: 1
- color: "#808080"
- }
-
- Row {
- id: row
- anchors.horizontalCenter: parent.horizontalCenter
-
- Rectangle {
- height: 31
- width: 1
- color: "#808080"
- }
-
- Repeater {
- id: columnsRepeater
-
- // Workaround for translations in listElements. All translated strings needs to be listed in this file.
- property string stringPaymentID: qsTr("Payment ID") + translationManager.emptyString
- property string stringDate: qsTr("Date") + translationManager.emptyString
- property string stringBlockHeight: qsTr("Block height") + translationManager.emptyString
- property string stringAmount: qsTr("Amount") + translationManager.emptyString
-
- delegate: Rectangle {
- id: delegate
- property bool desc: false
- color: "transparent"
- height: 31
- width: columnWidth
-
- Text {
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: -2
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.leftMargin: 13
- anchors.rightMargin: 13
- elide: Text.ElideRight
- font.family: "Arial"
- font.pixelSize: 14
- color: {
- if(delegateArea.pressed)
- return "#FF4304"
- return index === header.activeSortColumn || delegateArea.containsMouse ? "white" : "#808080"
- }
- text: qsTr(columnName) + translationManager.emptyString
- }
-
- MouseArea {
- id: delegateArea
- hoverEnabled: true
- anchors.fill: parent
- cursorShape: Qt.PointingHandCursor
- onClicked: {
- delegate.desc = !delegate.desc
- header.activeSortColumn = index
- header.sortRequest(delegate.desc, index)
- }
- }
-
- Row {
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.rightMargin: 9
-
- Item {
- width: 14
- anchors.top: parent.top
- anchors.bottom: parent.bottom
-
- Image {
- anchors.centerIn: parent
- anchors.verticalCenterOffset: -2
- source: {
- if(descArea.pressed)
- return "../images/descSortIndicatorPressed.png"
- return index === header.activeSortColumn || descArea.containsMouse ? "../images/descSortIndicatorActived.png" :
- "../images/descSortIndicator.png"
- }
- }
-
- MouseArea {
- id: descArea
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- delegate.desc = true
- header.activeSortColumn = index
- header.sortRequest(delegate.desc, index)
- }
- }
- }
-
- Item {
- width: 14
- anchors.top: parent.top
- anchors.bottom: parent.bottom
-
- Image {
- anchors.centerIn: parent
- anchors.verticalCenterOffset: -3
- source: {
- if(ascArea.pressed)
- return "../images/ascSortIndicatorPressed.png"
- return index === header.activeSortColumn || ascArea.containsMouse ? "../images/ascSortIndicatorActived.png" :
- "../images/ascSortIndicator.png"
- }
- }
-
- MouseArea {
- id: ascArea
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- delegate.desc = false
- header.activeSortColumn = index
- header.sortRequest(delegate.desc, index)
- }
- }
- }
- }
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- height: 1
- color: "transparent"
- }
-
- Rectangle {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- width: 1
- color: "#808080"
- }
- }
- }
- }
-}
diff --git a/images/ascSortIndicator.png b/images/ascSortIndicator.png
deleted file mode 100644
index 3a167ba9..00000000
Binary files a/images/ascSortIndicator.png and /dev/null differ
diff --git a/images/ascSortIndicatorActived.png b/images/ascSortIndicatorActived.png
deleted file mode 100644
index b6739c68..00000000
Binary files a/images/ascSortIndicatorActived.png and /dev/null differ
diff --git a/images/ascSortIndicatorPressed.png b/images/ascSortIndicatorPressed.png
deleted file mode 100644
index e5f4ed41..00000000
Binary files a/images/ascSortIndicatorPressed.png and /dev/null differ
diff --git a/images/descSortIndicator.png b/images/descSortIndicator.png
deleted file mode 100644
index 28ff5252..00000000
Binary files a/images/descSortIndicator.png and /dev/null differ
diff --git a/images/descSortIndicatorActived.png b/images/descSortIndicatorActived.png
deleted file mode 100644
index 5e6d6ba9..00000000
Binary files a/images/descSortIndicatorActived.png and /dev/null differ
diff --git a/images/descSortIndicatorPressed.png b/images/descSortIndicatorPressed.png
deleted file mode 100644
index c9c9068c..00000000
Binary files a/images/descSortIndicatorPressed.png and /dev/null differ
diff --git a/images/hseparator.png b/images/hseparator.png
deleted file mode 100644
index 2c7d4ff1..00000000
Binary files a/images/hseparator.png and /dev/null differ
diff --git a/images/magnifier.png b/images/magnifier.png
deleted file mode 100644
index 8603412b..00000000
Binary files a/images/magnifier.png and /dev/null differ
diff --git a/main.qml b/main.qml
index 1ee60881..3eec18fc 100644
--- a/main.qml
+++ b/main.qml
@@ -106,8 +106,6 @@ ApplicationWindow {
return
}
- // Dashboard is not implemented
- // if(seq === "Ctrl+") middlePanel.state = "Dashboard"
if(seq === "Ctrl+S") middlePanel.state = "Transfer"
else if(seq === "Ctrl+R") middlePanel.state = "Receive"
else if(seq === "Ctrl+K") middlePanel.state = "TxKey"
@@ -121,8 +119,7 @@ ApplicationWindow {
else if(seq === "Ctrl+D") middlePanel.state = "Advanced"
else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") {
/*
- if(middlePanel.state === "Dashboard") middlePanel.state = "Transfer"
- else if(middlePanel.state === "Transfer") middlePanel.state = "Receive"
+ if(middlePanel.state === "Transfer") middlePanel.state = "Receive"
else if(middlePanel.state === "Receive") middlePanel.state = "TxKey"
else if(middlePanel.state === "TxKey") middlePanel.state = "SharedRingDB"
else if(middlePanel.state === "SharedRingDB") middlePanel.state = "History"
@@ -130,7 +127,6 @@ ApplicationWindow {
else if(middlePanel.state === "AddressBook") middlePanel.state = "Mining"
else if(middlePanel.state === "Mining") middlePanel.state = "Sign"
else if(middlePanel.state === "Sign") middlePanel.state = "Settings"
- else if(middlePanel.state === "Settings") middlePanel.state = "Dashboard"
*/
if(middlePanel.state === "Settings") middlePanel.state = "Transfer"
else if(middlePanel.state === "Transfer") middlePanel.state = "AddressBook"
@@ -143,7 +139,6 @@ ApplicationWindow {
else if(middlePanel.state === "Sign") middlePanel.state = "Settings"
} else if(seq === "Ctrl+Shift+Backtab" || seq === "Alt+Shift+Backtab") {
/*
- if(middlePanel.state === "Dashboard") middlePanel.state = "Settings"
if(middlePanel.state === "Settings") middlePanel.state = "Sign"
else if(middlePanel.state === "Sign") middlePanel.state = "Mining"
else if(middlePanel.state === "Mining") middlePanel.state = "AddressBook"
@@ -152,7 +147,6 @@ ApplicationWindow {
else if(middlePanel.state === "SharedRingDB") middlePanel.state = "TxKey"
else if(middlePanel.state === "TxKey") middlePanel.state = "Receive"
else if(middlePanel.state === "Receive") middlePanel.state = "Transfer"
- else if(middlePanel.state === "Transfer") middlePanel.state = "Dashboard"
*/
if(middlePanel.state === "Settings") middlePanel.state = "Sign"
else if(middlePanel.state === "Sign") middlePanel.state = "SharedRingDB"
@@ -1351,14 +1345,6 @@ ApplicationWindow {
anchors.top: mobileHeader.bottom
anchors.left: parent.left
anchors.bottom: parent.bottom
- onDashboardClicked: {
- middlePanel.state = "Dashboard";
- middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
- updateBalance();
- }
onTransferClicked: {
middlePanel.state = "Transfer";
diff --git a/pages/Dashboard.qml b/pages/Dashboard.qml
deleted file mode 100644
index cfcb46a8..00000000
--- a/pages/Dashboard.qml
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) 2014-2018, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-// conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-// of conditions and the following disclaimer in the documentation and/or other
-// materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-// used to endorse or promote products derived from this software without specific
-// prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import QtQuick 2.0
-import "../components"
-
-Rectangle {
- color: "#F0EEEE"
-
- SearchInput {
- id: searchInput
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.leftMargin: 17
- anchors.rightMargin: 17
- anchors.topMargin: 17
- z: 1
- }
-
- Text {
- id: quickTransferText
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: searchInput.bottom
- anchors.topMargin: 20
- elide: Text.ElideRight
- anchors.margins: 17
- font.family: "Arial"
- font.pixelSize: 18
- color: "#4A4949"
- text: qsTr("Quick transfer") + translationManager.emptyString
- }
-
- LineEdit {
- id: quickTransferLine
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: quickTransferText.bottom
- anchors.topMargin: 18
- anchors.leftMargin: 17
- anchors.rightMargin: 17
- }
-
- Row {
- id: row
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: quickTransferLine.bottom
- anchors.topMargin: 18
- anchors.leftMargin: 17
- anchors.rightMargin: 17
- spacing: 17
-
- LineEdit {
- id: amountLine
- width: 148
- placeholderText: "amount..."
- }
-
- StandardButton {
- id: sendButton
- width: 60
- text: qsTr("SEND")
- shadowReleasedColor: "#FF4304"
- shadowPressedColor: "#B32D00"
- releasedColor: "#FF6C3C"
- pressedColor: "#FF4304"
- }
-
- Text {
- anchors.verticalCenter: parent.verticalCenter
- font.family: "Arial"
- font.pixelSize: 12
- color: "#545454"
- textFormat: Text.RichText
- text: qsTr("\
- looking for security level and address book? go to Transfer tab")
- + translationManager.emptyString
- font.underline: false
- onLinkActivated: appWindow.showPageRequest("Transfer")
- }
- }
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- anchors.top: row.bottom
- anchors.topMargin: 17
- color: "#FFFFFF"
-
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- height: 1
- color: "#DBDBDB"
- }
-
- ListModel {
- id: columnsModel
- ListElement { columnName: "Date"; columnWidth: 97 }
- ListElement { columnName: "Amount"; columnWidth: 158 }
- ListElement { columnName: "Balance"; columnWidth: 168 }
- }
-
- TableHeader {
- id: header
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.topMargin: 17
- anchors.leftMargin: 14
- anchors.rightMargin: 14
- dataModel: columnsModel
- offset: 145
- onSortRequest: console.log("column: " + column + " desc: " + desc)
- }
-
- ListModel {
- id: testModel
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: "Client from Australia"; out: false }
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: true }
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: true }
- ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: false }
- ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: "Client from Australia"; out: false }
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: false }
- ListElement { paymentId: ""; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: false }
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: false }
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: "Client from Australia"; out: false }
- ListElement { paymentId: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; address: "faef56b9acf67a7dba75ec01f403497049d7cff111628edfe7b57278554dc798"; date: "Jan 12, 2014"; time: "12:23 AM"; amount: "0.000709159241"; balance: "19301.870709159241"; description: ""; out: false }
- }
-
- Scroll {
- id: flickableScroll
- anchors.right: table.right
- anchors.rightMargin: -14
- anchors.top: table.top
- anchors.bottom: table.bottom
- flickable: table
- }
-
- DashboardTable {
- id: table
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: header.bottom
- anchors.bottom: parent.bottom
- anchors.leftMargin: 14
- anchors.rightMargin: 14
- onContentYChanged: flickableScroll.flickableContentYChanged()
- model: testModel
- }
- }
-}
diff --git a/qml.qrc b/qml.qrc
index f2c1cf4f..89c38c2b 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -18,7 +18,6 @@
images/lockIcon.png
components/MenuButton.qml
images/menuIndicator.png
- pages/Dashboard.qml
pages/Transfer.qml
pages/History.qml
pages/AddressBook.qml
@@ -27,21 +26,10 @@
images/statusConnected.png
images/statusDisconnected.png
components/Input.qml
- components/SearchInput.qml
- images/magnifier.png
components/StandardButton.qml
images/dropIndicator.png
- images/hseparator.png
components/LineEdit.qml
- components/TableHeader.qml
- images/ascSortIndicator.png
- images/ascSortIndicatorActived.png
- images/ascSortIndicatorPressed.png
- images/descSortIndicator.png
- images/descSortIndicatorActived.png
- images/descSortIndicatorPressed.png
images/backToWindowIcon.png
- components/DashboardTable.qml
components/TableDropdown.qml
images/tableOptions.png
images/dropdownAdd.png