Merge pull request #1922

8eb4f0d Force save daemon flags (xmrdsc)
515d051 daemonFlags input: fillWidth and force wrap (multiline) (xmrdsc)
This commit is contained in:
luigi1111 2019-02-01 01:11:18 -06:00
commit c7f3deb5cc
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -362,6 +362,7 @@ Rectangle{
if (appWindow.daemonRunning) { if (appWindow.daemonRunning) {
appWindow.stopDaemon(); appWindow.stopDaemon();
} else { } else {
persistentSettings.daemonFlags = daemonFlags.text;
appWindow.startDaemon(persistentSettings.daemonFlags); appWindow.startDaemon(persistentSettings.daemonFlags);
} }
} }
@ -395,21 +396,18 @@ Rectangle{
} }
} }
RowLayout { MoneroComponents.LineEditMulti {
id: daemonFlagsRow id: daemonFlags
Layout.fillWidth: true
MoneroComponents.LineEditMulti { labelFontSize: 14 * scaleRatio
id: daemonFlags fontSize: 15 * scaleRatio
Layout.preferredWidth: 200 wrapMode: Text.WrapAnywhere
Layout.fillWidth: true labelText: qsTr("Daemon startup flags") + translationManager.emptyString
labelFontSize: 14 * scaleRatio placeholderText: qsTr("(optional)") + translationManager.emptyString
fontSize: 15 * scaleRatio placeholderFontSize: 15 * scaleRatio
labelText: qsTr("Daemon startup flags") + translationManager.emptyString text: persistentSettings.daemonFlags
placeholderText: qsTr("(optional)") + translationManager.emptyString addressValidation: false
placeholderFontSize: 15 * scaleRatio onEditingFinished: persistentSettings.daemonFlags = daemonFlags.text;
text: appWindow.persistentSettings.daemonFlags
addressValidation: false
}
} }
RowLayout { RowLayout {