From c4183f1b950bbaeedf373ffa7313a302f017bfa1 Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Tue, 26 Apr 2022 11:45:03 +0200 Subject: [PATCH] Improve GUI --- SOURCE/Plugin/DeviceDescription.Designer.cs | 22 ++-- SOURCE/Plugin/DeviceDescription.resx | 106 ++------------------ 2 files changed, 19 insertions(+), 109 deletions(-) diff --git a/SOURCE/Plugin/DeviceDescription.Designer.cs b/SOURCE/Plugin/DeviceDescription.Designer.cs index 1b6b814..f5046a7 100644 --- a/SOURCE/Plugin/DeviceDescription.Designer.cs +++ b/SOURCE/Plugin/DeviceDescription.Designer.cs @@ -57,6 +57,7 @@ namespace Aml.Editor.Plugin this.industrialSensorLibraryv100ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advancedModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.caexVersionFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpButton = new System.Windows.Forms.ToolStripDropDownButton(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.manualToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -228,7 +229,6 @@ namespace Aml.Editor.Plugin this.toolStripButton13 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton14 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton15 = new System.Windows.Forms.ToolStripButton(); - this.caexVersionFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1.SuspendLayout(); this.Page0_FullWindow.SuspendLayout(); this.Page0_FullWindowPanel2.SuspendLayout(); @@ -454,10 +454,17 @@ namespace Aml.Editor.Plugin // advancedModeToolStripMenuItem // this.advancedModeToolStripMenuItem.Name = "advancedModeToolStripMenuItem"; - this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(170, 22); this.advancedModeToolStripMenuItem.Text = "Advanced Mode"; this.advancedModeToolStripMenuItem.Click += new System.EventHandler(this.advancedModeToolStripMenuItem_Click); // + // caexVersionFileToolStripMenuItem + // + this.caexVersionFileToolStripMenuItem.Name = "caexVersionFileToolStripMenuItem"; + this.caexVersionFileToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.caexVersionFileToolStripMenuItem.Text = "Use CAEX 2.15 File"; + this.caexVersionFileToolStripMenuItem.Click += new System.EventHandler(this.caexVersionFileToolStripMenuItem_Click); + // // helpButton // this.helpButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -472,14 +479,14 @@ namespace Aml.Editor.Plugin // this.aboutToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // // manualToolStripMenuItem // this.manualToolStripMenuItem.Name = "manualToolStripMenuItem"; - this.manualToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.manualToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.manualToolStripMenuItem.Text = "Manual"; this.manualToolStripMenuItem.Click += new System.EventHandler(this.manualToolStripMenuItem_Click); // @@ -2387,13 +2394,6 @@ namespace Aml.Editor.Plugin this.toolStripButton15.Size = new System.Drawing.Size(44, 24); this.toolStripButton15.Text = "Save"; // - // caexVersionFileToolStripMenuItem - // - this.caexVersionFileToolStripMenuItem.Name = "caexVersionFileToolStripMenuItem"; - this.caexVersionFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.caexVersionFileToolStripMenuItem.Text = "Use CAEX 2.15 File"; - this.caexVersionFileToolStripMenuItem.Click += new System.EventHandler(this.caexVersionFileToolStripMenuItem_Click); - // // DeviceDescription // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); diff --git a/SOURCE/Plugin/DeviceDescription.resx b/SOURCE/Plugin/DeviceDescription.resx index 1bd2594..9049185 100644 --- a/SOURCE/Plugin/DeviceDescription.resx +++ b/SOURCE/Plugin/DeviceDescription.resx @@ -123,12 +123,6 @@ 265, 17 - - 1330, 103 - - - 1066, 103 - 278, 103 @@ -137,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD6 - DAAAAk1TRnQBSQFMAgEBAwEAAZABBAGQAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBAwEAAZgBBAGYAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABcAMAARwDAAEBAQABCAUAAUABDBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -213,24 +207,6 @@ 853, 146 - - 1038, 146 - - - True - - - True - - - True - - - True - - - True - @@ -265,23 +241,8 @@ True - - True - - - True - - - True - - - True - - - True - - - True + + 1038, 146 True @@ -301,38 +262,8 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True + + 1330, 103 True @@ -367,18 +298,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 1179, 60 - - - True - - - True - - - True - True @@ -409,9 +328,6 @@ 729, 60 - - 729, 60 - iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -420,12 +336,6 @@ RgtnViTyCJEC4UCoEdfIj94AAAAASUVORK5CYII= - - 1311, 60 - - - 1435, 60 - 149, 103 @@ -434,7 +344,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABC - DQAAAk1TRnQBSQFMAgEBAwEAAZABBAGQAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBAwEAAZgBBAGYAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABcAMAARwDAAEBAQABCAUAAUABDBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -507,7 +417,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4 - CQAAAk1TRnQBSQFMAgEBAgEAAYgBBAGIAQQBGQEAARkBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAZABBAGQAQQBGQEAARkBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABZAMAARkDAAEBAQABCAUAAcQBCRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -562,7 +472,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAA - CAAAAk1TRnQBSQFMAwEBAAGQAQQBkAEEARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + CAAAAk1TRnQBSQFMAwEBAAGYAQQBmAEEARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm