1.4.0

GameLauncher_Console/DataConversionTool/DataConversionTool.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows10.0.17763.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <StartupObject>DataConversionTool.Program</StartupObject>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.326103">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

GameLauncher_Console/GameLauncher_Console.sln

@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameLauncher_Console", "GameLauncher_Console\GameLauncher_Console.csproj", "{4EBCEF5B-1A8A-42FB-81DB-446A14ED15D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D149C871-27ED-4307-BE1F-E5FB55C2BB45} = {D149C871-27ED-4307-BE1F-E5FB55C2BB45}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{FBEDF6E1-33EC-4B48-B44F-0CC2CE8585BF}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -24,12 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PureOrigin.API", "PureOrigin.API", "{EF2BF649-24D0-4307-9D49-4FA96259C214}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureOrigin.API", "..\PureOrigin.API\Src\PureOrigin.API\PureOrigin.API.csproj", "{D149C871-27ED-4307-BE1F-E5FB55C2BB45}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureOrigin.API.Tests", "..\PureOrigin.API\Src\PureOrigin.API.Tests\PureOrigin.API.Tests.csproj", "{AFD1FA2C-F2BF-43D3-91FB-225BF1021543}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -48,22 +39,10 @@ Global
 		{92A97D68-92B7-4348-9275-BC3E9D0E8941}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92A97D68-92B7-4348-9275-BC3E9D0E8941}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92A97D68-92B7-4348-9275-BC3E9D0E8941}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D149C871-27ED-4307-BE1F-E5FB55C2BB45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D149C871-27ED-4307-BE1F-E5FB55C2BB45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D149C871-27ED-4307-BE1F-E5FB55C2BB45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D149C871-27ED-4307-BE1F-E5FB55C2BB45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFD1FA2C-F2BF-43D3-91FB-225BF1021543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFD1FA2C-F2BF-43D3-91FB-225BF1021543}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFD1FA2C-F2BF-43D3-91FB-225BF1021543}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFD1FA2C-F2BF-43D3-91FB-225BF1021543}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D149C871-27ED-4307-BE1F-E5FB55C2BB45} = {EF2BF649-24D0-4307-9D49-4FA96259C214}
-		{AFD1FA2C-F2BF-43D3-91FB-225BF1021543} = {EF2BF649-24D0-4307-9D49-4FA96259C214}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {90858D12-1823-4AAB-91A4-04758C95F911}
 	EndGlobalSection

GameLauncher_Console/GameLauncher_Console/App.config

@@ -107,9 +107,18 @@
       <setting name="flag_do_not_show_settings_in_platform_list" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="flag_do_not_scan_dlc" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="flag_do_not_scan_nongame_software" serializeAs="String">
+        <value>True</value>
+      </setting>
       <setting name="flag_do_not_scan_not_installed_games" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="flag_do_not_scan_unowned_games" serializeAs="String">
+        <value>True</value>
+      </setting>
       <setting name="flag_only_scan_custom_games" serializeAs="String">
         <value>False</value>
       </setting>
@@ -145,7 +154,10 @@
       </setting>
       <setting name="flag_use_humble_launcher" serializeAs="String">
         <value>True</value>
-	  </setting>
+      </setting>
+      <setting name="flag_use_itch_launcher" serializeAs="String">
+        <value>True</value>
+      </setting>
       <setting name="flag_use_legendary_for_epic" serializeAs="String">
         <value>False</value>
       </setting>
@@ -176,6 +188,9 @@
       <setting name="num_steam_id" serializeAs="String">
         <value>0</value>
       </setting>
+      <setting name="text_steam_apikey" serializeAs="String">
+        <value></value>
+      </setting>
       <setting name="text_oculus_username" serializeAs="String">
         <value></value>
       </setting>

GameLauncher_Console/GameLauncher_Console/Config.cs

@@ -4,6 +4,8 @@
 using System.Configuration;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Versioning;
+
 //using System.Runtime.InteropServices;
 //using System.Text;
 using System.Windows.Forms;
@@ -110,7 +112,10 @@ public struct Hotkeys
 			public ConsoleKey tagsCK2;
 			public ConsoleKey downloadCK1;
 			public ConsoleKey downloadCK2;
+			public ConsoleKey allimgCK1;
+			public ConsoleKey allimgCK2;
 		}
+
 		public struct Colours
         {
 			public ConsoleColor bgCC;
@@ -154,7 +159,10 @@ public struct Colours
 		public const string CFG_USELITE		= "flag_colour_light_mode_is_default";
 		public const string CFG_USEALL		= "flag_always_show_all_games";
 		public const string CFG_NOCFG		= "flag_do_not_show_settings_in_platform_list";			// TODO
-		public const string CFG_INSTONLY	= "flag_do_not_scan_not_installed_games";				// TODO
+		public const string CFG_BASEONLY	= "flag_do_not_scan_dlc";
+		public const string CFG_GAMEONLY	= "flag_do_not_scan_nongame_software";
+		public const string CFG_INSTONLY	= "flag_do_not_scan_not_installed_games";
+		public const string CFG_OWNONLY		= "flag_do_not_scan_unowned_games";
 		public const string CFG_USECUST		= "flag_only_scan_custom_games";
 		public const string CFG_USETEXT		= "flag_text_use_custom_text_values";
 		public const string CFG_IMGBORD		= "flag_image_draw_border_characters";
@@ -167,6 +175,7 @@ public struct Colours
 		public const string CFG_USEEGL		= "flag_use_epic_launcher";
 		public const string CFG_USEGAL		= "flag_use_gog_galaxy_launcher";
 		public const string CFG_USEHUM		= "flag_use_humble_launcher";
+		public const string CFG_USEITC		= "flag_use_itch_launcher";
 		public const string CFG_USELEG		= "flag_use_legendary_for_epic";
 #if DEBUG
 		public const string CFG_UWPLIST		= "list_show_uwp_titles";
@@ -180,6 +189,7 @@ public struct Colours
 		public const string CFG_IMGPOS		= "num_selected_image_y_location_percent";
 		public const string CFG_COLSIZE		= "num_grid_text_min_column_characters";
 		public const string CFG_STEAMID		= "num_steam_id";
+		public const string CFG_STEAMAPI	= "text_steam_apikey";
 		public const string CFG_OCULUSID	= "text_oculus_username";
 		public const string CFG_ORIGINID	= "text_ea_email";
 		public const string CFG_ORIGINPW	= "base64_ea_password";
@@ -273,6 +283,8 @@ public struct Colours
 		public const string CFG_KEYRATEDN2	= "key_rating_down_2";
 		public const string CFG_KEYDLIMG1	= "key_download_image_1";
 		public const string CFG_KEYDLIMG2	= "key_download_image_2";
+		public const string CFG_KEYDLALL1	= "key_download_all_images_1";
+		public const string CFG_KEYDLALL2	= "key_download_all_images_2";
 		public const string CFG_PATHLEG		= "path_legendary_exe";
 		public const string CFG_TXTMAINT	= "text_main_menu_title";
 		public const string CFG_TXTCFGT		= "text_settings_title";
@@ -555,7 +567,8 @@ static string GetCharsFromKeys(Keys keys, bool shift, bool altGr)
 		/// <returns>Value of the translated key or original key if not found</returns>
 		public static string KeyToUSFormat(string strCKeyName)
 		{
-			if (InputLanguage.CurrentInputLanguage.LayoutName == "US")
+			if (OperatingSystem.IsWindowsVersionAtLeast(6, 1) &&
+				InputLanguage.CurrentInputLanguage.LayoutName == "US")
 			{
 				switch (strCKeyName)
 				{
@@ -595,8 +608,12 @@ public static string KeyToUSFormat(string strCKeyName)
 		/// <returns>Value of the translated key or original key if not found</returns>
 		public static string ShortenKeyName(string strCKeyName)
 		{
-			if (InputLanguage.CurrentInputLanguage.LayoutName == "US")
+			if (OperatingSystem.IsWindowsVersionAtLeast(6, 1) &&
+				InputLanguage.CurrentInputLanguage.LayoutName == "US")
+			{
 				strCKeyName = KeyToUSFormat(strCKeyName);
+			}
+
 			switch (strCKeyName)
 			{
 				case "Backspace":

GameLauncher_Console/GameLauncher_Console/ConsoleHelper.cs

@@ -164,6 +164,7 @@ public CConsoleHelper(int nColumnCount, int nSpacing, int nPaging) //, ConsoleSt
 		/// </summary>
 		public enum DockSelection
 		{
+			cSel_downloadAll = -26,
 			cSel_Tags = -25,
 			cSel_raiseRating = -24,
 			cSel_lowerRating = -23,
@@ -269,14 +270,14 @@ public int DisplayCfg(CConfig.ConfigVolatile cfgv, CConfig.Hotkeys keys, CConfig
 			{
 				if (m_ConsoleState == ConsoleState.cState_Insert)
 				{
-					code = HandleInsertMenu(nStartY, nStopY, cfgv, cols, true, false, ref game, options.ToArray());
+					code = HandleInsertMenu(nStartY, nStopY, cfgv, cols, setup: true, browse: false, ref game, options.ToArray());
 					if (code > -1)
 						CDock.m_nCurrentSelection = code;
 					CLogger.LogDebug("HandleInsertMenu:{0},{1}", code, CDock.m_nCurrentSelection);
 				}
 				else //if (m_ConsoleState == ConsoleState.cState_Navigate)
 				{
-					code = HandleNavigationMenu(nStartY, nStopY, cfgv, keys, cols, true, false, ref game, options.ToArray());
+					code = HandleNavigationMenu(nStartY, nStopY, cfgv, keys, cols, setup: true, browse: false, ref game, options.ToArray());
 					CLogger.LogDebug("HandleNavigationMenu:{0},{1}", code, CDock.m_nCurrentSelection);
 					if (options.Count < 2)
 						CDock.m_nCurrentSelection = -1;
@@ -412,14 +413,14 @@ public int DisplayFS(CConfig.ConfigVolatile cfgv, CConfig.Hotkeys keys, CConfig.
 			{
 				if (m_ConsoleState == ConsoleState.cState_Insert)
 				{
-					code = HandleInsertMenu(nStartY, nStopY, cfgv, cols, false, true, ref game, options.ToArray());
+					code = HandleInsertMenu(nStartY, nStopY, cfgv, cols, setup: false, browse: true, ref game, options.ToArray());
 					if (code > -1)
 						CDock.m_nCurrentSelection = code;
 					CLogger.LogDebug("HandleInsertMenu:{0},{1}", code, CDock.m_nCurrentSelection);
 				}
 				else //if (m_ConsoleState == ConsoleState.cState_Navigate)
 				{
-					code = HandleNavigationMenu(nStartY, nStopY, cfgv, keys, cols, false, true, ref game, options.ToArray());
+					code = HandleNavigationMenu(nStartY, nStopY, cfgv, keys, cols, setup: false, browse: true, ref game, options.ToArray());
 					CLogger.LogDebug("HandleNavigationMenu:{0},{1}", code, CDock.m_nCurrentSelection);
 					if (options.Count < 2)
 						CDock.m_nCurrentSelection = -1;
@@ -501,21 +502,21 @@ public int DisplayMenu(CConfig.ConfigVolatile cfgv, CConfig.Hotkeys keys, CConfi
 				Console.Clear();
 
 			DrawMenuTitle(cols);
-			if (IsSelectionValid(CDock.m_nSelectedPlatform, options.Length)) DrawInstruct(cols, true);
-			else DrawInstruct(cols, false);
+			if (IsSelectionValid(CDock.m_nSelectedPlatform, options.Length)) DrawInstruct(cols, subMenu: true);
+			else DrawInstruct(cols, subMenu: false);
 			int nStartY = Console.CursorTop + CDock.INSTRUCT_CUSHION;
 			int nStopY = CDock.INPUT_BOTTOM_CUSHION + CDock.INPUT_ITEM_CUSHION;
 
 			do
 			{
 				if (m_ConsoleState == ConsoleState.cState_Insert)
 				{
-					code = HandleInsertMenu(nStartY, nStopY, cfgv, cols, false, false, ref game, options);
+					code = HandleInsertMenu(nStartY, nStopY, cfgv, cols, setup: false, browse: false, ref game, options);
 					CLogger.LogDebug("HandleInsertMenu:{0},{1}", code, CDock.m_nCurrentSelection);
 				}
 				else //if (m_ConsoleState == ConsoleState.cState_Navigate)
 				{
-					code = HandleNavigationMenu(nStartY, nStopY, cfgv, keys, cols, false, false, ref game, options);
+					code = HandleNavigationMenu(nStartY, nStopY, cfgv, keys, cols, setup: false, browse: false, ref game, options);
 					CLogger.LogDebug("HandleNavigationMenu:{0},{1}", code, CDock.m_nCurrentSelection);
 				}
 				if (code == (int)DockSelection.cSel_Exit ||
@@ -666,10 +667,10 @@ public int HandleNavigationMenu(int nStartY, int nStopY, CConfig.ConfigVolatile
 							{
 								CGame selectedGame = GetPlatformGame((GamePlatform)CDock.m_nSelectedPlatform, CDock.m_nCurrentSelection);
 								if (selectedGame != null)
-									CConsoleImage.ShowImage(CDock.m_nCurrentSelection, selectedGame.Title, selectedGame.Icon, false, CDock.sizeImage, CDock.locImage, imageColour);
+									CConsoleImage.ShowImage(CDock.m_nCurrentSelection, selectedGame.Title, selectedGame.Icon, bPlatform: false, CDock.sizeImage, CDock.locImage, imageColour);
 							}
 							else
-								CConsoleImage.ShowImage(CDock.m_nCurrentSelection, options[CDock.m_nCurrentSelection], options[CDock.m_nCurrentSelection], true, CDock.sizeImage, CDock.locImage, imageColour);
+								CConsoleImage.ShowImage(CDock.m_nCurrentSelection, options[CDock.m_nCurrentSelection], options[CDock.m_nCurrentSelection], bPlatform: true, CDock.sizeImage, CDock.locImage, imageColour);
 						}
 					});
 				}
@@ -841,6 +842,9 @@ public int HandleNavigationMenu(int nStartY, int nStopY, CConfig.ConfigVolatile
 				else if (key == keys.scanCK1 || key == keys.scanCK2)
 					return (int)DockSelection.cSel_Rescan; // Rescan the registry and the 'CustomGames' folder for new games
 
+				else if (key == keys.allimgCK1 || key == keys.allimgCK2)
+					return (int)DockSelection.cSel_downloadAll; // Rescan the registry and the 'CustomGames' folder for new games
+
 			} while (key != keys.selectCK1 && key != keys.selectCK2);
 
 			return (int)DockSelection.cSel_Default;
@@ -963,6 +967,9 @@ public int HandleInsertMenu(int nStartY, int nStopY, CConfig.ConfigVolatile cfgv
 				else if (strInput.Equals("/icon", CDock.IGNORE_CASE))
 					return (int)DockSelection.cSel_Image;
 
+				else if (strInput.Equals("/allicon", CDock.IGNORE_CASE))
+					return (int)DockSelection.cSel_downloadAll;
+
 				else if (strInput.Equals("/sort", CDock.IGNORE_CASE))
 					return (int)DockSelection.cSel_Sort;
 
@@ -1060,7 +1067,7 @@ public void DrawInfoBar(string selection, CConfig.Colours cols)
 				}
 				else
 				{
-					selection = selection.Substring(0, selection.IndexOf(": "));
+					selection = selection[..selection.IndexOf(": ")];
 					leftSide = string.Format("{0} {1} {0}", CDock.SEPARATOR_SYMBOL, selection);
 				}
 				Console.WriteLine(leftSide + rightSide.PadLeft(Console.WindowWidth - leftSide.Length - 1));
@@ -1082,10 +1089,10 @@ public void DrawIcon(int nY, int nItem, string strItem, ConsoleColor? iconColour
 				if (CDock.m_nSelectedPlatform > -1)
 				{
 					CGame selectedGame = GetPlatformGame((GamePlatform)CDock.m_nSelectedPlatform, nItem);
-					CConsoleImage.ShowImage(CDock.m_nCurrentSelection, selectedGame.Title, selectedGame.Icon, false, CDock.sizeIcon, iconPosition, iconColour);
+					CConsoleImage.ShowImage(CDock.m_nCurrentSelection, selectedGame.Title, selectedGame.Icon, bPlatform: false, CDock.sizeIcon, iconPosition, iconColour);
 				}
 				else
-					CConsoleImage.ShowImage(CDock.m_nCurrentSelection, strItem, strItem, true, CDock.sizeIcon, iconPosition, iconColour);
+					CConsoleImage.ShowImage(CDock.m_nCurrentSelection, strItem, strItem, bPlatform: true, CDock.sizeIcon, iconPosition, iconColour);
 			});
 		}
 
@@ -1129,7 +1136,7 @@ public void DrawGridMenu(int nCursorPosition, int nPage, int nStartY, int nStopY
 					else
 						CDock.SetFgColour(cols.entryCC, cols.entryLtCC);
 				}
-				Console.WriteLine(itemList[i].Substring(0, Math.Min(itemList[i].Length, m_nSpacingPerLine - CDock.COLUMN_CUSHION)));
+				Console.WriteLine(itemList[i][..Math.Min(itemList[i].Length, m_nSpacingPerLine - CDock.COLUMN_CUSHION)]);
 				CDock.SetBgColour(cols.bgCC, cols.bgLtCC);
 				CDock.SetFgColour(cols.entryCC, cols.entryLtCC);
 			}
@@ -1351,7 +1358,7 @@ public void UpdateMenu(int nPreviousSelection, int nPage, int nListStartX, int n
 			if (m_MenuType == MenuType.cType_List)
 				Console.Write(strCurrentOption);
 			else if (m_ConsoleState == ConsoleState.cState_Navigate)  // if (m_MenuType == MenuType.cType_Grid &&
-				Console.Write(strCurrentOption.Substring(0, Math.Min(strCurrentOption.Length, m_nSpacingPerLine - CDock.COLUMN_CUSHION)));
+				Console.Write(strCurrentOption[..Math.Min(strCurrentOption.Length, m_nSpacingPerLine - CDock.COLUMN_CUSHION)]);
 			if (!(bool)CConfig.GetConfigBool(CConfig.CFG_NOPAGE) && !(m_MenuType == MenuType.cType_List && (ushort)CConfig.GetConfigNum(CConfig.CFG_ICONSIZE) > 0))
 				DrawInfoBar(strCurrentOption, cols);
 
@@ -1393,7 +1400,7 @@ public void UpdateMenu(int nPreviousSelection, int nPage, int nListStartX, int n
 					}
 				}
 				else
-					Console.Write(strPreviousOption.Substring(0, Math.Min(strPreviousOption.Length, m_nSpacingPerLine - CDock.COLUMN_CUSHION)));
+					Console.Write(strPreviousOption[..Math.Min(strPreviousOption.Length, m_nSpacingPerLine - CDock.COLUMN_CUSHION)]);
 			}
 			catch (Exception e)
 			{
@@ -1440,7 +1447,7 @@ public static void MakeShortcut(string title, string path, string icon, string l
 				// save it
 				IPersistFile file = (IPersistFile)link;
 				if (Directory.Exists(location))
-					file.Save(Path.Combine(location, title + ".LNK"), false);
+					file.Save(Path.Combine(location, title + ".LNK"), fRemember: false);
 			}
             catch (Exception e)
 			{