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

Updated game library images

Browse Source 
Also changed from game library icons
to game library images to better match
the current icon generation logic.
This commit is contained in:
Terry MacDonald 2021-05-19 20:40:26 +12:00
parent 5b99c3ac7a
commit a4db4b39b7
15 changed files with 148 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DisplayMagician/DisplayMagician.csproj
View File

@ -343,12 +343,16 @@
<None Include="Resources\Epic.ico" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Steam.png" />
<None Include="Resources\Uplay.png" />
<None Include="Resources\whitearrowsup.png" />
<None Include="Resources\redarrowsup.png" />
<None Include="Resources\whitearrows.png" />
<None Include="Resources\warning.png" />
<None Include="Resources\DisplayMagician.ico" />
<None Include="Resources\error.png" />
<None Include="Resources\Epic.png" />
<None Include="Resources\Origin.png" />
<Content Include="Resources\redarrows.png" />
</ItemGroup>
<ItemGroup>

37
DisplayMagician/Program.cs
View File

@ -421,37 +421,6 @@ namespace DisplayMagician {
heliosIcon.Save(fs);
}
// Save a copy of the Steam Icon, and all the game library ones in preparation for future use
if (!File.Exists(AppSteamIconFilename))
{
Icon heliosIcon = (Icon)Properties.Resources.Steam;
using (FileStream fs = new FileStream(AppSteamIconFilename, FileMode.Create))
heliosIcon.Save(fs);
}
// Save a copy of the Uplay Icon, and all the game library ones in preparation for future use
if (!File.Exists(AppUplayIconFilename))
{
Icon heliosIcon = (Icon)Properties.Resources.Uplay;
using (FileStream fs = new FileStream(AppUplayIconFilename, FileMode.Create))
heliosIcon.Save(fs);
}
// Save a copy of the Epic Icon, and all the game library ones in preparation for future use
if (!File.Exists(AppEpicIconFilename))
{
Icon heliosIcon = (Icon)Properties.Resources.Epic;
using (FileStream fs = new FileStream(AppEpicIconFilename, FileMode.Create))
heliosIcon.Save(fs);
}
// Save a copy of the Origin Icon, and all the game library ones in preparation for future use
if (!File.Exists(AppOriginIconFilename))
{
Icon heliosIcon = (Icon)Properties.Resources.Origin;
using (FileStream fs = new FileStream(AppOriginIconFilename, FileMode.Create))
heliosIcon.Save(fs);
}
}
catch (Exception ex)
{
@ -902,11 +871,11 @@ namespace DisplayMagician {
if (bm == null)
{
if (game.GameLibrary.Equals(SupportedGameLibraryType.Steam))
bm = Properties.Resources.Steam.ToBitmap();
bm = Properties.Resources.Steam;
else if (game.GameLibrary.Equals(SupportedGameLibraryType.Uplay))
bm = Properties.Resources.Uplay.ToBitmap();
bm = Properties.Resources.Uplay;
else if (game.GameLibrary.Equals(SupportedGameLibraryType.Origin))
bm = Properties.Resources.Origin.ToBitmap();
bm = Properties.Resources.Origin;
else
bm = Properties.Resources.DisplayMagician.ToBitmap();
}

24
DisplayMagician/Properties/Resources.Designer.cs generated
View File

@ -71,12 +71,12 @@ namespace DisplayMagician.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Icon Epic {
public static System.Drawing.Bitmap Epic {
get {
object obj = ResourceManager.GetObject("Epic", resourceCulture);
return ((System.Drawing.Icon)(obj));
return ((System.Drawing.Bitmap)(obj));
}
}
@ -91,12 +91,12 @@ namespace DisplayMagician.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Icon Origin {
public static System.Drawing.Bitmap Origin {
get {
object obj = ResourceManager.GetObject("Origin", resourceCulture);
return ((System.Drawing.Icon)(obj));
return ((System.Drawing.Bitmap)(obj));
}
}
@ -121,22 +121,22 @@ namespace DisplayMagician.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Icon Steam {
public static System.Drawing.Bitmap Steam {
get {
object obj = ResourceManager.GetObject("Steam", resourceCulture);
return ((System.Drawing.Icon)(obj));
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Icon Uplay {
public static System.Drawing.Bitmap Uplay {
get {
object obj = ResourceManager.GetObject("Uplay", resourceCulture);
return ((System.Drawing.Icon)(obj));
return ((System.Drawing.Bitmap)(obj));
}
}

24
DisplayMagician/Properties/Resources.resx
View File

@ -118,21 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Epic" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Epic.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DisplayMagician" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DisplayMagician.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Origin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Origin.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Steam" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Steam.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Uplay" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Uplay.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="RedArrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\redarrows.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -151,4 +139,16 @@
<data name="whitearrowsup" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\whitearrowsup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Epic" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Epic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Origin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Origin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Steam" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Steam.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Uplay" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Uplay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
DisplayMagician/Resources/Epic.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 KiB

BIN
DisplayMagician/Resources/Epic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
DisplayMagician/Resources/Origin.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 293 KiB

BIN
DisplayMagician/Resources/Origin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
DisplayMagician/Resources/Steam.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 292 KiB

BIN
DisplayMagician/Resources/Steam.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
DisplayMagician/Resources/Uplay.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 155 KiB

BIN
DisplayMagician/Resources/Uplay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

12
DisplayMagician/ShortcutItem.cs
View File

@ -995,17 +995,17 @@ namespace DisplayMagician
if (_gameLibrary == SupportedGameLibraryType.Steam)
{
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Using the Steam icon as the icon instead.");
bm = ToBitmapOverlay(Properties.Resources.Steam.ToBitmap(), _profileToUse.ProfileIcon.ToBitmap(),256,256);
bm = ToBitmapOverlay(Properties.Resources.Steam, _profileToUse.ProfileIcon.ToBitmap(),256,256);
}
else if (_gameLibrary == SupportedGameLibraryType.Uplay)
{
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Using the Uplay icon as the icon instead.");
bm = ToBitmapOverlay(Properties.Resources.Uplay.ToBitmap(), _profileToUse.ProfileIcon.ToBitmap(), 256, 256);
bm = ToBitmapOverlay(Properties.Resources.Uplay, _profileToUse.ProfileIcon.ToBitmap(), 256, 256);
}
else if (_gameLibrary == SupportedGameLibraryType.Origin)
{
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Using the Origin icon as the icon instead.");
bm = ToBitmapOverlay(Properties.Resources.Origin.ToBitmap(), _profileToUse.ProfileIcon.ToBitmap(), 256, 256);
bm = ToBitmapOverlay(Properties.Resources.Origin, _profileToUse.ProfileIcon.ToBitmap(), 256, 256);
}
si.Add(bm);
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Saving the replacement icon for Shortcut '{Name}' to {_savedShortcutIconCacheFilename}.");
@ -1041,17 +1041,17 @@ namespace DisplayMagician
if (_gameLibrary == SupportedGameLibraryType.Steam)
{
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Using the Steam icon as the icon instead.");
originalBitmap = Properties.Resources.Steam.ToBitmap();
originalBitmap = Properties.Resources.Steam;
}
else if (_gameLibrary == SupportedGameLibraryType.Uplay)
{
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Using the Uplay icon as the icon instead.");
originalBitmap = Properties.Resources.Uplay.ToBitmap();
originalBitmap = Properties.Resources.Uplay;
}
else if (_gameLibrary == SupportedGameLibraryType.Origin)
{
logger.Trace($"ShortcutItem/SaveShortcutIconToCache: Using the Origin icon as the icon instead.");
originalBitmap = Properties.Resources.Origin.ToBitmap();
originalBitmap = Properties.Resources.Origin;
}
}
else

216
DisplayMagician/UIForms/SettingsForm.Designer.cs generated
View File

@ -36,17 +36,17 @@ namespace DisplayMagician.UIForms
this.cmb_loglevel = new System.Windows.Forms.ComboBox();
this.cb_minimise_notification_area = new System.Windows.Forms.CheckBox();
this.gb_hotkeys = new System.Windows.Forms.GroupBox();
this.btn_hotkey_main_window = new System.Windows.Forms.Button();
this.btn_hotkey_display_profile = new System.Windows.Forms.Button();
this.btn_hotkey_shortcuts = new System.Windows.Forms.Button();
this.lbl_hotkey_main_window_description = new System.Windows.Forms.Label();
this.lbl_hotkey_display_profile_description = new System.Windows.Forms.Label();
this.lbl_hotkey_shortcut_library_description = new System.Windows.Forms.Label();
this.btn_clear_all_hotkeys = new System.Windows.Forms.Button();
this.lv_dynamic_hotkeys = new System.Windows.Forms.ListView();
this.lbl_hotkey_main_window = new System.Windows.Forms.Label();
this.lbl_hotkey_display_profile = new System.Windows.Forms.Label();
this.lbl_hotkey_shortcut_library = new System.Windows.Forms.Label();
this.lbl_hotkey_display_profile = new System.Windows.Forms.Label();
this.lbl_hotkey_main_window = new System.Windows.Forms.Label();
this.lv_dynamic_hotkeys = new System.Windows.Forms.ListView();
this.btn_clear_all_hotkeys = new System.Windows.Forms.Button();
this.lbl_hotkey_shortcut_library_description = new System.Windows.Forms.Label();
this.lbl_hotkey_display_profile_description = new System.Windows.Forms.Label();
this.lbl_hotkey_main_window_description = new System.Windows.Forms.Label();
this.btn_hotkey_shortcuts = new System.Windows.Forms.Button();
this.btn_hotkey_display_profile = new System.Windows.Forms.Button();
this.btn_hotkey_main_window = new System.Windows.Forms.Button();
this.gb_general.SuspendLayout();
this.gb_hotkeys.SuspendLayout();
this.SuspendLayout();
@ -152,80 +152,44 @@ namespace DisplayMagician.UIForms
this.gb_hotkeys.TabStop = false;
this.gb_hotkeys.Text = "Hotkeys";
//
// btn_hotkey_main_window
// lbl_hotkey_shortcut_library
//
this.btn_hotkey_main_window.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_hotkey_main_window.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_hotkey_main_window.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_hotkey_main_window.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_hotkey_main_window.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hotkey_main_window.ForeColor = System.Drawing.Color.White;
this.btn_hotkey_main_window.Location = new System.Drawing.Point(412, 27);
this.btn_hotkey_main_window.Name = "btn_hotkey_main_window";
this.btn_hotkey_main_window.Size = new System.Drawing.Size(88, 33);
this.btn_hotkey_main_window.TabIndex = 36;
this.btn_hotkey_main_window.Text = "Set Hotkey";
this.btn_hotkey_main_window.UseVisualStyleBackColor = true;
this.btn_hotkey_main_window.Click += new System.EventHandler(this.btn_hotkey_main_window_Click);
this.lbl_hotkey_shortcut_library.Location = new System.Drawing.Point(236, 133);
this.lbl_hotkey_shortcut_library.Name = "lbl_hotkey_shortcut_library";
this.lbl_hotkey_shortcut_library.Size = new System.Drawing.Size(169, 16);
this.lbl_hotkey_shortcut_library.TabIndex = 47;
this.lbl_hotkey_shortcut_library.Text = "None Set";
this.lbl_hotkey_shortcut_library.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lbl_hotkey_shortcut_library.Click += new System.EventHandler(this.lbl_hotkey_shortcut_library_Click);
//
// btn_hotkey_display_profile
// lbl_hotkey_display_profile
//
this.btn_hotkey_display_profile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_hotkey_display_profile.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_hotkey_display_profile.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_hotkey_display_profile.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_hotkey_display_profile.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hotkey_display_profile.ForeColor = System.Drawing.Color.White;
this.btn_hotkey_display_profile.Location = new System.Drawing.Point(411, 75);
this.btn_hotkey_display_profile.Name = "btn_hotkey_display_profile";
this.btn_hotkey_display_profile.Size = new System.Drawing.Size(89, 33);
this.btn_hotkey_display_profile.TabIndex = 37;
this.btn_hotkey_display_profile.Text = "Set Hotkey";
this.btn_hotkey_display_profile.UseVisualStyleBackColor = true;
this.btn_hotkey_display_profile.Click += new System.EventHandler(this.btn_hotkey_display_profile_Click);
this.lbl_hotkey_display_profile.Location = new System.Drawing.Point(236, 83);
this.lbl_hotkey_display_profile.Name = "lbl_hotkey_display_profile";
this.lbl_hotkey_display_profile.Size = new System.Drawing.Size(169, 16);
this.lbl_hotkey_display_profile.TabIndex = 46;
this.lbl_hotkey_display_profile.Text = "None Set";
this.lbl_hotkey_display_profile.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lbl_hotkey_display_profile.Click += new System.EventHandler(this.lbl_hotkey_display_profile_Click);
//
// btn_hotkey_shortcuts
// lbl_hotkey_main_window
//
this.btn_hotkey_shortcuts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_hotkey_shortcuts.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_hotkey_shortcuts.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_hotkey_shortcuts.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_hotkey_shortcuts.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hotkey_shortcuts.ForeColor = System.Drawing.Color.White;
this.btn_hotkey_shortcuts.Location = new System.Drawing.Point(411, 125);
this.btn_hotkey_shortcuts.Name = "btn_hotkey_shortcuts";
this.btn_hotkey_shortcuts.Size = new System.Drawing.Size(88, 33);
this.btn_hotkey_shortcuts.TabIndex = 38;
this.btn_hotkey_shortcuts.Text = "Set Hotkey";
this.btn_hotkey_shortcuts.UseVisualStyleBackColor = true;
this.btn_hotkey_shortcuts.Click += new System.EventHandler(this.btn_hotkey_shortcuts_Click);
this.lbl_hotkey_main_window.Location = new System.Drawing.Point(237, 35);
this.lbl_hotkey_main_window.Name = "lbl_hotkey_main_window";
this.lbl_hotkey_main_window.Size = new System.Drawing.Size(169, 16);
this.lbl_hotkey_main_window.TabIndex = 45;
this.lbl_hotkey_main_window.Text = "None Set";
this.lbl_hotkey_main_window.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lbl_hotkey_main_window.Click += new System.EventHandler(this.lbl_hotkey_main_window_Click);
//
// lbl_hotkey_main_window_description
// lv_dynamic_hotkeys
//
this.lbl_hotkey_main_window_description.AutoSize = true;
this.lbl_hotkey_main_window_description.Location = new System.Drawing.Point(26, 35);
this.lbl_hotkey_main_window_description.Name = "lbl_hotkey_main_window_description";
this.lbl_hotkey_main_window_description.Size = new System.Drawing.Size(185, 16);
this.lbl_hotkey_main_window_description.TabIndex = 39;
this.lbl_hotkey_main_window_description.Text = "Hotkey to open Main Window:";
//
// lbl_hotkey_display_profile_description
//
this.lbl_hotkey_display_profile_description.AutoSize = true;
this.lbl_hotkey_display_profile_description.Location = new System.Drawing.Point(25, 83);
this.lbl_hotkey_display_profile_description.Name = "lbl_hotkey_display_profile_description";
this.lbl_hotkey_display_profile_description.Size = new System.Drawing.Size(243, 16);
this.lbl_hotkey_display_profile_description.TabIndex = 40;
this.lbl_hotkey_display_profile_description.Text = "Hotkey to open Display Profile Window:";
//
// lbl_hotkey_shortcut_library_description
//
this.lbl_hotkey_shortcut_library_description.AutoSize = true;
this.lbl_hotkey_shortcut_library_description.Location = new System.Drawing.Point(25, 133);
this.lbl_hotkey_shortcut_library_description.Name = "lbl_hotkey_shortcut_library_description";
this.lbl_hotkey_shortcut_library_description.Size = new System.Drawing.Size(197, 16);
this.lbl_hotkey_shortcut_library_description.TabIndex = 41;
this.lbl_hotkey_shortcut_library_description.Text = "Hotkey to open Shortcut Library:";
this.lv_dynamic_hotkeys.HideSelection = false;
this.lv_dynamic_hotkeys.Location = new System.Drawing.Point(27, 177);
this.lv_dynamic_hotkeys.Name = "lv_dynamic_hotkeys";
this.lv_dynamic_hotkeys.Size = new System.Drawing.Size(473, 143);
this.lv_dynamic_hotkeys.TabIndex = 44;
this.lv_dynamic_hotkeys.UseCompatibleStateImageBehavior = false;
//
// btn_clear_all_hotkeys
//
@ -243,44 +207,80 @@ namespace DisplayMagician.UIForms
this.btn_clear_all_hotkeys.UseVisualStyleBackColor = true;
this.btn_clear_all_hotkeys.Click += new System.EventHandler(this.btn_clear_all_hotkeys_Click);
//
// lv_dynamic_hotkeys
// lbl_hotkey_shortcut_library_description
//
this.lv_dynamic_hotkeys.HideSelection = false;
this.lv_dynamic_hotkeys.Location = new System.Drawing.Point(27, 177);
this.lv_dynamic_hotkeys.Name = "lv_dynamic_hotkeys";
this.lv_dynamic_hotkeys.Size = new System.Drawing.Size(473, 143);
this.lv_dynamic_hotkeys.TabIndex = 44;
this.lv_dynamic_hotkeys.UseCompatibleStateImageBehavior = false;
this.lbl_hotkey_shortcut_library_description.AutoSize = true;
this.lbl_hotkey_shortcut_library_description.Location = new System.Drawing.Point(25, 133);
this.lbl_hotkey_shortcut_library_description.Name = "lbl_hotkey_shortcut_library_description";
this.lbl_hotkey_shortcut_library_description.Size = new System.Drawing.Size(197, 16);
this.lbl_hotkey_shortcut_library_description.TabIndex = 41;
this.lbl_hotkey_shortcut_library_description.Text = "Hotkey to open Shortcut Library:";
//
// lbl_hotkey_main_window
// lbl_hotkey_display_profile_description
//
this.lbl_hotkey_main_window.Location = new System.Drawing.Point(237, 35);
this.lbl_hotkey_main_window.Name = "lbl_hotkey_main_window";
this.lbl_hotkey_main_window.Size = new System.Drawing.Size(169, 16);
this.lbl_hotkey_main_window.TabIndex = 45;
this.lbl_hotkey_main_window.Text = "None Set";
this.lbl_hotkey_main_window.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lbl_hotkey_main_window.Click += new System.EventHandler(this.lbl_hotkey_main_window_Click);
this.lbl_hotkey_display_profile_description.AutoSize = true;
this.lbl_hotkey_display_profile_description.Location = new System.Drawing.Point(25, 83);
this.lbl_hotkey_display_profile_description.Name = "lbl_hotkey_display_profile_description";
this.lbl_hotkey_display_profile_description.Size = new System.Drawing.Size(243, 16);
this.lbl_hotkey_display_profile_description.TabIndex = 40;
this.lbl_hotkey_display_profile_description.Text = "Hotkey to open Display Profile Window:";
//
// lbl_hotkey_display_profile
// lbl_hotkey_main_window_description
//
this.lbl_hotkey_display_profile.Location = new System.Drawing.Point(236, 83);
this.lbl_hotkey_display_profile.Name = "lbl_hotkey_display_profile";
this.lbl_hotkey_display_profile.Size = new System.Drawing.Size(169, 16);
this.lbl_hotkey_display_profile.TabIndex = 46;
this.lbl_hotkey_display_profile.Text = "None Set";
this.lbl_hotkey_display_profile.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lbl_hotkey_display_profile.Click += new System.EventHandler(this.lbl_hotkey_display_profile_Click);
this.lbl_hotkey_main_window_description.AutoSize = true;
this.lbl_hotkey_main_window_description.Location = new System.Drawing.Point(26, 35);
this.lbl_hotkey_main_window_description.Name = "lbl_hotkey_main_window_description";
this.lbl_hotkey_main_window_description.Size = new System.Drawing.Size(185, 16);
this.lbl_hotkey_main_window_description.TabIndex = 39;
this.lbl_hotkey_main_window_description.Text = "Hotkey to open Main Window:";
//
// lbl_hotkey_shortcut_library
// btn_hotkey_shortcuts
//
this.lbl_hotkey_shortcut_library.Location = new System.Drawing.Point(236, 133);
this.lbl_hotkey_shortcut_library.Name = "lbl_hotkey_shortcut_library";
this.lbl_hotkey_shortcut_library.Size = new System.Drawing.Size(169, 16);
this.lbl_hotkey_shortcut_library.TabIndex = 47;
this.lbl_hotkey_shortcut_library.Text = "None Set";
this.lbl_hotkey_shortcut_library.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lbl_hotkey_shortcut_library.Click += new System.EventHandler(this.lbl_hotkey_shortcut_library_Click);
this.btn_hotkey_shortcuts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_hotkey_shortcuts.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_hotkey_shortcuts.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_hotkey_shortcuts.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_hotkey_shortcuts.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hotkey_shortcuts.ForeColor = System.Drawing.Color.White;
this.btn_hotkey_shortcuts.Location = new System.Drawing.Point(411, 125);
this.btn_hotkey_shortcuts.Name = "btn_hotkey_shortcuts";
this.btn_hotkey_shortcuts.Size = new System.Drawing.Size(88, 33);
this.btn_hotkey_shortcuts.TabIndex = 38;
this.btn_hotkey_shortcuts.Text = "Set Hotkey";
this.btn_hotkey_shortcuts.UseVisualStyleBackColor = true;
this.btn_hotkey_shortcuts.Click += new System.EventHandler(this.btn_hotkey_shortcuts_Click);
//
// btn_hotkey_display_profile
//
this.btn_hotkey_display_profile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_hotkey_display_profile.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_hotkey_display_profile.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_hotkey_display_profile.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_hotkey_display_profile.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hotkey_display_profile.ForeColor = System.Drawing.Color.White;
this.btn_hotkey_display_profile.Location = new System.Drawing.Point(411, 75);
this.btn_hotkey_display_profile.Name = "btn_hotkey_display_profile";
this.btn_hotkey_display_profile.Size = new System.Drawing.Size(89, 33);
this.btn_hotkey_display_profile.TabIndex = 37;
this.btn_hotkey_display_profile.Text = "Set Hotkey";
this.btn_hotkey_display_profile.UseVisualStyleBackColor = true;
this.btn_hotkey_display_profile.Click += new System.EventHandler(this.btn_hotkey_display_profile_Click);
//
// btn_hotkey_main_window
//
this.btn_hotkey_main_window.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_hotkey_main_window.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_hotkey_main_window.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_hotkey_main_window.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_hotkey_main_window.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hotkey_main_window.ForeColor = System.Drawing.Color.White;
this.btn_hotkey_main_window.Location = new System.Drawing.Point(412, 27);
this.btn_hotkey_main_window.Name = "btn_hotkey_main_window";
this.btn_hotkey_main_window.Size = new System.Drawing.Size(88, 33);
this.btn_hotkey_main_window.TabIndex = 36;
this.btn_hotkey_main_window.Text = "Set Hotkey";
this.btn_hotkey_main_window.UseVisualStyleBackColor = true;
this.btn_hotkey_main_window.Click += new System.EventHandler(this.btn_hotkey_main_window_Click);
//
// SettingsForm
//

6
DisplayMagician/UIForms/SettingsForm.cs
View File

@ -108,7 +108,6 @@ namespace DisplayMagician.UIForms
lv_dynamic_hotkeys.View = View.Details;
lv_dynamic_hotkeys.GridLines = true;
lv_dynamic_hotkeys.FullRowSelect = true;
lv_dynamic_hotkeys.ShowGroups = true;
//Add column header
lv_dynamic_hotkeys.Columns.Add("Name", 300);
@ -340,9 +339,9 @@ namespace DisplayMagician.UIForms
testHotkey = Program.AppProgramSettings.HotkeyShortcutLibraryWindow;
else
testHotkey = Keys.None;
string hotkeyHeading = $"Choose a Hotkey for the Display Profile window";
string hotkeyHeading = $"Choose a Hotkey for the Shortcut Library window";
string hotkeyDescription = $"Choose a Hotkey (a keyboard shortcut) so that you can apply use to" + Environment.NewLine +
"open the Display Profile window. This must be a Hotkey that" + Environment.NewLine +
"open the Shortcut Library window. This must be a Hotkey that" + Environment.NewLine +
"is unique across all your applications otherwise DisplayMagician" + Environment.NewLine +
"might not see it.";
HotkeyForm scHotkeyForm = new HotkeyForm(testHotkey, hotkeyHeading, hotkeyDescription);
@ -448,5 +447,6 @@ namespace DisplayMagician.UIForms
return String.Empty;
}
}
}
}