Fixing the start-up wizards

3 files changed, 30 insertions, 10 deletions

diff --git a/components/Label.qml b/components/Label.qml
index b2c4e52f..5ad72e08 100644
--- a/components/Label.qml
+++ b/components/Label.qml
@@ -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()
     }
 
diff --git a/components/LineEdit.qml b/components/LineEdit.qml
index 7f46506f..330e3bba 100644
--- a/components/LineEdit.qml
+++ b/components/LineEdit.qml
@@ -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
         }
 
diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml
index 49413436..4d44c156 100644
--- a/components/RemoteNodeEdit.qml
+++ b/components/RemoteNodeEdit.qml
@@ -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
     }
 }