Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Fixes the placeholder texts for RemoteNodeEdit in the wallet creation wizard

Browse Source
This commit is contained in:
Sander Ferdinand
2018-03-27 22:04:18 +02:00
committed by moneromooo-monero
parent 6e503cd0e2
commit d98221ac56
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/RemoteNodeEdit.qml
View File

@@ -40,6 +40,14 @@ GridLayout {
property alias daemonAddrLabelText: daemonAddr.labelText property alias daemonAddrLabelText: daemonAddr.labelText
property alias daemonPortLabelText: daemonPort.labelText property alias daemonPortLabelText: daemonPort.labelText
// TODO: LEGACY; remove these placeHolder variables when
// the wizards get redesigned to the black-theme
property string placeholderFontFamily: Style.fontRegular.name
property bool placeholderFontBold: false
property int placeholderFontSize: 18 * scaleRatio
property string placeholderColor: Style.defaultFontColor
property real placeholderOpacity: 0.25
property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15) property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
property string lineEditBackgroundColor: "white" property string lineEditBackgroundColor: "white"
property string lineEditFontColor: "black" property string lineEditFontColor: "black"
@@ -55,6 +63,11 @@ GridLayout {
id: daemonAddr id: daemonAddr
Layout.fillWidth: true Layout.fillWidth: true
placeholderText: qsTr("Remote Node Hostname / IP") + translationManager.emptyString placeholderText: qsTr("Remote Node Hostname / IP") + translationManager.emptyString
placeholderFontFamily: root.placeholderFontFamily
placeholderFontBold: root.placeholderFontBold
placeholderFontSize: root.placeholderFontSize
placeholderColor: root.placeholderColor
placeholderOpacity: root.placeholderOpacity
onEditingFinished: root.editingFinished() onEditingFinished: root.editingFinished()
borderColor: lineEditBorderColor borderColor: lineEditBorderColor
backgroundColor: lineEditBackgroundColor backgroundColor: lineEditBackgroundColor
@@ -66,8 +79,13 @@ GridLayout {
id: daemonPort id: daemonPort
Layout.fillWidth: true Layout.fillWidth: true
placeholderText: qsTr("Port") + translationManager.emptyString placeholderText: qsTr("Port") + translationManager.emptyString
placeholderFontFamily: root.placeholderFontFamily
placeholderFontBold: root.placeholderFontBold
placeholderFontSize: root.placeholderFontSize
placeholderColor: root.placeholderColor
placeholderOpacity: root.placeholderOpacity
onEditingFinished: root.editingFinished() onEditingFinished: root.editingFinished()
legacyWizardStyle: true
borderColor: lineEditBorderColor borderColor: lineEditBorderColor
backgroundColor: lineEditBackgroundColor backgroundColor: lineEditBackgroundColor
fontColor: lineEditFontColor fontColor: lineEditFontColor

17
wizard/WizardDaemonSettings.qml
View File

@@ -152,6 +152,10 @@ ColumnLayout {
Layout.preferredWidth: 200 * scaleRatio Layout.preferredWidth: 200 * scaleRatio
Layout.fillWidth: true Layout.fillWidth: true
text: persistentSettings.blockchainDataDir text: persistentSettings.blockchainDataDir
placeholderFontBold: true
placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor
placeholderOpacity: 1.0
placeholderText: qsTr("(optional)") + translationManager.emptyString placeholderText: qsTr("(optional)") + translationManager.emptyString
borderColor: Qt.rgba(0, 0, 0, 0.15) borderColor: Qt.rgba(0, 0, 0, 0.15)
@@ -182,6 +186,12 @@ ColumnLayout {
Layout.minimumWidth: 300 * scaleRatio Layout.minimumWidth: 300 * scaleRatio
opacity: localNode.checked opacity: localNode.checked
id: bootstrapNodeEdit id: bootstrapNodeEdit
placeholderFontBold: true
placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor
placeholderOpacity: 1.0
daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim() daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
daemonPortText: { daemonPortText: {
var node_split = persistentSettings.bootstrapNodeAddress.split(":"); var node_split = persistentSettings.bootstrapNodeAddress.split(":");
@@ -198,6 +208,7 @@ ColumnLayout {
CheckBox { CheckBox {
id: remoteNode id: remoteNode
text: qsTr("Connect to a remote node") + translationManager.emptyString text: qsTr("Connect to a remote node") + translationManager.emptyString
checkedIcon: "../images/checkedBlackIcon.png"
Layout.topMargin: 20 * scaleRatio Layout.topMargin: 20 * scaleRatio
background: "#FFFFFF" background: "#FFFFFF"
fontColor: "#4A4646" fontColor: "#4A4646"
@@ -218,6 +229,12 @@ ColumnLayout {
property var rna: persistentSettings.remoteNodeAddress property var rna: persistentSettings.remoteNodeAddress
daemonAddrText: rna.search(":") != -1 ? rna.split(":")[0].trim() : "" daemonAddrText: rna.search(":") != -1 ? rna.split(":")[0].trim() : ""
daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? "18081" : persistentSettings.remoteNodeAddress.split(":")[1] : "" daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? "18081" : persistentSettings.remoteNodeAddress.split(":")[1] : ""
placeholderFontBold: true
placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor
placeholderOpacity: 1.0
lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15) lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
lineEditBackgroundColor: "white" lineEditBackgroundColor: "white"
lineEditFontColor: "black" lineEditFontColor: "black"