diff --git a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml b/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
index 0c58bdff87d6b8a4efb52ef946e7b33ed4f6cf77..ad42c4374c14bb08a9bc2920d007cd5d9a110925 100755
--- a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
+++ b/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
@@ -178,7 +178,5 @@ Page {
source: "DapUiQmlScreenDialog.qml"
}
}
-
-
}
diff --git a/KelvinDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml b/KelvinDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..7e796a587da699b94c49f35573c5fa321f35e87b
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
@@ -0,0 +1,31 @@
+import QtQuick 2.12
+import QtQml 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+
+Page {
+
+ Row {
+ anchors.left: parent.left
+ anchors.bottom: parent.bottom
+ anchors.leftMargin: 28 * pt
+ anchors.bottomMargin: 42 * pt
+ spacing: 68 * pt
+
+ DapUiQmlWidgetExchangeOrderForm {
+ titleOrder: qsTr("Buy")
+
+ }
+
+ DapUiQmlWidgetExchangeOrderForm {
+ titleOrder: qsTr("Sell")
+ }
+ }
+}
+
+
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/KelvinDashboardGUI/DapUiQmlScreenHistory.qml b/KelvinDashboardGUI/DapUiQmlScreenHistory.qml
index 71473ee8c45de898c060d4ed2a2a5a36442f5b1a..95d4199f2777014e6bce696e00a559d1e2e97bbc 100644
--- a/KelvinDashboardGUI/DapUiQmlScreenHistory.qml
+++ b/KelvinDashboardGUI/DapUiQmlScreenHistory.qml
@@ -5,19 +5,11 @@ import QtQuick.Layouts 1.12
import DapTransactionHistory 1.0
-Page {
- ListView {
- id: dapListView
- anchors.fill: parent
- model: dapHistoryModel
- delegate: dapDelegate
- section.property: "date"
- section.criteria: ViewSection.FullString
- section.delegate: dapDate
- }
+DapUiQmlScreenHistoryForm {
+ id: dapUiQmlScreenHistory
Component {
- id: dapDate
+ id: delegateDate
Rectangle {
width: dapListView.width
height: 30 * pt
@@ -36,8 +28,9 @@ Page {
}
}
+
Component {
- id: dapDelegate
+ id: delegateConetnet
Column {
Rectangle {
@@ -249,4 +242,11 @@ Page {
}
}
}
+
+
+}
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
}
+ ##^##*/
diff --git a/KelvinDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml b/KelvinDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..2fd35cb48adc5d570387ed689a33bbe005624d79
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.9
+import QtQml 2.12
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.12
+
+import DapTransactionHistory 1.0
+
+Page {
+ ListView {
+ id: dapListView
+ anchors.fill: parent
+ model: dapHistoryModel
+ delegate: delegateConetnet
+ section.property: "date"
+ section.criteria: ViewSection.FullString
+ section.delegate: delegateDate
+ }
+}
diff --git a/KelvinDashboardGUI/DapUiQmlScreenMainWindow.qml b/KelvinDashboardGUI/DapUiQmlScreenMainWindow.qml
new file mode 100644
index 0000000000000000000000000000000000000000..3e3535ac0ec40c26713dd48fc2bec6f685182c7c
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlScreenMainWindow.qml
@@ -0,0 +1,102 @@
+import QtQuick 2.9
+import QtQuick.Controls 1.4
+
+DapUiQmlScreenMainWindowForm {
+ id: dapQmlScreenMainWindow
+
+ Component{
+ id: componentItemMainMenuTab
+ Column {
+ id: columnTab
+ height: 148
+ Rectangle {
+ id: componentItem
+ property bool isPushed: listViewTabs.currentIndex === index
+
+ width: listViewTabs.width
+ height: 150
+ color: "transparent"
+ Rectangle
+ {
+ id: spacerItem1
+ height: 25
+ anchors.top: parent.top
+ }
+ Image
+ {
+ id: imageItem
+ anchors.top: spacerItem1.bottom
+ source: model.source
+ height: 60
+ width: 60
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ Rectangle
+ {
+ id: spacerItem2
+ anchors.top: imageItem.bottom
+ height: 16
+ }
+ Text
+ {
+ id: textItemMenu
+ anchors.top: spacerItem2.bottom
+ text: qsTr(name)
+ color: "#505559"
+ anchors.horizontalCenter: parent.horizontalCenter
+ font.family: "Roboto"
+ font.weight: componentItem.isPushed ? Font.Normal : Font.Light
+ font.pointSize: 16
+ }
+ Rectangle
+ {
+ id: spacerItem3
+ anchors.top: textItemMenu.bottom
+ height: 30
+ }
+ MouseArea {
+ anchors.fill: parent
+ hoverEnabled: true
+ onEntered:
+ {
+ textItemMenu.font.weight = Font.Normal
+ if(!componentItem.isPushed) componentItem.color ="#B0B0B5"
+ }
+ onExited:
+ {
+ textItemMenu.font.weight = Font.Light
+ if(!componentItem.isPushed) componentItem.color = "transparent"
+ }
+
+ onClicked:
+ {
+ listViewTabs.currentIndex = index
+ stackViewScreenDashboard.setSource(Qt.resolvedUrl(page))
+ }
+ }
+
+ onIsPushedChanged: {
+ componentItem.color = (isPushed ? "#D0D3D6" : "transparent");
+ }
+ }
+ Rectangle
+ {
+ id: borderItem
+ height: 1
+ color: "#B5B5B5"
+ width: parent.width
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml b/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml
deleted file mode 100644
index 4f6d67ec1377c3aaf98d75915fa1422af5ff32fd..0000000000000000000000000000000000000000
--- a/KelvinDashboardGUI/DapUiQmlScreenMainWindow.ui.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-
-Page {
-
- title: qsTr("General")
-}
diff --git a/KelvinDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml b/KelvinDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..855645840a27e330e332fddd63199b1fa42c2718
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
@@ -0,0 +1,117 @@
+import QtQuick 2.9
+import QtQuick.Controls 1.4
+import QtQuick.Controls 2.2
+import QtQuick.Controls.Styles 1.4
+
+import KelvinDashboard 1.0
+
+Page {
+ id: dapUiQmlScreenMainWindow
+ title: qsTr("General")
+
+ property alias listViewTabs: listViewTabs
+ property alias stackViewScreenDashboard: stackViewScreenDashboard
+
+
+ Rectangle
+ {
+ id: rectangleTabsBorder
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ color: "#B5B5B5"
+ width: 150
+ Rectangle {
+ id: rectangleTabs
+ anchors.fill: parent
+ anchors.leftMargin: 1
+ anchors.rightMargin: 1
+
+ color: "#E1E4E6"
+ ListView {
+ id: listViewTabs
+ anchors.fill: parent
+ model: listModelTabs
+ spacing: 3
+
+ ListModel {
+ id: listModelTabs
+
+ ListElement {
+ name: qsTr("Dashboard")
+ page: "DapUiQmlScreenDialog.qml"
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+ ListElement {
+ name: qsTr("Exchange")
+ page: "DapUiQmlScreenExchangeForm.ui.qml"
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+ ListElement {
+ name: qsTr("Settings")
+ page: "DapQmlScreenAbout.qml"
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+ ListElement {
+ name: qsTr("Logs")
+ page: "DapUiQmlWidgetChainNodeLogs.qml"
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+ ListElement {
+ name: qsTr("History")
+ page: "DapUiQmlScreenHistory.qml"
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+ ListElement {
+ name: qsTr("About")
+ page: "DapQmlScreenAbout.qml"
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+ }
+ delegate: componentItemMainMenuTab
+
+ }
+ focus: true
+ }
+ }
+
+ Rectangle
+ {
+ id: rectangleStatusBar
+ anchors.left: rectangleTabsBorder.right
+ anchors.top: parent.top
+ anchors.right: parent.right
+ color: "#B5B5B5"
+ height: 60
+ Rectangle
+ {
+ anchors.fill: parent
+ anchors.bottomMargin: 1
+ color: "#F2F2F4"
+ }
+ }
+
+ Rectangle {
+ id: mainDashboard
+ anchors.left: rectangleTabsBorder.right
+ anchors.top: rectangleStatusBar.bottom
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ border.color: "whitesmoke"
+
+ Loader {
+ id: stackViewScreenDashboard
+ clip: true
+ anchors.fill: parent
+ source: "DapUiQmlScreenDialog.qml"
+ }
+ }
+}
+
+
+
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..d85a8a71cf3b9adecae3c3825ec3c580656ff263
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
@@ -0,0 +1,27 @@
+import QtQuick 2.12
+import QtQml 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+
+Button {
+ property alias buttonFont: buttonText.font.family
+ property alias buttonText: buttonText.text
+
+ id: buttonBuy
+ width: 70 * pt
+ height: 30 * pt
+
+ contentItem: Text {
+ id: buttonText
+ color: "#FFFFFF"
+ font.pixelSize: 14 * pt
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ }
+
+ background: Rectangle {
+ implicitWidth: parent.width
+ implicitHeight: parent.height
+ color: buttonBuy.hovered ? "#A2A4A7" : "#4F5357"
+ }
+}
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..3fc8fb2bbc03e42886f797da2c83e8e3f960c916
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
@@ -0,0 +1,73 @@
+import QtQuick 2.12
+import QtQml 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+
+Item {
+ property string contentFont: ""
+ width: childrenRect.width
+ height: childrenRect.height
+
+ ColumnLayout {
+ spacing: 16 * pt
+
+ Repeater {
+ model: [qsTr("Ammount"), qsTr("Price"), qsTr("Total"), qsTr("Fee (0.2%)"), qsTr("Total+Fee")]
+ RowLayout {
+ spacing: 0
+ Rectangle {
+ height: childrenRect.height
+ width: 120 * pt
+
+ Text {
+ text: modelData
+ color: "#ACACAF"
+ font.family: contentFont
+ font.pixelSize: 12 * pt
+ }
+ }
+
+
+ Rectangle {
+ width: 130 * pt
+ height: 22 * pt
+ border.width: 1 * pt
+ border.color: "#B0B1B5"
+
+ TextInput {
+ id: currencyTextInput
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.right: textCurrency.left
+ anchors.leftMargin: 6 * pt
+ anchors.rightMargin: 6 * pt
+ color: readOnly ? "#ACACAF" : "#737880"
+ font.family: contentFont
+ font.pixelSize: 12 * pt
+ verticalAlignment: Qt.AlignVCenter
+ validator: RegExpValidator{ regExp: /\d+/ }
+ clip: true
+ readOnly: index === 3 || index === 4
+ text: readOnly ? "0" : ""
+ }
+
+ Text {
+ id: textCurrency
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.rightMargin: 6 * pt
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignRight
+ color: currencyTextInput.readOnly ? "#ACACAF" : "#737880"
+ font.family: fontExchange.name
+ font.pixelSize: 12 * pt
+ text: index === 0 ? currencyName : qsTr("USD")
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..52ef1c08598c30086a323bae20531e9df866e5bb
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml
@@ -0,0 +1,53 @@
+import QtQuick 2.12
+import QtQml 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+
+Item {
+ property alias titleOrder: orderTitle.orderText
+ property string currencyName: qsTr("KLVN")
+ property string balance: "0"
+
+ width: childrenRect.width
+ height: childrenRect.height
+
+ FontLoader {
+ id: fontExchange
+ source: "qrc:/Resources/Fonts/roboto_regular.ttf"
+ }
+
+ ColumnLayout {
+
+ DapUiQmlWidgetExchangeOrderTitleForm {
+ id: orderTitle
+ orderFont: fontExchange.name
+ }
+
+ Text {
+ text: qsTr("Balance: ") + balance + " " + currencyName
+ color: "#ACACAF"
+ font.family: fontExchange.name
+ font.pixelSize: 12 * pt
+ }
+
+ Rectangle {
+ width: parent.width
+ height: 6 * pt
+
+ }
+
+ DapUiQmlWidgetExchangeOrderContentForm {
+ contentFont: fontExchange.name
+ }
+
+ Rectangle {
+ height: 12 * pt
+ width: parent.width
+ }
+
+ DapUiQmlWidgetExchangeOrderButtonForm {
+ buttonFont: fontExchange.name
+ buttonText: titleOrder
+ }
+ }
+}
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..a90eb4096a863a238ba3cd91048decb89f341133
--- /dev/null
+++ b/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
@@ -0,0 +1,32 @@
+import QtQuick 2.12
+import QtQml 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+
+Item {
+ property alias orderText: textOrder.text
+ property alias orderFont: textOrder.font.family
+
+ width: childrenRect.width
+ height: childrenRect.height
+
+ RowLayout {
+ spacing: 8 * pt
+ Rectangle {
+ width: 32
+ height: 32
+ border.color: "#000000"
+ border.width: 1
+
+ Image {
+ anchors.fill: parent
+ }
+ }
+
+ Text {
+ id: textOrder
+ color: "#4F5357"
+ font.pixelSize: 14 * pt
+ }
+ }
+}
diff --git a/KelvinDashboardGUI/Resources/Fonts/LICENSE.txt b/KelvinDashboardGUI/Resources/Fonts/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7
--- /dev/null
+++ b/KelvinDashboardGUI/Resources/Fonts/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_black.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_black.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..51c71bbe2d565247a020319ff9b324e8c8e05353
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_black.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_black_italic.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_black_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ca20ca399981d14c441b9ea2f3decc1c88e69da4
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_black_italic.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_bold.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e612852d259930d0dcc632318ac0f15ae312422b
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_bold.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..677bc045e565c7b74c3ce0f8ad55df305bb28a29
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_italic.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5fd05c3b645a8fdcdeffae18bffc19369514a76a
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_italic.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_light.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_light.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4f1fb5805f432036d390a353c43191f06b0ad6e0
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_light.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_light_italic.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_light_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..eec0ae9be8f8f74279afe5253de5286c04fc2fad
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_light_italic.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_medium.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..86d1c52ed5ee125fdfa6ed63a58f5c02f08dd246
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_medium.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..66aa174f058481c39bcd60bdb464a1b3f78e4dcc
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_regular.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cb8ffcf1ad2c163bbf95ce6ff829b537d8bebd18
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_regular.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_thin.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_thin.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a85eb7c29505713608ec9fd8489944977914be21
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_thin.ttf differ
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf b/KelvinDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ac77951b80fc3ad37533dcae49c9e8085c42f1fb
Binary files /dev/null and b/KelvinDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf differ
diff --git a/KelvinDashboardGUI/main.qml b/KelvinDashboardGUI/main.qml
index 5fb41f07e5aa83c52a99947a036421c6769508d7..7a9e4cb62177127555645e9b6aed14705cf14b6b 100755
--- a/KelvinDashboardGUI/main.qml
+++ b/KelvinDashboardGUI/main.qml
@@ -17,10 +17,10 @@ ApplicationWindow {
console.log("Close")
window.hide()
}
-
+
Connections {
target: dapServiceController
-
+
onActivateWindow: {
if(window.visibility === Window.Hidden) {
window.show()
@@ -30,7 +30,7 @@ ApplicationWindow {
window.hide()
}
}
-
+
// onErrorConnect: {
// imageNetwork.visible = false
// if(imageErrorNetwork.visible)
@@ -38,15 +38,15 @@ ApplicationWindow {
// else
// imageErrorNetwork.visible = true
// }
-
+
// onConnectedToService: {
// imageNetwork.visible = true
// imageErrorNetwork.visible = false
// console.log("Connected")
// }
}
-
-
+
+
// header:
// Column
// {
@@ -125,7 +125,7 @@ ApplicationWindow {
// color: "green"
// }
// }
-
+
Drawer {
id: drawerMenu
width: window.width * 0.3
@@ -197,7 +197,7 @@ ApplicationWindow {
StackView {
id: stackView
- initialItem: "DapUiQmlScreenDashboard.qml"
+ initialItem: "DapUiQmlScreenMainWindow.qml"
anchors.fill: parent
}
}
diff --git a/KelvinDashboardGUI/qml.qrc b/KelvinDashboardGUI/qml.qrc
index aa9389073691678c6a8412b4649f27d38e441bb3..a36bff67f9e6d077f50577a521d8a31a0bd12f90 100755
--- a/KelvinDashboardGUI/qml.qrc
+++ b/KelvinDashboardGUI/qml.qrc
@@ -1,8 +1,6 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>DapUiQmlScreenDashboard.qml</file>
- <file>DapUiQmlScreenMainWindow.ui.qml</file>
<file>KelvinDashboardGUI.conf</file>
<file>DapUiQmlWidgetChainBlockExplorer.ui.qml</file>
<file>DapUiQmlWidgetChainExchanges.ui.qml</file>
@@ -27,6 +25,24 @@
<file>DapUiQmlWidgetConsoleForm.ui.qml</file>
<file>DapUiQmlWidgetConsole.qml</file>
<file>DapUiQmlWidgetNodeNetworkExplorer.qml</file>
+ <file>Resources/Icons/defaul_icon.png</file>
+ <file>DapUiQmlScreenExchangeForm.ui.qml</file>
+ <file>Resources/Fonts/roboto_black.ttf</file>
+ <file>Resources/Fonts/roboto_black_italic.ttf</file>
+ <file>Resources/Fonts/roboto_bold.ttf</file>
+ <file>Resources/Fonts/roboto_bold_italic.ttf</file>
+ <file>Resources/Fonts/roboto_italic.ttf</file>
+ <file>Resources/Fonts/roboto_light.ttf</file>
+ <file>Resources/Fonts/roboto_light_italic.ttf</file>
+ <file>Resources/Fonts/roboto_medium.ttf</file>
+ <file>Resources/Fonts/roboto_medium_italic.ttf</file>
+ <file>Resources/Fonts/roboto_regular.ttf</file>
+ <file>Resources/Fonts/roboto_thin.ttf</file>
+ <file>Resources/Fonts/roboto_thin_italic.ttf</file>
+ <file>DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
+ <file>DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file>
+ <file>DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
+ <file>DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file>
<file>DapUiQmlScreenHistory.qml</file>
<file>Resources/Icons/defaul_icon.png</file>
<file>DapUiQmlWidgetLastActionsForms.qml</file>