From 366308a0020730053716241858a45e8c160d4eb5 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 8 Jan 2023 15:46:12 +0100 Subject: [PATCH 1/4] It's that time of the year again --- GlosSIConfig/UIModel.cpp | 2 +- GlosSIConfig/UIModel.h | 2 +- GlosSIConfig/WinEventFilter.h | 2 +- GlosSIConfig/main.cpp | 2 +- GlosSIConfig/qml/AddSelectTypeDialog.qml | 2 +- GlosSIConfig/qml/AdvancedTargetSettings.qml | 2 +- GlosSIConfig/qml/CollapsiblePane.qml | 2 +- GlosSIConfig/qml/EGSSelectDialog.qml | 2 +- GlosSIConfig/qml/FluentTextInput.qml | 2 +- GlosSIConfig/qml/GlobalConf.qml | 2 +- GlosSIConfig/qml/InfoDialog.qml | 2 +- GlosSIConfig/qml/RPane.qml | 2 +- GlosSIConfig/qml/ShortcutCards.qml | 2 +- GlosSIConfig/qml/ShortcutProps.qml | 2 +- GlosSIConfig/qml/SteamGridDialog.qml | 2 +- GlosSIConfig/qml/SteamInputXboxDisabledDialog.qml | 2 +- GlosSIConfig/qml/SteamNotFoundDialog.qml | 2 +- GlosSIConfig/qml/UWPSelectDialog.qml | 2 +- GlosSIConfig/qml/main.qml | 2 +- GlosSITarget/AppLauncher.cpp | 2 +- GlosSITarget/AppLauncher.h | 2 +- GlosSITarget/HidHide.cpp | 2 +- GlosSITarget/HidHide.h | 2 +- GlosSITarget/HttpServer.cpp | 2 +- GlosSITarget/HttpServer.h | 2 +- GlosSITarget/InputRedirector.cpp | 2 +- GlosSITarget/InputRedirector.h | 2 +- GlosSITarget/Overlay.cpp | 2 +- GlosSITarget/Overlay.h | 2 +- GlosSITarget/Settings.h | 2 +- GlosSITarget/SteamOverlayDetector.cpp | 2 +- GlosSITarget/SteamOverlayDetector.h | 2 +- GlosSITarget/SteamTarget.cpp | 2 +- GlosSITarget/SteamTarget.h | 2 +- GlosSITarget/TargetWindow.cpp | 2 +- GlosSITarget/TargetWindow.h | 2 +- GlosSITarget/UnhookUtil.cpp | 2 +- GlosSITarget/UnhookUtil.h | 2 +- GlosSITarget/main.cpp | 2 +- GlosSITarget/steam_sf_keymap.h | 2 +- GlosSITarget/util.h | 2 +- GlosSIWatchdog/dllmain.cpp | 2 +- Readme.md | 2 +- UWPOverlayEnablerDLL/dllmain.cpp | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp index 007545a..a10d4c2 100644 --- a/GlosSIConfig/UIModel.cpp +++ b/GlosSIConfig/UIModel.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/UIModel.h b/GlosSIConfig/UIModel.h index 8bc5871..1813143 100644 --- a/GlosSIConfig/UIModel.h +++ b/GlosSIConfig/UIModel.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/WinEventFilter.h b/GlosSIConfig/WinEventFilter.h index b82407f..be1ef65 100644 --- a/GlosSIConfig/WinEventFilter.h +++ b/GlosSIConfig/WinEventFilter.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/main.cpp b/GlosSIConfig/main.cpp index 8ad85de..ba303d3 100644 --- a/GlosSIConfig/main.cpp +++ b/GlosSIConfig/main.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/AddSelectTypeDialog.qml b/GlosSIConfig/qml/AddSelectTypeDialog.qml index 857981b..ce21ef9 100644 --- a/GlosSIConfig/qml/AddSelectTypeDialog.qml +++ b/GlosSIConfig/qml/AddSelectTypeDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/AdvancedTargetSettings.qml b/GlosSIConfig/qml/AdvancedTargetSettings.qml index 5628f4a..916ee81 100644 --- a/GlosSIConfig/qml/AdvancedTargetSettings.qml +++ b/GlosSIConfig/qml/AdvancedTargetSettings.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/CollapsiblePane.qml b/GlosSIConfig/qml/CollapsiblePane.qml index 6dea9e0..14ac6f0 100644 --- a/GlosSIConfig/qml/CollapsiblePane.qml +++ b/GlosSIConfig/qml/CollapsiblePane.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/EGSSelectDialog.qml b/GlosSIConfig/qml/EGSSelectDialog.qml index 5fce0bd..bc0e2a1 100644 --- a/GlosSIConfig/qml/EGSSelectDialog.qml +++ b/GlosSIConfig/qml/EGSSelectDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/FluentTextInput.qml b/GlosSIConfig/qml/FluentTextInput.qml index 21efd88..0004c45 100644 --- a/GlosSIConfig/qml/FluentTextInput.qml +++ b/GlosSIConfig/qml/FluentTextInput.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/GlobalConf.qml b/GlosSIConfig/qml/GlobalConf.qml index 97c7a65..29ec398 100644 --- a/GlosSIConfig/qml/GlobalConf.qml +++ b/GlosSIConfig/qml/GlobalConf.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/InfoDialog.qml b/GlosSIConfig/qml/InfoDialog.qml index f635235..b31d404 100644 --- a/GlosSIConfig/qml/InfoDialog.qml +++ b/GlosSIConfig/qml/InfoDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/RPane.qml b/GlosSIConfig/qml/RPane.qml index 2705cd7..713f2ab 100644 --- a/GlosSIConfig/qml/RPane.qml +++ b/GlosSIConfig/qml/RPane.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/ShortcutCards.qml b/GlosSIConfig/qml/ShortcutCards.qml index 90857c0..b50aee2 100644 --- a/GlosSIConfig/qml/ShortcutCards.qml +++ b/GlosSIConfig/qml/ShortcutCards.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/ShortcutProps.qml b/GlosSIConfig/qml/ShortcutProps.qml index 9d66279..aea927d 100644 --- a/GlosSIConfig/qml/ShortcutProps.qml +++ b/GlosSIConfig/qml/ShortcutProps.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/SteamGridDialog.qml b/GlosSIConfig/qml/SteamGridDialog.qml index 85459e3..c74954f 100644 --- a/GlosSIConfig/qml/SteamGridDialog.qml +++ b/GlosSIConfig/qml/SteamGridDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/SteamInputXboxDisabledDialog.qml b/GlosSIConfig/qml/SteamInputXboxDisabledDialog.qml index 7e2350c..28a7324 100644 --- a/GlosSIConfig/qml/SteamInputXboxDisabledDialog.qml +++ b/GlosSIConfig/qml/SteamInputXboxDisabledDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/SteamNotFoundDialog.qml b/GlosSIConfig/qml/SteamNotFoundDialog.qml index 1aba489..f519d39 100644 --- a/GlosSIConfig/qml/SteamNotFoundDialog.qml +++ b/GlosSIConfig/qml/SteamNotFoundDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/UWPSelectDialog.qml b/GlosSIConfig/qml/UWPSelectDialog.qml index 3c12235..bd3fe4f 100644 --- a/GlosSIConfig/qml/UWPSelectDialog.qml +++ b/GlosSIConfig/qml/UWPSelectDialog.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIConfig/qml/main.qml b/GlosSIConfig/qml/main.qml index 1f5fe67..80b82d6 100644 --- a/GlosSIConfig/qml/main.qml +++ b/GlosSIConfig/qml/main.qml @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/AppLauncher.cpp b/GlosSITarget/AppLauncher.cpp index e9b007a..140a28d 100644 --- a/GlosSITarget/AppLauncher.cpp +++ b/GlosSITarget/AppLauncher.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/AppLauncher.h b/GlosSITarget/AppLauncher.h index 8293e8e..311ae78 100644 --- a/GlosSITarget/AppLauncher.h +++ b/GlosSITarget/AppLauncher.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/HidHide.cpp b/GlosSITarget/HidHide.cpp index 086383d..4b9cbb3 100644 --- a/GlosSITarget/HidHide.cpp +++ b/GlosSITarget/HidHide.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/HidHide.h b/GlosSITarget/HidHide.h index 4fa1b27..20689f9 100644 --- a/GlosSITarget/HidHide.h +++ b/GlosSITarget/HidHide.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/HttpServer.cpp b/GlosSITarget/HttpServer.cpp index a475cde..790e2a3 100644 --- a/GlosSITarget/HttpServer.cpp +++ b/GlosSITarget/HttpServer.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/HttpServer.h b/GlosSITarget/HttpServer.h index 5541dfd..1660ffa 100644 --- a/GlosSITarget/HttpServer.h +++ b/GlosSITarget/HttpServer.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/InputRedirector.cpp b/GlosSITarget/InputRedirector.cpp index 883c420..20efb5b 100644 --- a/GlosSITarget/InputRedirector.cpp +++ b/GlosSITarget/InputRedirector.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/InputRedirector.h b/GlosSITarget/InputRedirector.h index 0e74653..cc456a9 100644 --- a/GlosSITarget/InputRedirector.h +++ b/GlosSITarget/InputRedirector.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/Overlay.cpp b/GlosSITarget/Overlay.cpp index c5427d5..92aed93 100644 --- a/GlosSITarget/Overlay.cpp +++ b/GlosSITarget/Overlay.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/Overlay.h b/GlosSITarget/Overlay.h index afd4d52..f04d691 100644 --- a/GlosSITarget/Overlay.h +++ b/GlosSITarget/Overlay.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/Settings.h b/GlosSITarget/Settings.h index 05db5b9..e2aeaf0 100644 --- a/GlosSITarget/Settings.h +++ b/GlosSITarget/Settings.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/SteamOverlayDetector.cpp b/GlosSITarget/SteamOverlayDetector.cpp index 76d2b9a..0b25c61 100644 --- a/GlosSITarget/SteamOverlayDetector.cpp +++ b/GlosSITarget/SteamOverlayDetector.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/SteamOverlayDetector.h b/GlosSITarget/SteamOverlayDetector.h index 34dbba0..633eee7 100644 --- a/GlosSITarget/SteamOverlayDetector.h +++ b/GlosSITarget/SteamOverlayDetector.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/SteamTarget.cpp b/GlosSITarget/SteamTarget.cpp index 5916152..473232f 100644 --- a/GlosSITarget/SteamTarget.cpp +++ b/GlosSITarget/SteamTarget.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/SteamTarget.h b/GlosSITarget/SteamTarget.h index ff39ff1..735a547 100644 --- a/GlosSITarget/SteamTarget.h +++ b/GlosSITarget/SteamTarget.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/TargetWindow.cpp b/GlosSITarget/TargetWindow.cpp index ee01712..eaed382 100644 --- a/GlosSITarget/TargetWindow.cpp +++ b/GlosSITarget/TargetWindow.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/TargetWindow.h b/GlosSITarget/TargetWindow.h index 57d673e..1f05b65 100644 --- a/GlosSITarget/TargetWindow.h +++ b/GlosSITarget/TargetWindow.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/UnhookUtil.cpp b/GlosSITarget/UnhookUtil.cpp index 13a4c56..c37331d 100644 --- a/GlosSITarget/UnhookUtil.cpp +++ b/GlosSITarget/UnhookUtil.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/UnhookUtil.h b/GlosSITarget/UnhookUtil.h index 55a5cbc..f96a31b 100644 --- a/GlosSITarget/UnhookUtil.h +++ b/GlosSITarget/UnhookUtil.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/main.cpp b/GlosSITarget/main.cpp index 7c0a7d5..71e609f 100644 --- a/GlosSITarget/main.cpp +++ b/GlosSITarget/main.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/steam_sf_keymap.h b/GlosSITarget/steam_sf_keymap.h index d499cee..b007100 100644 --- a/GlosSITarget/steam_sf_keymap.h +++ b/GlosSITarget/steam_sf_keymap.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSITarget/util.h b/GlosSITarget/util.h index 3fd791a..1644f8b 100644 --- a/GlosSITarget/util.h +++ b/GlosSITarget/util.h @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/GlosSIWatchdog/dllmain.cpp b/GlosSIWatchdog/dllmain.cpp index c63ce7d..d154509 100644 --- a/GlosSIWatchdog/dllmain.cpp +++ b/GlosSIWatchdog/dllmain.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Readme.md b/Readme.md index 91c3b91..23f0162 100644 --- a/Readme.md +++ b/Readme.md @@ -67,7 +67,7 @@ For Building instructions refer to [BUILDING.md](./docs/BUILDING.md) ## License ```license -Copyright 2017-2022 Peter Repukat - FlatspotSoftware +Copyright 2017-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/UWPOverlayEnablerDLL/dllmain.cpp b/UWPOverlayEnablerDLL/dllmain.cpp index 21bd67a..497ff4a 100644 --- a/UWPOverlayEnablerDLL/dllmain.cpp +++ b/UWPOverlayEnablerDLL/dllmain.cpp @@ -1,5 +1,5 @@ /* -Copyright 2021-2022 Peter Repukat - FlatspotSoftware +Copyright 2021-2023 Peter Repukat - FlatspotSoftware Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 338f44745fb5b4f296646c7cd3f085c4e00747f7 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 8 Jan 2023 15:47:39 +0100 Subject: [PATCH 2/4] Clone submodules via https instead of ssh --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index d488b86..ae61cba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,13 +27,13 @@ url = https://github.com/nlohmann/json [submodule "deps/traypp"] path = deps/traypp - url = https://github.com/Soundux/traypp.git + url = https://github.com/Soundux/traypp [submodule "deps/fifo_map"] path = deps/fifo_map - url = git@github.com:nlohmann/fifo_map.git + url = https://github.com/nlohmann/fifo_map [submodule "deps/Shortcuts_VDF"] path = deps/Shortcuts_VDF - url = git@github.com:Alia5/Shortcuts_VDF.git + url = https://github.com/Alia5/Shortcuts_VDF [submodule "deps/cpp-httplib"] path = deps/cpp-httplib - url = git@github.com:yhirose/cpp-httplib.git + url = https://github.com/yhirose/cpp-httplib From f61971923db6d685cb7409d68b43389bda5d6fd8 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 8 Jan 2023 16:00:29 +0100 Subject: [PATCH 3/4] Uncamelcasify EGS game names --- GlosSIConfig/qml/EGSSelectDialog.qml | 2 +- GlosSIConfig/qml/ShortcutProps.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GlosSIConfig/qml/EGSSelectDialog.qml b/GlosSIConfig/qml/EGSSelectDialog.qml index bc0e2a1..0f06d17 100644 --- a/GlosSIConfig/qml/EGSSelectDialog.qml +++ b/GlosSIConfig/qml/EGSSelectDialog.qml @@ -189,7 +189,7 @@ Dialog { anchors.verticalCenter: parent.verticalCenter spacing: 2 Label { - text: modelData.InstallLocation.split('/').pop().split('\\').pop() + text: modelData.InstallLocation.split('/').pop().split('\\').pop().replace(/([a-z])([A-Z])/g, '$1 $2') font.pixelSize: 18 font.bold: true } diff --git a/GlosSIConfig/qml/ShortcutProps.qml b/GlosSIConfig/qml/ShortcutProps.qml index aea927d..f5397ab 100644 --- a/GlosSIConfig/qml/ShortcutProps.qml +++ b/GlosSIConfig/qml/ShortcutProps.qml @@ -374,7 +374,7 @@ Item { id: egsSelectDialog onConfirmed: function(modelData) { if (nameInput.text == "") { - nameInput.text = modelData.InstallLocation.split('/').pop().split('\\').pop() + nameInput.text = modelData.InstallLocation.split('/').pop().split('\\').pop().replace(/([a-z])([A-Z])/g, '$1 $2') } pathInput.text = "com.epicgames.launcher://apps/" + modelData.NamespaceId From 244528669460d180b6fff3e0979bff8bb91ff7b9 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 8 Jan 2023 16:25:46 +0100 Subject: [PATCH 4/4] Fix shortcut names not editable --- GlosSIConfig/Resource.rc | 44 +++++++++++++++++++++++++++--- GlosSIConfig/UIModel.cpp | 22 ++++++++++----- GlosSIConfig/qml/ShortcutProps.qml | 6 +++- GlosSIConfig/qml/main.qml | 12 ++++---- 4 files changed, 66 insertions(+), 18 deletions(-) diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc index cfa4115..657b696 100644 --- a/GlosSIConfig/Resource.rc +++ b/GlosSIConfig/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,1,101000823500 - PRODUCTVERSION 0,1,1,101000823500 + FILEVERSION 0,1,1,204000619719 + PRODUCTVERSION 0,1,1,204000619719 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.1-1-ga8235ca" + VALUE "FileVersion", "0.1.1.2-4-gf619719" VALUE "InternalName", "GlosSIConfig" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSIConfig.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.1.1.1-1-ga8235ca" + VALUE "ProductVersion", "0.1.1.2-4-gf619719" END END BLOCK "VarFileInfo" @@ -1400,6 +1400,42 @@ IDI_ICON1 ICON "..\GlosSI_Icon.ico" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp index a10d4c2..005db9b 100644 --- a/GlosSIConfig/UIModel.cpp +++ b/GlosSIConfig/UIModel.cpp @@ -115,6 +115,8 @@ bool UIModel::updateTarget(int index, QVariant shortcut) const auto map = shortcut.toMap(); const auto json = QJsonObject::fromVariantMap(map); + const auto was_in_steam_ = isInSteam(shortcut); + auto oldSteamName = targets_[index].toMap()["name"].toString(); auto oldName = targets_[index].toMap()["name"].toString().replace(QRegularExpression("[\\\\/:*?\"<>|]"), "") + ".json"; @@ -132,15 +134,19 @@ bool UIModel::updateTarget(int index, QVariant shortcut) path /= config_dir_name_.toStdString(); path /= (map["name"].toString()).toStdString(); - if (removeFromSteam(oldSteamName, QString::fromStdWString(path.wstring()))) { - if (!addToSteam(shortcut, QString::fromStdWString(path.wstring()))) { - qDebug() << "Couldn't add shortcut \"" << (map["name"].toString()) << "\" to Steam when updating"; - return false; + if (was_in_steam_) { + if (removeFromSteam(oldSteamName, QString::fromStdWString(path.wstring()))) { + if (!addToSteam(shortcut, QString::fromStdWString(path.wstring()))) { + qDebug() << "Couldn't add shortcut \"" << (map["name"].toString()) << "\" to Steam when updating"; + return false; + } + return true; } + qDebug() << "Couldn't remove shortcut \"" << oldName << "\" from Steam when updating"; + return false; + } else { return true; } - qDebug() << "Couldn't remove shortcut \"" << oldName << "\" from Steam when updating"; - return false; } void UIModel::deleteTarget(int index) @@ -159,7 +165,9 @@ bool UIModel::isInSteam(QVariant shortcut) const { const auto map = shortcut.toMap(); for (auto& steam_shortcut : shortcuts_vdf_) { - if (map["name"].toString() == QString::fromStdString(steam_shortcut.appname)) { + if ( + map["name"].toString() == QString::fromStdString(steam_shortcut.appname) || + map["oldName"].toString() == QString::fromStdString(steam_shortcut.appname)) { if (QString::fromStdString(steam_shortcut.exe).toLower().contains("glossitarget.exe")) { return true; } diff --git a/GlosSIConfig/qml/ShortcutProps.qml b/GlosSIConfig/qml/ShortcutProps.qml index f5397ab..08a0737 100644 --- a/GlosSIConfig/qml/ShortcutProps.qml +++ b/GlosSIConfig/qml/ShortcutProps.qml @@ -136,7 +136,11 @@ Item { id: nameInput placeholderText: qsTr("...") text: shortcutInfo.name - onTextChanged: shortcutInfo.name = text + onTextChanged: function() { + shortcutInfo.oldName = shortcutInfo.oldName || shortcutInfo.name + shortcutInfo.name = nameInput.text + shortcutInfo = shortcutInfo + } validator: RegularExpressionValidator { regularExpression: /([0-z]|\s|.)+/gm } } } diff --git a/GlosSIConfig/qml/main.qml b/GlosSIConfig/qml/main.qml index 80b82d6..c9fa9aa 100644 --- a/GlosSIConfig/qml/main.qml +++ b/GlosSIConfig/qml/main.qml @@ -492,12 +492,12 @@ Window { if (windowContent.editedIndex < 0) { uiModel.addTarget(shortcut) } else { - if (uiModel.isInSteam(shortcut)) { - if (uiModel.updateTarget(windowContent.editedIndex, shortcut)) { - if (steamShortcutsChanged == false) { - steamChangedDialog.open(); - } - } else { + if (uiModel.updateTarget(windowContent.editedIndex, shortcut)) { + if (uiModel.isInSteam(shortcut) && steamShortcutsChanged == false) { + steamChangedDialog.open(); + } + } else { + if (uiModel.isInSteam(shortcut)) { manualInfo = uiModel.manualProps(shortcut); writeErrorDialog.open(); }