Skip to content
Snippets Groups Projects
Commit 88edf70e authored by andrey.daragan's avatar andrey.daragan
Browse files

Bugs 2893

parent 3c5a3889
No related branches found
No related tags found
1 merge request!11Cellframe clone
Showing
with 535 additions and 59 deletions
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
<file>screen/DapAbstractScreenForm.ui.qml</file> <file>screen/DapAbstractScreenForm.ui.qml</file>
<file>screen/DapAbstractRightPanel.qml</file> <file>screen/DapAbstractRightPanel.qml</file>
<file>screen/DapAbstractRightPanelForm.ui.qml</file> <file>screen/DapAbstractRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/DapDashboardRightPanel.qml</file>
<file>screen/desktop/Dashboard/DapDashboardRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/DapDashboardScreen.qml</file> <file>screen/desktop/Dashboard/DapDashboardScreen.qml</file>
<file>screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml</file> <file>screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml</file>
<file>screen/desktop/Dashboard/DapDashboardTab.qml</file> <file>screen/desktop/Dashboard/DapDashboardTab.qml</file>
...@@ -82,5 +80,18 @@ ...@@ -82,5 +80,18 @@
<file>res/icons/new-wallet_icon_dark.png</file> <file>res/icons/new-wallet_icon_dark.png</file>
<file>res/icons/ic_arrow_drop_down.png</file> <file>res/icons/ic_arrow_drop_down.png</file>
<file>res/icons/ic_arrow_drop_up.png</file> <file>res/icons/ic_arrow_drop_up.png</file>
<file>screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml</file>
<file>res/icons/back_icon_hover.png</file>
<file>res/icons/back_icon.png</file>
<file>res/icons/close_icon_hover.png</file>
<file>res/icons/close_icon.png</file>
<file>res/icons/ic_arrow_drop_down_dark.png</file>
</qresource> </qresource>
</RCC> </RCC>
CellFrameDashboardGUI/res/icons/back_icon.png

613 B

CellFrameDashboardGUI/res/icons/back_icon_hover.png

965 B

CellFrameDashboardGUI/res/icons/close_icon.png

552 B

CellFrameDashboardGUI/res/icons/close_icon_hover.png

625 B

CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark.png

304 B

...@@ -6,34 +6,35 @@ import "qrc:/widgets" ...@@ -6,34 +6,35 @@ import "qrc:/widgets"
DapRightPanel DapRightPanel
{ {
id: rightPanel id: rightPanel
///@detalis Stack of right panels owned by current.
property alias dapChildRightPanels: childRightPanels
dapHeader.height: 30 * pt property DapButton dapButtonClose:
dapFrame.width: 350 * pt DapButton
dapFrame.height: parent.height
color: "blue"
dapHeaderData:
Rectangle
{ {
anchors.fill: parent id: buttonClose
color: "yellow" height: 16 * pt
width: 16 * pt
heightImageButton: 16 * pt
widthImageButton: 16 * pt
colorBackgroundNormal: "#F8F7FA"
colorBackgroundHover: "#F8F7FA"
normalImageButton: "qrc:/res/icons/close_icon.png"
hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
} }
dapContentItemData: dapHeader.height: 30 * pt
// Install right panel content dapFrame.width: 400 * pt
StackView dapFrame.height: parent.height
{ color: "#F8F7FA"
id: childRightPanels
anchors.fill: parent
}
} }
/*##^## Designer { /*##^## Designer {
D{i:0;autoSize:true;height:480;width:640} D{i:0;autoSize:true;height:480;width:640}
} }
......
...@@ -4,5 +4,5 @@ import "qrc:/widgets" ...@@ -4,5 +4,5 @@ import "qrc:/widgets"
DapTab DapTab
{ {
dapSeparator.width: 1 * pt dapSeparator.width: 1 * pt
dapSeparator.color: "red" dapSeparator.color: "#E3E2E6"
} }
import QtQuick 2.4 import QtQuick 2.4
DapDashboardScreenForm { DapDashboardScreenForm
buttonTest.onClicked: textTest.text = "DESKTOP" {
buttonTest.onClicked: textTest.text = "DESKTOP " + textTest.font.pointSize + " " + textTest.font.pixelSize
} }
import QtQuick 2.4 import QtQuick 2.4
DapDashboardTabForm { DapDashboardTabForm
{
///@detalis Path to the right pane of transaction history.
readonly property string transactionHistoryWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml"
///@detalis Path to the right pane of transaction history.
readonly property string inputNameWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml"
///@detalis Path to the right pane of transaction history.
readonly property string recoveryWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml"
///@detalis Path to the right pane of transaction history.
readonly property string doneWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapDoneWalletRightPanel.qml"
dapDashboardRightPanel.source: Qt.resolvedUrl(inputNameWallet)
} }
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 2.0
import "qrc:/" import "qrc:/"
import "../../" import "../../"
...@@ -6,11 +7,19 @@ DapAbstractTab ...@@ -6,11 +7,19 @@ DapAbstractTab
{ {
id: dashboardTab id: dashboardTab
property alias dapDashboardRightPanel: rightPanelLoader
dapTopPanel: DapDashboardTopPanel { } dapTopPanel: DapDashboardTopPanel { }
dapScreen: DapDashboardScreen { } dapScreen: DapDashboardScreen { }
dapRightPanel: DapDashboardRightPanel { } dapRightPanel:
Loader
{
id: rightPanelLoader
anchors.fill: parent
width: 400
}
} }
......
import QtQuick 2.4 import QtQuick 2.4
DapDashboardTopPanelForm { DapDashboardTopPanelForm
{
} }
...@@ -3,15 +3,14 @@ import QtQuick.Controls 2.0 ...@@ -3,15 +3,14 @@ import QtQuick.Controls 2.0
import "qrc:/widgets" import "qrc:/widgets"
import "../../" import "../../"
DapAbstractTopPanel
DapAbstractTopPanel
{ {
anchors.fill: parent anchors.fill: parent
// Static text "Wallet" // Static text "Wallet"
Label Label
{ {
id:textHeaderWallet id: textHeaderWallet
text: qsTr("Wallet") text: qsTr("Wallet")
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 24 * pt anchors.leftMargin: 24 * pt
...@@ -22,7 +21,7 @@ DapAbstractTopPanel ...@@ -22,7 +21,7 @@ DapAbstractTopPanel
} }
// Wallet selection combo box // Wallet selection combo box
Rectangle Rectangle
{ {
id: frameComboBox id: frameComboBox
...@@ -32,34 +31,47 @@ DapAbstractTopPanel ...@@ -32,34 +31,47 @@ DapAbstractTopPanel
width: 148 * pt width: 148 * pt
color: "transparent" color: "transparent"
DapComboBox DapComboBox
{ {
id: comboboxWallet id: comboboxWallet
model: ListModel{ model: ListModel
id:сonversionList {
ListElement{text:"all wallets"} id: сonversionList
ListElement{text:"Money for children"} ListElement
ListElement{text:"Money for education"} {
ListElement{text:"Money for medicine"} text: "all wallets"
}
ListElement
{
text: "Money for children"
}
ListElement
{
text: "Money for education"
}
ListElement
{
text: "Money for medicine"
}
} }
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png" indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png" indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal:0 * pt sidePaddingNormal: 0 * pt
sidePaddingActive:16 * pt sidePaddingActive: 16 * pt
topIndentActive:10 * pt topIndentActive: 10 * pt
normalColorText:"#070023" normalColorText: "#070023"
hilightColorText:"#FFFFFF" hilightColorText: "#FFFFFF"
normalColorTopText:"#FFFFFF" normalColorTopText: "#FFFFFF"
hilightColorTopText:"#070023" hilightColorTopText: "#070023"
hilightColor: "#330F54" hilightColor: "#330F54"
normalTopColor: "#070023" normalTopColor: "#070023"
widthPopupComboBoxNormal:148 * pt widthPopupComboBoxNormal: 148 * pt
widthPopupComboBoxActive:180 * pt widthPopupComboBoxActive: 180 * pt
heightComboBoxNormal:24 * pt heightComboBoxNormal: 24 * pt
heightComboBoxActive:44 * pt heightComboBoxActive: 44 * pt
bottomIntervalListElement:8 * pt bottomIntervalListElement: 8 * pt
topEffect:false topEffect: false
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
normalColor: "#FFFFFF" normalColor: "#FFFFFF"
hilightTopColor: normalColor hilightTopColor: normalColor
...@@ -74,14 +86,14 @@ DapAbstractTopPanel ...@@ -74,14 +86,14 @@ DapAbstractTopPanel
indicatorHeight: indicatorWidth indicatorHeight: indicatorWidth
colorTopNormalDropShadow: "#00000000" colorTopNormalDropShadow: "#00000000"
colorDropShadow: "#40ABABAB" colorDropShadow: "#40ABABAB"
fontComboBox.pixelSize: 14*pt fontComboBox.pixelSize: 14 * pt
fontComboBox.family: "Roboto" fontComboBox.family: "Roboto"
} }
} }
// Static wallet balance text "Wallet balance" // Static wallet balance text "Wallet balance"
Label Label
{ {
id: headerWalletBalance id: headerWalletBalance
text: qsTr("Wallet balance") text: qsTr("Wallet balance")
...@@ -94,7 +106,7 @@ DapAbstractTopPanel ...@@ -94,7 +106,7 @@ DapAbstractTopPanel
} }
// Dynamic wallet balance text // Dynamic wallet balance text
Label Label
{ {
id: textWalletBalance id: textWalletBalance
text: "$ 3 050 745.3453289 USD" text: "$ 3 050 745.3453289 USD"
...@@ -121,16 +133,16 @@ DapAbstractTopPanel ...@@ -121,16 +133,16 @@ DapAbstractTopPanel
widthImageButton: 28 * pt widthImageButton: 28 * pt
heightImageButton: 28 * pt heightImageButton: 28 * pt
indentImageLeftButton: 10 * pt indentImageLeftButton: 10 * pt
colorBackgroundNormal:"#070023" colorBackgroundNormal: "#070023"
colorBackgroundHover: "#D51F5D" colorBackgroundHover: "#D51F5D"
colorButtonTextNormal: "#FFFFFF" colorButtonTextNormal: "#FFFFFF"
colorButtonTextHover: "#FFFFFF" colorButtonTextHover: "#FFFFFF"
indentTextRight: 20 * pt indentTextRight: 20 * pt
existenceImage:true fontButton.pixelSize: 14 * pt
existenceImage: true
borderColorButton: "#000000" borderColorButton: "#000000"
borderWidthButton: 0 borderWidthButton: 0
fontButton.family: "Roboto" fontButton.family: "Roboto"
fontButton.pixelSize: 14 * pt
fontButton.weight: Font.Normal fontButton.weight: Font.Normal
horizontalAligmentText:Qt.AlignRight horizontalAligmentText:Qt.AlignRight
colorTextButton: "#FFFFFF" colorTextButton: "#FFFFFF"
......
import QtQuick 2.4
import QtQuick.Controls 2.0
<<<<<<< HEAD
import "qrc:/widgets"
=======
>>>>>>> develop
import "../../"
DapAbstractTopPanel
{
<<<<<<< HEAD
anchors.fill: parent
=======
property alias testButton: button
Button
{
id: button
anchors.fill: parent
text: "Press"
}
>>>>>>> develop
// Static text "Wallet"
Label
{
id:textHeaderWallet
text: qsTr("Wallet")
anchors.left: parent.left
anchors.leftMargin: 24 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pixelSize: 12 * pt
color: "#ACAAB5"
}
// Wallet selection combo box
Rectangle
{
id: frameComboBox
anchors.left: textHeaderWallet.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 30 * pt
width: 148 * pt
color: "transparent"
DapComboBox
{
id: comboboxWallet
model: ListModel{
id:сonversionList
ListElement{text:"all wallets"}
ListElement{text:"Money for children"}
ListElement{text:"Money for education"}
ListElement{text:"Money for medicine"}
}
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal:0 * pt
sidePaddingActive:16 * pt
topIndentActive:10 * pt
normalColorText:"#070023"
hilightColorText:"#FFFFFF"
normalColorTopText:"#FFFFFF"
hilightColorTopText:"#070023"
hilightColor: "#330F54"
normalTopColor: "#070023"
fontSizeComboBox: 14*px
widthPopupComboBoxNormal:148 * pt
widthPopupComboBoxActive:180 * pt
heightComboBoxNormal:24 * pt
heightComboBoxActive:44 * pt
bottomIntervalListElement:8 * pt
topEffect:false
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
}
}
// Static wallet balance text "Wallet balance"
Label
{
id: headerWalletBalance
text: qsTr("Wallet balance")
anchors.left: frameComboBox.right
anchors.leftMargin: 70 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pixelSize: 12 * pt
color: "#ACAAB5"
}
// Dynamic wallet balance text
Label
{
id: textWalletBalance
text: "$ 3 050 745.3453289 USD"
anchors.left: headerWalletBalance.right
anchors.leftMargin: 18 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pixelSize: 16 * pt
color: "#FFFFFF"
}
// Wallet create button
DapButton
{
id: addWalletButton
textButton: "New wallet"
anchors.right: parent.right
anchors.rightMargin: 24 * pt
anchors.verticalCenter: parent.verticalCenter
normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
heightButton: 24 * pt
widthButton: 120 * pt
widthImageButton: 28 * pt
heightImageButton: 28 * pt
indentImageLeftButton: 10 * pt
colorBackgroundNormal:"#070023"
colorBackgroundHover: "#D51F5D"
colorButtonTextNormal: "#FFFFFF"
colorButtonTextHover: "#FFFFFF"
indentTextRight: 20 * pt
fontSizeButton: 14 * pt
existenceImage:true
borderColorButton: "#000000"
borderWidthButton: 0
}
}
import QtQuick 2.4
import "../../"
DapAbstractTopPanel
{
}
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
import QtQuick 2.4
import QtQuick.Controls 2.0
import "qrc:/widgets"
import "../../"
DapAbstractTopPanel
{
anchors.fill: parent
// Static text "Wallet"
Label
{
id:textHeaderWallet
text: qsTr("Wallet")
anchors.left: parent.left
anchors.leftMargin: 24 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pixelSize: 12 * pt
color: "#ACAAB5"
}
// Wallet selection combo box
Rectangle
{
id: frameComboBox
anchors.left: textHeaderWallet.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 30 * pt
width: 148 * pt
color: "transparent"
DapComboBox
{
id: comboboxWallet
model: ListModel{
id:сonversionList
ListElement{text:"all wallets"}
ListElement{text:"Money for children"}
ListElement{text:"Money for education"}
ListElement{text:"Money for medicine"}
}
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal:0 * pt
sidePaddingActive:16 * pt
topIndentActive:10 * pt
normalColorText:"#070023"
hilightColorText:"#FFFFFF"
normalColorTopText:"#FFFFFF"
hilightColorTopText:"#070023"
hilightColor: "#330F54"
normalTopColor: "#070023"
fontSizeComboBox: 14*px
widthPopupComboBoxNormal:148 * pt
widthPopupComboBoxActive:180 * pt
heightComboBoxNormal:24 * pt
heightComboBoxActive:44 * pt
bottomIntervalListElement:8 * pt
topEffect:false
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
}
}
// Static wallet balance text "Wallet balance"
Label
{
id: headerWalletBalance
text: qsTr("Wallet balance")
anchors.left: frameComboBox.right
anchors.leftMargin: 70 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pixelSize: 12 * pt
color: "#ACAAB5"
}
// Dynamic wallet balance text
Label
{
id: textWalletBalance
text: "$ 3 050 745.3453289 USD"
anchors.left: headerWalletBalance.right
anchors.leftMargin: 18 * pt
anchors.verticalCenter: parent.verticalCenter
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pixelSize: 16 * pt
color: "#FFFFFF"
}
// Wallet create button
DapButton
{
id: addWalletButton
textButton: "New wallet"
anchors.right: parent.right
anchors.rightMargin: 24 * pt
anchors.verticalCenter: parent.verticalCenter
normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
heightButton: 24 * pt
widthButton: 120 * pt
widthImageButton: 28 * pt
heightImageButton: 28 * pt
indentImageLeftButton: 10 * pt
colorBackgroundNormal:"#070023"
colorBackgroundHover: "#D51F5D"
colorButtonTextNormal: "#FFFFFF"
colorButtonTextHover: "#FFFFFF"
indentTextRight: 20 * pt
fontSizeButton: 14 * pt
existenceImage:true
borderColorButton: "#000000"
borderWidthButton: 0
}
}
import QtQuick 2.4
import QtQuick.Controls 2.0
import "../../"
DapAbstractTopPanel
{
property alias testButton: button
Button
{
id: button
anchors.fill: parent
text: "Press"
}
}
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
import QtQuick 2.4 import QtQuick 2.4
DapDashboardRightPanelForm DapDoneWalletRightPanelForm
{ {
} }
import QtQuick 2.4
import "qrc:/widgets"
import "../../../"
DapAbstractRightPanel
{
dapButtonClose.height: 16 * pt
dapButtonClose.width: 16 * pt
dapButtonClose.heightImageButton: 16 * pt
dapButtonClose.widthImageButton: 16 * pt
dapButtonClose.normalImageButton: "qrc:/res/icons/close_icon.png"
dapButtonClose.hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
dapHeaderData:
Row
{
anchors.fill: parent
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt
Item
{
id: itemButtonClose
data: dapButtonClose
}
}
dapContentItemData:
Rectangle
{
anchors.fill: parent
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
color: "transparent"
Rectangle
{
id: rectangleTop
anchors.top: parent.top
anchors.bottom: textMessage.top
anchors.left: parent.left
anchors.right: parent.right
color: "transparent"
}
Text
{
id: textMessage
text: qsTr("Wallet created\nsuccessfully")
horizontalAlignment: Text.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: 24 * pt
anchors.bottom: rectangleCenter.top
anchors.bottomMargin: 24 * pt
color: "#070023"
font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
font.pointSize: 16 * pt
}
Rectangle
{
id: rectangleCenter
height: 118 * pt
anchors.bottom: buttonDone.top
anchors.left: parent.left
anchors.right: parent.right
color: "transparent"
}
DapButton
{
id: buttonDone
heightButton: 44 * pt
widthButton: 130 * pt
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: rectangleBottom.top
anchors.topMargin: 24 * pt
anchors.bottomMargin: 24 * pt
checkable: true
textButton: qsTr("Done")
existenceImage: false
horizontalAligmentText: Text.AlignHCenter
indentTextRight: 0
fontSizeButton: 18 * pt
colorTextButton: buttonDone.checked ? "#3E3853" : "#FFFFFF"
colorBackgroundButton: "#3E3853"
}
Rectangle
{
id: rectangleBottom
height: 189 * pt
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
color: "transparent"
}
}
}
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
import QtQuick 2.4
DapInputNewWalletNameRightPanelForm
{
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment