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

Fixing the start-up wizards

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
components/Label.qml
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()
}

20
components/LineEdit.qml
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
}

14
components/RemoteNodeEdit.qml
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
}
}