Use newlines for the help text separator on the unmapped gamepad dialog

This commit is contained in:
Cameron Gutman 2019-03-31 20:10:56 -07:00
parent 2e9af8fef0
commit 32535578a0
2 changed files with 3 additions and 3 deletions

View file

@ -2,8 +2,6 @@ import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.2
import SystemProperties 1.0
NavigableDialog {
id: dialog
@ -11,6 +9,7 @@ NavigableDialog {
property string helpText
property string helpUrl : "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting"
property string helpTextSeparator : " "
onOpened: {
// Force keyboard focus on the label so keyboard navigation works
@ -35,7 +34,7 @@ NavigableDialog {
property string dialogText
id: dialogLabel
text: dialogText + (SystemProperties.hasBrowser ? (" " + helpText) : "")
text: dialogText + ((helpText && (standardButtons & Dialog.Help)) ? (helpTextSeparator + helpText) : "")
wrapMode: Text.WordWrap
// Cap the width so the dialog doesn't grow horizontally forever. This

View file

@ -405,6 +405,7 @@ ApplicationWindow {
id: unmappedGamepadDialog
property string unmappedGamepads : ""
text: "Moonlight detected gamepads without a mapping:\n" + unmappedGamepads
helpTextSeparator: "\n\n"
helpText: "Click the Help button for information on how to map your gamepads."
helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Gamepad-Mapping"
}