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

[*] Edits made.

parent 3dce19a2
No related branches found
No related tags found
1 merge request!11Cellframe clone
Hide whitespace changes
Inline Side-by-side
Showing
with 155 additions and 44 deletions
CellFrameDashboardGUI/qml.qrc
+ 0
− 1
View file @ 74fecec1
......@@ -50,7 +50,6 @@
<file>screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml</file>
<file>screen/Dashboard/DapUiQmlScreenDashboard.qml</file>
<file>screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml</file>
<file>screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml</file>
<file>screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file>
<file>screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
<file>screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
......
CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml.autosave 0 → 100644
+ 155
− 0
View file @ 74fecec1
import QtQuick 2.12
import QtQml 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import "../../../libdap-qt-ui-qml"
Page {
///Top panel in tab Exchange
Rectangle{
id:topPanelExchange
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.leftMargin: 24*pt
anchors.topMargin: 12*pt
anchors.rightMargin: 24*pt
height:42 * pt
///Token ComboBox
Rectangle{
id:leftComboBox
anchors.top: topPanelExchange.top
anchors.left: topPanelExchange.left
width:112 * pt
height:parent.height
DapComboBox{
model: ListModel{
id:conversionList
ListElement{text:"TKN1/NGD"}
ListElement{text:"TKN2/NGD"}
ListElement{text:"NGD/KLVN"}
ListElement{text:"KLVN/USD"}
}
fontSizeComboBox: 16*pt
widthPopupComboBoxActive: 144 *pt
widthPopupComboBoxNormal: 112 *pt
sidePaddingActive: 16*pt
sidePaddingNormal: 0
x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
}
}
///Time ComboBox
Rectangle{
id:rightComboBox
anchors.left: leftComboBox.right
anchors.leftMargin: 72*pt
anchors.top: topPanelExchange.top
width:100 * pt
height:parent.height
DapComboBox{
model: ListModel{
ListElement{text:"1 minute"}
ListElement{text:"5 minute"}
ListElement{text:"15 minute"}
ListElement{text:"30 minute"}
ListElement{text:"1 hour"}
ListElement{text:"4 hour"}
ListElement{text:"12 hour"}
ListElement{text:"24 hour"}
}
fontSizeComboBox: 14*pt
widthPopupComboBoxActive: 132 *pt
widthPopupComboBoxNormal: 100 *pt
sidePaddingActive: 16*pt
sidePaddingNormal: 0
x:popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
}
}
///Value Last price
Rectangle{
id: lastPrice
height: parent.height
width: 150*pt
anchors.right: volume24.left
anchors.rightMargin: 30 * pt
Text{
anchors.left: lastPrice.left
anchors.bottom: value_lastPrice.top
anchors.bottomMargin: 6 * pt
color: "#757184"
font.pixelSize: 10 * pt
font.family: fontRobotoRegular.name
text: qsTr("Last price")
}
Text {
id: value_lastPrice
anchors.left: lastPrice.left
anchors.bottom: lastPrice.bottom
color: "#070023"
font.pixelSize: 12 * pt
font.family: fontRobotoRegular.name
text: qsTr("$ 10 807.35 NGD")
}
Text {
anchors.left: value_lastPrice.right
anchors.bottom: lastPrice.bottom
anchors.leftMargin: 6 * pt
color: "#6F9F00"
font.pixelSize: 10 * pt
font.family: fontRobotoRegular.name
text: qsTr("+3.59%")
}
}
///Value 24h volume
Rectangle{
id: volume24
height: parent.height
width: 75*pt
anchors.right: topPanelExchange.right
Text{
anchors.right: volume24.right
anchors.bottom: value_valume24.top
anchors.bottomMargin: 6 * pt
color: "#757184"
font.pixelSize: 10 * pt
font.family: fontRobotoRegular.name
text: qsTr("24h volume")
}
Text {
id: value_valume24
anchors.right: volume24.right
anchors.bottom: volume24.bottom
color: "#070023"
font.pixelSize: 12 * pt
font.family: fontRobotoRegular.name
text: qsTr("9 800 TKN1")
}
}
}
///Left down panel
Row {
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.leftMargin: 28 * pt
anchors.bottomMargin: 42 * pt
spacing: 68 * pt
DapUiQmlWidgetExchangeOrderForm {
titleOrder: qsTr("Buy")
}
DapUiQmlWidgetExchangeOrderForm {
titleOrder: qsTr("Sell")
}
}
}
CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml deleted 100644 → 0
+ 0
− 15
View file @ 3dce19a2
import QtQuick 2.9
import QtQuick.Controls 2.2
///this file used in DapUiQmlWidgetModel.cpp
Page {
id: dapUiQmlWidgetChainExchanges
title: qsTr("Exchanges")
Text {
id: name
anchors.centerIn: parent
text: qsTr("Exchanges")
}
}
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+ 0
− 26
View file @ 74fecec1
......@@ -108,26 +108,6 @@ DapUiQmlScreen {
DapComboBox{
property Label fieldBalance: Label {}
///Этот код был в DapUiQmlWidgetStatusBarComboBoxToken.qml на первый
/// взгляд не сильно ясно что он делает и разбираться тоже не стал к тикету не относился
// model: ListModel {id: tokenList}
// textRole: "tokenName"
// delegate: DapComboBoxDelegate {
// delegateContentText: tokenName
// }
// onCurrentIndexChanged: {
// if(currentIndex === -1)
// fieldBalance.text = 0;
// else
// {
// var money = dapChainWalletsModel.get(comboboxWallet.currentIndex).tokens[currentIndex * 3];
// fieldBalance.text = dapChainConvertor.toConvertCurrency(money);
// }
// }
model: ListModel {
id: signatureType
ListElement {
......@@ -291,9 +271,3 @@ DapUiQmlScreen {
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
+ 0
− 2
View file @ 74fecec1
......@@ -38,8 +38,6 @@ Rectangle {
property Label fieldBalance: Label {}
model: dapWalletModel.wallets
///Эта строка была ранее возможно на что то влияла но сейчас файлы объеденились возможно не нужна.
// fieldBalance: fieldWalletBalance
indicator: Image {
id: arrow
......
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