diff --git a/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
index 3e3535ac0ec40c26713dd48fc2bec6f685182c7c..e304c2aa6372706344f09062940563c6b9d4b885 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
@@ -4,98 +4,75 @@ import QtQuick.Controls 1.4
DapUiQmlScreenMainWindowForm {
id: dapQmlScreenMainWindow
- Component{
+ 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:
+ Rectangle {
+ id: componentItem
+ property bool isPushed: listViewTabs.currentIndex === index
+ width: 180 * pt
+ height: 60 * pt
+ color: "transparent"
+
+ Image
+ {
+ id: imageItem
+ anchors.left: parent.left
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 24 * pt
+ source: model.normal
+ height: 18 * pt
+ width: 18 * pt
+ }
+
+ Text {
+ id: textItemMenu
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: imageItem.right
+ anchors.leftMargin: 18 * pt
+ text: name
+ font.family: fontRobotoLight.name
+ font.pixelSize: 16 * pt
+ color: "#FFFFFF"
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ hoverEnabled: true
+
+ onEntered: {
+ if(!componentItem.isPushed)
{
- textItemMenu.font.weight = Font.Light
- if(!componentItem.isPushed) componentItem.color = "transparent"
+ imageItem.source = model.hover;
+ textItemMenu.font.family = fontRobotoRegular.name;
}
+ }
- onClicked:
+ onExited: {
+ if(!componentItem.isPushed)
{
- listViewTabs.currentIndex = index
- stackViewScreenDashboard.setSource(Qt.resolvedUrl(page))
+ imageItem.source = model.normal
+ textItemMenu.font.family = fontRobotoLight.name;
}
}
- onIsPushedChanged: {
- componentItem.color = (isPushed ? "#D0D3D6" : "transparent");
+ onClicked: {
+ listViewTabs.currentIndex = index;
+ stackViewScreenDashboard.setSource(Qt.resolvedUrl(page));
+
}
}
- Rectangle
- {
- id: borderItem
- height: 1
- color: "#B5B5B5"
- width: parent.width
+
+ onIsPushedChanged: {
+ componentItem.color = (isPushed ? "#D51F5D" : "transparent");
+ imageItem.source = model.hover;
+ textItemMenu.font.family = (isPushed ? fontRobotoRegular.name : fontRobotoLight.name);
}
}
}
}
-
-
-
-
-
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
index b94101f05e94b7cd6238032dd65608a2e6d25e39..952162476a18cdcc8ba1360a02735258b68db0ad 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
@@ -9,101 +9,133 @@ Page {
id: dapUiQmlScreenMainWindow
title: qsTr("General")
+ /// ----------- Load fonts -----------
+ /// using example: font.family: fontRobotoLight.name
+ readonly property FontLoader fontRobotoLight: FontLoader { source: "qrc:/Resources/Fonts/roboto_light.ttf" }
+ readonly property FontLoader fontRobotoRegular: FontLoader { source: "qrc:/Resources/Fonts/roboto_regular.ttf" }
+ /// -----------
+
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"
- page: "DapUiQmlScreenSettings.qml"
-// page: "DapUiQmlWidgetSettingsNetwork.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("Console")
- page: "DapUiQmlScreenConsoleForm.ui.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
- }
- }
-
- DapUiQmlWidgetStatusBar {
+ DapUiQmlWidgetStatusBar
+ {
id: rectangleStatusBar
anchors.left: rectangleTabsBorder.right
anchors.top: parent.top
anchors.right: parent.right
- color: "#B5B5B5"
+ color: "#070023"
height: 60 * pt
}
- Rectangle {
- id: mainDashboard
- anchors.left: rectangleTabsBorder.right
- anchors.top: rectangleStatusBar.bottom
+ Rectangle
+ {
+ id: rectangleTabsBorder
+ anchors.top: parent.top
anchors.bottom: parent.bottom
- anchors.right: parent.right
- border.color: "whitesmoke"
+ anchors.left: parent.left
+ color: "#070023"
+ width: 160 * pt
- Loader {
- id: stackViewScreenDashboard
- clip: true
+ ListView {
+ id: listViewTabs
anchors.fill: parent
- source: "DapUiQmlScreenDialog.qml"
+ anchors.topMargin: 60 * pt
+ model: listModelTabs
+ spacing: 3
+
+ ListModel {
+ id: listModelTabs
+
+ ListElement {
+ name: qsTr("Dashboard")
+ page: "DapUiQmlScreenDialog.qml"
+ normal: "qrc:/Resources/Icons/icon_dashboard.png"
+ hover: "qrc:/Resources/Icons/icon_dashboard_hover.png"
+ }
+
+ ListElement {
+ name: qsTr("Exchange")
+ page: "DapUiQmlScreenExchangeForm.ui.qml"
+ normal: "qrc:/Resources/Icons/icon_exchange.png"
+ hover: "qrc:/Resources/Icons/icon_exchange_hover.png"
+ }
+
+ ListElement {
+ name: qsTr("History")
+ page: "DapUiQmlScreenHistory.qml"
+ normal: "qrc:/Resources/Icons/icon_history.png"
+ hover: "qrc:/Resources/Icons/icon_history_hover.png"
+ }
+
+ ListElement {
+ name: qsTr("Console")
+ page: "DapUiQmlScreenConsoleForm.ui.qml"
+ normal: "qrc:/Resources/Icons/icon_console.png"
+ hover: "qrc:/Resources/Icons/icon_console_hover.png"
+ }
+
+ ListElement {
+ name: qsTr("Logs")
+ page: "DapUiQmlWidgetChainNodeLogs.qml"
+ normal: "qrc:/Resources/Icons/icon_logs.png"
+ hover: "qrc:/Resources/Icons/icon_logs_hover.png"
+ }
+
+ ListElement {
+ name: qsTr("Settings")
+ page: "DapUiQmlScreenSettings.qml"
+ normal: "qrc:/Resources/Icons/icon_settings.png"
+ hover: "qrc:/Resources/Icons/icon_settings_hover.png"
+ }
+
+ ListElement {
+ name: qsTr("VPN")
+ page: "DapUiQmlScreenVpn.qml"
+ normal: "qrc:/Resources/Icons/defaul_icon.png"
+ hover: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+
+ /// TODO: It wasn't in the task. I will not delete it, maybe later
+ /// we will need it
+ // ListElement {
+ // name: qsTr("About")
+ // page: "DapQmlScreenAbout.qml"
+ // source: "qrc:/Resources/Icons/defaul_icon.png"
+ // }
+ }
+ delegate: componentItemMainMenuTab
+
+ }
+ focus: true
+// DapUiQmlWidgetStatusBar {
+// id: rectangleStatusBar
+// anchors.left: rectangleTabsBorder.right
+// anchors.top: parent.top
+// anchors.right: parent.right
+// color: "#B5B5B5"
+// height: 60 * pt
+ }
+
+ 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/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml b/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml
index f7897fe4e805a44e761276f288f82fb2f4cf7e2e..5fb8481403408cb8c49a3e94c3f879483848d2eb 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml
@@ -10,6 +10,11 @@ DapUiQmlScreenSettingsForm {
name: qsTr("Network")
element: "DapUiQmlWidgetSettingsNetwork.qml"
}
+
+ ListElement {
+ name: qsTr("VPN")
+ element: "DapUiQmlWidgetSettingsVpn.qml"
+ }
}
ListView {
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenVpn.qml b/CellFrameDashboardGUI/DapUiQmlScreenVpn.qml
new file mode 100644
index 0000000000000000000000000000000000000000..d764fba09aba7faae098b42a8719adfb46219bd0
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlScreenVpn.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.4
+
+DapUiQmlScreenVpnForm {
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenVpnForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenVpnForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..0d46084bd97551357824b53f563d75dfa59f2ebe
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlScreenVpnForm.ui.qml
@@ -0,0 +1,149 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.5
+import QtQuick.Controls.Styles 1.4
+import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.13
+
+Item {
+ width: 400
+ height: 600
+
+ Text {
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.leftMargin: 30 * pt
+ anchors.topMargin: 18 * pt
+ color: "#d61f5d"
+ font.family: "Roboto Regular"
+ font.pixelSize: 14 * pt
+ text: "283 days left"
+ }
+
+ Row {
+ width: childrenRect.width
+ anchors.top: parent.top
+ anchors.topMargin: 40 * pt
+ anchors.horizontalCenter: parent.horizontalCenter
+ spacing: 10 * pt
+
+ Image {
+ id: imageVpn
+ Layout.alignment: Qt.AlignVCenter
+ width: 48 * pt
+ height: 48 * pt
+ source: "qrc:/Resources/Icons/defaul_icon.png"
+ }
+
+ Text {
+ id: titleVpn
+ Layout.alignment: Qt.AlignVCenter
+ verticalAlignment: Text.AlignVCenter
+ text: "KELVPN"
+ font.family: "Roboto Regular"
+ font.pixelSize: 42 * pt
+ }
+ }
+
+
+ Switch {
+ id: control
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: 150 * pt
+ height: 70 * pt
+ text: checked ? "Connected" : "Disconnected"
+
+ indicator: Rectangle {
+ implicitWidth: control.width
+ implicitHeight: control.height
+ x: control.leftPadding
+ y: parent.height / 2 - height / 2
+ radius: control.height / 2
+ color: control.checked ? "#d61f5d" : "#ffffff"
+ border.color: control.checked ? "#d61f5d" : "#cccccc"
+
+ Rectangle {
+ x: control.checked ? parent.width - width - 10 * pt : 10 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ width: control.height - 15 * pt
+ height: width
+ radius: height / 2
+ color: control.down ? "#cccccc" : "#ffffff"
+ border.color: control.checked ? (control.down ? "#17a81a" : "#d61f5d") : "#999999"
+ }
+ }
+
+ contentItem: Text {
+ text: control.text
+ anchors.left: control.left
+ anchors.right: control.right
+ anchors.bottom: control.top
+ anchors.bottomMargin: 10 * pt
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignBottom
+ font.family: "Roboto"
+ font.pixelSize: 16 * pt
+ color: "#707070"
+ }
+ }
+
+ ComboBox {
+ id: comboboxServer
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 40 * pt
+ width: 150 * pt
+ height: 48 * pt
+ textRole: "name"
+
+ model: ListModel {
+ id: modelTest
+ ListElement {name: "first"; icon: "qrc:/Resources/Icons/defaul_icon.png" }
+ ListElement {name: "second"; icon: "qrc:/Resources/Icons/defaul_icon.png" }
+ }
+
+ background: Rectangle {
+ anchors.fill: parent
+
+ Rectangle {
+ id: contentCorner
+ anchors.fill: parent
+ color: "#FFFFFF"
+ radius: width / 2
+ }
+
+ DropShadow {
+ anchors.fill: parent
+ source: contentCorner
+ verticalOffset: 4 * pt
+ samples: 13 * pt
+ color: "#40000000"
+ }
+ }
+
+ contentItem: Rectangle {
+ anchors.fill: parent
+ color: "transparent"
+
+ Image {
+ id: imageServer
+ anchors.left: parent.left
+ anchors.leftMargin: 22 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ source: modelTest.get(modelTest.index(comboboxServer.currentIndex, 0)).icon
+ width: 24 * pt
+ height: 24 * pt
+ }
+
+ Text {
+ anchors.left: imageServer.right
+ anchors.leftMargin: 10 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ text: comboboxServer.currentText
+ font.family: "Roboto Light"
+ font.pixelSize: 16 * pt
+ }
+ }
+
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml
index 30286e2c369761260bcb845cba90c05cf553666f..b73c03d6c3d61fa71dd5b3dd9e75e6854ad7559c 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.12
DapUiQmlWidgetSettingsNetworkForm {
width: parent.width
- height: childrenRect.height
+ height: childrenRect.height + 40 * pt
ComboBox {
width: 150
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpn.qml b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpn.qml
new file mode 100644
index 0000000000000000000000000000000000000000..d8d1cccb01d64291326ade967d539ca959d259c9
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpn.qml
@@ -0,0 +1,67 @@
+import QtQuick 2.4
+
+DapUiQmlWidgetSettingsVpnForm {
+ Column {
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.leftMargin: 15 * pt
+ anchors.topMargin: 13 * pt
+ spacing: 15 * pt
+
+ DapUiQmlWidgetSettingsVpnComboBox {
+ id: comboBoxBand
+ width: 150 * pt
+ height: 32 * pt
+ textRole: "band"
+ model: ListModel {
+ ListElement {band: "100 Mbit" }
+ ListElement {band: "200 Mbit" }
+ }
+ }
+
+ DapUiQmlWidgetSettingsVpnComboBox {
+ id: comboBoxUptime
+ width: 150 * pt
+ height: 32 * pt
+ textRole: "uptime"
+ model: ListModel {
+ ListElement {uptime: "30 minutes" }
+ ListElement {uptime: "3 hours" }
+ }
+ }
+
+ DapUiQmlWidgetSettingsVpnComboBox {
+ id: comboBoxEncription
+ width: 150 * pt
+ height: 32 * pt
+ textRole: "encription"
+ model: ListModel {
+ ListElement {encription: "RSA-2048" }
+ ListElement {encription: "AES-256" }
+ }
+ }
+
+ DapUiQmlWidgetSettingsVpnComboBox {
+ id: comboBoxBalance
+ width: 150 * pt
+ height: 32 * pt
+ textRole: "balance"
+ model: ListModel {
+ ListElement {balance: "320 RUB" }
+ ListElement {balance: "500 RUB" }
+ }
+ }
+
+ DapUiQmlWidgetSettingsVpnComboBox {
+ id: comboBoxLanguage
+ width: 150 * pt
+ height: 32 * pt
+ textRole: "language"
+ model: ListModel {
+ ListElement {language: "RUS" }
+ ListElement {language: "ENG" }
+ }
+ }
+ }
+
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBox.qml b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBox.qml
new file mode 100644
index 0000000000000000000000000000000000000000..3651997ceb88c62df61fcd9a4866c1fc82c9abef
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBox.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.4
+
+DapUiQmlWidgetSettingsVpnComboBoxForm {
+
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..fa2b6d69636b2c54f4930b1e6334491d8c6836ce
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
@@ -0,0 +1,32 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.5
+import QtGraphicalEffects 1.0
+
+ComboBox {
+ background: Rectangle {
+ anchors.fill: parent
+ border.color: "#707070"
+ border.width: 1
+ radius: parent.width / 2
+ }
+
+ contentItem: Text {
+ anchors.fill: parent
+ anchors.leftMargin: 12 * pt
+ anchors.rightMargin: 52 * pt
+ text: parent.displayText
+ font.family: "Regular"
+ font.pixelSize: 14 * pt
+ color: "#A7A7A7"
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
+ }
+
+ DropShadow {
+ anchors.fill: parent
+ source: parent.background
+ verticalOffset: 4 * pt
+ samples: 13 * pt
+ color: "#40000000"
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..86a170a0ae976cc400dcf7bfed4ef6fb825ea7f8
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnForm.ui.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.4
+
+Item {
+ width: 400
+ height: 400
+
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
index 41877dd0e02ae9c940fee55ad928f76655d6ab0f..06a9f7fb4fc9f777ea2d2ae792209f40252baaa3 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
@@ -2,63 +2,79 @@ import QtQuick 2.0
import QtQuick.Controls 2.5
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.3
Rectangle {
Rectangle {
anchors.fill: parent
anchors.bottomMargin: 1
- color: "#F2F2F4"
+ color: "transparent"
- DapUiQmlWidgetStatusBarComboBoxWallet {
- id: comboboxWallet
- anchors.left: parent.left
+ Row {
anchors.top: parent.top
+ anchors.left: parent.left
anchors.bottom: parent.bottom
+ anchors.right: buttonAddWallet.left
anchors.leftMargin: 30 * pt
anchors.topMargin: 10 * pt
anchors.bottomMargin: 10 * pt
- listToken: comboboxToken
- }
+ spacing: 10 * pt
- DapUiQmlWidgetStatusBarComboBoxToken {
- id: comboboxToken
- anchors.top: parent.top
- anchors.left: comboboxWallet.right
- anchors.bottom: parent.bottom
- anchors.leftMargin: 30 * pt
- anchors.topMargin: 10 * pt
- anchors.bottomMargin: 10 * pt
- fieldBalance: fieldWalletBalance
- }
+ Label {
+ text: qsTr("Wallet")
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ verticalAlignment: Qt.AlignVCenter
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#A7A7A7"
+ }
- Label {
- id: titleWalletBalance
- anchors.top: parent.top
- anchors.left: comboboxToken.right
- anchors.bottom: parent.bottom
- anchors.leftMargin: 40 * pt
- anchors.topMargin: 10 * pt
- anchors.bottomMargin: 10 * pt
- verticalAlignment: Qt.AlignVCenter
- text: "Wallet balance:"
- font.family: "Regular"
- font.pixelSize: 12 * pt
- color: "#A7A7A7"
- }
+ DapUiQmlWidgetStatusBarComboBoxWallet {
+ id: comboboxWallet
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ listToken: comboboxToken
+ }
- Label {
- id: fieldWalletBalance
- anchors.top: parent.top
- anchors.left: titleWalletBalance.right
- anchors.bottom: parent.bottom
- anchors.leftMargin: 16 * pt
- anchors.topMargin: 10 * pt
- anchors.bottomMargin: 10 * pt
- verticalAlignment: Qt.AlignVCenter
- font.family: "Regular"
- font.pixelSize: 16 * pt
- color: "#797979"
+ Label {
+ text: qsTr("Token")
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ verticalAlignment: Qt.AlignVCenter
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#A7A7A7"
+ }
+
+ DapUiQmlWidgetStatusBarComboBoxToken {
+ id: comboboxToken
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ fieldBalance: fieldWalletBalance
+ }
+
+ Label {
+ id: titleWalletBalance
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ verticalAlignment: Qt.AlignVCenter
+ text: qsTr("Wallet balance:")
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#A7A7A7"
+ }
+
+ Label {
+ id: fieldWalletBalance
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ verticalAlignment: Qt.AlignVCenter
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 16 * pt
+ color: "#FFFFFF"
+ }
}
DapUiQmlScreenDialogAddWallet
@@ -67,6 +83,7 @@ Rectangle {
}
DapUiQmlWidgetStatusBarButton {
+ id: buttonAddWallet
width: 130 * pt
anchors.right: parent.right
anchors.top: parent.top
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBox.qml b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBox.qml
index 17f844f7bc4fc02db472fc3b5d90a9141b361b19..6f5333f44b834dff271bc2a030c2a1a58cd19cea 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBox.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarComboBox.qml
@@ -27,7 +27,7 @@ ComboBox {
anchors.rightMargin: 48 * pt
anchors.topMargin: 10 * pt
text: parent.displayText
- font.family: "Regular"
+ font.family: fontRobotoRegular.name
font.pixelSize: 14 * pt
color: parent.popup.visible ? "#332F49" : "#FFFFFF"
verticalAlignment: Text.AlignTop
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarContentItem.qml b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarContentItem.qml
index 0babc0b174eba8c7a360c4e4f59ced1a0b02002f..e985354491a03f3ba765d44c6916832a59870cd7 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarContentItem.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarContentItem.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls.Styles 1.4
Text {
color: "#A7A7A7"
- font.family: "Regular"
+ font.family: fontRobotoRegular.name
font.pixelSize: 14 * pt
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_console.png b/CellFrameDashboardGUI/Resources/Icons/icon_console.png
new file mode 100644
index 0000000000000000000000000000000000000000..415f9da3982122730eedb8b410e9111bc8a9948a
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_console.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png b/CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa739a9af1374b60787f2c388c2c7aa10d882352
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png b/CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9697d8b06c3c81bd5baf620411ceae1d94f388d
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png b/CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..452e7b7ebd2099cf444abca5601ee65e8e6e53d4
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_exchange.png b/CellFrameDashboardGUI/Resources/Icons/icon_exchange.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a37278e8403bce4ac57340e1476de01539527c9
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_exchange.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png b/CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33d2978d801af5e9e58bbb1326b35206f733803
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_history.png b/CellFrameDashboardGUI/Resources/Icons/icon_history.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd452bc416fb1448545207f6325e2d72a8ca207
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_history.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png b/CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..481538e196d74877c351d9215484ffa35668a560
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_logs.png b/CellFrameDashboardGUI/Resources/Icons/icon_logs.png
new file mode 100644
index 0000000000000000000000000000000000000000..67f71c201d4e2e66d78610d6c399e49bae33e4bd
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_logs.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png b/CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4dd306c15f4721c3049b2fdf3e24fe50753c17a
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_settings.png b/CellFrameDashboardGUI/Resources/Icons/icon_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..b846fa16d5cf2a6407bbe900011a161a814cf681
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_settings.png differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png b/CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2610d079f45b473b6e858c96a5e58255fcdffd9
Binary files /dev/null and b/CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png differ
diff --git a/CellFrameDashboardGUI/main.qml b/CellFrameDashboardGUI/main.qml
index 2d45e306e10f1a7175c9120dc65857bb14583e99..20ce225e664fb63e2267f2df59917d9c373f8b0d 100755
--- a/CellFrameDashboardGUI/main.qml
+++ b/CellFrameDashboardGUI/main.qml
@@ -11,7 +11,7 @@ ApplicationWindow {
id: window
visible: true
width: 1280
- height: 1024
+ height: 800
onClosing: {
console.log("Close")
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 83e173edf1555ede232f41c36ffa1ad3fabfa884..03b9a582ef07595f318acfeaf459538c7e971763 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -60,6 +60,16 @@
<file>DapUiQmlWidgetConsoleLastActionsDelegateForm.qml</file>
<file>DapUiQmlWidgetConsole.qml</file>
<file>DapUiQmlWidgetConsoleForm.ui.qml</file>
+ <file>Resources/Icons/icon_console.png</file>
+ <file>Resources/Icons/icon_console_hover.png</file>
+ <file>Resources/Icons/icon_dashboard.png</file>
+ <file>Resources/Icons/icon_dashboard_hover.png</file>
+ <file>Resources/Icons/icon_exchange.png</file>
+ <file>Resources/Icons/icon_exchange_hover.png</file>
+ <file>Resources/Icons/icon_history.png</file>
+ <file>Resources/Icons/icon_history_hover.png</file>
+ <file>Resources/Icons/icon_logs.png</file>
+ <file>Resources/Icons/icon_logs_hover.png</file>
<file>Resources/Icons/ic_arrow_drop_down.png</file>
<file>Resources/Icons/ic_arrow_drop_up.png</file>
<file>DapUiQmlWidgetStatusBar.qml</file>
@@ -75,6 +85,14 @@
<file>DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file>
<file>DapUiQmlWidgetStatusBarComboBoxToken.qml</file>
<file>DapUiQmlWidgetStatusBarComboBoxTokenForm.ui.qml</file>
+ <file>Resources/Icons/icon_settings.png</file>
+ <file>Resources/Icons/icon_settings_hover.png</file>
+ <file>DapUiQmlScreenVpn.qml</file>
+ <file>DapUiQmlScreenVpnForm.ui.qml</file>
+ <file>DapUiQmlWidgetSettingsVpn.qml</file>
+ <file>DapUiQmlWidgetSettingsVpnForm.ui.qml</file>
+ <file>DapUiQmlWidgetSettingsVpnComboBox.qml</file>
+ <file>DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file>
<file>DapUiQmlWidgetStatusBarComboBoxDelegate.qml</file>
</qresource>
</RCC>