Merge branch 'develop'

Alia5 · Sep 5, 2022 · 8f53468 · 8f53468
2 parents ee8157e + f631321
commit 8f53468
Show file tree

Hide file tree

Showing 37 changed files with 561 additions and 365 deletions.
diff --git a/GlosSIConfig/GetAUMIDs.ps1 b/GlosSIConfig/GetAUMIDs.ps1
@@ -21,7 +21,7 @@ foreach ($app in $installedapps) {
                 }
 
                 #filter more apps with improper naming patterns; games generally have the appropriate field in their manifests filled out.
-                if ($name -like "MicrosoftWindows.*" -or $name -like "Microsoft.*" -or $name -like "Windows.*" -or $name -like "Windows Web*") { break; }
+                if ($name -like "MicrosoftWindows.*"  -or $name -like "Windows.*" -or $name -like "Windows Web*") { break; }
 
                 $installDir = $app.InstallLocation;
                 #filter out system apps and apps installed by Microsoft as part of Windows

diff --git a/GlosSIConfig/GlosSIConfig.vcxproj b/GlosSIConfig/GlosSIConfig.vcxproj
@@ -34,12 +34,12 @@
     <QtModules>quick qml</QtModules>
     <QtBuildConfig>debug</QtBuildConfig>
     <QtQMLDebugEnable>true</QtQMLDebugEnable>
-    <QtInstall>6.2.4_msvc2019_64</QtInstall>
+    <QtInstall>6.3.1_msvc2019_64</QtInstall>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
     <QtModules>quick qml</QtModules>
     <QtBuildConfig>release</QtBuildConfig>
-    <QtInstall>6.2.4_msvc2019_64</QtInstall>
+    <QtInstall>6.3.1_msvc2019_64</QtInstall>
   </PropertyGroup>
   <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
     <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
@@ -87,7 +87,7 @@
     <ClCompile>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/Zc:__cplusplus  /Zc:zwoPhase-  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus  /Zc:zwoPhase-  /permissive- %(AdditionalOptions)</AdditionalOptions>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\deps\WinReg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -153,7 +153,6 @@
   <ItemGroup>
     <ClInclude Include="ExeImageProvider.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="resource1.h" />
     <ClInclude Include="UWPFetch.h" />
     <ClInclude Include="VDFParser.h" />
     <ClInclude Include="WinEventFilter.h" />
@@ -165,7 +164,7 @@
     <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="..\GloSC_Icon.ico" />
+    <Image Include="$(SolutionDir)\GloSC_Icon.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">

diff --git a/GlosSIConfig/GlosSIConfig.vcxproj.filters b/GlosSIConfig/GlosSIConfig.vcxproj.filters
@@ -84,9 +84,6 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ExeImageProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -102,8 +99,8 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="..\GloSC_Icon.ico">
-      <Filter>Resource Files</Filter>
+    <Image Include="$(SolutionDir)\GloSC_Icon.ico">
+        <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
 </Project>
diff --git a/GlosSIConfig/RCa37628 b/GlosSIConfig/RCa37628
diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource1.h"
+#include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -27,12 +27,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource1.h\0"
+    "resource.h\0"
 END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""winres.h""\r\n"
+    "#include winres.h\r\n"
     "\0"
 END
 
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,7,004000070037
- PRODUCTVERSION 0,0,7,004000070037
+ 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.0-4-gcf7ad37"
+            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.0-4-gcf7ad37"
+            VALUE "ProductName", "GlosSI"
+            VALUE "ProductVersion", "0.0.7.1-21-g31ee876"
         END
     END
     BLOCK "VarFileInfo"
@@ -91,7 +91,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON                    "D:\\Alia5\\Documents\\Visual_Studio_Projects\\GlosSI\\GloSC_Icon.ico"
+IDI_ICON1               ICON                    "..\GloSC_Icon.ico"
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
@@ -124,3 +124,207 @@ IDI_ICON1               ICON                    "D:\\Alia5\\Documents\\Visual_St
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp
@@ -39,7 +39,7 @@ UIModel::UIModel() : QObject(nullptr)
         std::filesystem::create_directories(path);
 
     config_path_ = path;
-    config_dir_name_ = (path /= "Targets").string().data();
+    config_dir_name_ = QString::fromStdWString((path /= "Targets").wstring().data());
 
     if (!std::filesystem::exists(path))
         std::filesystem::create_directories(path);
@@ -58,7 +58,7 @@ void UIModel::readConfigs()
 
     std::for_each(entries.begin(), entries.end(), [this](const auto& name) {
         auto path = config_path_;
-        path /= config_dir_name_.toStdString();
+        path /= config_dir_name_.toStdWString();
         path /= name.toStdWString();
         QFile file(path);
         if (!file.open(QIODevice::Text | QIODevice::ReadOnly)) {
@@ -84,7 +84,7 @@ void UIModel::readConfigs()
         json["maxFps"] = filejson["window"]["maxFps"];
         json["scale"] = filejson["window"]["scale"];
         json["disableOverlay"] = filejson["window"]["disableOverlay"];
-        json["maxControllers"] = filejson["controller"]["allowDesktopConfig"];
+        json["maxControllers"] = filejson["controller"]["maxControllers"];
         json["allowDesktopConfig"] = filejson["controller"]["allowDesktopConfig"];
         json["emulateDS4"] = filejson["controller"]["emulateDS4"];