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] Fixing Shortcut Bitmap

Browse Source 
Partially completed bitmap work.
Need to implement generic bitmap
resizing to work with small and large
icons, and for different sizes for overlay
bitmap.
This commit is contained in:
temacdonald
2020-06-07 20:48:45 +12:00
parent f59490a1ff
commit e7ad4dc847
22 changed files with 670 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HeliosPlus.Reporting/Program.cs
View File

@ -208,7 +208,7 @@ namespace HeliosPlus.Reporting
try try
{ {
Dump(Profile.LoadAllProfiles(), "HeliosPlus.Shared.Profile.GetAllProfiles()", null, 99); Dump(ProfileItem.LoadAllProfiles(), "HeliosPlus.Shared.Profile.GetAllProfiles()", null, 99);
} }
catch (Exception e) catch (Exception e)
{ {

4
HeliosPlus.Shared/Helios.cs
View File

@ -45,7 +45,7 @@ namespace HeliosPlus.Shared
// ReSharper disable once TooManyArguments // ReSharper disable once TooManyArguments
public static void Open( public static void Open(
HeliosStartupAction action = HeliosStartupAction.None, HeliosStartupAction action = HeliosStartupAction.None,
Profile profile = null, ProfileItem profile = null,
string programAddress = null, string programAddress = null,
bool asAdmin = false) bool asAdmin = false)
{ {
@ -94,7 +94,7 @@ namespace HeliosPlus.Shared
public static void OpenSteamGame( public static void OpenSteamGame(
HeliosStartupAction action = HeliosStartupAction.None, HeliosStartupAction action = HeliosStartupAction.None,
Profile profile = null, ProfileItem profile = null,
uint steamAppId = 0) uint steamAppId = 0)
{ {
try try

2
HeliosPlus.Shared/HeliosPlus.Shared.csproj
View File

@ -46,7 +46,7 @@
<Compile Include="NVIDIA\SurroundHelper.cs" /> <Compile Include="NVIDIA\SurroundHelper.cs" />
<Compile Include="NVIDIA\SurroundTopologyDisplay.cs" /> <Compile Include="NVIDIA\SurroundTopologyDisplay.cs" />
<Compile Include="PixelShift.cs" /> <Compile Include="PixelShift.cs" />
<Compile Include="Profile.cs" /> <Compile Include="ProfileItem.cs" />
<Compile Include="NVIDIA\SurroundTopology.cs" /> <Compile Include="NVIDIA\SurroundTopology.cs" />
<Compile Include="HeliosStartupAction.cs" /> <Compile Include="HeliosStartupAction.cs" />
<Compile Include="ProfileIcon.cs" /> <Compile Include="ProfileIcon.cs" />

100
HeliosPlus.Shared/ProfileIcon.cs
View File

@ -4,6 +4,7 @@ using System.Drawing.Drawing2D;
using System.Drawing.IconLib; using System.Drawing.IconLib;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Linq; using System.Linq;
using System.Windows.Forms;
using HeliosPlus.Shared.Topology; using HeliosPlus.Shared.Topology;
namespace HeliosPlus.Shared namespace HeliosPlus.Shared
@ -11,9 +12,9 @@ namespace HeliosPlus.Shared
public class ProfileIcon public class ProfileIcon
{ {
private Profile _profile; private ProfileItem _profile;
public ProfileIcon(Profile profile, int paddingX = 100, int paddingY = 100) public ProfileIcon(ProfileItem profile, int paddingX = 100, int paddingY = 100)
{ {
_profile = profile; _profile = profile;
PaddingX = paddingX; PaddingX = paddingX;
@ -72,19 +73,19 @@ namespace HeliosPlus.Shared
public static Size NormalizeResolution(ProfileViewport path) public static Size NormalizeResolution(ProfileViewport path)
{ {
var bigest = Size.Empty; var biggest = Size.Empty;
foreach (var target in path.TargetDisplays) foreach (var target in path.TargetDisplays)
{ {
var res = NormalizeResolution(path.Resolution, target.Rotation); var res = NormalizeResolution(path.Resolution, target.Rotation);
if ((ulong) res.Width * (ulong) res.Height > (ulong) bigest.Width * (ulong) bigest.Height) if ((ulong) res.Width * (ulong) res.Height > (ulong) biggest.Width * (ulong) biggest.Height)
{ {
bigest = res; biggest = res;
} }
} }
return bigest.IsEmpty ? path.Resolution : bigest; return biggest.IsEmpty ? path.Resolution : biggest;
} }
@ -127,7 +128,7 @@ namespace HeliosPlus.Shared
return path; return path;
} }
public Bitmap ToBitmap(int width = 128, int height = 128, PixelFormat format = PixelFormat.Format32bppArgb) public Bitmap ToBitmap(int width = 256, int height = 256, PixelFormat format = PixelFormat.Format32bppArgb)
{ {
var bitmap = new Bitmap(width, height, format); var bitmap = new Bitmap(width, height, format);
bitmap.MakeTransparent(); bitmap.MakeTransparent();
@ -141,40 +142,73 @@ namespace HeliosPlus.Shared
return bitmap; return bitmap;
} }
public Bitmap ToBitmapOverlay(Bitmap bitmap, int width = 0, int height = 0, PixelFormat format = PixelFormat.Format32bppArgb) public Bitmap ToTightestBitmap(int width = 256, int height = 0, PixelFormat format = PixelFormat.Format32bppArgb)
{ {
var viewSize = CalculateViewSize(_profile.Viewports, true, PaddingX, PaddingY);
if (width == 0) int viewSizeRatio = Convert.ToInt32(viewSize.Width / viewSize.Height);
width = bitmap.Width;
if (height == 0) if (height == 0)
height = bitmap.Height; height = width * viewSizeRatio;
var viewSize = CalculateViewSize(_profile.Viewports, true, PaddingX, PaddingY); var bitmap = new Bitmap(width, height, format);
int viewSizeRatio = (int) Math.Round(viewSize.Width * viewSize.Height); bitmap.MakeTransparent();
int overlayWidth = (int) Math.Round(width * 0.7f,0);
int overlayHeight = overlayWidth / viewSizeRatio;
int overlayX = width - overlayWidth;
int overlayY = height - overlayHeight;
Point overlayPosition = new Point(overlayX, overlayY);
Size overlaySize = new Size(overlayWidth, overlayHeight);
Rectangle overlayRect = new Rectangle(overlayPosition, overlaySize);
//var width = bitmap.Width * 0.7f;
//var height = width / viewSize.Width * viewSize.Height;
var combinedBitmap = new Bitmap(width, height, format); using (var g = Graphics.FromImage(bitmap))
combinedBitmap.MakeTransparent();
using (var g = Graphics.FromImage(combinedBitmap))
{ {
g.SmoothingMode = SmoothingMode.HighQuality; g.SmoothingMode = SmoothingMode.HighQuality;
//g.DrawImage(bitmap, 0, 0, width, height); DrawView(g, width, height);
g.TranslateTransform(overlayX, overlayY); }
//Rectangle compressionRectangle = new Rectangle(300, 10,
//myBitmap.Width / 2, myBitmap.Height / 2);
g.DrawRectangle(new Pen(Color.FromArgb(125, 50, 50, 50), 2f), overlayRect);
DrawView(g, overlayWidth, overlayHeight); return bitmap;
}
public Bitmap ToBitmapOverlay(Bitmap bitmap)
{
/* if (width == 0)
width = bitmap.Width;
if (height == 0)
height = bitmap.Height;
var viewSize = CalculateViewSize(_profile.Viewports, true, PaddingX, PaddingY);
int viewSizeRatio = (int) Math.Round(viewSize.Width / viewSize.Height);
int overlayWidth = (int) Math.Round(width * 0.7f,0);
int overlayHeight = overlayWidth / viewSizeRatio;
int overlayX = width - overlayWidth;
int overlayY = height - overlayHeight;
Point overlayPosition = new Point(overlayX, overlayY);
Size overlaySize = new Size(overlayWidth, overlayHeight);
Rectangle overlayRect = new Rectangle(overlayPosition, overlaySize);
//var width = bitmap.Width * 0.7f;
//var height = width / viewSize.Width * viewSize.Height;
var combinedBitmap = new Bitmap(width, height, format);
combinedBitmap.MakeTransparent();
using (var g = Graphics.FromImage(combinedBitmap))
{
g.SmoothingMode = SmoothingMode.HighQuality;
//g.DrawImage(bitmap, 0, 0, width, height);
g.TranslateTransform(overlayX, overlayY);
//Rectangle compressionRectangle = new Rectangle(300, 10,
//myBitmap.Width / 2, myBitmap.Height / 2);
g.DrawRectangle(new Pen(Color.FromArgb(125, 50, 50, 50), 2f), overlayRect);
DrawView(g, overlayWidth, overlayHeight);
}
return bitmap;*/
var viewSize = CalculateViewSize(_profile.Viewports, true, PaddingX, PaddingY);
var width = bitmap.Width * 0.7f;
var height = width / viewSize.Width * viewSize.Height;
using (var g = Graphics.FromImage(bitmap))
{
g.SmoothingMode = SmoothingMode.HighQuality;
g.TranslateTransform(bitmap.Width - width, bitmap.Height - height * 1.1f);
DrawView(g, width, height);
} }
return bitmap; return bitmap;

72
HeliosPlus.Shared/Profile.cs → HeliosPlus.Shared/ProfileItem.cs
View File

@ -18,12 +18,12 @@ using WindowsDisplayAPI;
namespace HeliosPlus.Shared namespace HeliosPlus.Shared
{ {
public class Profile public class ProfileItem
{ {
private static Profile _currentProfile; private static ProfileItem _currentProfile;
private static List<Profile> _allSavedProfiles = new List<Profile>(); private static List<ProfileItem> _allSavedProfiles = new List<ProfileItem>();
private ProfileIcon _profileIcon; private ProfileIcon _profileIcon;
private Bitmap _profileBitmap; private Bitmap _profileBitmap, _profileShortcutBitmap;
private static List<Display> _availableDisplays; private static List<Display> _availableDisplays;
private static List<UnAttachedDisplay> _unavailableDisplays; private static List<UnAttachedDisplay> _unavailableDisplays;
@ -89,7 +89,7 @@ namespace HeliosPlus.Shared
} }
#endregion #endregion
static Profile() static ProfileItem()
{ {
try try
{ {
@ -162,19 +162,19 @@ namespace HeliosPlus.Shared
get => System.IO.Path.Combine(AppDataPath, $"Profiles"); get => System.IO.Path.Combine(AppDataPath, $"Profiles");
} }
public static List<Profile> AllSavedProfiles public static List<ProfileItem> AllSavedProfiles
{ {
get get
{ {
if (_allSavedProfiles.Count == 0) if (_allSavedProfiles.Count == 0)
{ {
Profile.LoadAllProfiles(); ProfileItem.LoadAllProfiles();
} }
return _allSavedProfiles; return _allSavedProfiles;
} }
} }
public static Profile CurrentProfile public static ProfileItem CurrentProfile
{ {
get => _currentProfile; get => _currentProfile;
} }
@ -211,7 +211,7 @@ namespace HeliosPlus.Shared
return _profileBitmap; return _profileBitmap;
else else
{ {
_profileBitmap = this.ProfileIcon.ToBitmap(128, 128); _profileBitmap = this.ProfileIcon.ToBitmap(256, 256);
return _profileBitmap; return _profileBitmap;
} }
} }
@ -222,7 +222,27 @@ namespace HeliosPlus.Shared
} }
public static List<Profile> LoadAllProfiles() [JsonConverter(typeof(CustomBitmapConverter))]
public Bitmap ProfileTightestBitmap
{
get
{
if (_profileShortcutBitmap != null)
return _profileShortcutBitmap;
else
{
_profileShortcutBitmap = this.ProfileIcon.ToTightestBitmap();
return _profileShortcutBitmap;
}
}
set
{
_profileShortcutBitmap = value;
}
}
public static List<ProfileItem> LoadAllProfiles()
{ {
if (File.Exists(SavedProfilesFilePath)) if (File.Exists(SavedProfilesFilePath))
@ -231,11 +251,11 @@ namespace HeliosPlus.Shared
if (!string.IsNullOrWhiteSpace(json)) if (!string.IsNullOrWhiteSpace(json))
{ {
List<Profile> profiles = new List<Profile>(); List<ProfileItem> profiles = new List<ProfileItem>();
try try
{ {
//var profiles = JsonConvert.DeserializeObject<Profile[]>(json, new JsonSerializerSettings //var profiles = JsonConvert.DeserializeObject<Profile[]>(json, new JsonSerializerSettings
profiles = JsonConvert.DeserializeObject<List<Profile>>(json, new JsonSerializerSettings profiles = JsonConvert.DeserializeObject<List<ProfileItem>>(json, new JsonSerializerSettings
{ {
MissingMemberHandling = MissingMemberHandling.Ignore, MissingMemberHandling = MissingMemberHandling.Ignore,
NullValueHandling = NullValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore,
@ -254,7 +274,7 @@ namespace HeliosPlus.Shared
//List<Profile> profilesList = profiles.ToList<Profile>(); //List<Profile> profilesList = profiles.ToList<Profile>();
// Find which entry is being used now, and save that info in a class variable // Find which entry is being used now, and save that info in a class variable
Profile myCurrentProfile = new Profile ProfileItem myCurrentProfile = new ProfileItem
{ {
Name = "Current Display Profile", Name = "Current Display Profile",
Viewports = PathInfo.GetActivePaths().Select(info => new ProfileViewport(info)).ToArray() Viewports = PathInfo.GetActivePaths().Select(info => new ProfileViewport(info)).ToArray()
@ -262,7 +282,7 @@ namespace HeliosPlus.Shared
_currentProfile = myCurrentProfile; _currentProfile = myCurrentProfile;
foreach (Profile loadedProfile in profiles) foreach (ProfileItem loadedProfile in profiles)
{ {
// Save a profile Icon to the profile // Save a profile Icon to the profile
loadedProfile.ProfileIcon = new ProfileIcon(loadedProfile); loadedProfile.ProfileIcon = new ProfileIcon(loadedProfile);
@ -283,7 +303,7 @@ namespace HeliosPlus.Shared
// If we get here, then we don't have any profiles saved! // If we get here, then we don't have any profiles saved!
// So we gotta start from scratch // So we gotta start from scratch
// Create a new profile based on our current display settings // Create a new profile based on our current display settings
_currentProfile = new Profile _currentProfile = new ProfileItem
{ {
Name = "Current Display Profile", Name = "Current Display Profile",
Viewports = PathInfo.GetActivePaths().Select(info => new ProfileViewport(info)).ToArray() Viewports = PathInfo.GetActivePaths().Select(info => new ProfileViewport(info)).ToArray()
@ -294,14 +314,14 @@ namespace HeliosPlus.Shared
_currentProfile.ProfileBitmap = _currentProfile.ProfileIcon.ToBitmap(128, 128); _currentProfile.ProfileBitmap = _currentProfile.ProfileIcon.ToBitmap(128, 128);
// Create a new empty list of all our display profiles as we don't have any saved! // Create a new empty list of all our display profiles as we don't have any saved!
_allSavedProfiles = new List<Profile>(); _allSavedProfiles = new List<ProfileItem>();
return _allSavedProfiles; return _allSavedProfiles;
} }
public static bool IsValidName(string testName) public static bool IsValidName(string testName)
{ {
foreach (Profile loadedProfile in _allSavedProfiles) foreach (ProfileItem loadedProfile in _allSavedProfiles)
{ {
if (loadedProfile.Name == testName) if (loadedProfile.Name == testName)
{ {
@ -314,7 +334,7 @@ namespace HeliosPlus.Shared
public static bool IsValidId(string testId) public static bool IsValidId(string testId)
{ {
foreach (Profile loadedProfile in _allSavedProfiles) foreach (ProfileItem loadedProfile in _allSavedProfiles)
{ {
if (loadedProfile.Id == testId) if (loadedProfile.Id == testId)
{ {
@ -328,7 +348,7 @@ namespace HeliosPlus.Shared
public static void UpdateCurrentProfile() public static void UpdateCurrentProfile()
{ {
_currentProfile = new Profile _currentProfile = new ProfileItem
{ {
Name = "Current Display Profile", Name = "Current Display Profile",
Viewports = PathInfo.GetActivePaths().Select(info => new ProfileViewport(info)).ToArray() Viewports = PathInfo.GetActivePaths().Select(info => new ProfileViewport(info)).ToArray()
@ -342,7 +362,7 @@ namespace HeliosPlus.Shared
return false; return false;
} }
public static bool SaveAllProfiles(List<Profile> profilesToSave) public static bool SaveAllProfiles(List<ProfileItem> profilesToSave)
{ {
if (!Directory.Exists(SavedProfilesPath)) if (!Directory.Exists(SavedProfilesPath))
@ -359,7 +379,7 @@ namespace HeliosPlus.Shared
// Now we loop over the profiles and save their images for later // Now we loop over the profiles and save their images for later
foreach (Profile profileToSave in profilesToSave) foreach (ProfileItem profileToSave in profilesToSave)
{ {
profileToSave.SaveProfileImageToCache(); profileToSave.SaveProfileImageToCache();
} }
@ -403,11 +423,11 @@ namespace HeliosPlus.Shared
// The public override for the Object.Equals // The public override for the Object.Equals
public override bool Equals(object obj) public override bool Equals(object obj)
{ {
return this.Equals(obj as Profile); return this.Equals(obj as ProfileItem);
} }
// Profiles are equal if their contents (except name) are equal // Profiles are equal if their contents (except name) are equal
public bool Equals(Profile other) public bool Equals(ProfileItem other)
{ {
// If parameter is null, return false. // If parameter is null, return false.
@ -591,10 +611,10 @@ namespace HeliosPlus.Shared
// Custom comparer for the Profile class // Custom comparer for the Profile class
// Allows us to use 'Contains' // Allows us to use 'Contains'
class ProfileComparer : IEqualityComparer<Profile> class ProfileComparer : IEqualityComparer<ProfileItem>
{ {
// Products are equal if their names and product numbers are equal. // Products are equal if their names and product numbers are equal.
public bool Equals(Profile x, Profile y) public bool Equals(ProfileItem x, ProfileItem y)
{ {
//Check whether the compared objects reference the same data. //Check whether the compared objects reference the same data.
@ -616,7 +636,7 @@ namespace HeliosPlus.Shared
// If Equals() returns true for a pair of objects // If Equals() returns true for a pair of objects
// then GetHashCode() must return the same value for these objects. // then GetHashCode() must return the same value for these objects.
public int GetHashCode(Profile profile) public int GetHashCode(ProfileItem profile)
{ {
// Check whether the object is null // Check whether the object is null

4
HeliosPlus.Shared/UserControls/DisplayView.cs
View File

@ -7,7 +7,7 @@ namespace HeliosPlus.Shared.UserControls
{ {
public partial class DisplayView : UserControl public partial class DisplayView : UserControl
{ {
private Profile _profile; private ProfileItem _profile;
public DisplayView() public DisplayView()
{ {
@ -18,7 +18,7 @@ namespace HeliosPlus.Shared.UserControls
public int PaddingX { get; set; } = 100; public int PaddingX { get; set; } = 100;
public int PaddingY { get; set; } = 100; public int PaddingY { get; set; } = 100;
public Profile Profile public ProfileItem Profile
{ {
get => _profile; get => _profile;
set set

4
HeliosPlus.ShellExtension/Helios.cs
View File

@ -12,7 +12,7 @@ namespace HeliosPlus.ShellExtension
public static void Open( public static void Open(
HeliosStartupAction action = HeliosStartupAction.None, HeliosStartupAction action = HeliosStartupAction.None,
Profile profile = null, ProfileItem profile = null,
string programAddress = null, string programAddress = null,
bool asAdmin = false) bool asAdmin = false)
{ {
@ -29,7 +29,7 @@ namespace HeliosPlus.ShellExtension
public static void OpenSteamGame( public static void OpenSteamGame(
HeliosStartupAction action = HeliosStartupAction.None, HeliosStartupAction action = HeliosStartupAction.None,
Profile profile = null, ProfileItem profile = null,
uint steamAppId = 0) uint steamAppId = 0)
{ {
try try

8
HeliosPlus.ShellExtension/HeliosDesktopMenuExtension.cs
View File

@ -13,7 +13,7 @@ namespace HeliosPlus.ShellExtension
[Guid("2EC0C798-715B-458E-8C86-5D846F67FBA1")] [Guid("2EC0C798-715B-458E-8C86-5D846F67FBA1")]
internal class HeliosDesktopMenuExtension : SharpContextMenu internal class HeliosDesktopMenuExtension : SharpContextMenu
{ {
private static ToolStripMenuItem CreateProfileMenu(Profile profile) private static ToolStripMenuItem CreateProfileMenu(ProfileItem profile)
{ {
var profileMenu = new ToolStripMenuItem(profile.Name, new ProfileIcon(profile).ToBitmap(16, 16)); var profileMenu = new ToolStripMenuItem(profile.Name, new ProfileIcon(profile).ToBitmap(16, 16));
profileMenu.DropDownItems.Add(new ToolStripMenuItem(Language.Apply, null, profileMenu.DropDownItems.Add(new ToolStripMenuItem(Language.Apply, null,
@ -39,13 +39,13 @@ namespace HeliosPlus.ShellExtension
{ {
var explorerMenu = new ContextMenuStrip(); var explorerMenu = new ContextMenuStrip();
if (Profile.LoadAllProfiles().Any()) if (ProfileItem.LoadAllProfiles().Any())
{ {
Profile.UpdateCurrentProfile(); ProfileItem.UpdateCurrentProfile();
var extensionMenu = new ToolStripMenuItem(Language.Display_Profiles, var extensionMenu = new ToolStripMenuItem(Language.Display_Profiles,
Properties.Resources.Icon_x16); Properties.Resources.Icon_x16);
foreach (var profile in Profile.LoadAllProfiles()) foreach (var profile in ProfileItem.LoadAllProfiles())
{ {
extensionMenu.DropDownItems.Add(CreateProfileMenu(profile)); extensionMenu.DropDownItems.Add(CreateProfileMenu(profile));
} }

10
HeliosPlus.ShellExtension/HeliosExecutableMenuExtension.cs
View File

@ -18,7 +18,7 @@ namespace HeliosPlus.ShellExtension
{ {
return Helios.IsInstalled && return Helios.IsInstalled &&
SelectedItemPaths.Count() == 1 && SelectedItemPaths.Count() == 1 &&
Profile.LoadAllProfiles().Any() && ProfileItem.LoadAllProfiles().Any() &&
Path.GetExtension(SelectedItemPaths.First())?.ToLower() == @".exe"; Path.GetExtension(SelectedItemPaths.First())?.ToLower() == @".exe";
} }
@ -28,11 +28,11 @@ namespace HeliosPlus.ShellExtension
var extensionMenu = new ToolStripMenuItem(Language.Open_under_Display_Profile, var extensionMenu = new ToolStripMenuItem(Language.Open_under_Display_Profile,
Properties.Resources.Icon_x16); Properties.Resources.Icon_x16);
if (Profile.LoadAllProfiles().Any()) if (ProfileItem.LoadAllProfiles().Any())
{ {
Profile.UpdateCurrentProfile(); ProfileItem.UpdateCurrentProfile();
foreach (var profile in Profile.LoadAllProfiles()) foreach (var profile in ProfileItem.LoadAllProfiles())
{ {
extensionMenu.DropDownItems.Add(CreateProfileMenu(profile)); extensionMenu.DropDownItems.Add(CreateProfileMenu(profile));
} }
@ -52,7 +52,7 @@ namespace HeliosPlus.ShellExtension
return explorerMenu; return explorerMenu;
} }
private ToolStripMenuItem CreateProfileMenu(Profile profile) private ToolStripMenuItem CreateProfileMenu(ProfileItem profile)
{ {
var profileMenu = new ToolStripMenuItem(profile.Name, new ProfileIcon(profile).ToBitmap(16, 16)); var profileMenu = new ToolStripMenuItem(profile.Name, new ProfileIcon(profile).ToBitmap(16, 16));
profileMenu.DropDownItems.Add(new ToolStripMenuItem(Language.Run, null, profileMenu.DropDownItems.Add(new ToolStripMenuItem(Language.Run, null,

10
HeliosPlus.ShellExtension/HeliosSteamUrlMenuExtension.cs
View File

@ -19,7 +19,7 @@ namespace HeliosPlus.ShellExtension
{ {
return Helios.IsInstalled && return Helios.IsInstalled &&
SelectedItemPaths.Count() == 1 && SelectedItemPaths.Count() == 1 &&
Profile.LoadAllProfiles().Any() && ProfileItem.LoadAllProfiles().Any() &&
ParseSteamAppId() > 0; ParseSteamAppId() > 0;
} }
@ -29,11 +29,11 @@ namespace HeliosPlus.ShellExtension
var extensionMenu = new ToolStripMenuItem(Language.Open_under_Display_Profile, var extensionMenu = new ToolStripMenuItem(Language.Open_under_Display_Profile,
Properties.Resources.Icon_x16); Properties.Resources.Icon_x16);
if (Profile.LoadAllProfiles().Any()) if (ProfileItem.LoadAllProfiles().Any())
{ {
Profile.UpdateCurrentProfile(); ProfileItem.UpdateCurrentProfile();
foreach (var profile in Profile.LoadAllProfiles()) foreach (var profile in ProfileItem.LoadAllProfiles())
{ {
extensionMenu.DropDownItems.Add(CreateProfileMenu(profile)); extensionMenu.DropDownItems.Add(CreateProfileMenu(profile));
} }
@ -53,7 +53,7 @@ namespace HeliosPlus.ShellExtension
return explorerMenu; return explorerMenu;
} }
private ToolStripMenuItem CreateProfileMenu(Profile profile) private ToolStripMenuItem CreateProfileMenu(ProfileItem profile)
{ {
var appId = ParseSteamAppId(); var appId = ParseSteamAppId();
var profileMenu = new ToolStripMenuItem(profile.Name, new ProfileIcon(profile).ToBitmap(16, 16)); var profileMenu = new ToolStripMenuItem(profile.Name, new ProfileIcon(profile).ToBitmap(16, 16));

10
HeliosPlus/DisplayRepresentation.cs
View File

@ -48,7 +48,7 @@ namespace HeliosPlus
public DisplayPossibleSetting[] PossibleSettings { get; } public DisplayPossibleSetting[] PossibleSettings { get; }
public static IEnumerable<DisplayRepresentation> GetDisplays(Profile profile = null) public static IEnumerable<DisplayRepresentation> GetDisplays(ProfileItem profile = null)
{ {
//var displays = //var displays =
// Display.GetDisplays() // Display.GetDisplays()
@ -77,12 +77,12 @@ namespace HeliosPlus
return Display.GetDisplays().FirstOrDefault(display => display.DevicePath.StartsWith(Path)); return Display.GetDisplays().FirstOrDefault(display => display.DevicePath.StartsWith(Path));
} }
public ProfileViewport GetPathSource(Profile profile) public ProfileViewport GetPathSource(ProfileItem profile)
{ {
return profile.Viewports.FirstOrDefault(path => path.TargetDisplays.Any(target => target.DevicePath == Path)); return profile.Viewports.FirstOrDefault(path => path.TargetDisplays.Any(target => target.DevicePath == Path));
} }
public ProfileViewportTargetDisplay GetPathTarget(Profile profile) public ProfileViewportTargetDisplay GetPathTarget(ProfileItem profile)
{ {
return profile.Viewports.SelectMany(path => path.TargetDisplays).FirstOrDefault(target => target.DevicePath == Path); return profile.Viewports.SelectMany(path => path.TargetDisplays).FirstOrDefault(target => target.DevicePath == Path);
} }
@ -96,7 +96,7 @@ namespace HeliosPlus
.FirstOrDefault(); .FirstOrDefault();
} }
public Bitmap ToBitmap(Size size, Profile profile = null) public Bitmap ToBitmap(Size size, ProfileItem profile = null)
{ {
var targetInfo = GetTargetInfo(); var targetInfo = GetTargetInfo();
var resolution = Size.Empty; var resolution = Size.Empty;
@ -115,7 +115,7 @@ namespace HeliosPlus
} }
} }
var p = new Profile {Viewports = new ProfileViewport[1]}; var p = new ProfileItem {Viewports = new ProfileViewport[1]};
p.Viewports[0] = new ProfileViewport p.Viewports[0] = new ProfileViewport
{ {
Resolution = resolution, Resolution = resolution,

5
HeliosPlus/HeliosPlus.csproj
View File

@ -77,7 +77,8 @@
<Compile Include="GameLibraries\SteamAppInfoParser\Package.cs" /> <Compile Include="GameLibraries\SteamAppInfoParser\Package.cs" />
<Compile Include="GameLibraries\SteamAppInfoParser\PackageInfo.cs" /> <Compile Include="GameLibraries\SteamAppInfoParser\PackageInfo.cs" />
<Compile Include="GameLibraries\SteamAppInfoParser\App.cs" /> <Compile Include="GameLibraries\SteamAppInfoParser\App.cs" />
<Compile Include="Shortcut.cs" /> <Compile Include="IconUtils.cs" />
<Compile Include="ShortcutItem.cs" />
<Compile Include="ShortcutRepository.cs" /> <Compile Include="ShortcutRepository.cs" />
<Compile Include="UIForms\ShortcutAdaptor.cs" /> <Compile Include="UIForms\ShortcutAdaptor.cs" />
<Compile Include="UIForms\ProfileAdaptor.cs" /> <Compile Include="UIForms\ProfileAdaptor.cs" />
@ -145,6 +146,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UIForms\DisplayProfileForm.resx"> <EmbeddedResource Include="UIForms\DisplayProfileForm.resx">
<DependentUpon>DisplayProfileForm.cs</DependentUpon> <DependentUpon>DisplayProfileForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
@ -156,6 +158,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UIForms\ShortcutLibraryForm.resx"> <EmbeddedResource Include="UIForms\ShortcutLibraryForm.resx">
<DependentUpon>ShortcutLibraryForm.cs</DependentUpon> <DependentUpon>ShortcutLibraryForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

117
HeliosPlus/IconUtils.cs Normal file
View File

@ -0,0 +1,117 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Security;
using System.Text;
namespace IconUtils
{
internal static class ExtractIcon
{
[UnmanagedFunctionPointer(CallingConvention.Winapi, SetLastError = true, CharSet = CharSet.Unicode)]
[SuppressUnmanagedCodeSecurity]
internal delegate bool ENUMRESNAMEPROC(IntPtr hModule, IntPtr lpszType, IntPtr lpszName, IntPtr lParam);
[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
public static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hFile, uint dwFlags);
[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
public static extern IntPtr FindResource(IntPtr hModule, IntPtr lpName, IntPtr lpType);
[DllImport("kernel32.dll", SetLastError = true)]
public static extern IntPtr LoadResource(IntPtr hModule, IntPtr hResInfo);
[DllImport("kernel32.dll", SetLastError = true)]
public static extern IntPtr LockResource(IntPtr hResData);
[DllImport("kernel32.dll", SetLastError = true)]
public static extern uint SizeofResource(IntPtr hModule, IntPtr hResInfo);
[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
[SuppressUnmanagedCodeSecurity]
public static extern bool EnumResourceNames(IntPtr hModule, IntPtr lpszType, ENUMRESNAMEPROC lpEnumFunc, IntPtr lParam);
private const uint LOAD_LIBRARY_AS_DATAFILE = 0x00000002;
private readonly static IntPtr RT_ICON = (IntPtr)3;
private readonly static IntPtr RT_GROUP_ICON = (IntPtr)14;
public static Icon ExtractIconFromExecutable(string path)
{
IntPtr hModule = LoadLibraryEx(path, IntPtr.Zero, LOAD_LIBRARY_AS_DATAFILE);
var tmpData = new List<byte[]>();
ENUMRESNAMEPROC callback = (h, t, name, l) =>
{
var dir = GetDataFromResource(hModule, RT_GROUP_ICON, name);
// Calculate the size of an entire .icon file.
int count = BitConverter.ToUInt16(dir, 4); // GRPICONDIR.idCount
int len = 6 + 16 * count; // sizeof(ICONDIR) + sizeof(ICONDIRENTRY) * count
for (int i = 0; i < count; ++i)
len += BitConverter.ToInt32(dir, 6 + 14 * i + 8); // GRPICONDIRENTRY.dwBytesInRes
using (var dst = new BinaryWriter(new MemoryStream(len)))
{
// Copy GRPICONDIR to ICONDIR.
dst.Write(dir, 0, 6);
int picOffset = 6 + 16 * count; // sizeof(ICONDIR) + sizeof(ICONDIRENTRY) * count
for (int i = 0; i < count; ++i)
{
// Load the picture.
ushort id = BitConverter.ToUInt16(dir, 6 + 14 * i + 12); // GRPICONDIRENTRY.nID
var pic = GetDataFromResource(hModule, RT_ICON, (IntPtr)id);
// Copy GRPICONDIRENTRY to ICONDIRENTRY.
dst.Seek(6 + 16 * i, 0);
dst.Write(dir, 6 + 14 * i, 8); // First 8bytes are identical.
dst.Write(pic.Length); // ICONDIRENTRY.dwBytesInRes
dst.Write(picOffset); // ICONDIRENTRY.dwImageOffset
// Copy a picture.
dst.Seek(picOffset, 0);
dst.Write(pic, 0, pic.Length);
picOffset += pic.Length;
}
tmpData.Add(((MemoryStream)dst.BaseStream).ToArray());
}
return true;
};
EnumResourceNames(hModule, RT_GROUP_ICON, callback, IntPtr.Zero);
byte[][] iconData = tmpData.ToArray();
using (var ms = new MemoryStream(iconData[0]))
{
return new Icon(ms);
}
}
private static byte[] GetDataFromResource(IntPtr hModule, IntPtr type, IntPtr name)
{
// Load the binary data from the specified resource.
IntPtr hResInfo = FindResource(hModule, name, type);
IntPtr hResData = LoadResource(hModule, hResInfo);
IntPtr pResData = LockResource(hResData);
uint size = SizeofResource(hModule, hResInfo);
byte[] buf = new byte[size];
Marshal.Copy(pResData, buf, 0, buf.Length);
return buf;
}
}
}

26
HeliosPlus/Program.cs
View File

@ -34,10 +34,10 @@ namespace HeliosPlus {
//internal static string ShortcutIconCachePath; //internal static string ShortcutIconCachePath;
internal static Profile GetProfile(string profileName) internal static ProfileItem GetProfile(string profileName)
{ {
// Create an array of display profiles we have // Create an array of display profiles we have
var profiles = Profile.LoadAllProfiles().ToArray(); var profiles = ProfileItem.LoadAllProfiles().ToArray();
// Check if the user supplied a --profile option using the profiles' ID // Check if the user supplied a --profile option using the profiles' ID
var profileIndex = profiles.Length > 0 ? Array.FindIndex(profiles, p => p.Id.Equals(profileName, StringComparison.InvariantCultureIgnoreCase)) : -1; var profileIndex = profiles.Length > 0 ? Array.FindIndex(profiles, p => p.Id.Equals(profileName, StringComparison.InvariantCultureIgnoreCase)) : -1;
// If the profileID wasn't there, maybe they used the profile name? // If the profileID wasn't there, maybe they used the profile name?
@ -50,7 +50,7 @@ namespace HeliosPlus {
return profiles[profileIndex]; return profiles[profileIndex];
} }
internal static bool GoProfile(Profile profile) internal static bool GoProfile(ProfileItem profile)
{ {
if (profile.IsActive) if (profile.IsActive)
{ {
@ -92,12 +92,12 @@ namespace HeliosPlus {
} }
} }
private static void EditProfile(Profile profile) private static void EditProfile(ProfileItem profile)
{ {
// Get the status of the thing // Get the status of the thing
IPCService.GetInstance().Status = InstanceStatus.User; IPCService.GetInstance().Status = InstanceStatus.User;
// Load all the profiles from JSON // Load all the profiles from JSON
Profile.LoadAllProfiles().ToArray(); ProfileItem.LoadAllProfiles().ToArray();
// Start up the DisplayProfileForm directly // Start up the DisplayProfileForm directly
new DisplayProfileForm(profile).ShowDialog(); new DisplayProfileForm(profile).ShowDialog();
// Then we close down as we're only here to edit one profile // Then we close down as we're only here to edit one profile
@ -268,9 +268,9 @@ namespace HeliosPlus {
} }
private static void SwitchToExecutable(Profile profile, string executableToRun, string processToMonitor, uint timeout, string executableArguments) private static void SwitchToExecutable(ProfileItem profile, string executableToRun, string processToMonitor, uint timeout, string executableArguments)
{ {
var rollbackProfile = Profile.CurrentProfile; var rollbackProfile = ProfileItem.CurrentProfile;
if (!profile.IsPossible) if (!profile.IsPossible)
{ {
@ -372,7 +372,7 @@ namespace HeliosPlus {
private static void SwitchToSteamGame(Profile profile, string steamGameIdToRun, uint timeout, string steamGameArguments) private static void SwitchToSteamGame(ProfileItem profile, string steamGameIdToRun, uint timeout, string steamGameArguments)
{ {
// Convert the steamGameIdToRun string to a uint for Steam Games // Convert the steamGameIdToRun string to a uint for Steam Games
@ -383,7 +383,7 @@ namespace HeliosPlus {
} }
// Save the profile we're on now // Save the profile we're on now
var rollbackProfile = Profile.CurrentProfile; var rollbackProfile = ProfileItem.CurrentProfile;
// Check that the profile we've been asked to change to will actually work // Check that the profile we've been asked to change to will actually work
if (!profile.IsPossible) if (!profile.IsPossible)
@ -512,10 +512,10 @@ namespace HeliosPlus {
} }
private static void SwitchToUplayGame(Profile profile, string uplayGameIdToRun, uint timeout, string uplayGameArguments) private static void SwitchToUplayGame(ProfileItem profile, string uplayGameIdToRun, uint timeout, string uplayGameArguments)
{ {
var rollbackProfile = Profile.CurrentProfile; var rollbackProfile = ProfileItem.CurrentProfile;
if (!profile.IsPossible) if (!profile.IsPossible)
{ {
@ -641,9 +641,9 @@ namespace HeliosPlus {
// ReSharper disable once CyclomaticComplexity // ReSharper disable once CyclomaticComplexity
private static void SwitchToProfile(Profile profile) private static void SwitchToProfile(ProfileItem profile)
{ {
var rollbackProfile = Profile.CurrentProfile; var rollbackProfile = ProfileItem.CurrentProfile;
if ( if (
IPCClient.QueryAll() IPCClient.QueryAll()

307
HeliosPlus/Shortcut.cs → HeliosPlus/ShortcutItem.cs
View File

@ -5,8 +5,10 @@ using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.IconLib; using System.Drawing.IconLib;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using TsudaKageyu;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -31,22 +33,23 @@ namespace HeliosPlus
NoGame, NoGame,
} }
public class Shortcut public class ShortcutItem
{ {
private static List<Shortcut> _allSavedShortcuts = new List<Shortcut>(); private static List<ShortcutItem> _allSavedShortcuts = new List<ShortcutItem>();
private MultiIcon _shortcutIcon, _originalIcon = null; private MultiIcon _shortcutIcon, _originalIcon = null;
private Bitmap _shortcutBitmap, _originalBitmap = null; private Bitmap _shortcutBitmap, _originalBitmap = null;
private Profile _profileToUse = null; private ProfileItem _profileToUse = null;
private string _originalIconPath = "";
private uint _id = 0; private uint _id = 0;
private string _profileName = ""; private string _profileName = "";
private bool _isPossible = false; private bool _isPossible = false;
public Shortcut() public ShortcutItem()
{ {
} }
public Shortcut(Profile profile) : this() public ShortcutItem(ProfileItem profile) : this()
{ {
ProfileToUse = profile; ProfileToUse = profile;
} }
@ -70,18 +73,39 @@ namespace HeliosPlus
public string Name { get; set; } = ""; public string Name { get; set; } = "";
[JsonIgnore] [JsonIgnore]
public Profile ProfileToUse { get; set; } = null; public ProfileItem ProfileToUse {
get
{
return _profileToUse;
}
set
{
if (value is ProfileItem)
{
_profileToUse = value;
_profileName = _profileToUse.Name;
// And if we have the _originalBitmap we can also save the Bitmap overlay, but only if the ProfileToUse is set
if (_originalBitmap is Bitmap)
_shortcutBitmap = ToBitmapOverlay(_originalBitmap, ProfileToUse.ProfileTightestBitmap,256,256);
}
}
}
public string ProfileName { public string ProfileName {
get get
{ {
if (ProfileToUse is Profile)
_profileName = ProfileToUse.Name;
return _profileName; return _profileName;
} }
set set
{ {
_profileName = value; _profileName = value;
// We try to find and set the ProfileTouse
foreach (ProfileItem profileToTest in ProfileItem.AllSavedProfiles)
{
if (profileToTest.Name.Equals(_profileName))
_profileToUse = profileToTest;
}
} }
} }
@ -113,7 +137,28 @@ namespace HeliosPlus
public bool GameArgumentsRequired { get; set; } = false; public bool GameArgumentsRequired { get; set; } = false;
public string OriginalIconPath { get; set; } = ""; public string OriginalIconPath {
get
{
if (String.IsNullOrEmpty(_originalIconPath))
return null;
return _originalIconPath;
}
set
{
_originalIconPath = value;
// We now force creation of the bitmap
// straight away, so we know it has already been done.
_originalBitmap = ToBitmapFromIcon(_originalIconPath);
// And we do the same for the Bitmap overlay, but only if the ProfileToUse is set
if (ProfileToUse is ProfileItem)
_shortcutBitmap = ToBitmapOverlay(_originalBitmap, ProfileToUse.ProfileTightestBitmap, 256, 256);
}
}
//[JsonConverter(typeof(CustomBitmapConverter))] //[JsonConverter(typeof(CustomBitmapConverter))]
[JsonIgnore] [JsonIgnore]
@ -121,18 +166,14 @@ namespace HeliosPlus
{ {
get get
{ {
if (_originalBitmap != null) if (_originalBitmap is Bitmap)
return _originalBitmap; return _originalBitmap;
else else
{ {
if (String.IsNullOrEmpty(OriginalIconPath)) if (String.IsNullOrEmpty(OriginalIconPath))
return null; return null;
Icon icoAppIcon = Icon.ExtractAssociatedIcon(OriginalIconPath);
// We first try high quality icons return ToBitmapFromIcon(OriginalIconPath);
_originalBitmap = ExtractVistaIcon(icoAppIcon);
if (_originalBitmap == null)
_originalBitmap = icoAppIcon.ToBitmap();
return _originalBitmap;
} }
} }
@ -148,7 +189,7 @@ namespace HeliosPlus
{ {
get get
{ {
if (_shortcutBitmap != null) if (_shortcutBitmap is Bitmap)
return _shortcutBitmap; return _shortcutBitmap;
else else
{ {
@ -159,7 +200,9 @@ namespace HeliosPlus
if (OriginalBitmap == null) if (OriginalBitmap == null)
return null; return null;
_shortcutBitmap = new ProfileIcon(ProfileToUse).ToBitmapOverlay(OriginalBitmap,128 ,128); //_shortcutBitmap = new ProfileIcon(ProfileToUse).ToBitmapOverlay(OriginalBitmap,128 ,128);
_shortcutBitmap = ToBitmapOverlay(_originalBitmap, ProfileToUse.ProfileTightestBitmap, 256, 256);
_shortcutBitmap.Save(Path.Combine(Program.AppDataPath, @"ShortcutOverlay.png"), ImageFormat.Png);
return _shortcutBitmap; return _shortcutBitmap;
} }
} }
@ -186,10 +229,9 @@ namespace HeliosPlus
} }
} }
public bool CopyTo (ShortcutItem shortcut, bool overwriteId = false)
public bool CopyTo (Shortcut shortcut, bool overwriteId = false)
{ {
if (!(shortcut is Shortcut)) if (!(shortcut is ShortcutItem))
return false; return false;
if (overwriteId) if (overwriteId)
@ -222,7 +264,6 @@ namespace HeliosPlus
return true; return true;
} }
public static Bitmap ExtractVistaIcon(Icon icoIcon) public static Bitmap ExtractVistaIcon(Icon icoIcon)
{ {
Bitmap bmpPngExtracted = null; Bitmap bmpPngExtracted = null;
@ -256,6 +297,228 @@ namespace HeliosPlus
return bmpPngExtracted; return bmpPngExtracted;
} }
/* public Bitmap ToBitmap(int width = 256, int height = 256, PixelFormat format = PixelFormat.Format32bppArgb)
{
var bitmap = new Bitmap(width, height, format);
bitmap.MakeTransparent();
using (var g = Graphics.FromImage(bitmap))
{
g.SmoothingMode = SmoothingMode.HighQuality;
g.DrawImage(g, width, height);
}
return bitmap;
}*/
private Bitmap ToBitmapFromExe(string fileNameAndPath)
{
/* IconExtractor ie = new IconExtractor(fileNameAndPath);
Icon[] allIcons = ie.GetAllIcons();
Icon biggestIcon = allIcons.OrderByDescending(item => item.Size).First();
//_originalBitmap = ExtractVistaIcon(biggestIcon);
Bitmap bitmapToReturn = IconUtil.ToBitmap(biggestIcon);
if (bitmapToReturn == null)
bitmapToReturn = biggestIcon.ToBitmap();
return bitmapToReturn;
*/
Icon exeIcon = IconUtils.ExtractIcon.ExtractIconFromExecutable(fileNameAndPath);
Bitmap bitmapToReturn = exeIcon.ToBitmap();
exeIcon.Dispose();
return bitmapToReturn;
}
private Bitmap ToBitmapFromIcon(string fileNameAndPath)
{
Icon icoIcon = new Icon(fileNameAndPath, 256, 256);
//_originalBitmap = ExtractVistaIcon(biggestIcon);
Bitmap bitmapToReturn = icoIcon.ToBitmap();
icoIcon.Dispose();
return bitmapToReturn;
}
private Bitmap ToBitmapOverlay(Bitmap originalBitmap, Bitmap overlayBitmap, int width, int height, PixelFormat format = PixelFormat.Format32bppArgb)
{
if (!(width is int) || width <= 0)
return null;
if (!(height is int) || height <= 0)
return null;
// Make a new empoty bitmap of the wanted size
var combinedBitmap = new Bitmap(width, height, format);
combinedBitmap.MakeTransparent();
using (var g = Graphics.FromImage(combinedBitmap))
{
g.SmoothingMode = SmoothingMode.None;
g.InterpolationMode = InterpolationMode.NearestNeighbor;
g.PixelOffsetMode = PixelOffsetMode.HighQuality;
g.CompositingQuality = CompositingQuality.AssumeLinear;
// Resize the originalBitmap if needed
if (originalBitmap.Width > width || originalBitmap.Height > height)
{
float originalBitmapRatio = (float) originalBitmap.Width / (float) originalBitmap.Height;
float newWidth, newHeight, newX, newY;
if (originalBitmap.Width > width)
{
// We need to shrink down until Height fits
newWidth = width;
newHeight = originalBitmap.Height * originalBitmapRatio;
newX = 0;
newY = (height - newHeight) / 2;
} else
{
// We need to shrink down until Width fits
newWidth = originalBitmap.Width * originalBitmapRatio;
newHeight = height;
newX = (width - newWidth) / 2;
newY = 0;
}
g.DrawImage(originalBitmap, newX, newY, newWidth, newHeight);
}
else
g.DrawImage(originalBitmap, 0, 0, width, height);
float overlayBitmapRatio = (float) overlayBitmap.Width / (float) overlayBitmap.Height;
float overlayWidth, overlayHeight, overlayX, overlayY;
string mode =
if (overlayBitmap.Width > width && overlayBitmap.Height < height)
{
// We need to shrink down until Height fits
overlayHeight = overlayWidth * overlayBitmapRatio;
overlayX = width - overlayWidth;
overlayY = height - overlayHeight;
}
else if (overlayBitmap.Width < width && overlayBitmap.Height > height)
{
// We need to shrink down until Width fits
overlayHeight = (height * 0.7F);
overlayWidth = overlayHeight * (1 / overlayBitmapRatio);
overlayX = width - overlayWidth;
overlayY = height - overlayHeight;
}
else if (overlayBitmap.Width > width && overlayBitmap.Height > height)
{
// We need to shrink down until Width and Height fits
overlayHeight = (height * 0.7F);
overlayWidth = overlayHeight * (1 / overlayBitmapRatio);
overlayX = width - overlayWidth;
overlayY = height - overlayHeight;
}
if (overlayBitmap.Width > width && overlayBitmap.Height < height)
{
// We need to shrink down until Height fits
overlayWidth = (width * 0.7F);
overlayHeight = overlayWidth * overlayBitmapRatio;
overlayX = width - overlayWidth;
overlayY = height - overlayHeight;
}
else if (overlayBitmap.Width < width && overlayBitmap.Height > height)
{
// We need to shrink down until Width fits
overlayHeight = (height * 0.7F);
overlayWidth = overlayHeight * (1/overlayBitmapRatio);
overlayX = width - overlayWidth;
overlayY = height - overlayHeight;
}
else if (overlayBitmap.Width > width && overlayBitmap.Height > height)
{
// We need to shrink down until Width and Height fits
overlayHeight = (height * 0.7F);
overlayWidth = overlayHeight * (1 / overlayBitmapRatio);
overlayX = width - overlayWidth;
overlayY = height - overlayHeight;
}
g.DrawImage(overlayBitmap, overlayX, overlayY, overlayWidth, overlayHeight);
}
return combinedBitmap;
}
public MultiIcon ToIcon()
{
var iconSizes = new[]
{
new Size(256, 256),
new Size(64, 64),
new Size(48, 48),
new Size(32, 32),
new Size(24, 24),
new Size(16, 16)
};
var multiIcon = new MultiIcon();
var icon = multiIcon.Add("Icon1");
foreach (var size in iconSizes)
{
Bitmap bitmap = new Bitmap(size.Width, size.Height);
using (var g = Graphics.FromImage(bitmap))
{
g.SmoothingMode = SmoothingMode.None;
g.InterpolationMode = InterpolationMode.NearestNeighbor;
g.PixelOffsetMode = PixelOffsetMode.HighQuality;
g.CompositingQuality = CompositingQuality.AssumeLinear;
g.DrawImage(_originalBitmap, new Rectangle(0, 0, size.Width, size.Height));
}
icon.Add(bitmap);
if (size.Width >= 256 && size.Height >= 256)
{
icon[icon.Count - 1].IconImageFormat = IconImageFormat.PNG;
}
bitmap.Dispose();
}
multiIcon.SelectedIndex = 0;
return multiIcon;
}
public MultiIcon ToIconOverlay()
{
var iconSizes = new[]
{
new Size(256, 256),
new Size(64, 64),
new Size(48, 48),
new Size(32, 32),
new Size(24, 24),
new Size(16, 16)
};
var multiIcon = new MultiIcon();
var icon = multiIcon.Add("Icon1");
foreach (var size in iconSizes)
{
Bitmap bitmapOverlay = ToBitmapOverlay(_originalBitmap, ProfileToUse.ProfileTightestBitmap, size.Width, size.Height);
icon.Add(bitmapOverlay);
if (size.Width >= 256 && size.Height >= 256)
{
icon[icon.Count - 1].IconImageFormat = IconImageFormat.PNG;
}
bitmapOverlay.Dispose();
}
multiIcon.SelectedIndex = 0;
return multiIcon;
}
// ReSharper disable once FunctionComplexityOverflow // ReSharper disable once FunctionComplexityOverflow
// ReSharper disable once CyclomaticComplexity // ReSharper disable once CyclomaticComplexity

67
HeliosPlus/ShortcutRepository.cs
View File

@ -18,7 +18,7 @@ namespace HeliosPlus
{ {
#region Class Variables #region Class Variables
// Common items to the class // Common items to the class
private static List<Shortcut> _allShortcuts = new List<Shortcut>(); private static List<ShortcutItem> _allShortcuts = new List<ShortcutItem>();
public static Version Version = new Version(1, 0, 0); public static Version Version = new Version(1, 0, 0);
// Other constants that are useful // Other constants that are useful
private static string _shortcutStorageJsonPath = Path.Combine(Program.AppDataPath, $"Shortcuts"); private static string _shortcutStorageJsonPath = Path.Combine(Program.AppDataPath, $"Shortcuts");
@ -38,21 +38,21 @@ namespace HeliosPlus
if (LoadShortcuts() && ShortcutCount > 0) if (LoadShortcuts() && ShortcutCount > 0)
{ {
// Work out the starting NextShortcutId value // Work out the starting NextShortcutId value
long max = _allShortcuts.Max<Shortcut>(item => item.Id); long max = _allShortcuts.Max<ShortcutItem>(item => item.Id);
_lastShortcutId = Convert.ToUInt32(max); _lastShortcutId = Convert.ToUInt32(max);
} else } else
_lastShortcutId = 0; _lastShortcutId = 0;
} }
public ShortcutRepository(Shortcut shortcut) : this() public ShortcutRepository(ShortcutItem shortcut) : this()
{ {
if (shortcut is Shortcut) if (shortcut is ShortcutItem)
AddShortcut(shortcut); AddShortcut(shortcut);
} }
#endregion #endregion
#region Class Properties #region Class Properties
public static List<Shortcut> AllShortcuts public static List<ShortcutItem> AllShortcuts
{ {
get get
{ {
@ -61,7 +61,7 @@ namespace HeliosPlus
if (LoadShortcuts() && ShortcutCount > 0) if (LoadShortcuts() && ShortcutCount > 0)
{ {
// Work out the starting NextShortcutId value // Work out the starting NextShortcutId value
long max = _allShortcuts.Max<Shortcut>(item => item.Id); long max = _allShortcuts.Max<ShortcutItem>(item => item.Id);
_lastShortcutId = Convert.ToUInt32(max); _lastShortcutId = Convert.ToUInt32(max);
} }
else else
@ -83,9 +83,9 @@ namespace HeliosPlus
#endregion #endregion
#region Class Methods #region Class Methods
public static bool AddShortcut(Shortcut shortcut) public static bool AddShortcut(ShortcutItem shortcut)
{ {
if (!(shortcut is Shortcut)) if (!(shortcut is ShortcutItem))
return false; return false;
// Doublecheck if it already exists // Doublecheck if it already exists
@ -93,7 +93,7 @@ namespace HeliosPlus
if (ContainsShortcut(shortcut)) if (ContainsShortcut(shortcut))
{ {
// We update the existing Shortcut with the data over // We update the existing Shortcut with the data over
Shortcut shortcutToUpdate = GetShortcut(shortcut.Id); ShortcutItem shortcutToUpdate = GetShortcut(shortcut.Id);
shortcut.CopyTo(shortcutToUpdate); shortcut.CopyTo(shortcutToUpdate);
} }
else else
@ -118,14 +118,14 @@ namespace HeliosPlus
} }
public static bool RemoveShortcut(Shortcut shortcut) public static bool RemoveShortcut(ShortcutItem shortcut)
{ {
if (!(shortcut is Shortcut)) if (!(shortcut is ShortcutItem))
return false; return false;
// Remove the Shortcut Icons from the Cache // Remove the Shortcut Icons from the Cache
List<Shortcut> shortcutsToRemove = _allShortcuts.FindAll(item => item.Id.Equals(shortcut.Id)); List<ShortcutItem> shortcutsToRemove = _allShortcuts.FindAll(item => item.Id.Equals(shortcut.Id));
foreach (Shortcut shortcutToRemove in shortcutsToRemove) foreach (ShortcutItem shortcutToRemove in shortcutsToRemove)
{ {
try try
{ {
@ -158,8 +158,8 @@ namespace HeliosPlus
return false; return false;
// Remove the Shortcut Icons from the Cache // Remove the Shortcut Icons from the Cache
List<Shortcut> shortcutsToRemove = _allShortcuts.FindAll(item => item.Name.Equals(shortcutName)); List<ShortcutItem> shortcutsToRemove = _allShortcuts.FindAll(item => item.Name.Equals(shortcutName));
foreach (Shortcut shortcutToRemove in shortcutsToRemove) foreach (ShortcutItem shortcutToRemove in shortcutsToRemove)
{ {
try try
{ {
@ -192,8 +192,8 @@ namespace HeliosPlus
return false; return false;
// Remove the Shortcut Icons from the Cache // Remove the Shortcut Icons from the Cache
List<Shortcut> shortcutsToRemove = _allShortcuts.FindAll(item => item.Id.Equals(shortcutId)); List<ShortcutItem> shortcutsToRemove = _allShortcuts.FindAll(item => item.Id.Equals(shortcutId));
foreach (Shortcut shortcutToRemove in shortcutsToRemove) foreach (ShortcutItem shortcutToRemove in shortcutsToRemove)
{ {
try try
{ {
@ -220,12 +220,12 @@ namespace HeliosPlus
} }
public static bool ContainsShortcut(Shortcut shortcut) public static bool ContainsShortcut(ShortcutItem shortcut)
{ {
if (!(shortcut is Shortcut)) if (!(shortcut is ShortcutItem))
return false; return false;
foreach (Shortcut testShortcut in _allShortcuts) foreach (ShortcutItem testShortcut in _allShortcuts)
{ {
if (testShortcut.Id.Equals(shortcut.Id)) if (testShortcut.Id.Equals(shortcut.Id))
return true; return true;
@ -239,7 +239,7 @@ namespace HeliosPlus
if (String.IsNullOrWhiteSpace(shortcutName)) if (String.IsNullOrWhiteSpace(shortcutName))
return false; return false;
foreach (Shortcut testShortcut in _allShortcuts) foreach (ShortcutItem testShortcut in _allShortcuts)
{ {
if (testShortcut.Name.Equals(shortcutName)) if (testShortcut.Name.Equals(shortcutName))
return true; return true;
@ -254,7 +254,7 @@ namespace HeliosPlus
if (shortcutId == 0) if (shortcutId == 0)
return true; return true;
foreach (Shortcut testShortcut in _allShortcuts) foreach (ShortcutItem testShortcut in _allShortcuts)
{ {
if (testShortcut.Id.Equals(shortcutId)) if (testShortcut.Id.Equals(shortcutId))
return true; return true;
@ -265,12 +265,12 @@ namespace HeliosPlus
} }
public static Shortcut GetShortcut(string shortcutName) public static ShortcutItem GetShortcut(string shortcutName)
{ {
if (String.IsNullOrWhiteSpace(shortcutName)) if (String.IsNullOrWhiteSpace(shortcutName))
return null; return null;
foreach (Shortcut testShortcut in _allShortcuts) foreach (ShortcutItem testShortcut in _allShortcuts)
{ {
if (testShortcut.Name.Equals(shortcutName)) if (testShortcut.Name.Equals(shortcutName))
return testShortcut; return testShortcut;
@ -279,12 +279,12 @@ namespace HeliosPlus
return null; return null;
} }
public static Shortcut GetShortcut(uint shortcutId) public static ShortcutItem GetShortcut(uint shortcutId)
{ {
if (shortcutId == 0) if (shortcutId == 0)
return null; return null;
foreach (Shortcut testShortcut in _allShortcuts) foreach (ShortcutItem testShortcut in _allShortcuts)
{ {
if (testShortcut.Id.Equals(shortcutId)) if (testShortcut.Id.Equals(shortcutId))
return testShortcut; return testShortcut;
@ -309,10 +309,10 @@ namespace HeliosPlus
if (!string.IsNullOrWhiteSpace(json)) if (!string.IsNullOrWhiteSpace(json))
{ {
List<Shortcut> shortcuts = new List<Shortcut>(); List<ShortcutItem> shortcuts = new List<ShortcutItem>();
try try
{ {
_allShortcuts = JsonConvert.DeserializeObject<List<Shortcut>>(json, new JsonSerializerSettings _allShortcuts = JsonConvert.DeserializeObject<List<ShortcutItem>>(json, new JsonSerializerSettings
{ {
MissingMemberHandling = MissingMemberHandling.Ignore, MissingMemberHandling = MissingMemberHandling.Ignore,
NullValueHandling = NullValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore,
@ -327,9 +327,9 @@ namespace HeliosPlus
} }
// Lookup all the Profile Names in the Saved Profiles // Lookup all the Profile Names in the Saved Profiles
foreach (Shortcut updatedShortcut in _allShortcuts) foreach (ShortcutItem updatedShortcut in _allShortcuts)
{ {
foreach (Profile profile in Profile.AllSavedProfiles) foreach (ProfileItem profile in ProfileItem.AllSavedProfiles)
{ {
if (profile.Name.Equals(updatedShortcut.ProfileName)) if (profile.Name.Equals(updatedShortcut.ProfileName))
@ -387,7 +387,7 @@ namespace HeliosPlus
return false; return false;
} }
private static void SaveShortcutIconToCache(Shortcut shortcut) private static void SaveShortcutIconToCache(ShortcutItem shortcut)
{ {
// Only add the rest of the options if the permanence is temporary // Only add the rest of the options if the permanence is temporary
@ -431,14 +431,15 @@ namespace HeliosPlus
MultiIcon shortcutIcon; MultiIcon shortcutIcon;
try try
{ {
shortcutIcon = new ProfileIcon(shortcut.ProfileToUse).ToIconOverlay(shortcut.OriginalIconPath); //shortcutIcon = new ProfileIcon(shortcut.ProfileToUse).ToIconOverlay(shortcut.OriginalIconPath);
shortcutIcon = shortcut.ToIconOverlay();
shortcutIcon.Save(shortcut.SavedShortcutIconCacheFilename, MultiIconFormat.ICO); shortcutIcon.Save(shortcut.SavedShortcutIconCacheFilename, MultiIconFormat.ICO);
} }
catch (Exception ex) catch (Exception ex)
{ {
// If we fail to create an icon based on the original executable or game // If we fail to create an icon based on the original executable or game
// Then we use the standard HeliosPlus profile one. // Then we use the standard HeliosPlus profile one.
shortcutIcon = new ProfileIcon(shortcut.ProfileToUse).ToIcon(); shortcutIcon = shortcut.ProfileToUse.ProfileIcon.ToIcon();
shortcutIcon.Save(shortcut.SavedShortcutIconCacheFilename, MultiIconFormat.ICO); shortcutIcon.Save(shortcut.SavedShortcutIconCacheFilename, MultiIconFormat.ICO);
} }
} }

46
HeliosPlus/UIForms/DisplayProfileForm.cs
View File

@ -13,11 +13,11 @@ namespace HeliosPlus.UIForms
{ {
internal partial class DisplayProfileForm : Form internal partial class DisplayProfileForm : Form
{ {
private Profile _selectedProfile; private ProfileItem _selectedProfile;
private List<Profile> _savedProfiles = new List<Profile>(); private List<ProfileItem> _savedProfiles = new List<ProfileItem>();
private string _saveOrRenameMode = "save"; private string _saveOrRenameMode = "save";
private static bool _inDialog = false; private static bool _inDialog = false;
private static Profile _profileToLoad = null; private static ProfileItem _profileToLoad = null;
private ProfileAdaptor _profileAdaptor; private ProfileAdaptor _profileAdaptor;
public DisplayProfileForm() public DisplayProfileForm()
@ -27,7 +27,7 @@ namespace HeliosPlus.UIForms
_profileAdaptor = new ProfileAdaptor(); _profileAdaptor = new ProfileAdaptor();
} }
public DisplayProfileForm(Profile profileToLoad) : this() public DisplayProfileForm(ProfileItem profileToLoad) : this()
{ {
_profileToLoad = profileToLoad; _profileToLoad = profileToLoad;
} }
@ -85,7 +85,7 @@ namespace HeliosPlus.UIForms
if (MessageBox.Show($"Are you sure you want to delete the '{_selectedProfile.Name}' Display Profile?", $"Delete '{_selectedProfile.Name}' Display Profile?", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.No) if (MessageBox.Show($"Are you sure you want to delete the '{_selectedProfile.Name}' Display Profile?", $"Delete '{_selectedProfile.Name}' Display Profile?", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.No)
return; return;
Profile profileToDelete = _selectedProfile; ProfileItem profileToDelete = _selectedProfile;
string profileToDeleteFilename = _selectedProfile.SavedProfileCacheFilename; string profileToDeleteFilename = _selectedProfile.SavedProfileCacheFilename;
// remove the profile from the imagelistview // remove the profile from the imagelistview
@ -120,7 +120,7 @@ namespace HeliosPlus.UIForms
ilv_saved_profiles.Items[ilvItemToSelect].Selected = true; ilv_saved_profiles.Items[ilvItemToSelect].Selected = true;
// select the // select the
foreach (Profile newSelectedProfile in _savedProfiles) foreach (ProfileItem newSelectedProfile in _savedProfiles)
{ {
if (newSelectedProfile.Name.Equals(ilv_saved_profiles.Items[ilvItemToSelect].Text)) if (newSelectedProfile.Name.Equals(ilv_saved_profiles.Items[ilvItemToSelect].Text))
{ {
@ -132,13 +132,13 @@ namespace HeliosPlus.UIForms
{ {
// We now only have an unsaved current profile, and no saved ones // We now only have an unsaved current profile, and no saved ones
// So we need to change the mode // So we need to change the mode
ChangeSelectedProfile(Profile.CurrentProfile); ChangeSelectedProfile(ProfileItem.CurrentProfile);
} }
// Then save the profiles so we always have it updated // Then save the profiles so we always have it updated
// Generating the imagelistview images automatically as we save. // Generating the imagelistview images automatically as we save.
Profile.SaveAllProfiles(_savedProfiles); ProfileItem.SaveAllProfiles(_savedProfiles);
} }
private void RefreshDisplayProfileUI() private void RefreshDisplayProfileUI()
@ -153,7 +153,7 @@ namespace HeliosPlus.UIForms
{ {
ImageListViewItem newItem = null; ImageListViewItem newItem = null;
bool foundCurrentProfileInLoadedProfiles = false; bool foundCurrentProfileInLoadedProfiles = false;
foreach (Profile loadedProfile in _savedProfiles) foreach (ProfileItem loadedProfile in _savedProfiles)
{ {
bool thisLoadedProfileIsAlreadyHere = (from item in ilv_saved_profiles.Items where item.Text == loadedProfile.Name select item.Text).Any(); bool thisLoadedProfileIsAlreadyHere = (from item in ilv_saved_profiles.Items where item.Text == loadedProfile.Name select item.Text).Any();
if (!thisLoadedProfileIsAlreadyHere) if (!thisLoadedProfileIsAlreadyHere)
@ -166,7 +166,7 @@ namespace HeliosPlus.UIForms
ilv_saved_profiles.Items.Add(newItem, _profileAdaptor); ilv_saved_profiles.Items.Add(newItem, _profileAdaptor);
} }
if (Profile.CurrentProfile.Equals(loadedProfile)) if (ProfileItem.CurrentProfile.Equals(loadedProfile))
{ {
// We have already saved the selected profile! // We have already saved the selected profile!
// so we need to show the selected profile // so we need to show the selected profile
@ -179,7 +179,7 @@ namespace HeliosPlus.UIForms
// found a matching profile, then we need to show the current // found a matching profile, then we need to show the current
// Profile // Profile
if (!foundCurrentProfileInLoadedProfiles) if (!foundCurrentProfileInLoadedProfiles)
ChangeSelectedProfile(Profile.CurrentProfile); ChangeSelectedProfile(ProfileItem.CurrentProfile);
// Check if we were loading a profile to edit // Check if we were loading a profile to edit
// If so, select that instead of all that other stuff above! // If so, select that instead of all that other stuff above!
@ -192,7 +192,7 @@ namespace HeliosPlus.UIForms
// If there are no profiles at all then we are starting from scratch! // If there are no profiles at all then we are starting from scratch!
// Show the profile in the DV window // Show the profile in the DV window
// Use the current profile name in the label and the save name // Use the current profile name in the label and the save name
ChangeSelectedProfile(Profile.CurrentProfile); ChangeSelectedProfile(ProfileItem.CurrentProfile);
} }
// Restart updating the saved_profiles listview // Restart updating the saved_profiles listview
@ -213,7 +213,7 @@ namespace HeliosPlus.UIForms
// and the app will automatically recognise that things have changed. // and the app will automatically recognise that things have changed.
// Reload the profiles in case we swapped to another program to change it // Reload the profiles in case we swapped to another program to change it
Profile.UpdateCurrentProfile(); ProfileItem.UpdateCurrentProfile();
// Refresh the Profile UI // Refresh the Profile UI
RefreshDisplayProfileUI(); RefreshDisplayProfileUI();
} }
@ -221,15 +221,15 @@ namespace HeliosPlus.UIForms
private void DisplayProfileForm_Load(object sender, EventArgs e) private void DisplayProfileForm_Load(object sender, EventArgs e)
{ {
// Load all the profiles to prepare things // Load all the profiles to prepare things
_savedProfiles = (List<Profile>)Profile.LoadAllProfiles(); _savedProfiles = (List<ProfileItem>)ProfileItem.LoadAllProfiles();
// Update the Current Profile // Update the Current Profile
Profile.UpdateCurrentProfile(); ProfileItem.UpdateCurrentProfile();
// Refresh the Profile UI // Refresh the Profile UI
RefreshDisplayProfileUI(); RefreshDisplayProfileUI();
} }
private void ChangeSelectedProfile(Profile profile) private void ChangeSelectedProfile(ProfileItem profile)
{ {
// And we need to update the actual selected profile too! // And we need to update the actual selected profile too!
@ -241,7 +241,7 @@ namespace HeliosPlus.UIForms
// And update the save/rename textbox // And update the save/rename textbox
txt_profile_save_name.Text = _selectedProfile.Name; txt_profile_save_name.Text = _selectedProfile.Name;
if (_selectedProfile.Equals(Profile.CurrentProfile)) if (_selectedProfile.Equals(ProfileItem.CurrentProfile))
{ {
if (_savedProfiles.Contains(_selectedProfile)) if (_savedProfiles.Contains(_selectedProfile))
{ {
@ -281,7 +281,7 @@ namespace HeliosPlus.UIForms
} }
private void RefreshImageListView(Profile profile) private void RefreshImageListView(ProfileItem profile)
{ {
ilv_saved_profiles.ClearSelection(); ilv_saved_profiles.ClearSelection();
IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_profiles.Items where item.Text == profile.Name select item); IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_profiles.Items where item.Text == profile.Name select item);
@ -305,7 +305,7 @@ namespace HeliosPlus.UIForms
} }
// Check we're not already using the name // Check we're not already using the name
foreach (Profile savedProfile in Profile.AllSavedProfiles) foreach (ProfileItem savedProfile in ProfileItem.AllSavedProfiles)
{ {
//if (String.Equals(txt_profile_save_name.Text, savedProfile.Name, StringComparison.InvariantCultureIgnoreCase)) //if (String.Equals(txt_profile_save_name.Text, savedProfile.Name, StringComparison.InvariantCultureIgnoreCase))
if (savedProfile.Name.Equals(txt_profile_save_name.Text)) if (savedProfile.Name.Equals(txt_profile_save_name.Text))
@ -322,7 +322,7 @@ namespace HeliosPlus.UIForms
// We're in 'save' mode! // We're in 'save' mode!
// Check we're not already saving this profile // Check we're not already saving this profile
foreach (Profile savedProfile in Profile.AllSavedProfiles) foreach (ProfileItem savedProfile in ProfileItem.AllSavedProfiles)
{ {
//if (String.Equals(txt_profile_save_name.Text, savedProfile.Name, StringComparison.InvariantCultureIgnoreCase)) //if (String.Equals(txt_profile_save_name.Text, savedProfile.Name, StringComparison.InvariantCultureIgnoreCase))
if (savedProfile.Equals(_selectedProfile)) if (savedProfile.Equals(_selectedProfile))
@ -394,7 +394,7 @@ namespace HeliosPlus.UIForms
// Then save the profiles so we always have it updated // Then save the profiles so we always have it updated
// Generating the imagelistview images automatically as we save. // Generating the imagelistview images automatically as we save.
Profile.SaveAllProfiles(_savedProfiles); ProfileItem.SaveAllProfiles(_savedProfiles);
// now update the profiles image listview // now update the profiles image listview
//ilv_saved_profiles.Refresh(); //ilv_saved_profiles.Refresh();
@ -403,7 +403,7 @@ namespace HeliosPlus.UIForms
private void ilv_saved_profiles_ItemClick(object sender, ItemClickEventArgs e) private void ilv_saved_profiles_ItemClick(object sender, ItemClickEventArgs e)
{ {
foreach (Profile savedProfile in _savedProfiles) foreach (ProfileItem savedProfile in _savedProfiles)
{ {
if (savedProfile.Name == e.Item.Text) if (savedProfile.Name == e.Item.Text)
{ {
@ -416,7 +416,7 @@ namespace HeliosPlus.UIForms
private void btn_view_current_Click(object sender, EventArgs e) private void btn_view_current_Click(object sender, EventArgs e)
{ {
// Reload the profiles in case we swapped to another program to change it // Reload the profiles in case we swapped to another program to change it
Profile.UpdateCurrentProfile(); ProfileItem.UpdateCurrentProfile();
// Refresh the Profile UI // Refresh the Profile UI
RefreshDisplayProfileUI(); RefreshDisplayProfileUI();
} }

12
HeliosPlus/UIForms/ProfileAdaptor.cs
View File

@ -45,9 +45,9 @@ namespace HeliosPlus.UIForms
{ {
string profileName = key.ToString(); string profileName = key.ToString();
Profile profileToUse = null; ProfileItem profileToUse = null;
foreach (Profile profileToTest in Profile.AllSavedProfiles) foreach (ProfileItem profileToTest in ProfileItem.AllSavedProfiles)
{ {
if (profileToTest.Name == profileName) if (profileToTest.Name == profileName)
{ {
@ -58,7 +58,7 @@ namespace HeliosPlus.UIForms
if (profileToUse == null) if (profileToUse == null)
{ {
profileToUse = Profile.CurrentProfile; profileToUse = ProfileItem.CurrentProfile;
} }
Image.GetThumbnailImageAbort myCallback = new Image.GetThumbnailImageAbort(() => { return false; }); Image.GetThumbnailImageAbort myCallback = new Image.GetThumbnailImageAbort(() => { return false; });
@ -139,9 +139,9 @@ namespace HeliosPlus.UIForms
try try
{ {
string profileName = (string)key; string profileName = (string)key;
Profile profileToUse = null; ProfileItem profileToUse = null;
foreach (Profile profileToTest in Profile.AllSavedProfiles) foreach (ProfileItem profileToTest in ProfileItem.AllSavedProfiles)
{ {
if (profileToTest.Name == profileName) if (profileToTest.Name == profileName)
{ {
@ -152,7 +152,7 @@ namespace HeliosPlus.UIForms
if (profileToUse == null) if (profileToUse == null)
{ {
profileToUse = Profile.CurrentProfile; profileToUse = ProfileItem.CurrentProfile;
} }
// Get file info // Get file info

6
HeliosPlus/UIForms/ShortcutAdaptor.cs
View File

@ -42,7 +42,7 @@ namespace HeliosPlus.UIForms
try try
{ {
Shortcut shortcut = (Shortcut) key; ShortcutItem shortcut = (ShortcutItem) key;
if (shortcut == null) if (shortcut == null)
{ {
@ -79,7 +79,7 @@ namespace HeliosPlus.UIForms
try try
{ {
Shortcut shortcutName = (Shortcut) key; ShortcutItem shortcutName = (ShortcutItem) key;
return shortcutName.Name; return shortcutName.Name;
} }
catch catch
@ -135,7 +135,7 @@ namespace HeliosPlus.UIForms
try try
{ {
Shortcut shortcut = (Shortcut) key; ShortcutItem shortcut = (ShortcutItem) key;
// Get file info // Get file info
if (shortcut.ShortcutBitmap is Bitmap) if (shortcut.ShortcutBitmap is Bitmap)

38
HeliosPlus/UIForms/ShortcutForm.cs
View File

@ -21,9 +21,9 @@ namespace HeliosPlus.UIForms
List<SteamGame> _allSteamGames; List<SteamGame> _allSteamGames;
private ProfileAdaptor _profileAdaptor; private ProfileAdaptor _profileAdaptor;
private List<Profile> _loadedProfiles = new List<Profile>(); private List<ProfileItem> _loadedProfiles = new List<ProfileItem>();
private Profile _profileToUse= null; private ProfileItem _profileToUse= null;
private Shortcut _shortcutToEdit = null; private ShortcutItem _shortcutToEdit = null;
private bool _isNewShortcut = false; private bool _isNewShortcut = false;
private bool _isUnsaved = false; private bool _isUnsaved = false;
private bool _saveNameAutomatic = true; private bool _saveNameAutomatic = true;
@ -43,14 +43,14 @@ namespace HeliosPlus.UIForms
// existing Shortcut) // existing Shortcut)
if (_shortcutToEdit == null) if (_shortcutToEdit == null)
{ {
_shortcutToEdit = new Shortcut(); _shortcutToEdit = new ShortcutItem();
_isNewShortcut = true; _isNewShortcut = true;
} }
} }
public ShortcutForm(Shortcut shortcutToEdit) : this() public ShortcutForm(ShortcutItem shortcutToEdit) : this()
{ {
_shortcutToEdit = shortcutToEdit; _shortcutToEdit = shortcutToEdit;
_isNewShortcut = false; _isNewShortcut = false;
@ -141,7 +141,7 @@ namespace HeliosPlus.UIForms
} }
} }
public Shortcut Shortcut public ShortcutItem Shortcut
{ {
get => _shortcutToEdit; get => _shortcutToEdit;
} }
@ -269,7 +269,7 @@ namespace HeliosPlus.UIForms
} }
// Check the profile is set and that it's still valid // Check the profile is set and that it's still valid
if (!(_profileToUse is Profile)) if (!(_profileToUse is ProfileItem))
{ {
MessageBox.Show( MessageBox.Show(
@"You need to select a Display Profile to use with this shortcut. Please select one from the list of Display Profiles on the left of the screen.", @"You need to select a Display Profile to use with this shortcut. Please select one from the list of Display Profiles on the left of the screen.",
@ -471,7 +471,7 @@ namespace HeliosPlus.UIForms
private bool canEnableSaveButton() private bool canEnableSaveButton()
{ {
if ((txt_shortcut_save_name.Text.Length > 0) && if ((txt_shortcut_save_name.Text.Length > 0) &&
_profileToUse is Profile && _profileToUse is ProfileItem &&
(rb_no_game.Checked || (rb_no_game.Checked ||
rb_launcher.Checked && _gameId > 0 || rb_launcher.Checked && _gameId > 0 ||
rb_standalone.Checked && txt_executable.Text.Length > 0)) rb_standalone.Checked && txt_executable.Text.Length > 0))
@ -491,7 +491,7 @@ namespace HeliosPlus.UIForms
private void suggestShortcutName() private void suggestShortcutName()
{ {
if (_saveNameAutomatic && _profileToUse is Profile) if (_saveNameAutomatic && _profileToUse is ProfileItem)
{ {
if (rb_no_game.Checked) if (rb_no_game.Checked)
{ {
@ -588,7 +588,7 @@ namespace HeliosPlus.UIForms
} }
private void RefreshImageListView(Profile profile) private void RefreshImageListView(ProfileItem profile)
{ {
ilv_saved_profiles.ClearSelection(); ilv_saved_profiles.ClearSelection();
IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_profiles.Items where item.Text == profile.Name select item); IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_profiles.Items where item.Text == profile.Name select item);
@ -603,12 +603,12 @@ namespace HeliosPlus.UIForms
{ {
// Load all the profiles to prepare things // Load all the profiles to prepare things
_loadedProfiles = (List<Profile>)Profile.LoadAllProfiles(); _loadedProfiles = (List<ProfileItem>)ProfileItem.LoadAllProfiles();
bool foundCurrentProfileInLoadedProfiles = false; bool foundCurrentProfileInLoadedProfiles = false;
foreach (Profile loadedProfile in _loadedProfiles) foreach (ProfileItem loadedProfile in _loadedProfiles)
{ {
if (Profile.CurrentProfile.Equals(loadedProfile)) if (ProfileItem.CurrentProfile.Equals(loadedProfile))
{ {
// We have already saved the selected profile! // We have already saved the selected profile!
// so we need to show the selected profile // so we need to show the selected profile
@ -647,7 +647,7 @@ namespace HeliosPlus.UIForms
Icon icoAppIcon = Icon.ExtractAssociatedIcon(game.GameIconPath); Icon icoAppIcon = Icon.ExtractAssociatedIcon(game.GameIconPath);
// We first try high quality icons // We first try high quality icons
Bitmap extractedBitmap = Shortcut.ExtractVistaIcon(icoAppIcon); Bitmap extractedBitmap = ShortcutItem.ExtractVistaIcon(icoAppIcon);
if (extractedBitmap == null) if (extractedBitmap == null)
extractedBitmap = icoAppIcon.ToBitmap(); extractedBitmap = icoAppIcon.ToBitmap();
il_games.Images.Add(extractedBitmap); il_games.Images.Add(extractedBitmap);
@ -821,7 +821,7 @@ namespace HeliosPlus.UIForms
private void ilv_saved_profiles_ItemClick(object sender, ItemClickEventArgs e) private void ilv_saved_profiles_ItemClick(object sender, ItemClickEventArgs e)
{ {
foreach (Profile loadedProfile in _loadedProfiles) foreach (ProfileItem loadedProfile in _loadedProfiles)
{ {
if (loadedProfile.Name == e.Item.Text) if (loadedProfile.Name == e.Item.Text)
{ {
@ -831,7 +831,7 @@ namespace HeliosPlus.UIForms
} }
private void ChangeSelectedProfile(Profile profile) private void ChangeSelectedProfile(ProfileItem profile)
{ {
// If the profile is null then return // If the profile is null then return
// (this happens when a new blank shortcut is created // (this happens when a new blank shortcut is created
@ -844,7 +844,7 @@ namespace HeliosPlus.UIForms
// We also need to load the saved profile name to show the user // We also need to load the saved profile name to show the user
lbl_profile_shown.Text = _profileToUse.Name; lbl_profile_shown.Text = _profileToUse.Name;
if (_profileToUse.Equals(Profile.CurrentProfile)) if (_profileToUse.Equals(ProfileItem.CurrentProfile))
{ {
lbl_profile_shown_subtitle.Text = "(Current Display Profile in use)"; lbl_profile_shown_subtitle.Text = "(Current Display Profile in use)";
} }
@ -881,7 +881,7 @@ namespace HeliosPlus.UIForms
ImageListViewItem newItem = null; ImageListViewItem newItem = null;
bool foundCurrentProfileInLoadedProfiles = false; bool foundCurrentProfileInLoadedProfiles = false;
foreach (Profile loadedProfile in _loadedProfiles) foreach (ProfileItem loadedProfile in _loadedProfiles)
{ {
bool thisLoadedProfileIsAlreadyHere = (from item in ilv_saved_profiles.Items where item.Text == loadedProfile.Name select item.Text).Any(); bool thisLoadedProfileIsAlreadyHere = (from item in ilv_saved_profiles.Items where item.Text == loadedProfile.Name select item.Text).Any();
if (!thisLoadedProfileIsAlreadyHere) if (!thisLoadedProfileIsAlreadyHere)
@ -900,7 +900,7 @@ namespace HeliosPlus.UIForms
// found a matching profile, then we need to show the current // found a matching profile, then we need to show the current
// Profile // Profile
if (!foundCurrentProfileInLoadedProfiles) if (!foundCurrentProfileInLoadedProfiles)
ChangeSelectedProfile(Profile.CurrentProfile); ChangeSelectedProfile(ProfileItem.CurrentProfile);
// Check if we were loading a profile to edit // Check if we were loading a profile to edit
// If so, select that instead of all that other stuff above! // If so, select that instead of all that other stuff above!

40
HeliosPlus/UIForms/ShortcutLibraryForm.cs
View File

@ -22,7 +22,7 @@ namespace HeliosPlus.UIForms
private ShortcutAdaptor _shortcutAdaptor; private ShortcutAdaptor _shortcutAdaptor;
private ImageListViewItem _selectedShortcutILVItem = null; private ImageListViewItem _selectedShortcutILVItem = null;
private Shortcut _selectedShortcut = null; private ShortcutItem _selectedShortcut = null;
private ShortcutRepository _shortcutRepository = new ShortcutRepository(); private ShortcutRepository _shortcutRepository = new ShortcutRepository();
public ShortcutLibraryForm() public ShortcutLibraryForm()
@ -50,7 +50,7 @@ namespace HeliosPlus.UIForms
private void ShortcutLibraryForm_Load(object sender, EventArgs e) private void ShortcutLibraryForm_Load(object sender, EventArgs e)
{ {
// Load all the shortcuts we have saved earlier // Load all the shortcuts we have saved earlier
List<Shortcut> _savedShortcuts = ShortcutRepository.AllShortcuts; List<ShortcutItem> _savedShortcuts = ShortcutRepository.AllShortcuts;
// Refresh the Shortcut Library UI // Refresh the Shortcut Library UI
RefreshShortcutLibraryUI(); RefreshShortcutLibraryUI();
} }
@ -64,28 +64,33 @@ namespace HeliosPlus.UIForms
ilv_saved_shortcuts.SuspendLayout(); ilv_saved_shortcuts.SuspendLayout();
ImageListViewItem newItem = null; ImageListViewItem newItem = null;
ilv_saved_shortcuts.Items.Clear(); foreach (ShortcutItem loadedShortcut in ShortcutRepository.AllShortcuts)
foreach (Shortcut loadedShortcut in ShortcutRepository.AllShortcuts)
{ {
newItem = new ImageListViewItem(loadedShortcut, loadedShortcut.Name); bool thisLoadedShortcutIsAlreadyHere = (from item in ilv_saved_shortcuts.Items where item.Text == loadedShortcut.Name select item.Text).Any();
ilv_saved_shortcuts.Items.Add(newItem, _shortcutAdaptor); if (!thisLoadedShortcutIsAlreadyHere)
{
if (_selectedShortcut != null && _selectedShortcut is Shortcut) //loadedProfile.SaveProfileImageToCache();
RefreshImageListView(_selectedShortcut); //newItem = new ImageListViewItem(loadedProfile.SavedProfileCacheFilename, loadedProfile.Name);
//newItem = new ImageListViewItem(loadedProfile, loadedProfile.Name);
newItem = new ImageListViewItem(loadedShortcut, loadedShortcut.Name);
//ilv_saved_profiles.Items.Add(newItem);
ilv_saved_shortcuts.Items.Add(newItem, _shortcutAdaptor);
}
} }
if (_selectedShortcut != null && _selectedShortcut is ShortcutItem)
RefreshImageListView(_selectedShortcut);
// Restart updating the saved_profiles listview // Restart updating the saved_profiles listview
ilv_saved_shortcuts.ResumeLayout(); ilv_saved_shortcuts.ResumeLayout();
} }
// Refresh the image list view // Refresh the image list view
//RefreshImageListView(profile); //RefreshImageListView(_selectedShortcut);
} }
private void RefreshImageListView(Shortcut shortcut) private void RefreshImageListView(ShortcutItem shortcut)
{ {
ilv_saved_shortcuts.ClearSelection(); ilv_saved_shortcuts.ClearSelection();
IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_shortcuts.Items where item.Text == shortcut.Name select item); IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_shortcuts.Items where item.Text == shortcut.Name select item);
@ -98,7 +103,7 @@ namespace HeliosPlus.UIForms
} }
private Shortcut GetShortcutFromName(string shortcutName) private ShortcutItem GetShortcutFromName(string shortcutName)
{ {
return (from item in ShortcutRepository.AllShortcuts where item.Name == shortcutName select item).First(); return (from item in ShortcutRepository.AllShortcuts where item.Name == shortcutName select item).First();
} }
@ -209,6 +214,11 @@ namespace HeliosPlus.UIForms
if (MessageBox.Show($"Are you sure you want to delete the '{_selectedShortcut.Name}' Shortcut?", $"Delete '{_selectedShortcut.Name}' Shortcut?", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.No) if (MessageBox.Show($"Are you sure you want to delete the '{_selectedShortcut.Name}' Shortcut?", $"Delete '{_selectedShortcut.Name}' Shortcut?", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.No)
return; return;
// remove the profile from the imagelistview
int currentIlvIndex = ilv_saved_shortcuts.SelectedItems[0].Index;
ilv_saved_shortcuts.Items.RemoveAt(currentIlvIndex);
// Remove the shortcut
ShortcutRepository.RemoveShortcut(_selectedShortcut); ShortcutRepository.RemoveShortcut(_selectedShortcut);
_selectedShortcut = null; _selectedShortcut = null;

2
HeliosPlus/Validators.cs
View File

@ -23,7 +23,7 @@ namespace HeliosPlus
var profile = optionProfile.Value(); var profile = optionProfile.Value();
// Create an array of display profiles we have // Create an array of display profiles we have
var profiles = Profile.LoadAllProfiles().ToArray(); var profiles = ProfileItem.LoadAllProfiles().ToArray();
// Check if the user supplied a --profile option using the profiles' ID // Check if the user supplied a --profile option using the profiles' ID
var profileIndex = profiles.Length > 0 ? Array.FindIndex(profiles, p => p.Id.Equals(profile, StringComparison.InvariantCultureIgnoreCase)) : -1; var profileIndex = profiles.Length > 0 ? Array.FindIndex(profiles, p => p.Id.Equals(profile, StringComparison.InvariantCultureIgnoreCase)) : -1;
// If the profileID wasn't there, maybe they used the profile name? // If the profileID wasn't there, maybe they used the profile name?