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

Initial completed develop branch merge

Browse Source 
Code now compiles, so now it is just some testing to see what is broken!
This commit is contained in:
Terry MacDonald 2021-08-30 12:51:44 +12:00
parent 838ebff43b
commit 4c8ecc0bf6
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DisplayMagician/UIForms/DisplayProfileForm.Designer.cs generated
View File

@ -61,6 +61,7 @@ namespace DisplayMagician.UIForms
this.dv_profile = new DisplayMagicianShared.UserControls.DisplayView(); this.dv_profile = new DisplayMagicianShared.UserControls.DisplayView();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.pbLogo = new System.Windows.Forms.PictureBox(); this.pbLogo = new System.Windows.Forms.PictureBox();
this.btn_profile_settings = new System.Windows.Forms.Button();
this.menu_profiles.SuspendLayout(); this.menu_profiles.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pb_down_arrow)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pb_down_arrow)).BeginInit();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
@ -367,6 +368,7 @@ namespace DisplayMagician.UIForms
// panel1 // panel1
// //
this.panel1.BackColor = System.Drawing.Color.DimGray; this.panel1.BackColor = System.Drawing.Color.DimGray;
this.panel1.Controls.Add(this.btn_profile_settings);
this.panel1.Controls.Add(this.pbLogo); this.panel1.Controls.Add(this.pbLogo);
this.panel1.Location = new System.Drawing.Point(0, 61); this.panel1.Location = new System.Drawing.Point(0, 61);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
@ -383,6 +385,23 @@ namespace DisplayMagician.UIForms
this.pbLogo.TabIndex = 0; this.pbLogo.TabIndex = 0;
this.pbLogo.TabStop = false; this.pbLogo.TabStop = false;
// //
// btn_profile_settings
//
this.btn_profile_settings.Anchor = System.Windows.Forms.AnchorStyles.None;
this.btn_profile_settings.BackColor = System.Drawing.Color.Black;
this.btn_profile_settings.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
this.btn_profile_settings.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
this.btn_profile_settings.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_profile_settings.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_profile_settings.ForeColor = System.Drawing.Color.White;
this.btn_profile_settings.Location = new System.Drawing.Point(780, 452);
this.btn_profile_settings.Name = "btn_profile_settings";
this.btn_profile_settings.Size = new System.Drawing.Size(118, 40);
this.btn_profile_settings.TabIndex = 38;
this.btn_profile_settings.Text = "&Profile Settings";
this.btn_profile_settings.UseVisualStyleBackColor = false;
this.btn_profile_settings.Click += new System.EventHandler(this.btn_profile_settings_Click);
//
// DisplayProfileForm // DisplayProfileForm
// //
this.AcceptButton = this.btn_apply; this.AcceptButton = this.btn_apply;
@ -392,7 +411,6 @@ namespace DisplayMagician.UIForms
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.CancelButton = this.btn_back; this.CancelButton = this.btn_back;
this.ClientSize = new System.Drawing.Size(976, 829); this.ClientSize = new System.Drawing.Size(976, 829);
this.Controls.Add(this.btn_profile_settings);
this.Controls.Add(this.lbl_hotkey_assigned); this.Controls.Add(this.lbl_hotkey_assigned);
this.Controls.Add(this.btn_hotkey); this.Controls.Add(this.btn_hotkey);
this.Controls.Add(this.btn_save); this.Controls.Add(this.btn_save);
@ -458,6 +476,7 @@ namespace DisplayMagician.UIForms
private System.Windows.Forms.Label lbl_hotkey_assigned; private System.Windows.Forms.Label lbl_hotkey_assigned;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.PictureBox pbLogo; private System.Windows.Forms.PictureBox pbLogo;
private System.Windows.Forms.Button btn_profile_settings;
} }
} }

1
DisplayMagician/UIForms/DisplayProfileForm.cs
View File

@ -570,5 +570,6 @@ namespace DisplayMagician.UIForms
ProfileRepository.SaveProfiles(); ProfileRepository.SaveProfiles();
} }
} }
} }
} }

8
DisplayMagicianShared/ProfileRepository.cs
View File

@ -569,6 +569,7 @@ namespace DisplayMagicianShared
SharedLogger.logger.Debug($"ProfileRepository/RenameProfile: The profile was not renamed from {profile.Name} to {renamedName}"); SharedLogger.logger.Debug($"ProfileRepository/RenameProfile: The profile was not renamed from {profile.Name} to {renamedName}");
return false; return false;
} }
}
public static void UpdateActiveProfile() public static void UpdateActiveProfile()
{ {
@ -609,7 +610,8 @@ namespace DisplayMagicianShared
amdProfile.CreateProfileFromCurrentDisplaySettings(); amdProfile.CreateProfileFromCurrentDisplaySettings();
activeProfile = amdProfile; activeProfile = amdProfile;
} }
else { else
{
SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: Neither NVIDIA NVAPI or AMD ADL Drivers are installed, so using the built in Windows CCD library interface for this display profile."); SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: Neither NVIDIA NVAPI or AMD ADL Drivers are installed, so using the built in Windows CCD library interface for this display profile.");
WinProfileItem winProfile = new WinProfileItem WinProfileItem winProfile = new WinProfileItem
{ {
@ -1054,11 +1056,11 @@ namespace DisplayMagicianShared
{ {
if (Wallpaper.Set(profile.SavedProfileIconCacheFilename, profile.WallpaperStyle)) if (Wallpaper.Set(profile.SavedProfileIconCacheFilename, profile.WallpaperStyle))
{ {
logger.Trace($"Program/ApplyProfile: We attempted to set the desktop wallpaper to {profile.SavedProfileIconCacheFilename} using {profile.WallpaperStyle} style for profile {profile.Name}, and it worked!"); SharedLogger.logger.Trace($"Program/ApplyProfile: We attempted to set the desktop wallpaper to {profile.SavedProfileIconCacheFilename} using {profile.WallpaperStyle} style for profile {profile.Name}, and it worked!");
} }
else else
{ {
logger.Warn($"Program/ApplyProfile: We attempted to set the desktop wallpaper to {profile.SavedProfileIconCacheFilename} using {profile.WallpaperStyle} style for profile {profile.Name}, and it failed :("); SharedLogger.logger.Warn($"Program/ApplyProfile: We attempted to set the desktop wallpaper to {profile.SavedProfileIconCacheFilename} using {profile.WallpaperStyle} style for profile {profile.Name}, and it failed :(");
} }
} }
// We stop the stop watch // We stop the stop watch