From 648bbccaca55f5354f42f70e6067819f81bafe5f Mon Sep 17 00:00:00 2001 From: Terry MacDonald Date: Sat, 18 Dec 2021 21:55:39 +1300 Subject: [PATCH] Tweaked various UI features to support resizing Improved the minimum form sizes for multiple forms to stop them looking bad. Updated the DisplayMagician and DisplayMagicianShared assembly versions to v2.1.2.0 in preparation for release as the next version of DisplayMagician. --- DisplayMagician/Properties/AssemblyInfo.cs | 4 +- .../UIForms/DisplayProfileForm.Designer.cs | 9 +- DisplayMagician/UIForms/MainForm.Designer.cs | 22 +-- DisplayMagician/UIForms/MainForm.resx | 165 +++++++++--------- .../Properties/AssemblyInfo.cs | 4 +- 5 files changed, 102 insertions(+), 102 deletions(-) diff --git a/DisplayMagician/Properties/AssemblyInfo.cs b/DisplayMagician/Properties/AssemblyInfo.cs index dfe535f..ed71828 100644 --- a/DisplayMagician/Properties/AssemblyInfo.cs +++ b/DisplayMagician/Properties/AssemblyInfo.cs @@ -26,8 +26,8 @@ using System.Resources; [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")] // Version information -[assembly: AssemblyVersion("2.1.1.64")] -[assembly: AssemblyFileVersion("2.1.1.64")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] [assembly: NeutralResourcesLanguageAttribute( "en" )] [assembly: CLSCompliant(true)] diff --git a/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs b/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs index 2e71fef..362cb78 100644 --- a/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs +++ b/DisplayMagician/UIForms/DisplayProfileForm.Designer.cs @@ -232,6 +232,8 @@ namespace DisplayMagician.UIForms // txt_profile_save_name // this.txt_profile_save_name.Anchor = System.Windows.Forms.AnchorStyles.None; + this.txt_profile_save_name.BackColor = System.Drawing.Color.White; + this.txt_profile_save_name.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txt_profile_save_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_profile_save_name.Location = new System.Drawing.Point(271, 437); this.txt_profile_save_name.MaxLength = 200; @@ -293,12 +295,13 @@ namespace DisplayMagician.UIForms this.lbl_save_profile.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.lbl_save_profile.ForeColor = System.Drawing.Color.White; this.lbl_save_profile.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lbl_save_profile.Location = new System.Drawing.Point(319, 9); + this.lbl_save_profile.Location = new System.Drawing.Point(319, 95); this.lbl_save_profile.Name = "lbl_save_profile"; this.lbl_save_profile.Size = new System.Drawing.Size(296, 102); this.lbl_save_profile.TabIndex = 33; - this.lbl_save_profile.Text = "Setup your displays with NVIDIA Setup, AMD Setup or Windows Setup, then return to" + - " DisplayMagician and click \'Save As\' to save this Display Profile."; + this.lbl_save_profile.Text = "Setup your display layout in NVIDIA Control Panel, AMD Radeon Adrenalin or Window" + + "s Setup, then return to DisplayMagician and click \'Save As\' to store this Displa" + + "y Profile for later."; this.lbl_save_profile.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // btn_save diff --git a/DisplayMagician/UIForms/MainForm.Designer.cs b/DisplayMagician/UIForms/MainForm.Designer.cs index 7f93f58..f612bfd 100644 --- a/DisplayMagician/UIForms/MainForm.Designer.cs +++ b/DisplayMagician/UIForms/MainForm.Designer.cs @@ -31,6 +31,7 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btn_help = new System.Windows.Forms.Button(); this.btn_donate = new System.Windows.Forms.Button(); this.btn_settings = new System.Windows.Forms.Button(); this.lbl_create_profile = new System.Windows.Forms.Label(); @@ -55,7 +56,6 @@ this.shortcutToolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.btn_help = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -90,6 +90,16 @@ this.splitContainer1.Panel2.Controls.Add(this.pb_game_shortcut); this.splitContainer1.TabStop = false; // + // btn_help + // + resources.ApplyResources(this.btn_help, "btn_help"); + this.btn_help.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed; + this.btn_help.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown; + this.btn_help.ForeColor = System.Drawing.Color.White; + this.btn_help.Name = "btn_help"; + this.btn_help.UseVisualStyleBackColor = true; + this.btn_help.Click += new System.EventHandler(this.btn_help_Click); + // // btn_donate // resources.ApplyResources(this.btn_donate, "btn_donate"); @@ -270,16 +280,6 @@ resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // - // btn_help - // - resources.ApplyResources(this.btn_help, "btn_help"); - this.btn_help.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed; - this.btn_help.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown; - this.btn_help.ForeColor = System.Drawing.Color.White; - this.btn_help.Name = "btn_help"; - this.btn_help.UseVisualStyleBackColor = true; - this.btn_help.Click += new System.EventHandler(this.btn_help_Click); - // // MainForm // resources.ApplyResources(this, "$this"); diff --git a/DisplayMagician/UIForms/MainForm.resx b/DisplayMagician/UIForms/MainForm.resx index 8a8e399..8690ab7 100644 --- a/DisplayMagician/UIForms/MainForm.resx +++ b/DisplayMagician/UIForms/MainForm.resx @@ -10870,7 +10870,7 @@ NoControl - 282, 248 + 282, 250 222, 22 @@ -10912,7 +10912,7 @@ NoControl - 162, 354 + 162, 357 460, 20 @@ -10945,7 +10945,7 @@ Microsoft Sans Serif, 9.75pt - 12, 355 + 12, 358 25, 16 @@ -10981,7 +10981,7 @@ Microsoft Sans Serif, 21.75pt - 212, 175 + 212, 177 360, 50 @@ -11014,7 +11014,7 @@ NoControl - 700, 351 + 700, 354 75, 23 @@ -63370,81 +63370,6 @@ 152, 17 - - False - - - Segoe UI, 9pt, style=Italic - - - 218, 22 - - - DisplayMagician - - - 215, 6 - - - Segoe UI, 9pt, style=Bold - - - 218, 22 - - - Open Application Window - - - False - - - Segoe UI, 9pt, style=Italic - - - 155, 22 - - - Display Profiles - - - 152, 6 - - - 218, 22 - - - Change Display Profile - - - False - - - Segoe UI, 9pt, style=Italic - - - 156, 22 - - - Game Shortcuts - - - 153, 6 - - - 218, 22 - - - Run Game Shortcut - - - 215, 6 - - - 218, 22 - - - Exit DisplayMagician - 219, 126 @@ -71274,6 +71199,81 @@ True + + False + + + Segoe UI, 9pt, style=Italic + + + 218, 22 + + + DisplayMagician + + + 215, 6 + + + Segoe UI, 9pt, style=Bold + + + 218, 22 + + + Open Application Window + + + 218, 22 + + + Change Display Profile + + + False + + + Segoe UI, 9pt, style=Italic + + + 155, 22 + + + Display Profiles + + + 152, 6 + + + 218, 22 + + + Run Game Shortcut + + + False + + + Segoe UI, 9pt, style=Italic + + + 156, 22 + + + Game Shortcuts + + + 153, 6 + + + 215, 6 + + + 218, 22 + + + Exit DisplayMagician + True @@ -79103,14 +79103,11 @@ rjGJe6619efaHz2S/5D4v/OFla+gZqVXAAAAAElFTkSuQmCC - - NoControl - 1100, 950 - 550, 400 + 700, 400 CenterScreen diff --git a/DisplayMagicianShared/Properties/AssemblyInfo.cs b/DisplayMagicianShared/Properties/AssemblyInfo.cs index 62e8061..0f5215f 100644 --- a/DisplayMagicianShared/Properties/AssemblyInfo.cs +++ b/DisplayMagicianShared/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] \ No newline at end of file