Merge pull request #179 from Alia5/develop

Develop
Alia5 · Sep 23, 2022 · e8b2ab0 · e8b2ab0
2 parents f7b5e30 + abeca3e
commit e8b2ab0
Show file tree

Hide file tree

Showing 30 changed files with 1,912 additions and 450 deletions.
diff --git a/GlosSIConfig/.clang-format b/GlosSIConfig/.clang-format
@@ -1,4 +1,5 @@
 UseTab: false
+BasedOnStyle: LLVM
 IndentWidth: 4
 BreakBeforeBraces: "Stroustrup"
 AllowShortIfStatementsOnASingleLine: false

diff --git a/GlosSIConfig/GlosSIConfig.vcxproj b/GlosSIConfig/GlosSIConfig.vcxproj
@@ -137,13 +137,16 @@
     <ClCompile Include="UIModel.cpp" />
     <None Include=".clang-format" />
     <None Include="GetAUMIDs.ps1" />
+    <None Include="qml\CollapsiblePane.qml" />
+    <None Include="qml\SteamInputXboxDisabledDialog.qml" />
     <None Include="qml\AddSelectTypeDialog.qml" />
     <None Include="qml\FluentTextInput.qml" />
     <None Include="qml\InfoDialog.qml" />
     <None Include="qml\RPane.qml" />
     <None Include="qml\ShortcutCards.qml" />
     <None Include="qml\ShortcutProps.qml" />
     <None Include="qml\UWPSelectDialog.qml" />
+    <None Include="qml\SteamNotFoundDialog.qml" />
     <QtRcc Include="qml.qrc" />
     <None Include="qml\main.qml" />
   </ItemGroup>

diff --git a/GlosSIConfig/GlosSIConfig.vcxproj.filters b/GlosSIConfig/GlosSIConfig.vcxproj.filters
@@ -65,6 +65,15 @@
     </None>
     <None Include=".clang-format" />
     <None Include="GetAUMIDs.ps1" />
+    <None Include="qml\SteamNotFoundDialog.qml">
+      <Filter>qml</Filter>
+    </None>
+    <None Include="qml\SteamInputXboxDisabledDialog.qml">
+      <Filter>qml</Filter>
+    </None>
+    <None Include="qml\CollapsiblePane.qml">
+      <Filter>qml</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="UIModel.h">