Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Almost working game selection

Browse Source 
This is almost working. I'm struggling with
the icons loaded from various icon files which
are coming in really small rather than the large
size they should be. The .Net Icon constructor
isn't making an Icon the size I requested, so I may
need to change something else.
This commit is contained in:
Terry MacDonald 2021-05-14 20:07:53 +12:00
parent b84eff07ad
commit 91a493a35d
3 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DisplayMagician/Program.cs
View File

@ -897,22 +897,6 @@ namespace DisplayMagician {
game.GameBitmap = bm;
}
// TODO replicate this failed Task handling in Actions
/*bool failedAction = false;
foreach (var loadGameAction in loadGamesActions)
{
if (loadGameAction. .Exception != null)
{
failedTask = true;
foreach (var ex in loadGameTask.Exception.InnerExceptions)
logger.Error(ex, $"Program/LoadGamesInBackground exception during loadGamesTasks");
}
}
if (failedTask)
return false;*/
return true;
}

9
DisplayMagician/ShortcutItem.cs
View File

@ -15,6 +15,7 @@ using System.Text.RegularExpressions;
using IWshRuntimeLibrary;
using AudioSwitcher.AudioApi.CoreAudio;
using AudioSwitcher.AudioApi;
using TsudaKageyu;
namespace DisplayMagician
{
@ -2050,11 +2051,13 @@ namespace DisplayMagician
if (fileNameAndPath.EndsWith(".ico"))
{
logger.Trace($"ShortcutItem/ToSmallBitmap: The file we want to get the image from is an icon file. Attempting to load the icon file from {fileNameAndPath}.");
Icon icoIcon = new Icon(fileNameAndPath, 128, 128);
Size iconSize = new Size(128, 128);
Icon myIcon = new Icon(fileNameAndPath, iconSize);
Icon iconToReturn = IconUtil.TryGetIcon(myIcon,iconSize,24,true,true);
logger.Trace($"ShortcutItem/ToSmallBitmap: Attempting to convert the icon file {fileNameAndPath} to a bitmap.");
bm = icoIcon.ToBitmap();
bm = iconToReturn.ToBitmap();
logger.Trace($"ShortcutItem/ToSmallBitmap: Emptying the memory area used but the icon to stop memory leaks.");
icoIcon.Dispose();
iconToReturn.Dispose();
}
else
{

43
DisplayMagician/UIForms/ShortcutForm.cs
View File

@ -43,7 +43,7 @@ namespace DisplayMagician.UIForms
private bool _setCaptureVolume = false;
private decimal _captureVolume = -1;
private ShortcutItem _shortcutToEdit = null;
List<Game> allGames = new List<Game>();
//List<Game> allGames = new List<Game>();
private bool _isUnsaved = true;
private bool _loadedShortcut = false;
private bool _autoName = true;
@ -968,16 +968,16 @@ namespace DisplayMagician.UIForms
// Populate a full list of games
// Start with the Steam Games
allGames = new List<Game>();
/*allGames = new List<Game>();
allGames.AddRange(SteamLibrary.GetLibrary().AllInstalledGames);
// Then add the Uplay Games
allGames.AddRange(UplayLibrary.GetLibrary().AllInstalledGames);
// Then add the Origin Games
allGames.AddRange(OriginLibrary.GetLibrary().AllInstalledGames);
allGames.AddRange(OriginLibrary.GetLibrary().AllInstalledGames);*/
// Load all the Games into the Games ListView
foreach (var game in allGames.OrderBy(game => game.Name))
foreach (var game in DisplayMagician.GameLibraries.GameLibrary.AllInstalledGamesInAllLibraries.OrderBy(game => game.Name))
{
// Get the bitmap out of the IconPath
// IconPath can be an ICO, or an EXE
@ -993,13 +993,14 @@ namespace DisplayMagician.UIForms
}
// Add the images to the images array
il_games.Images.Add(bm);
//ilv_games.Images.Add(bm);
// ADd the game to the game array
ilv_games.Items.Add(new ImageListViewItem
ilv_games.Items.Add(new ImageListViewItem()
{
Text = game.Name,
Tag = game
Tag = game,
FileName = game.IconPath
});
}
@ -1113,7 +1114,7 @@ namespace DisplayMagician.UIForms
// Set the launcher items if we have them
if (_shortcutToEdit.GameLibrary.Equals(SupportedGameLibraryType.Unknown))
{
if (allGames.Count <= 0)
if (DisplayMagician.GameLibraries.GameLibrary.AllInstalledGamesInAllLibraries.Count <= 0)
{
// Fill in the game library information to highliught there isn't one detected.
txt_game_launcher.Text = "None detected";
@ -1372,28 +1373,6 @@ namespace DisplayMagician.UIForms
}
}
private void btn_choose_game_Click(object sender, EventArgs e)
{
if (ilv_games.SelectedItems.Count > 0)
{
txt_game_name.Text = ilv_games.SelectedItems[0].Text;
foreach (Game game in allGames)
{
if (game.Name == txt_game_name.Text)
{
if (_loadedShortcut)
_isUnsaved = true;
txt_game_launcher.Text = game.GameLibrary.ToString();
_gameId = game.Id;
}
}
}
SuggestShortcutName();
EnableSaveButtonIfValid();
}
private void ilv_saved_profiles_ItemClick(object sender, ItemClickEventArgs e)
{
foreach (ProfileItem savedProfile in ProfileRepository.AllProfiles)
@ -1481,7 +1460,7 @@ namespace DisplayMagician.UIForms
{
newItem = new ImageListViewItem(loadedGame, loadedGame.Name);
//ilv_saved_profiles.Items.Add(newItem);
ilv_saved_profiles.Items.Add(newItem, _gameAdaptor);
ilv_games.Items.Add(newItem, _gameAdaptor);
}
}
@ -2260,7 +2239,7 @@ namespace DisplayMagician.UIForms
if (ilv_games.SelectedItems.Count > 0)
{
txt_game_name.Text = e.Item.Text;
foreach (Game game in allGames)
foreach (Game game in DisplayMagician.GameLibraries.GameLibrary.AllInstalledGamesInAllLibraries)
{
if (game.Name == txt_game_name.Text)
{