Skip to content
Snippets Groups Projects
Commit 0494a354 authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

Merge branch 'develop' into features-3005

parents 7819fa0c f81179b5
No related branches found
No related tags found
1 merge request!11Cellframe clone
Hide whitespace changes
Inline Side-by-side
Showing
with 364 additions and 20 deletions
CellFrameDashboardGUI/qml.qrc
+ 9
− 0
View file @ 0494a354
......@@ -130,5 +130,14 @@
<file>res/icons/ic_arrow_drop_down_dark_blue.png</file>
<file>res/icons/ic_arrow_drop_up_dark_blue.png</file>
<file>res/icons/sell_icon.png</file>
<file>res/icons/ic_copy.png</file>
<file>res/icons/ic_copy_hover.png</file>
<file>res/icons/ic_edit.png</file>
<file>res/icons/ic_edit_hover.png</file>
<file>res/icons/ic_klvn.png</file>
<file>res/icons/new-payment_icon.png</file>
<file>res/icons/tkn2_icon.png</file>
<file>res/icons/tkn1_icon_light.png</file>
<file>res/icons/ng_icon.png</file>
</qresource>
</RCC>
CellFrameDashboardGUI/res/icons/ic_copy.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/ic_copy.png

470 B

CellFrameDashboardGUI/res/icons/ic_copy_hover.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/ic_copy_hover.png

471 B

CellFrameDashboardGUI/res/icons/ic_edit.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/ic_edit.png

686 B

CellFrameDashboardGUI/res/icons/ic_edit_hover.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/ic_edit_hover.png

669 B

CellFrameDashboardGUI/res/icons/ic_klvn.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/ic_klvn.png

2.7 KiB

CellFrameDashboardGUI/res/icons/new-payment_icon.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/new-payment_icon.png

556 B

CellFrameDashboardGUI/res/icons/ng_icon.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/ng_icon.png

1.4 KiB

CellFrameDashboardGUI/res/icons/tkn1_icon_light.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/tkn1_icon_light.png

1.33 KiB

CellFrameDashboardGUI/res/icons/tkn2_icon.png 0 → 100644
+ 0
− 0
View file @ 0494a354
CellFrameDashboardGUI/res/icons/tkn2_icon.png

2.55 KiB

CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
+ 355
− 20
View file @ 0494a354
import QtQuick 2.4
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.2
import "qrc:/widgets"
import "../../"
DapAbstractScreen
{
id: dapdashboard
dapFrame.color: "green"
textTest.text: "Here text"
Item{
id: dapButtonTest
data: buttonTest
width: 100
height: 100
anchors.centerIn: parent
}
dapFrame.color: "#FFFFFF"
anchors.fill: parent
anchors.leftMargin: 24 * pt
anchors.rightMargin: 24 * pt
// Paths to currency emblems
property string bitCoinImagePath: "qrc:/res/icons/tkn1_icon_light.png"
property string ethereumImagePath: "qrc:/res/icons/tkn2_icon.png"
property string newGoldImagePath: "qrc:/res/icons/ng_icon.png"
property string kelvinImagePath: "qrc:/res/icons/ic_klvn.png"
Rectangle
{
id: titleBlock
anchors.top: parent.top
anchors.topMargin: 20 * pt
anchors.bottomMargin: 20 * pt
anchors.left: parent.left
anchors.right: parent.right
height: 36 * pt
RowLayout
{
anchors.fill: parent
Text
{
font.pixelSize: 20 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
text: "My first wallet"
}
Item {
id: dapTextTest
data: textTest
MouseArea
{
id: walletNameEditButton
width: 20 * pt
height: 20 * pt
hoverEnabled: true
anchors.top: dapButtonTest.bottom
anchors.horizontalCenter: parent.horizontalCenter
Image
{
id: walletNameEditButtonImage
anchors.fill: parent
source: parent.containsMouse ? "qrc:/res/icons/ic_edit_hover.png" : "qrc:/res/icons/ic_edit.png"
sourceSize.width: width
sourceSize.height: height
}
}
Item
{
Layout.fillWidth: true
Layout.fillHeight: true
}
DapButton
{
widthButton: 132 * pt
heightButton: 36 * pt
textButton: "New payment"
colorBackgroundButton: "#3E3853"
colorBackgroundHover: "red"
colorButtonTextNormal: "#FFFFFF"
colorButtonTextHover: "#FFFFFF"
normalImageButton: "qrc:/res/icons/new-payment_icon.png"
hoverImageButton: "qrc:/res/icons/new-payment_icon.png"
widthImageButton: 20 * pt
heightImageButton: 20 * pt
indentImageLeftButton: 20 * pt
indentTextRight: 20 * pt
}
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
ListView
{
anchors.top: titleBlock.bottom
anchors.topMargin: 20 * pt
anchors.bottom: parent.bottom
width: parent.width
spacing: 5 * pt
clip: true
model:
ListModel
{
ListElement
{
name: "Kelvin Testnet"
address: "KLJHuhlkjshfausdh7865lksfahHKLUIHKJFHKLUESAHFILKUHEWKUAFHjkhfdkslusfkhgs"
money: [
ListElement
{
type: "bitCoin"
sum: 3487256
eq: "$ 3498750"
},
ListElement
{
type: "ether"
sum: 67896
eq: "$ 78687"
},
ListElement
{
type: "newGold"
sum: 675573
eq: "$ 987978"
}
]
}
ListElement
{
name: "Marketnet"
address: "lkajdsfeislsaIJEUfesIJEFHJISEFIsdfLIJFEISHFUSKEIEWEQLIJSlijfsfjlijeIEJJE"
money: [
ListElement
{
type: "bitCoin"
sum: 3487256
eq: "$ 3498750"
},
ListElement
{
type: "ether"
sum: 67896
eq: "$ 78687"
},
ListElement
{
type: "newGold"
sum: 675573
eq: "$ 987978"
},
ListElement
{
type: "ether"
sum: 6743896
eq: "$ 7843687"
}
]
}
}
delegate:
Column
{
width: parent.width
Rectangle
{
id: stockNameBlock
height: 30 * pt
width: parent.width
color: "#908D9D"
Text
{
id: stockNameText
anchors.left: parent.left
anchors.leftMargin: 16 * pt
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#FFFFFF"
verticalAlignment: Qt.AlignVCenter
text: name
}
}
Row
{
id: networkAddressBlock
height: 40 * pt
width: parent.width
Item
{
width: 16 * pt
height: parent.height
}
Text
{
id: networkAddressLabel
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#908D9D"
text: qsTr("Network address")
}
Item
{
width: 36 * pt
height: parent.height
}
Text
{
id: networkAddressValue
anchors.verticalCenter: parent.verticalCenter
width: 200 * pt
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#908D9D"
text: address
elide: Text.ElideRight
}
MouseArea
{
id: networkAddressCopyButton
anchors.verticalCenter: parent.verticalCenter
width: 20 * pt
height: 20 * pt
hoverEnabled: true
Image
{
id: networkAddressCopyButtonImage
anchors.fill: parent
source: parent.containsMouse ? "qrc:/res/icons/ic_copy_hover.png" : "qrc:/res/icons/ic_copy.png"
sourceSize.width: width
sourceSize.height: height
}
}
}
Repeater
{
width: parent.width
model: money
Rectangle
{
anchors.left: parent.left
anchors.leftMargin: 16 * pt
anchors.right: parent.right
anchors.rightMargin: 16 * pt
height: 56 * pt
Rectangle
{
anchors.top: parent.top
width: parent.width
height: 1 * pt
color: "#908D9D"
}
RowLayout
{
anchors.fill: parent
Image
{
id: currencyIcon
height: 40 * pt
width: 40 * pt
Layout.alignment: Qt.AlignLeft
source: (type === "bitCoin") ? bitCoinImagePath : (type === "ether") ? ethereumImagePath : newGoldImagePath // Don't know how to deal with it yet
sourceSize.width: width
sourceSize.height: height
}
Item
{
height: parent.height
width: 10 * pt
Layout.alignment: Qt.AlignLeft
}
Text
{
id: currencyName
Layout.alignment: Qt.AlignLeft
font.pixelSize: 18 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: type
}
// Delimiters - see design
Item
{
height: parent.height
width: 16 * pt
}
Item
{
Layout.fillWidth: true
}
Item
{
height: parent.height
width: 16 * pt
}
Text
{
id: currencySum
Layout.alignment: Qt.AlignHCenter
font.pixelSize: 18 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: sum
}
Text
{
id: currencyCode
font.pixelSize: 18 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: (type === "bitCoin") ? "BTC" : (type === "ether") ? "ETH" : (type === "newGold") ? "NGD" : "KLVN"
}
Item
{
Layout.fillWidth: true
}
Text
{
id: currencyDollarEqv
Layout.alignment: Qt.AlignRight
font.pixelSize: 18 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: eq
}
}
}
}
}
}
}
##^##*/
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