Fixing the start-up wizards

This commit is contained in:
Sander Ferdinand 2018-01-21 19:14:34 +01:00 committed by moneromooo-monero
parent a128581ae5
commit 53b5b7a5c7
6 changed files with 69 additions and 11 deletions

View file

@ -39,6 +39,8 @@ Item {
property string tipText: ""
property int fontSize: 16 * scaleRatio
property bool fontBold: false
property string fontColor: Style.defaultFontColor
property string fontFamily: Style.fontRegular.name
property alias wrapMode: label.wrapMode
property alias horizontalAlignment: label.horizontalAlignment
signal linkActivated()
@ -53,10 +55,10 @@ Item {
anchors.bottom: parent.bottom
anchors.bottomMargin: 2 * scaleRatio
anchors.left: parent.left
font.family: Style.fontRegular.name
font.family: fontFamily
font.pixelSize: fontSize
font.bold: fontBold
color: Style.defaultFontColor
color: fontColor
onLinkActivated: item.linkActivated()
}

View file

@ -43,14 +43,23 @@ Item {
property alias inlineButtonText: inlineButtonId.text
property alias inlineIcon: inlineIcon.visible
property bool copyButton: false
property string borderColor: {
if(input.activeFocus){
return Qt.rgba(255, 255, 255, 0.35);
} else {
return Qt.rgba(255, 255, 255, 0.25);
}
}
property bool borderDisabled: false
property int fontSize: 18 * scaleRatio
property bool showBorder: true
property bool fontBold: true
property alias fontColor: input.color
property bool error: false
property alias labelText: inputLabel.text
property alias labelColor: inputLabel.color
property alias labelTextFormat: inputLabel.textFormat
property string labelFontFamily: Style.fontRegular.name
property string backgroundColor: "transparent"
property string tipText: ""
property int labelFontSize: 14 * scaleRatio
@ -59,6 +68,7 @@ Item {
property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
property bool showingHeader: inputLabel.text !== "" || copyButton
property int inputHeight: 42 * scaleRatio
signal labelLinkActivated(); // input label, rich text <a> signal
signal editingFinished();
signal accepted();
@ -90,7 +100,7 @@ Item {
anchors.top: parent.top
anchors.left: parent.left
anchors.topMargin: 2 * scaleRatio
font.family: Style.fontRegular.name
font.family: labelFontFamily
font.pixelSize: labelFontSize
font.bold: labelFontBold
textFormat: Text.RichText
@ -158,13 +168,7 @@ Item {
color: backgroundColor
anchors.fill: parent
border.width: borderDisabled ? 0 : 1
border.color: {
if(input.activeFocus){
return Qt.rgba(255, 255, 255, 0.35);
} else {
return Qt.rgba(255, 255, 255, 0.25);
}
}
border.color: borderColor
radius: 4
}

View file

@ -40,6 +40,11 @@ GridLayout {
property alias daemonAddrLabelText: daemonAddr.labelText
property alias daemonPortLabelText: daemonPort.labelText
property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
property string lineEditBackgroundColor: "white"
property string lineEditFontColor: "black"
property bool lineEditFontBold: true
signal editingFinished()
function getAddress() {
@ -51,6 +56,10 @@ GridLayout {
Layout.fillWidth: true
placeholderText: qsTr("Remote Node Hostname / IP") + translationManager.emptyString
onEditingFinished: root.editingFinished()
borderColor: lineEditBorderColor
backgroundColor: lineEditBackgroundColor
fontColor: lineEditFontColor
fontBold: lineEditFontBold
}
LineEdit {
@ -58,5 +67,10 @@ GridLayout {
Layout.fillWidth: true
placeholderText: qsTr("Port") + translationManager.emptyString
onEditingFinished: root.editingFinished()
borderColor: lineEditBorderColor
backgroundColor: lineEditBackgroundColor
fontColor: lineEditFontColor
fontBold: lineEditFontBold
}
}

View file

@ -124,6 +124,7 @@ ColumnLayout {
CheckBox {
id: localNode
text: qsTr("Start a node automatically in background (recommended)") + translationManager.emptyString
checkedIcon: "../images/checkedVioletIcon.png"
background: "#FFFFFF"
fontColor: "#4A4646"
fontSize: 16 * scaleRatio
@ -152,6 +153,11 @@ ColumnLayout {
text: persistentSettings.blockchainDataDir
placeholderText: qsTr("(optional)") + translationManager.emptyString
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
MouseArea {
anchors.fill: parent
onClicked: {
@ -193,7 +199,6 @@ ColumnLayout {
localNode.checked = false
}
}
}
RowLayout {
@ -204,6 +209,10 @@ ColumnLayout {
property var rna: persistentSettings.remoteNodeAddress
daemonAddrText: rna.search(":") != -1 ? rna.split(":")[0].trim() : ""
daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? "18081" : persistentSettings.remoteNodeAddress.split(":")[1] : ""
lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
lineEditBackgroundColor: "white"
lineEditFontColor: "black"
lineEditFontBold: false
}
}
}

View file

@ -154,6 +154,8 @@ ColumnLayout {
Label {
Layout.topMargin: 20 * scaleRatio
fontFamily: "Ariel"
fontColor: "#555555"
fontSize: 14 * scaleRatio
text: qsTr("Wallet name")
+ translationManager.emptyString
@ -166,6 +168,10 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio
text: defaultAccountName
onTextUpdated: checkNextButton()
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
}
}
@ -232,6 +238,10 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio
placeholderText: qsTr("Account address (public)") + translationManager.emptyString
onTextUpdated: checkNextButton()
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
}
LineEdit {
Layout.fillWidth: true
@ -240,6 +250,10 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio
placeholderText: qsTr("View key (private)") + translationManager.emptyString
onTextUpdated: checkNextButton()
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
}
LineEdit {
@ -249,6 +263,10 @@ ColumnLayout {
id: spendKeyLine
placeholderText: qsTr("Spend key (private)") + translationManager.emptyString
onTextUpdated: checkNextButton()
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
}
}
@ -263,6 +281,10 @@ ColumnLayout {
validator: IntValidator {
bottom:0
}
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
}
}
@ -272,6 +294,8 @@ ColumnLayout {
Layout.fillWidth: true
Layout.topMargin: 20 * scaleRatio
fontSize: 14
fontFamily: "Ariel"
fontColor: "#555555"
text: qsTr("Your wallet is stored in") + ": " + fileUrlInput.text;
}
@ -292,6 +316,10 @@ ColumnLayout {
fileUrlInput.focus = true
}
}
borderColor: Qt.rgba(0, 0, 0, 0.15)
backgroundColor: "white"
fontColor: "black"
fontBold: false
}
FileDialog {

View file

@ -245,6 +245,7 @@ ColumnLayout {
CheckBox {
id: testNet
text: qsTr("Testnet") + translationManager.emptyString
checkedIcon: "../images/checkedVioletIcon.png"
background: "#FFFFFF"
fontColor: "#4A4646"
fontSize: 16 * scaleRatio