Skip to content
Snippets Groups Projects
Commit 85d5ccf3 authored by Alexandr Mruchok's avatar Alexandr Mruchok
Browse files

Merge branch 'feature-4584'

parents 396d3dac 9b4298e3
No related branches found
No related tags found
2 merge requests!226Added logging of information about the command to the Service.,!225Added logging of information about the command to the Service.
Hide whitespace changes
Inline Side-by-side
Showing
with 178 additions and 19 deletions
CellFrameDashboardGUI/qml.qrc
+ 4
− 1
View file @ 85d5ccf3
......@@ -17,7 +17,6 @@
<file>resources/icons/cellframe-logo-dashboard.png</file>
<file>screen/DapMainApplicationWindow.qml</file>
<file>screen/DapAbstractTab.qml</file>
<file>screen/DapAbstractTabForm.ui.qml</file>
<file>screen/DapAbstractScreen.qml</file>
<file>screen/DapAbstractScreenForm.ui.qml</file>
<file>screen/DapAbstractRightPanel.qml</file>
......@@ -173,6 +172,9 @@
<file>screen/desktop/Certificates/CertificatesLogic.qml</file>
<file>screen/desktop/Certificates/parts/TitleTextView.qml</file>
<file>screen/desktop/Certificates/parts/Utils.qml</file>
<file>screen/desktop/Wallet/DapWalletTab.qml</file>
<file>screen/desktop/Wallet/DapWalletTopPanel.qml</file>
<file>screen/desktop/DapTokensListView.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworksPanel.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworkPanelButton.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworksList.qml</file>
......@@ -187,5 +189,6 @@
<file>resources/icons/Icon_sync_net_hover.svg</file>
<file>resources/icons/next-page.svg</file>
<file>resources/icons/next-page_hover.svg</file>
<file>screen/desktop/DapRightPanel_New.qml</file>
</qresource>
</RCC>
CellFrameDashboardGUI/screen/DapAbstractTab.qml
+ 8
− 1
View file @ 85d5ccf3
import QtQuick 2.4
import "qrc:/widgets"
DapAbstractTabForm
DapTab
{
///@detalis Currently displayed right pane
property DapRightPanel currentRightPanel
dapSeparator.width: 1 * pt
dapSeparator.color: "#E3E2E6"
Connections
{
target: dapRightPanel
......
CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml deleted 100644 → 0
+ 0
− 11
View file @ 396d3dac
import QtQuick 2.4
import "qrc:/widgets"
DapTab
{
///@detalis Currently displayed right pane
property DapRightPanel currentRightPanel
dapSeparator.width: 1 * pt
dapSeparator.color: "#E3E2E6"
}
CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
+ 8
− 0
View file @ 85d5ccf3
......@@ -9,6 +9,8 @@ Item {
id: dapMainWindow
///@detalis Path to the dashboard tab.
readonly property string dashboardScreen: "qrc:/screen/" + device + "/Dashboard/DapDashboardTab.qml"
///@detalis Path to the dashboard tab.
readonly property string walletScreen: "qrc:/screen/" + device + "/Wallet/DapWalletTab.qml"
///@detalis Path to the exchange tab.
readonly property string exchangeScreen: "qrc:/screen/" + device + "/Exchange/DapExchangeTab.qml"
///@detalis Path to the history tab.
......@@ -180,6 +182,12 @@ Item {
normalIcon: "qrc:/resources/icons/icon_dashboard.png",
hoverIcon: "qrc:/resources/icons/icon_dashboard_hover.png"
})
append({
name: qsTr("Wallet"),
page: walletScreen,
normalIcon: "qrc:/resources/icons/icon_dashboard.png",
hoverIcon: "qrc:/resources/icons/icon_dashboard_hover.png"
})
//TODO: The tab is disabled until the functional part is implemented
// append ({
// name: qsTr("Exchange"),
......
CellFrameDashboardGUI/screen/desktop/DapRightPanel_New.qml 0 → 100644
+ 78
− 0
View file @ 85d5ccf3
import QtQuick 2.4
import QtQuick.Controls 1.4
import "qrc:/widgets"
Rectangle
{
id: root
property string caption: "New Wallet"
property alias stackView: stackView
anchors.top: parent.top
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: visible ? 24*pt : 0
anchors.leftMargin: 0
width: visible ? 350 * pt : 0;
border.color: "#E2E1E6"
border.width: 1 * pt
radius: 8 * pt
Item {
id: title
width: parent.width
height: 40 * pt
DapButton_New
{
id: backButton
height: 20 * pt
width: height
x: 16 * pt
anchors.verticalCenter: parent.verticalCenter
iconSource: stackView.depth > 1 ? "qrc:/resources/icons/back_icon.png" : "qrc:/resources/icons/Certificates/close_icon.svg"
hoverIconSource: stackView.depth > 1 ? "qrc:/resources/icons/back_icon_hover.png" : "qrc:/resources/icons/Certificates/close_icon_hover.svg"
iconSubcontroll.sourceSize: Qt.size(20 * pt, 20 * pt)
onClicked:
{
if(stackView.pop() === null)
root.visible = false;
}
}
Text {
id: titleText
anchors
{
left: backButton.right
leftMargin: 13 * pt
verticalCenter: parent.verticalCenter
}
font: quicksandFonts.bold14
color: "#3E3853"
text: qsTr(root.caption)
}
}
StackView
{
id: stackView
anchors
{
top:title.bottom
left: parent.left
right: parent.right
bottom: parent.bottom
}
delegate: StackViewDelegate
{
pushTransition: StackViewTransition { }
}
}
}
CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml 0 → 100644
+ 12
− 0
View file @ 85d5ccf3
import QtQuick 2.0
Rectangle
{
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.top: parent.top
border.color: "#E2E1E6"
border.width: 1 * pt
radius: 8 * pt
}
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+ 1
− 1
View file @ 85d5ccf3
......@@ -249,6 +249,6 @@ DapAbstractTab
{
if(state !== "WALLETSHOW")
state = "WALLETCREATE"
currentRightPanel = dapDashboardRightPanel.push({item:Qt.resolvedUrl(inputNameWallet)});
currentRightPanel = stackViewRightPanel.push({item:Qt.resolvedUrl(inputNameWallet)});
}
}
CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml 0 → 100644
+ 52
− 0
View file @ 85d5ccf3
import QtQuick 2.4
import QtQuick.Controls 1.4
import "qrc:/"
import "../../"
import "../"
Item
{
id: tab
Column
{
anchors.fill: parent
DapWalletTopPanel
{
id: topPanel
}
Item {
height: parent.height - topPanel.height
width: parent.width
DapTokensListView
{
anchors.margins: 24*pt
anchors.right: rightPanel.left
}
DapRightPanel_New
{
id: rightPanel
stackView.initialItem: firstPage
Component.onCompleted: stackView.push(secondPage)
}
Component
{
id:firstPage
Rectangle{
color: "#ff0000"
}
}
Component
{
id:secondPage
Rectangle{
color: "#00ff62"
}
}
}
}
}
CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml 0 → 100644
+ 10
− 0
View file @ 85d5ccf3
import QtQuick 2.4
import QtQuick.Controls 2.0
import Demlabs 1.0
import "../../"
import "qrc:/widgets"
DapTopPanel
{
}
CellFrameDashboardGUI/screen/mobile/Dashboard/DapDashboardTabForm.ui.qml
+ 1
− 1
View file @ 85d5ccf3
......@@ -2,7 +2,7 @@ import QtQuick 2.4
import "qrc:/"
import "../../"
DapTabForm {
DapTab {
id: dapDashboardTab
anchors.fill: parent
......
CellFrameDashboardGUI/screen/mobile/Exchange/DapExchangeTabForm.ui.qml
+ 1
− 1
View file @ 85d5ccf3
......@@ -2,7 +2,7 @@ import QtQuick 2.4
import "qrc:/"
import "../../"
DapTabForm {
DapTab {
id: dapExchangeTab
anchors.fill: parent
......
CellFrameDashboardGUI/screen/mobile/History/DapHistoryTabForm.ui.qml
+ 1
− 1
View file @ 85d5ccf3
......@@ -2,7 +2,7 @@ import QtQuick 2.4
import "qrc:/"
import "../../"
DapTabForm {
DapTab {
id: dapHistoryTab
anchors.fill: parent
......
cellframe-ui-sdk @ d9c7a081
Compare 3c2a6659...d9c7a081
Subproject commit 3c2a665989ccc6a3ec3c86a48071f51d9a2c9e7b
Subproject commit d9c7a081eea35af0f4c3f373f3b4d51c1202d4ae
dap-ui-sdk @ b522735c
Compare ab9d1c16...b522735c
Subproject commit ab9d1c16382aefc65fde5db8d4ebe85c0e2023c0
Subproject commit b522735cb809ea1a99f8531ce1d73e9abe75a638
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment