diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc index 657b696..9062346 100644 --- a/GlosSIConfig/Resource.rc +++ b/GlosSIConfig/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,1,204000619719 - PRODUCTVERSION 0,1,1,204000619719 + FILEVERSION 0,1,1,2012005004400 + PRODUCTVERSION 0,1,1,2012005004400 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - Config" - VALUE "FileVersion", "0.1.1.2-4-gf619719" + VALUE "FileVersion", "0.1.1.2-12-g5fe44d0" VALUE "InternalName", "GlosSIConfig" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSIConfig.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.1.1.2-4-gf619719" + VALUE "ProductVersion", "0.1.1.2-12-g5fe44d0" END END BLOCK "VarFileInfo" @@ -1436,6 +1436,70 @@ IDI_ICON1 ICON "..\GlosSI_Icon.ico" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp index 7540523..172630a 100644 --- a/GlosSIConfig/UIModel.cpp +++ b/GlosSIConfig/UIModel.cpp @@ -428,6 +428,7 @@ QVariantMap UIModel::getDefaultConf() const {"maxFps", QJsonValue::Null}, {"scale", QJsonValue::Null}, {"windowMode", false}, + {"disableGlosSIOverlay", false}, }}, }; diff --git a/GlosSIConfig/qml/AdvancedTargetSettings.qml b/GlosSIConfig/qml/AdvancedTargetSettings.qml index f1b072e..c6327cd 100644 --- a/GlosSIConfig/qml/AdvancedTargetSettings.qml +++ b/GlosSIConfig/qml/AdvancedTargetSettings.qml @@ -140,7 +140,7 @@ CollapsiblePane { RPane { width: parent.width / 2 - 8 - height: 280 + height: 324 radius: 4 Material.elevation: 32 bgOpacity: 0.97 @@ -290,7 +290,7 @@ CollapsiblePane { } RPane { width: parent.width / 2 - 8 - height: 280 + height: 324 radius: 4 Material.elevation: 32 bgOpacity: 0.97 @@ -401,6 +401,39 @@ CollapsiblePane { width: 1 height: 4 } + Row { + CheckBox { + id: disableGlosSIOverlayCheckbox + text: qsTr("Disable GlosSI overlay") + checked: shortcutInfo.window.disableGlosSIOverlay + onCheckedChanged: shortcutInfo.window.disableGlosSIOverlay = checked + } + RoundButton { + onClicked: () => { + helpInfoDialog.titleText = qsTr("Disable GlosSI overlay") + helpInfoDialog.text = + qsTr("Disables the additional GlosSI overlay") + + "\n" + + qsTr("but keeps the Steam 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 + } Row { leftPadding: 16 Label { diff --git a/GlosSITarget/Overlay.cpp b/GlosSITarget/Overlay.cpp index 92aed93..5fbe97a 100644 --- a/GlosSITarget/Overlay.cpp +++ b/GlosSITarget/Overlay.cpp @@ -182,6 +182,11 @@ void Overlay::update() } } + if (Settings::window.disableGlosSIOverlay) { + ImGui::SFML::Render(window_); + return; + } + showLogs(0); if (enabled_ || force_enable_) { diff --git a/GlosSITarget/Settings.h b/GlosSITarget/Settings.h index ffaf74f..f2b37df 100644 --- a/GlosSITarget/Settings.h +++ b/GlosSITarget/Settings.h @@ -55,6 +55,7 @@ inline struct Window { float scale = 0.f; bool disableOverlay = false; bool hideAltTab = false; + bool disableGlosSIOverlay = false; } window; inline struct Controller { @@ -193,6 +194,7 @@ inline void Parse(const nlohmann::basic_json<>& json) safeParseValue(winconf, "scale", window.scale); safeParseValue(winconf, "disableOverlay", window.disableOverlay); safeParseValue(winconf, "hideAltTab", window.hideAltTab); + safeParseValue(winconf, "disableGlosSIOverlay", window.disableGlosSIOverlay); } if (auto controllerConf = json["controller"]; !controllerConf.is_null() && !controllerConf.empty() && controllerConf.is_object()) { diff --git a/GlosSITarget/SteamTarget.cpp b/GlosSITarget/SteamTarget.cpp index d87ddb7..16e62f9 100644 --- a/GlosSITarget/SteamTarget.cpp +++ b/GlosSITarget/SteamTarget.cpp @@ -180,6 +180,9 @@ void SteamTarget::onOverlayChanged(bool overlay_open) void SteamTarget::toggleGlossiOverlay() { + if (Settings::window.disableGlosSIOverlay) { + return; + } if (overlay_.expired()) { return; }