Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Alia5 committed Oct 21, 2022
2 parents f6d959e + 5528dfb commit 78a9bbd
Show file tree
Hide file tree
Showing 42 changed files with 1,918 additions and 398 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -370,3 +370,5 @@ MigrationBackup/
# Fody - auto-generated XML schema
FodyWeavers.xsd
.visuallint
GlosSIConfig/steamgrid_api_keys.h
steamgrid.zip
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@
[submodule "deps/Shortcuts_VDF"]
path = deps/Shortcuts_VDF
url = [email protected]:Alia5/Shortcuts_VDF.git
[submodule "deps/cpp-httplib"]
path = deps/cpp-httplib
url = [email protected]:yhirose/cpp-httplib.git
3 changes: 3 additions & 0 deletions GlosSIConfig/GlosSIConfig.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@
<None Include="GetAUMIDs.ps1" />
<None Include="qml\AdvancedTargetSettings.qml" />
<None Include="qml\CollapsiblePane.qml" />
<None Include="qml\EGSSelectDialog.qml" />
<None Include="qml\GlobalConf.qml" />
<None Include="qml\SteamGridDialog.qml" />
<None Include="qml\SteamInputXboxDisabledDialog.qml" />
<None Include="qml\AddSelectTypeDialog.qml" />
<None Include="qml\FluentTextInput.qml" />
Expand All @@ -162,6 +164,7 @@
<ItemGroup>
<ClInclude Include="ExeImageProvider.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="steamgrid_api_keys.h" />
<ClInclude Include="UWPFetch.h" />
<ClInclude Include="WinEventFilter.h" />
</ItemGroup>
Expand Down
9 changes: 9 additions & 0 deletions GlosSIConfig/GlosSIConfig.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
<None Include="qml\GlobalConf.qml">
<Filter>qml</Filter>
</None>
<None Include="qml\EGSSelectDialog.qml">
<Filter>qml</Filter>
</None>
<None Include="qml\SteamGridDialog.qml">
<Filter>qml</Filter>
</None>
</ItemGroup>
<ItemGroup>
<QtMoc Include="UIModel.h">
Expand All @@ -99,6 +105,9 @@
<ClInclude Include="ExeImageProvider.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="steamgrid_api_keys.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Xml Include="manifest.xml">
Expand Down
168 changes: 164 additions & 4 deletions GlosSIConfig/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,9,1037005000102
PRODUCTVERSION 0,0,9,1037005000102
FILEVERSION 0,1,0,2045006300001
PRODUCTVERSION 0,1,0,2045006300001
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
VALUE "FileDescription", "GlosSI - Config"
VALUE "FileVersion", "0.0.9.1-37-g5ebe102"
VALUE "FileVersion", "0.1.0.2-45-g63fdab1"
VALUE "InternalName", "GlosSIConfig"
VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
VALUE "OriginalFilename", "GlosSIConfig.exe"
VALUE "ProductName", "GlosSI"
VALUE "ProductVersion", "0.0.9.1-37-g5ebe102"
VALUE "ProductVersion", "0.1.0.2-45-g63fdab1"
END
END
BLOCK "VarFileInfo"
Expand Down Expand Up @@ -1092,6 +1092,166 @@ IDI_ICON1 ICON "..\GlosSI_Icon.ico"






































































































































































Expand Down
Loading

0 comments on commit 78a9bbd

Please sign in to comment.