From 581e48fe79b3082319eabaaa89303b7e217a3e7b Mon Sep 17 00:00:00 2001
From: "daragan.andrey@demlabs.net" <daragan.andrey@demlabs.net>
Date: Wed, 15 May 2019 18:33:00 +0300
Subject: [PATCH] =?UTF-8?q?[*]=20=D0=A1hanged=20the=20toolbar=20design=20o?=
=?UTF-8?q?f=20the=20main=20application=20window.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DapUiQmlScreenDashboard.qml | 75 +++++++---
.../DapUiQmlWidgetChainNodeLogs.ui.qml | 141 ++++++++++++++----
KelvinDashboardGUI/KelvinDashboardGUI.pro | 2 +
KelvinDashboardGUI/Resources/Icons/about.png | Bin 0 -> 1388 bytes
KelvinDashboardGUI/Resources/Icons/home.png | Bin 0 -> 344 bytes
.../Resources/Icons/settings.png | Bin 0 -> 1330 bytes
KelvinDashboardGUI/main.qml | 17 ++-
KelvinDashboardGUI/qml.qrc | 3 +
8 files changed, 183 insertions(+), 55 deletions(-)
create mode 100644 KelvinDashboardGUI/Resources/Icons/about.png
create mode 100644 KelvinDashboardGUI/Resources/Icons/home.png
create mode 100644 KelvinDashboardGUI/Resources/Icons/settings.png
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml b/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
index 15d4eaa70..e266a9e8d 100755
--- a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
+++ b/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
@@ -6,24 +6,35 @@ import QtQuick.Controls.Styles 1.4
Page {
id: dapUiQmlScreenDashboard
title: qsTr("General")
+ Rectangle {
+ id: rectangleTabs
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ width: 70
+ color: "#353841"
ListView {
id: listViewTabs
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- width: dapUiQmlScreenDashboard.width/5
+ anchors.fill: parent
model: listModelTabs
-
+
ListModel {
id: listModelTabs
ListElement {
- name: qsTr("Dashboard")
+ name: qsTr("Home")
page: "DapUiQmlScreenDialog.qml"
+ source: "qrc:/Resources/Icons/home.png"
+ }
+ ListElement {
+ name: qsTr("Settings")
+ page: "DapQmlScreenAbout.qml"
+ source: "qrc:/Resources/Icons/settings.png"
}
ListElement {
name: qsTr("About")
page: "DapQmlScreenAbout.qml"
+ source: "qrc:/Resources/Icons/about.png"
}
}
@@ -33,22 +44,25 @@ Page {
Component {
id: componentTab
Item {
+ id: componentItem
width: listViewTabs.width
- height: textTab.height + 10
- Rectangle {
- id: canvas
- border.color: "whitesmoke"
- color: "Transparent"
- anchors.fill: parent
- Row {
- anchors.margins: 5
- anchors.fill: parent
-
- Text
- {
- id: textTab
- text: qsTr(name)
- }
+ height: 64
+ Column
+ {
+ anchors.centerIn: parent
+ Image
+ {
+ id: imageMenu
+ source: model.source
+ height: 36
+ width: 36
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ Text
+ {
+ text: qsTr(name)
+ color: "#BBBEBF"
+ anchors.horizontalCenter: parent.horizontalCenter
}
}
@@ -63,11 +77,26 @@ Page {
}
}
- highlight: Rectangle { color: "aliceblue"; radius: 1 }
+// highlight: Rectangle { color: "aliceblue"; radius: 1 }
+ highlight:
+ Component
+ {
+ Rectangle {
+ id: rectangleMenu
+ color: "#121B28"
+ Rectangle
+ {
+ height: rectangleMenu.height
+ width: 4
+ color: "#EE5321"
+ }
+ }
+ }
focus: true
}
+ }
Rectangle {
- anchors.left: listViewTabs.right
+ anchors.left: rectangleTabs.right
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.ui.qml
index 7d7f8bd1b..320b74680 100644
--- a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.ui.qml
+++ b/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.ui.qml
@@ -1,41 +1,124 @@
import QtQuick 2.11
import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
+import KelvinDashboard 1.0
Page {
id: dapUiQmlWidgetChainNodeLogs
title: "Logs"
- TableView {
- id: tableViewLogs
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- anchors.right: parent.right
-
-
- TableViewColumn {
- id: columnDate
- role: "date"
- title: "Date"
- }
- TableViewColumn {
- id: columnTime
- role: "time"
- title: "Time"
- }
- TableViewColumn {
- id: columnFile
- role: "file"
- title: "File"
- }
- TableViewColumn {
- id: columnMessage
- role: "Message"
- title: "Message"
+
+ ListModel {
+ id: dataModel
+
+ ListElement {
+ name: "Apple"
+ cost: 2.45
+// type: ":/Resources/Icons/dialogquestion.png"
+ }
+ ListElement {
+ name: "Orange"
+ cost: 3.25
+// type: ":/Resources/Icons/dialogwarning.png"
+ }
+ ListElement {
+ name: "Banana"
+ cost: 1.95
+// type: ":/Resources/Icons/dialoinformation.png"
+ }
}
- }
+ TabView
+ {
+ id: tabViewLogs
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ Repeater {
+ anchors.fill: parent
+ model: dapUiQmlWidgetModel
+ delegate:
+ Tab{
-
+
+
+ title: qsTr(name)
+
+ TableView {
+ id: tableViewLogs
+ model: dataModel
+ clip: true
+
+ TableViewColumn {
+ id: columnType
+ role: "type"
+ title: "Type"
+ delegate:
+ Item
+ {
+ height: parent.height
+ width: parent.height
+ Rectangle {
+ anchors.fill: parent
+ color: "transparent"
+ Image {
+ id: names
+ height: parent.height
+ width: parent.height
+// source: model.type
+ anchors.centerIn: parent
+ }
+ }
+ }
+ }
+ TableViewColumn {
+ id: columnDate
+ role: "name"
+ title: "Date"
+ }
+ TableViewColumn {
+ id: columnTime
+ role: "cost"
+ title: "Time"
+ }
+ TableViewColumn {
+ id: columnFile
+ role: "file"
+ title: "File"
+ }
+ TableViewColumn {
+ id: columnMessage
+ role: "Message"
+ title: "Message"
+ }
+ itemDelegate: Item {
+ Text {
+ anchors.centerIn: parent
+ renderType: Text.NativeRendering
+ text: styleData.value
+ }
+ }
+ headerDelegate: Rectangle {
+ height: 20
+ color: "#29333f"
+
+ Text {
+ text: styleData.value
+ color: "#FFF"
+ width: parent.width
+ height: parent.height
+ font.pointSize: 24
+ minimumPointSize: 3
+ font.family: "Roboto"
+ fontSizeMode: Text.Fit
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ }
+ }
+
+ }
+ }
+ }
+ }
}
diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.pro b/KelvinDashboardGUI/KelvinDashboardGUI.pro
index 1a7d6d67a..3eea6c63c 100755
--- a/KelvinDashboardGUI/KelvinDashboardGUI.pro
+++ b/KelvinDashboardGUI/KelvinDashboardGUI.pro
@@ -91,3 +91,5 @@ include (../DapRPCProtocol/DapRPCProtocol.pri)
INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/
$$_PRO_FILE_PWD_/../DapRPCProtocol/
$$_PRO_FILE_PWD_/../libdap-qt/
+
+DISTFILES +=
diff --git a/KelvinDashboardGUI/Resources/Icons/about.png b/KelvinDashboardGUI/Resources/Icons/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7b17286e71740ce64a2bead2369f0be0d1991b3
GIT binary patch
literal 1388
zcmds%+e=hY6vo%gM0pvD2qe_Wlx{?tv_mSaMsrfj#B87oL`At#yC6-`#e~t6sE5cd
z#L`MA2)fxrgfA6FS7|j55j}N#$Vf{FBajGJ-#&jqPd&8ZoMEx|{?_mN)?toUSCyru
zWTX<19zj4SvJ!NebY7vA5+LQGlu|qY;!uhR6~zkr1h?j3HymFc~4EZqpjFmMoJM
zvg*#VA-2R!EX3-riXpKiOd=!-B~n9bNtskgQ9v8g(86V$R@cWZYYZDB#;9wH%35RD
zSTR-|1vc3lX2W7w9Td)rHNr;3h=LJUjas8@RE(l4s38VuPy!2kXbf#gLkpMH8FDoi
zTPxP8^M|&mm@SKCb#_64O<^lyMd2P$IBS)yidEP{9>BzH!~y?+fJ0D24A7v&QE;F!
zv>^>Gb;-GH)L6o-E=c%8TT~(}id<nA6xd`HR^*7J5dgSw96`e^qC_6R#BIa@CK!f8
zP(uvRxCtz9pfR)|t!_l_G`3M=DJF&>;SX(5iK-i*H-1OqP1McP8<K<aa(CnPqI8U2
zI&RvYVTbH_aKrbooCB{Dr13dmN(c|0yjI?q_|IRphmVAae6+8oY8^2C%k{URX7+Of
z&L%gOZ;atzqRBnJqV5Ba5zzRG(&Ffb_IKykPCQx=ToKbdjnhxwxxG8Q>se0x>d(|C
zi7U~WYqp0@j_&Lm3C*U}8KH3EbCBYDPCTby`SY@TdtaWKdN=Z-BUlt#QgVHKPMe+F
zI(Jr1`R^&Y+k$<Ajq7VE@nLDWWY@QSmsY){(S_$Ssvf+$9k_X{W7#JEP+nW%qr341
zTl^Q2KSeqN>DlpMh+a3-wKIj`=%Li`*R#nV_a`RQ4fw(>J!9=Pi_^Z0B@P6JTKh)o
z*WM3SKOKB{+4p@%!;x`|GMjG1DdZoXROzoTc$$~E*WcND=*P;~`=LbFaBph%j5&$<
uS<ljsRo;pX6u;@p-<+IVxx6{nob=t_eQ;XV>AJGtF4BrfRcTMj*495cIHLUk
literal 0
HcmV?d00001
diff --git a/KelvinDashboardGUI/Resources/Icons/home.png b/KelvinDashboardGUI/Resources/Icons/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cce557a5fa0eaed1a05434b94bfce6518ed3594
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVxatW5N34Jm|elZz{ut4
z;uw<A_;!XPUz34=tD}k9nwZT+2N`{;n0#$aIb#-dvVSlrb@cGg?A0`$yK?4skvTut
z3(Go%a@L<Q@Jo|WZ@#(snARKidb@WSdk=i{w>z$KprcjS=@9=-&AZ?J{+8K&j>~>d
z(65yBv((DuxwkF!dBC1+pRAJj>Waa)YQ>v6Gt%CBPV!?~W!cG6a(RtV#Mw<A3FeM#
z`(^)CRmWcVwZqkVY4n9he5bFmO)cnNyIouC^EI}K5#lFz7CejFt+Hdy?<F!ZhxBVs
z7oU)2lM-Cu#<D^)?g2-j%2$2yN3j!q4m`as+!{0KsJ{ct3PHv!mj;L$AhXH8e@@)W
j9WC?9y5~12ym`WWFqf&@TRzSM7*q_Nu6{1-oD!M<;Hrl7
literal 0
HcmV?d00001
diff --git a/KelvinDashboardGUI/Resources/Icons/settings.png b/KelvinDashboardGUI/Resources/Icons/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3fc9a640698781d6678d04a6bda91068b1e75ef
GIT binary patch
literal 1330
zcmds%%}bS05XR>w<OivdWKbBIP(l=!4!Dp4yJ#tvib>Wg1DhxalnNuGZh~NhR7lt?
z`j9AeVJIz%5(x>)8tl4gQA7z5xafnTFVdWzdH;e|EjsYt%iMF$Gr#AVmwTqZc58Ol
z@+>0CuCA(Rz<0Sn8EN>ueCPCgqBN@C)>w&>C=fA`5Gj#)6#@mOAQY5>`6dTqCKh5P
zHa{zYgh_-%NzAWmAZ1b^RZ@czSs-IFAyYCG(1tX$a2cn~`}pDzBm@n?ye%r`z!F#k
zn^Ry@IEVz%Am&gws~l8<YET0st_I^^5=?`kE2tp`Xix$RduR-8NJ9&k%?){tCCtif
z?hkEIiLfY(xm{3TQ-xJo4ekMjvuwhqY_NwsfQj3P1O5R4hoFWSph1bF;6P(&LmFD<
z$@w;FEEO>i68_K@m8z&ASJ(vwHpNs7IU;EU04^Ly&~S?=kq0nw8*zXMhT#y@5Cb%B
z0t*~y3~fl8kH}AB8#R_;Vh9rc&=!@N`2eHwJ4G~6pJy~Ahl+Cd@kUWPW0a0hJ2LFZ
zkp~}sgyjyRPLRgyfGHt7c#2v@Z{k1y*mwLy0a1*OG}P_@#(%l~Hq;dpau8=TTdQ^-
z#=k^|Ke3Hh+aKabt*+SIxU1_!UrkOjo>9?Zx4)LJe6;=gx`Jyh-KAT0X6f1Ao$m^V
z=8{9Pqr-hP-Bu9qUNk;NMN^r@(@%Qy_RMzYq?&5a4N!dbvQ*;b*kJpsg~x6#$p5x#
zr1?i#QSRbY?!<xQ`LVjXf<()b{pHE}&l?h*pVo3|S<`rNU2*E!<oxrrlF9T~f6;L7
z<MqY&FU$<h^}N;CmC=hmvxW1q!5c%Bt!*FYzIQFCxx4h~q4-RGdjGJdkG@&+h3>t0
hJ$-8L)X4`q$-H09C6@*^{T%UNsw-<NZY7#K{{X)Mlv)4)
literal 0
HcmV?d00001
diff --git a/KelvinDashboardGUI/main.qml b/KelvinDashboardGUI/main.qml
index fd7fede5a..47fbc6bf5 100755
--- a/KelvinDashboardGUI/main.qml
+++ b/KelvinDashboardGUI/main.qml
@@ -74,7 +74,7 @@ ApplicationWindow {
scale: 0.7
visible: false
anchors.verticalCenter: parent.verticalCenter
- anchors.right: labelBalance.left
+ anchors.right: imageDollars.left
}
Image {
@@ -83,12 +83,23 @@ ApplicationWindow {
scale: 0.7
visible: true
anchors.verticalCenter: parent.verticalCenter
- anchors.right: labelBalance.left
+ anchors.right: imageDollars.left
+ }
+
+ Image {
+ id: imageDollars
+ source: "qrc:/Resources/Icons/dollar.png"
+ scale: 0.7
+ visible: true
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.right: labelBalance.right
+ anchors.leftMargin: 5
+ anchors.rightMargin: 5
}
Text {
id: labelBalance
- text: "$0"
+ text: "0"
font.pointSize: 16
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
diff --git a/KelvinDashboardGUI/qml.qrc b/KelvinDashboardGUI/qml.qrc
index 8d93e1b02..6226a7f09 100755
--- a/KelvinDashboardGUI/qml.qrc
+++ b/KelvinDashboardGUI/qml.qrc
@@ -22,5 +22,8 @@
<file>DapUiQmlWidgetChainNodeLogs.ui.qml</file>
<file>Resources/Icons/add.png</file>
<file>Resources/Icons/icon.ico</file>
+ <file>Resources/Icons/about.png</file>
+ <file>Resources/Icons/home.png</file>
+ <file>Resources/Icons/settings.png</file>
</qresource>
</RCC>
--
GitLab