diff --git a/components/LineEdit.qml b/components/LineEdit.qml index 115b92b3..f7266d2c 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -32,9 +32,15 @@ import "." 1.0 Item { id: item property alias text: input.text + property alias placeholderText: placeholderLabel.text property bool placeholderCenter: false + 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 alias validator: input.validator property alias readOnly : input.readOnly property alias cursorPosition: input.cursorPosition @@ -148,10 +154,11 @@ Item { else { return 10 * scaleRatio; } } - opacity: 0.25 - color: Style.defaultFontColor - font.family: Style.fontRegular.name + opacity: item.placeholderOpacity + color: item.placeholderColor + font.family: item.placeholderFontFamily font.pixelSize: placeholderFontSize * scaleRatio + font.bold: item.placeholderFontBold text: "" z: 3 } diff --git a/components/Style.qml b/components/Style.qml index ffe9c194..3b917f97 100644 --- a/components/Style.qml +++ b/components/Style.qml @@ -16,6 +16,7 @@ QtObject { property string inputBoxBackground: "black" property string inputBoxBackgroundError: "#FFDDDD" property string inputBoxColor: "white" + property string legacy_placeholderFontColor: "#BABABA" property string buttonBackgroundColor: "#FA6800" property string buttonBackgroundColorHover: "#E65E00" diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml index 80407f0c..51eb8204 100644 --- a/wizard/WizardManageWalletUI.qml +++ b/wizard/WizardManageWalletUI.qml @@ -236,7 +236,11 @@ ColumnLayout { id: addressLine Layout.maximumWidth: 600 * scaleRatio Layout.minimumWidth: 200 * scaleRatio + placeholderFontBold: true + placeholderFontFamily: "Arial" + placeholderColor: Style.legacy_placeholderFontColor placeholderText: qsTr("Account address (public)") + translationManager.emptyString + placeholderOpacity: 1.0 onTextUpdated: checkNextButton() borderColor: Qt.rgba(0, 0, 0, 0.15) backgroundColor: "white" @@ -248,7 +252,11 @@ ColumnLayout { id: viewKeyLine Layout.maximumWidth: 600 * scaleRatio Layout.minimumWidth: 200 * scaleRatio + placeholderFontBold: true + placeholderFontFamily: "Arial" + placeholderColor: Style.legacy_placeholderFontColor placeholderText: qsTr("View key (private)") + translationManager.emptyString + placeholderOpacity: 1.0 onTextUpdated: checkNextButton() borderColor: Qt.rgba(0, 0, 0, 0.15) backgroundColor: "white" @@ -261,7 +269,11 @@ ColumnLayout { Layout.maximumWidth: 600 * scaleRatio Layout.minimumWidth: 200 * scaleRatio id: spendKeyLine + placeholderFontBold: true + placeholderFontFamily: "Arial" + placeholderColor: Style.legacy_placeholderFontColor placeholderText: qsTr("Spend key (private)") + translationManager.emptyString + placeholderOpacity: 1.0 onTextUpdated: checkNextButton() borderColor: Qt.rgba(0, 0, 0, 0.15) backgroundColor: "white" @@ -277,7 +289,11 @@ ColumnLayout { Layout.fillWidth: true Layout.maximumWidth: 600 * scaleRatio Layout.minimumWidth: 200 * scaleRatio + placeholderFontBold: true + placeholderFontFamily: "Arial" + placeholderColor: Style.legacy_placeholderFontColor placeholderText: qsTr("Restore height (optional)") + translationManager.emptyString + placeholderOpacity: 1.0 validator: IntValidator { bottom:0 } @@ -294,7 +310,7 @@ ColumnLayout { Layout.fillWidth: true Layout.topMargin: 20 * scaleRatio fontSize: 14 - fontFamily: "Ariel" + fontFamily: "Arial" fontColor: "#555555" text: qsTr("Your wallet is stored in") + ": " + fileUrlInput.text; } diff --git a/wizard/WizardMemoTextInput.qml b/wizard/WizardMemoTextInput.qml index 9611977d..a796fc3f 100644 --- a/wizard/WizardMemoTextInput.qml +++ b/wizard/WizardMemoTextInput.qml @@ -41,6 +41,7 @@ Column { font.pixelSize: 16 * scaleRatio anchors.margins: 8 * scaleRatio font.bold:true + font.family: "Arial" text: qsTr("Enter your 25 (or 24) word mnemonic seed") + translationManager.emptyString color: "#BABABA" visible: !memoTextInput.text/* && !parent.focus*/