From bb5c2de5284cc3df9750678ede0865d48ca1be23 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 4 Sep 2022 16:18:02 +0200 Subject: [PATCH] GloSSIConfig: Attempt to declutter UI a bit --- GlosSIConfig/Resource.rc | 204 ++++++++++++++++++- GlosSIConfig/qml.qrc | 1 + GlosSIConfig/qml/InfoDialog.qml | 4 +- GlosSIConfig/qml/ShortcutProps.qml | 147 ++++++++----- GlosSIConfig/svg/help_outline_white_24dp.svg | 1 + GlosSITarget/Resource.rc | 52 ++++- 6 files changed, 349 insertions(+), 60 deletions(-) create mode 100644 GlosSIConfig/svg/help_outline_white_24dp.svg diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc index fe1d9d3..3049894 100644 --- a/GlosSIConfig/Resource.rc +++ b/GlosSIConfig/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,7,1013000522117 - PRODUCTVERSION 0,0,7,1013000522117 + FILEVERSION 0,0,7,1021003100876 + PRODUCTVERSION 0,0,7,1021003100876 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - Config" - VALUE "FileVersion", "0.0.7.1-13-gb522117" + VALUE "FileVersion", "0.0.7.1-21-g31ee876" VALUE "InternalName", "GlosSIConfig" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSIConfig.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.0.7.1-13-gb522117" + VALUE "ProductVersion", "0.0.7.1-21-g31ee876" END END BLOCK "VarFileInfo" @@ -127,6 +127,202 @@ IDI_ICON1 ICON "..\GloSC_Icon.ico" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GlosSIConfig/qml.qrc b/GlosSIConfig/qml.qrc index 523435f..80ff2b9 100644 --- a/GlosSIConfig/qml.qrc +++ b/GlosSIConfig/qml.qrc @@ -14,5 +14,6 @@ steamscreener.png noise.png GloSC_Icon_small.png + svg/help_outline_white_24dp.svg diff --git a/GlosSIConfig/qml/InfoDialog.qml b/GlosSIConfig/qml/InfoDialog.qml index b3b72c7..96066aa 100644 --- a/GlosSIConfig/qml/InfoDialog.qml +++ b/GlosSIConfig/qml/InfoDialog.qml @@ -80,6 +80,7 @@ Dialog { anchors.top: title.bottom anchors.topMargin: parent.spacing spacing: 16 + height: text.height + spacing Label { id: text } @@ -89,7 +90,7 @@ Dialog { anchors.top: col.bottom anchors.topMargin: parent.spacing spacing: 16 - + height: okbutton.height + spacing + parent.spacing Button { id: extrabutton visible: extraButton @@ -100,6 +101,7 @@ Dialog { } Button { + id: okbutton text: qsTr("OK") onClicked: function(){ close() diff --git a/GlosSIConfig/qml/ShortcutProps.qml b/GlosSIConfig/qml/ShortcutProps.qml index 075ec39..14ba84c 100644 --- a/GlosSIConfig/qml/ShortcutProps.qml +++ b/GlosSIConfig/qml/ShortcutProps.qml @@ -77,7 +77,7 @@ Item { pathInput.text = shortcutInfo.launchPath || "" argsInput.text = shortcutInfo.launchAppArgs || "" closeOnExit.checked = shortcutInfo.closeOnExit || false - waitForChildren.checked = shortcutInfo.waitForChildProcs || true + waitForChildren.checked = shortcutInfo.waitForChildProcs hideDevices.checked = shortcutInfo.hideDevices || false windowMode.checked = shortcutInfo.windowMode || false maxControllersSpinBox.value = shortcutInfo.maxControllers @@ -321,7 +321,7 @@ Item { RPane { width: parent.width / 2 - 8 - height: 394 + height: 264 radius: 4 Material.elevation: 32 bgOpacity: 0.97 @@ -329,64 +329,99 @@ Item { Column { spacing: 2 width: parent.width - CheckBox { - id: hideDevices - text: qsTr("Hide (Real) Controllers") - checked: shortcutInfo.hideDevices - onCheckedChanged: shortcutInfo.hideDevices = checked - } - Label { - text: qsTr("Hides real game controllers from the system\nThis may prevent doubled inputs") - wrapMode: Text.WordWrap - width: parent.width - leftPadding: 32 - topPadding: -8 - } - Label { - text: qsTr("You can change this setting and which devices are hidden in the GlosSI overlay") - wrapMode: Text.WordWrap - width: parent.width - leftPadding: 32 + Row { + CheckBox { + id: hideDevices + text: qsTr("Hide (Real) Controllers") + checked: shortcutInfo.hideDevices + onCheckedChanged: shortcutInfo.hideDevices = checked + } + RoundButton { + onClicked: () => { + helpInfoDialog.titleText = qsTr("Hide (Real) Controllers") + helpInfoDialog.text = + qsTr("Hides real game controllers from the system\nThis may prevent doubled inputs") + + "\n" + + qsTr("You can change this setting and which devices are hidden in the GlosSI overlay") + + helpInfoDialog.open() + } + width: 48 + height: 48 + Material.elevation: 0 + anchors.topMargin: 16 + Image { + anchors.centerIn: parent + source: "qrc:/svg/help_outline_white_24dp.svg" + width: 24 + height: 24 + } + } } Item { width: 1 height: 4 } - CheckBox { - id: realDeviceIds - text: qsTr("Use real device (USB)-IDs") - checked: shortcutInfo.realDeviceIds - onCheckedChanged: shortcutInfo.realDeviceIds = checked - } - Label { - text: qsTr("Only enable if input's are not recognized by the game") - wrapMode: Text.WordWrap - width: parent.width - leftPadding: 32 - topPadding: -8 - } - Label { - text: qsTr("If enabled, device-hiding won't work.\nUse the \"Max. Controller count\" setting!") - wrapMode: Text.WordWrap - width: parent.width - leftPadding: 32 + Row { + CheckBox { + id: realDeviceIds + text: qsTr("Use real device (USB)-IDs") + checked: shortcutInfo.realDeviceIds + onCheckedChanged: shortcutInfo.realDeviceIds = checked + } + RoundButton { + onClicked: () => { + helpInfoDialog.titleText = qsTr("Use real device (USB)-IDs") + helpInfoDialog.text = + qsTr("Only enable if input's are not recognized by the game") + + "\n" + + qsTr("If enabled, device-hiding won't work.\nUse the \"Max. Controller count\" setting!") + + helpInfoDialog.open() + } + width: 48 + height: 48 + Material.elevation: 0 + anchors.topMargin: 16 + Image { + anchors.centerIn: parent + source: "qrc:/svg/help_outline_white_24dp.svg" + width: 24 + height: 24 + } + } } Item { width: 1 height: 4 } - CheckBox { - id: emulateDS4 - text: qsTr("Emulate DS4") - checked: shortcutInfo.emulateDS4 - onCheckedChanged: shortcutInfo.emulateDS4 = checked - } - Label { - text: qsTr("Instead of X360 Pad; Disable \"Playstation Configuration support\" in Steam") - wrapMode: Text.WordWrap - width: parent.width - leftPadding: 32 - topPadding: -8 + Row { + CheckBox { + id: emulateDS4 + text: qsTr("Emulate DS4") + checked: shortcutInfo.emulateDS4 + onCheckedChanged: shortcutInfo.emulateDS4 = checked + } + RoundButton { + onClicked: () => { + helpInfoDialog.titleText = qsTr("Emulate DS4") + helpInfoDialog.text = + qsTr("Instead of X360 Pad") + + "\n" + + qsTr("Disable \"Playstation Configuration support\" in Steam") + helpInfoDialog.open() + } + width: 48 + height: 48 + Material.elevation: 0 + anchors.topMargin: 16 + Image { + anchors.centerIn: parent + source: "qrc:/svg/help_outline_white_24dp.svg" + width: 24 + height: 24 + } + } } Item { width: 1 @@ -411,7 +446,7 @@ Item { } RPane { width: parent.width / 2 - 8 - height: 294 + height: 264 radius: 4 Material.elevation: 32 bgOpacity: 0.97 @@ -520,4 +555,14 @@ Item { } } + InfoDialog { + id: helpInfoDialog + titleText: qsTr("") + text: qsTr("") + extraButton: false + extraButtonText: qsTr("") + onConfirmedExtra: function(data) { + } + } + } diff --git a/GlosSIConfig/svg/help_outline_white_24dp.svg b/GlosSIConfig/svg/help_outline_white_24dp.svg new file mode 100644 index 0000000..439616e --- /dev/null +++ b/GlosSIConfig/svg/help_outline_white_24dp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/GlosSITarget/Resource.rc b/GlosSITarget/Resource.rc index b88f622..e37e0b4 100644 --- a/GlosSITarget/Resource.rc +++ b/GlosSITarget/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,7,1014002600010 - PRODUCTVERSION 0,0,7,1014002600010 + FILEVERSION 0,0,7,1018000020006 + PRODUCTVERSION 0,0,7,1018000020006 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - SteamTarget" - VALUE "FileVersion", "0.0.7.1-14-g26da010" + VALUE "FileVersion", "0.0.7.1-18-g0f2bac6" VALUE "InternalName", "GlosSITarget" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.0.7.1-14-g26da010" + VALUE "ProductVersion", "0.0.7.1-18-g0f2bac6" END END BLOCK "VarFileInfo" @@ -127,6 +127,50 @@ IDI_ICON1 ICON "GloSC_Icon.ico" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +