mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-09 11:22:05 +02:00
Added some styles, changed some margins, testing with the new LineEdit
This commit is contained in:
parent
e7eb3bdfef
commit
f15d6f5197
@ -127,7 +127,7 @@ Rectangle {
|
|||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 8
|
anchors.topMargin: 8
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: 190
|
anchors.leftMargin: 184
|
||||||
font.bold: true
|
font.bold: true
|
||||||
color: "white"
|
color: "white"
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ Rectangle {
|
|||||||
signal getProofClicked(string txid, string address, string message);
|
signal getProofClicked(string txid, string address, string message);
|
||||||
signal checkProofClicked(string txid, string address, string message, string signature);
|
signal checkProofClicked(string txid, string address, string message, string signature);
|
||||||
|
|
||||||
color: "#F0EEEE"
|
color: "black"
|
||||||
|
|
||||||
onCurrentViewChanged: {
|
onCurrentViewChanged: {
|
||||||
if (previousView) {
|
if (previousView) {
|
||||||
@ -163,8 +163,8 @@ Rectangle {
|
|||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: 2
|
anchors.margins: 18
|
||||||
anchors.topMargin: appWindow.persistentSettings.customDecorations ? 30 : 0
|
anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 : 0
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
||||||
Flickable {
|
Flickable {
|
||||||
|
@ -7,4 +7,8 @@ QtObject {
|
|||||||
property QtObject fontBold: FontLoader { id: _fontBold; source: "qrc:/fonts/SFUIDisplay-Bold.otf"; }
|
property QtObject fontBold: FontLoader { id: _fontBold; source: "qrc:/fonts/SFUIDisplay-Bold.otf"; }
|
||||||
property QtObject fontLight: FontLoader { id: _fontLight; source: "qrc:/fonts/SFUIDisplay-Light.otf"; }
|
property QtObject fontLight: FontLoader { id: _fontLight; source: "qrc:/fonts/SFUIDisplay-Light.otf"; }
|
||||||
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "qrc:/fonts/SFUIDisplay-Regular.otf"; }
|
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "qrc:/fonts/SFUIDisplay-Regular.otf"; }
|
||||||
|
|
||||||
|
property string inputBoxBackground: "black"
|
||||||
|
property string inputBoxBackgroundError: "#FFDDDD"
|
||||||
|
property string inputBoxColor: "white"
|
||||||
}
|
}
|
||||||
|
@ -44,6 +44,9 @@ import moneroComponents.SubaddressModel 1.0
|
|||||||
Rectangle {
|
Rectangle {
|
||||||
id: pageReceive
|
id: pageReceive
|
||||||
color: "#F0EEEE"
|
color: "#F0EEEE"
|
||||||
|
property alias addressText : addressLine.text
|
||||||
|
property alias paymentIdText : paymentIdLine.text
|
||||||
|
property alias integratedAddressText : integratedAddressLine.text
|
||||||
property var model
|
property var model
|
||||||
property var current_address
|
property var current_address
|
||||||
property alias addressText : pageReceive.current_address
|
property alias addressText : pageReceive.current_address
|
||||||
@ -240,7 +243,7 @@ Rectangle {
|
|||||||
|
|
||||||
LineEdit {
|
LineEdit {
|
||||||
id: amountLine
|
id: amountLine
|
||||||
fontSize: mainLayout.lineEditFontSize
|
// fontSize: mainLayout.lineEditFontSize
|
||||||
placeholderText: qsTr("Amount to receive") + translationManager.emptyString
|
placeholderText: qsTr("Amount to receive") + translationManager.emptyString
|
||||||
readOnly: false
|
readOnly: false
|
||||||
width: mainLayout.editWidth
|
width: mainLayout.editWidth
|
||||||
|
@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
|
|||||||
import moneroComponents.PendingTransaction 1.0
|
import moneroComponents.PendingTransaction 1.0
|
||||||
import "../components"
|
import "../components"
|
||||||
import moneroComponents.Wallet 1.0
|
import moneroComponents.Wallet 1.0
|
||||||
|
import "." 1.0
|
||||||
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
@ -40,11 +41,8 @@ Rectangle {
|
|||||||
int priority, string description)
|
int priority, string description)
|
||||||
signal sweepUnmixableClicked()
|
signal sweepUnmixableClicked()
|
||||||
|
|
||||||
color: "#F0EEEE"
|
color: "black"
|
||||||
property string startLinkText: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>" +
|
property string startLinkText: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font>") + translationManager.emptyString
|
||||||
qsTr("Start daemon") +
|
|
||||||
"</a><font size='2'>)</font>" +
|
|
||||||
translationManager.emptyString
|
|
||||||
property bool showAdvanced: false
|
property bool showAdvanced: false
|
||||||
|
|
||||||
function scaleValueToMixinCount(scaleValue) {
|
function scaleValueToMixinCount(scaleValue) {
|
||||||
@ -118,10 +116,23 @@ Rectangle {
|
|||||||
anchors.margins: 17 * scaleRatio
|
anchors.margins: 17 * scaleRatio
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
||||||
|
RowLayout{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.bottomMargin: 20
|
||||||
|
|
||||||
|
Text {
|
||||||
|
id: panelHeader
|
||||||
|
font.family: Style.fontMedium.name
|
||||||
|
font.pixelSize: 32 * scaleRatio
|
||||||
|
color: "#FFFFFF"
|
||||||
|
text: "Send"
|
||||||
|
height: 150
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
GridLayout {
|
GridLayout {
|
||||||
columns: (isMobile)? 1 : 2
|
columns: (isMobile)? 1 : 2
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Label {
|
Label {
|
||||||
@ -212,6 +223,65 @@ Rectangle {
|
|||||||
z: parent.z + 1
|
z: parent.z + 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
id: amountRowx
|
||||||
|
Label {
|
||||||
|
id: amountLabelx
|
||||||
|
text: qsTr("Amount") + translationManager.emptyString
|
||||||
|
width: mainLayout.labelWidth
|
||||||
|
}
|
||||||
|
|
||||||
|
// this LineEdit is for testing purposes
|
||||||
|
LineEdit {
|
||||||
|
id: amountLinex
|
||||||
|
fontSize: mainLayout.lineEditFontSize
|
||||||
|
placeholderText: qsTr("Amount to receive") + translationManager.emptyString
|
||||||
|
readOnly: false
|
||||||
|
width: mainLayout.editWidth
|
||||||
|
Layout.fillWidth: true
|
||||||
|
// validator: DoubleValidator {
|
||||||
|
// bottom: 0.0
|
||||||
|
// top: 18446744.073709551615
|
||||||
|
// decimals: 12
|
||||||
|
// notation: DoubleValidator.StandardNotation
|
||||||
|
// locale: "C"
|
||||||
|
// }
|
||||||
|
|
||||||
|
Rectangle{
|
||||||
|
color: "#808080"
|
||||||
|
border.color: "black"
|
||||||
|
height: 20
|
||||||
|
width: 40
|
||||||
|
radius: 3
|
||||||
|
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 8
|
||||||
|
anchors.topMargin: 8
|
||||||
|
|
||||||
|
Text {
|
||||||
|
id: xee
|
||||||
|
font.family: Style.fontBold.name
|
||||||
|
font.pixelSize: 16 * scaleRatio
|
||||||
|
color: "#FFFFFF"
|
||||||
|
text: "Send"
|
||||||
|
anchors.top: parent.top + 2
|
||||||
|
anchors.left: parent.left + 6
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// IconButton {
|
||||||
|
// imageSource: "../images/copyToClipboard.png"
|
||||||
|
// onClicked: {
|
||||||
|
// if (integratedAddressLine.text.length > 0) {
|
||||||
|
// clipboard.setText(integratedAddressLine.text)
|
||||||
|
// appWindow.showStatusMessage(qsTr("Integrated address copied to clipboard"),3)
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Label {
|
Label {
|
||||||
|
Loading…
Reference in New Issue
Block a user