From 9f94843b883d0191d6ccee0f84357434b9882ab9 Mon Sep 17 00:00:00 2001 From: David R <114369357+MuertoGB@users.noreply.github.com> Date: Sun, 23 Jul 2023 12:59:56 +0100 Subject: [PATCH 1/8] Multiple changes. --- CHANGELOG.md | 13 +- mefit/Common/FWBase.cs | 55 +++- mefit/Program.cs | 2 +- mefit/Properties/AssemblyInfo.cs | 4 +- mefit/UI/ArrowDrawer.cs | 11 +- mefit/UI/METMessageBox.Designer.cs | 3 +- mefit/WinForms/aboutWindow.Designer.cs | 3 +- mefit/WinForms/editorWindow.Designer.cs | 363 +++++++++++----------- mefit/WinForms/infoWindow.Designer.cs | 60 ++-- mefit/WinForms/infoWindow.cs | 52 +++- mefit/WinForms/mainWindow.Designer.cs | 129 ++++---- mefit/WinForms/mainWindow.cs | 109 +++++-- mefit/WinForms/settingsWindow.Designer.cs | 3 +- mefit/WinForms/termsWindow.Designer.cs | 3 +- 14 files changed, 461 insertions(+), 349 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63681be..5678450 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@
- V1.0.2 • + V1.0.3 • + V1.0.2 • V1.0.1 • V1.0.0 • V0.7.0 • @@ -14,6 +15,16 @@ V0.3.4
+## Version 1.0.3 + +#### New: +- Updated the firmware parser with a new feature that attempts to force find the Fsys Store if it was not initially located within the NVRAM on the first pass. + +#### Enhancements: +- Implemented a visual colour change in the presentation of NVRAM store labels in the main window. The manual has been updated to reflect this change. +- Improved the image validation logic. +- User interface improvements. + ## Version 1.0.2 #### Enhancements: diff --git a/mefit/Common/FWBase.cs b/mefit/Common/FWBase.cs index 8ed28d2..32f0b6c 100644 --- a/mefit/Common/FWBase.cs +++ b/mefit/Common/FWBase.cs @@ -179,6 +179,17 @@ internal static void LoadFirmwareBaseData(byte[] sourceBytes, string fileName) EfiLock = (SvsStoreData.PrimaryStoreBase != -1 && SvsStoreData.PrimaryStoreBytes != null) ? EfiLock = GetIsEfiLocked(SvsStoreData.PrimaryStoreBytes) : EfiLockStatus.Unknown; + + if (FsysStoreData.FsysBytes == null) + { + FsysStoreData = GetFsysStoreData(sourceBytes, false, true); + + if (FsysStoreData.FsysBytes != null) + { + Logger.WriteToLogFile($"Force found Fsys Store at {FsysStoreData.FsysBase:X}h." + + $" The image may be misaligned or corrupt ({FileInfoData.FileNameWithExt}).", LogType.Application); + } + } } internal static void ResetFirmwareBaseData() @@ -201,11 +212,14 @@ internal static void ResetFirmwareBaseData() internal static bool IsValidImage(byte[] sourceBytes) { - int dxeCore = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.DXE_CORE); + int dxeCore = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.DXE_CORE, 16, 16); - if (!Descriptor.DescriptorMode && dxeCore == -1) + if (!Descriptor.DescriptorMode) { - return false; + if (dxeCore == -1) + { + return false; + } } return true; @@ -280,7 +294,7 @@ private static PdrSection DefaultPdrSection() #endregion #region Fsys Store - internal static FsysStore GetFsysStoreData(byte[] sourceBytes, bool isFsysStoreOnly) + internal static FsysStore GetFsysStoreData(byte[] sourceBytes, bool isFsysStoreOnly, bool forceFind = false) { // Base should be zero if the isFsysStoreOnly flag is set int fsysBase = 0; @@ -288,23 +302,30 @@ internal static FsysStore GetFsysStoreData(byte[] sourceBytes, bool isFsysStoreO // Arg to skip Fsys searching if (!isFsysStoreOnly) { - // First we need to locate the NVRAM section GUID - int guidBase = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.NVRAM_SECTION_GUID, _biosBase, _biosLimit); + if (!forceFind) + { + // First we need to locate the NVRAM section GUID + int guidBase = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.NVRAM_SECTION_GUID, _biosBase, _biosLimit); + + if (guidBase == -1) + { + // NVRAM store was not found so return default data + return DefaultFsysRegion(); + } - if (guidBase == -1) + // Get NVRAM section size from header + byte[] sectionLengthBytes = BinaryUtils.GetBytesBaseLength(sourceBytes, guidBase + GUID_LENGTH, 4); + // Convert NVRAM section size to int32 + int nvramLength = BitConverter.ToInt32(sectionLengthBytes, 0); + // Search for the Fsys store within bounds of the NVRAM section + fsysBase = BinaryUtils.GetBasePosition(sourceBytes, FSYS_SIG, guidBase - ZERO_VECTOR_LENGTH - GUID_LENGTH, nvramLength); + } + else { - // NVRAM store was not found so return default data - return DefaultFsysRegion(); + fsysBase = BinaryUtils.GetBasePosition(sourceBytes, FSYS_SIG, _biosBase, _biosLimit); } - // Get NVRAM section size from header - byte[] sectionLengthBytes = BinaryUtils.GetBytesBaseLength(sourceBytes, guidBase + GUID_LENGTH, 4); - // Convert NVRAM section size to int32 - int nvramLength = BitConverter.ToInt32(sectionLengthBytes, 0); - // Search for the Fsys store within bounds of the NVRAM section - fsysBase = BinaryUtils.GetBasePosition(sourceBytes, FSYS_SIG, guidBase - ZERO_VECTOR_LENGTH - GUID_LENGTH, nvramLength); - - // Fsys store was not found within scope of the NVRAM section + // Fsys store was not found within scope of the binary. if (fsysBase == -1) { return DefaultFsysRegion(); diff --git a/mefit/Program.cs b/mefit/Program.cs index f0df909..da5ea7b 100644 --- a/mefit/Program.cs +++ b/mefit/Program.cs @@ -33,7 +33,7 @@ internal struct METPath internal struct METVersion { - internal static readonly string Build = "230718.1355"; + internal static readonly string Build = "230723.1256"; internal static readonly string Channel = "Stable"; } diff --git a/mefit/Properties/AssemblyInfo.cs b/mefit/Properties/AssemblyInfo.cs index e4cf637..fd3ace8 100644 --- a/mefit/Properties/AssemblyInfo.cs +++ b/mefit/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2")] -[assembly: AssemblyFileVersion("1.0.2")] +[assembly: AssemblyVersion("1.0.3")] +[assembly: AssemblyFileVersion("1.0.3")] [assembly: NeutralResourcesLanguage("en")] diff --git a/mefit/UI/ArrowDrawer.cs b/mefit/UI/ArrowDrawer.cs index 6e32028..a435425 100644 --- a/mefit/UI/ArrowDrawer.cs +++ b/mefit/UI/ArrowDrawer.cs @@ -14,18 +14,15 @@ public class ArrowDrawer { - private static Color arrowColor; public static void Draw(Control control, Color color) { - arrowColor = color; - control.Paint += (sender, e) => { int arrowX = control.Width / 2; int arrowY = control.Height - 6; - using (SolidBrush brush = new SolidBrush(arrowColor)) + using (SolidBrush brush = new SolidBrush(color)) { e.Graphics.SmoothingMode = SmoothingMode.AntiAlias; e.Graphics.InterpolationMode = InterpolationMode.HighQualityBilinear; @@ -42,10 +39,4 @@ public static void Draw(Control control, Color color) } }; } - - public static void Update(Control control, Color color) - { - arrowColor = color; - control.Invalidate(); - } } \ No newline at end of file diff --git a/mefit/UI/METMessageBox.Designer.cs b/mefit/UI/METMessageBox.Designer.cs index b7e5bb7..096d27c 100644 --- a/mefit/UI/METMessageBox.Designer.cs +++ b/mefit/UI/METMessageBox.Designer.cs @@ -185,8 +185,9 @@ private void InitializeComponent() // this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/mefit/WinForms/aboutWindow.Designer.cs b/mefit/WinForms/aboutWindow.Designer.cs index e813902..de0e415 100644 --- a/mefit/WinForms/aboutWindow.Designer.cs +++ b/mefit/WinForms/aboutWindow.Designer.cs @@ -315,8 +315,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/mefit/WinForms/editorWindow.Designer.cs b/mefit/WinForms/editorWindow.Designer.cs index 5c4e28b..489db7c 100644 --- a/mefit/WinForms/editorWindow.Designer.cs +++ b/mefit/WinForms/editorWindow.Designer.cs @@ -36,8 +36,10 @@ private void InitializeComponent() this.lblNvramText = new System.Windows.Forms.Label(); this.lblSerialText = new System.Windows.Forms.Label(); this.tlpSerialA = new System.Windows.Forms.TableLayoutPanel(); + this.cbxReplaceSerial = new Mac_EFI_Toolkit.UI.METCheckbox(); this.tlpFsys = new System.Windows.Forms.TableLayoutPanel(); this.cmdFsysPath = new System.Windows.Forms.Button(); + this.cbxReplaceFsysStore = new Mac_EFI_Toolkit.UI.METCheckbox(); this.lblFsysStoreText = new System.Windows.Forms.Label(); this.tlpSerialB = new System.Windows.Forms.TableLayoutPanel(); this.lblHwcText = new System.Windows.Forms.Label(); @@ -46,13 +48,20 @@ private void InitializeComponent() this.tbxHwc = new System.Windows.Forms.TextBox(); this.tlpNss = new System.Windows.Forms.TableLayoutPanel(); this.lblNssChevRight = new System.Windows.Forms.Label(); + this.cbxClearNssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); + this.cbxClearNssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); this.tlpSvs = new System.Windows.Forms.TableLayoutPanel(); + this.cbxClearSvsStore = new Mac_EFI_Toolkit.UI.METCheckbox(); + this.cbxClearSvsBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); this.lblSvsChevRight = new System.Windows.Forms.Label(); this.tlpVss = new System.Windows.Forms.TableLayoutPanel(); this.lblVssChevRight = new System.Windows.Forms.Label(); + this.cbxClearVssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); + this.cbxClearVssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); this.lblMeText = new System.Windows.Forms.Label(); this.tlpMeRegion = new System.Windows.Forms.TableLayoutPanel(); this.cmdMePath = new System.Windows.Forms.Button(); + this.cbxReplaceMeRegion = new Mac_EFI_Toolkit.UI.METCheckbox(); this.tlpLog = new System.Windows.Forms.TableLayoutPanel(); this.pnlLog = new System.Windows.Forms.Panel(); this.rtbLog = new System.Windows.Forms.RichTextBox(); @@ -68,15 +77,6 @@ private void InitializeComponent() this.cmdBuild = new System.Windows.Forms.Button(); this.cmdOpenLast = new System.Windows.Forms.Button(); this.cmdOpenBuildsDir = new System.Windows.Forms.Button(); - this.cbxReplaceSerial = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxReplaceFsysStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearNssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearNssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearSvsStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearSvsBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearVssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearVssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxReplaceMeRegion = new Mac_EFI_Toolkit.UI.METCheckbox(); this.pnlMain.SuspendLayout(); this.tlpMain.SuspendLayout(); this.tlpOptions.SuspendLayout(); @@ -215,6 +215,25 @@ private void InitializeComponent() this.tlpSerialA.Size = new System.Drawing.Size(400, 30); this.tlpSerialA.TabIndex = 1; // + // cbxReplaceSerial + // + this.cbxReplaceSerial.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxReplaceSerial.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxReplaceSerial.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxReplaceSerial.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxReplaceSerial.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxReplaceSerial.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxReplaceSerial.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxReplaceSerial.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxReplaceSerial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbxReplaceSerial.Location = new System.Drawing.Point(11, 4); + this.cbxReplaceSerial.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxReplaceSerial.Name = "cbxReplaceSerial"; + this.cbxReplaceSerial.Size = new System.Drawing.Size(192, 21); + this.cbxReplaceSerial.TabIndex = 0; + this.cbxReplaceSerial.Text = "Replace Serial Number"; + this.cbxReplaceSerial.CheckedChanged += new System.EventHandler(this.cmdReplaceSerial_CheckedChanged); + // // tlpFsys // this.tlpFsys.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -252,6 +271,25 @@ private void InitializeComponent() this.cmdFsysPath.UseVisualStyleBackColor = false; this.cmdFsysPath.Click += new System.EventHandler(this.cmdFsysPath_Click); // + // cbxReplaceFsysStore + // + this.cbxReplaceFsysStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxReplaceFsysStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxReplaceFsysStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxReplaceFsysStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxReplaceFsysStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxReplaceFsysStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxReplaceFsysStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxReplaceFsysStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxReplaceFsysStore.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbxReplaceFsysStore.Location = new System.Drawing.Point(11, 4); + this.cbxReplaceFsysStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxReplaceFsysStore.Name = "cbxReplaceFsysStore"; + this.cbxReplaceFsysStore.Size = new System.Drawing.Size(163, 21); + this.cbxReplaceFsysStore.TabIndex = 0; + this.cbxReplaceFsysStore.Text = "Replace Fsys Store"; + this.cbxReplaceFsysStore.CheckedChanged += new System.EventHandler(this.cbxReplaceFsysStore_CheckedChanged); + // // lblFsysStoreText // this.lblFsysStoreText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -381,6 +419,44 @@ private void InitializeComponent() this.lblNssChevRight.Text = "."; this.lblNssChevRight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // cbxClearNssStore + // + this.cbxClearNssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearNssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearNssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearNssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearNssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearNssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearNssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearNssStore.ForeColor = System.Drawing.Color.White; + this.cbxClearNssStore.Location = new System.Drawing.Point(11, 4); + this.cbxClearNssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxClearNssStore.Name = "cbxClearNssStore"; + this.cbxClearNssStore.Size = new System.Drawing.Size(149, 21); + this.cbxClearNssStore.TabIndex = 0; + this.cbxClearNssStore.Text = "Clear NSS Store"; + this.cbxClearNssStore.CheckedChanged += new System.EventHandler(this.cbxClearNssStore_CheckedChanged); + // + // cbxClearNssBackup + // + this.cbxClearNssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearNssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearNssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearNssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearNssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearNssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearNssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearNssBackup.Enabled = false; + this.cbxClearNssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearNssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); + this.cbxClearNssBackup.Location = new System.Drawing.Point(190, 4); + this.cbxClearNssBackup.Margin = new System.Windows.Forms.Padding(0); + this.cbxClearNssBackup.Name = "cbxClearNssBackup"; + this.cbxClearNssBackup.Size = new System.Drawing.Size(210, 21); + this.cbxClearNssBackup.TabIndex = 1; + this.cbxClearNssBackup.Text = "Clear NSS Backup Store"; + // // tlpSvs // this.tlpSvs.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -400,6 +476,44 @@ private void InitializeComponent() this.tlpSvs.Size = new System.Drawing.Size(400, 30); this.tlpSvs.TabIndex = 4; // + // cbxClearSvsStore + // + this.cbxClearSvsStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearSvsStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearSvsStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearSvsStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearSvsStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearSvsStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearSvsStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearSvsStore.ForeColor = System.Drawing.Color.White; + this.cbxClearSvsStore.Location = new System.Drawing.Point(11, 4); + this.cbxClearSvsStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxClearSvsStore.Name = "cbxClearSvsStore"; + this.cbxClearSvsStore.Size = new System.Drawing.Size(149, 21); + this.cbxClearSvsStore.TabIndex = 0; + this.cbxClearSvsStore.Text = "Clear SVS Store"; + this.cbxClearSvsStore.CheckedChanged += new System.EventHandler(this.cbxClearSvsStore_CheckedChanged); + // + // cbxClearSvsBackup + // + this.cbxClearSvsBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearSvsBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearSvsBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearSvsBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearSvsBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearSvsBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearSvsBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearSvsBackup.Enabled = false; + this.cbxClearSvsBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearSvsBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); + this.cbxClearSvsBackup.Location = new System.Drawing.Point(190, 4); + this.cbxClearSvsBackup.Margin = new System.Windows.Forms.Padding(0); + this.cbxClearSvsBackup.Name = "cbxClearSvsBackup"; + this.cbxClearSvsBackup.Size = new System.Drawing.Size(210, 21); + this.cbxClearSvsBackup.TabIndex = 1; + this.cbxClearSvsBackup.Text = "Clear SVS Backup Store"; + // // lblSvsChevRight // this.lblSvsChevRight.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -447,6 +561,44 @@ private void InitializeComponent() this.lblVssChevRight.Text = "."; this.lblVssChevRight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // cbxClearVssBackup + // + this.cbxClearVssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearVssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearVssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearVssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearVssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearVssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearVssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearVssBackup.Enabled = false; + this.cbxClearVssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearVssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); + this.cbxClearVssBackup.Location = new System.Drawing.Point(190, 4); + this.cbxClearVssBackup.Margin = new System.Windows.Forms.Padding(0); + this.cbxClearVssBackup.Name = "cbxClearVssBackup"; + this.cbxClearVssBackup.Size = new System.Drawing.Size(210, 21); + this.cbxClearVssBackup.TabIndex = 1; + this.cbxClearVssBackup.Text = "Clear VSS Backup Store"; + // + // cbxClearVssStore + // + this.cbxClearVssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearVssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearVssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearVssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearVssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearVssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearVssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearVssStore.ForeColor = System.Drawing.Color.White; + this.cbxClearVssStore.Location = new System.Drawing.Point(11, 4); + this.cbxClearVssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxClearVssStore.Name = "cbxClearVssStore"; + this.cbxClearVssStore.Size = new System.Drawing.Size(149, 21); + this.cbxClearVssStore.TabIndex = 0; + this.cbxClearVssStore.Text = "Clear VSS Store"; + this.cbxClearVssStore.CheckedChanged += new System.EventHandler(this.cbxClearVssStore_CheckedChanged); + // // lblMeText // this.lblMeText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -498,6 +650,25 @@ private void InitializeComponent() this.cmdMePath.UseVisualStyleBackColor = false; this.cmdMePath.Click += new System.EventHandler(this.cmdMePath_Click); // + // cbxReplaceMeRegion + // + this.cbxReplaceMeRegion.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxReplaceMeRegion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxReplaceMeRegion.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxReplaceMeRegion.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxReplaceMeRegion.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxReplaceMeRegion.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxReplaceMeRegion.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxReplaceMeRegion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxReplaceMeRegion.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbxReplaceMeRegion.Location = new System.Drawing.Point(11, 4); + this.cbxReplaceMeRegion.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxReplaceMeRegion.Name = "cbxReplaceMeRegion"; + this.cbxReplaceMeRegion.Size = new System.Drawing.Size(163, 21); + this.cbxReplaceMeRegion.TabIndex = 0; + this.cbxReplaceMeRegion.Text = "Replace ME Region"; + this.cbxReplaceMeRegion.CheckedChanged += new System.EventHandler(this.cbxReplaceMeRegion_CheckedChanged); + // // tlpLog // this.tlpLog.ColumnCount = 1; @@ -638,8 +809,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -768,177 +940,6 @@ private void InitializeComponent() this.cmdOpenBuildsDir.UseVisualStyleBackColor = false; this.cmdOpenBuildsDir.Click += new System.EventHandler(this.cmdOpenBuildsDir_Click); // - // cbxReplaceSerial - // - this.cbxReplaceSerial.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxReplaceSerial.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxReplaceSerial.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxReplaceSerial.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxReplaceSerial.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxReplaceSerial.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxReplaceSerial.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxReplaceSerial.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxReplaceSerial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbxReplaceSerial.Location = new System.Drawing.Point(11, 4); - this.cbxReplaceSerial.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxReplaceSerial.Name = "cbxReplaceSerial"; - this.cbxReplaceSerial.Size = new System.Drawing.Size(192, 21); - this.cbxReplaceSerial.TabIndex = 0; - this.cbxReplaceSerial.Text = "Replace Serial Number"; - this.cbxReplaceSerial.CheckedChanged += new System.EventHandler(this.cmdReplaceSerial_CheckedChanged); - // - // cbxReplaceFsysStore - // - this.cbxReplaceFsysStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxReplaceFsysStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxReplaceFsysStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxReplaceFsysStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxReplaceFsysStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxReplaceFsysStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxReplaceFsysStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxReplaceFsysStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxReplaceFsysStore.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbxReplaceFsysStore.Location = new System.Drawing.Point(11, 4); - this.cbxReplaceFsysStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxReplaceFsysStore.Name = "cbxReplaceFsysStore"; - this.cbxReplaceFsysStore.Size = new System.Drawing.Size(163, 21); - this.cbxReplaceFsysStore.TabIndex = 0; - this.cbxReplaceFsysStore.Text = "Replace Fsys Store"; - this.cbxReplaceFsysStore.CheckedChanged += new System.EventHandler(this.cbxReplaceFsysStore_CheckedChanged); - // - // cbxClearNssStore - // - this.cbxClearNssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearNssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearNssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearNssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearNssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearNssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearNssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearNssStore.ForeColor = System.Drawing.Color.White; - this.cbxClearNssStore.Location = new System.Drawing.Point(11, 4); - this.cbxClearNssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxClearNssStore.Name = "cbxClearNssStore"; - this.cbxClearNssStore.Size = new System.Drawing.Size(149, 21); - this.cbxClearNssStore.TabIndex = 0; - this.cbxClearNssStore.Text = "Clear NSS Store"; - this.cbxClearNssStore.CheckedChanged += new System.EventHandler(this.cbxClearNssStore_CheckedChanged); - // - // cbxClearNssBackup - // - this.cbxClearNssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearNssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearNssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearNssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearNssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearNssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearNssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearNssBackup.Enabled = false; - this.cbxClearNssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearNssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.cbxClearNssBackup.Location = new System.Drawing.Point(190, 4); - this.cbxClearNssBackup.Margin = new System.Windows.Forms.Padding(0); - this.cbxClearNssBackup.Name = "cbxClearNssBackup"; - this.cbxClearNssBackup.Size = new System.Drawing.Size(210, 21); - this.cbxClearNssBackup.TabIndex = 1; - this.cbxClearNssBackup.Text = "Clear NSS Backup Store"; - // - // cbxClearSvsStore - // - this.cbxClearSvsStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearSvsStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearSvsStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearSvsStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearSvsStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearSvsStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearSvsStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearSvsStore.ForeColor = System.Drawing.Color.White; - this.cbxClearSvsStore.Location = new System.Drawing.Point(11, 4); - this.cbxClearSvsStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxClearSvsStore.Name = "cbxClearSvsStore"; - this.cbxClearSvsStore.Size = new System.Drawing.Size(149, 21); - this.cbxClearSvsStore.TabIndex = 0; - this.cbxClearSvsStore.Text = "Clear SVS Store"; - this.cbxClearSvsStore.CheckedChanged += new System.EventHandler(this.cbxClearSvsStore_CheckedChanged); - // - // cbxClearSvsBackup - // - this.cbxClearSvsBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearSvsBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearSvsBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearSvsBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearSvsBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearSvsBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearSvsBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearSvsBackup.Enabled = false; - this.cbxClearSvsBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearSvsBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.cbxClearSvsBackup.Location = new System.Drawing.Point(190, 4); - this.cbxClearSvsBackup.Margin = new System.Windows.Forms.Padding(0); - this.cbxClearSvsBackup.Name = "cbxClearSvsBackup"; - this.cbxClearSvsBackup.Size = new System.Drawing.Size(210, 21); - this.cbxClearSvsBackup.TabIndex = 1; - this.cbxClearSvsBackup.Text = "Clear SVS Backup Store"; - // - // cbxClearVssBackup - // - this.cbxClearVssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearVssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearVssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearVssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearVssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearVssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearVssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearVssBackup.Enabled = false; - this.cbxClearVssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearVssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.cbxClearVssBackup.Location = new System.Drawing.Point(190, 4); - this.cbxClearVssBackup.Margin = new System.Windows.Forms.Padding(0); - this.cbxClearVssBackup.Name = "cbxClearVssBackup"; - this.cbxClearVssBackup.Size = new System.Drawing.Size(210, 21); - this.cbxClearVssBackup.TabIndex = 1; - this.cbxClearVssBackup.Text = "Clear VSS Backup Store"; - // - // cbxClearVssStore - // - this.cbxClearVssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearVssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearVssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearVssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearVssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearVssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearVssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearVssStore.ForeColor = System.Drawing.Color.White; - this.cbxClearVssStore.Location = new System.Drawing.Point(11, 4); - this.cbxClearVssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxClearVssStore.Name = "cbxClearVssStore"; - this.cbxClearVssStore.Size = new System.Drawing.Size(149, 21); - this.cbxClearVssStore.TabIndex = 0; - this.cbxClearVssStore.Text = "Clear VSS Store"; - this.cbxClearVssStore.CheckedChanged += new System.EventHandler(this.cbxClearVssStore_CheckedChanged); - // - // cbxReplaceMeRegion - // - this.cbxReplaceMeRegion.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxReplaceMeRegion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxReplaceMeRegion.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxReplaceMeRegion.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxReplaceMeRegion.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxReplaceMeRegion.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxReplaceMeRegion.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxReplaceMeRegion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxReplaceMeRegion.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbxReplaceMeRegion.Location = new System.Drawing.Point(11, 4); - this.cbxReplaceMeRegion.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxReplaceMeRegion.Name = "cbxReplaceMeRegion"; - this.cbxReplaceMeRegion.Size = new System.Drawing.Size(163, 21); - this.cbxReplaceMeRegion.TabIndex = 0; - this.cbxReplaceMeRegion.Text = "Replace ME Region"; - this.cbxReplaceMeRegion.CheckedChanged += new System.EventHandler(this.cbxReplaceMeRegion_CheckedChanged); - // // editorWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); diff --git a/mefit/WinForms/infoWindow.Designer.cs b/mefit/WinForms/infoWindow.Designer.cs index 3dcfb8e..1550362 100644 --- a/mefit/WinForms/infoWindow.Designer.cs +++ b/mefit/WinForms/infoWindow.Designer.cs @@ -102,8 +102,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -149,13 +150,13 @@ private void InitializeComponent() this.tlpBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpBottom.Controls.Add(this.lblSectionData, 0, 0); - this.tlpBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tlpBottom.Location = new System.Drawing.Point(0, 311); + this.tlpBottom.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpBottom.Location = new System.Drawing.Point(0, 312); this.tlpBottom.Margin = new System.Windows.Forms.Padding(0); this.tlpBottom.Name = "tlpBottom"; this.tlpBottom.RowCount = 1; this.tlpBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpBottom.Size = new System.Drawing.Size(438, 35); + this.tlpBottom.Size = new System.Drawing.Size(438, 34); this.tlpBottom.TabIndex = 1; // // lblSectionData @@ -169,7 +170,7 @@ private void InitializeComponent() this.lblSectionData.Margin = new System.Windows.Forms.Padding(0); this.lblSectionData.Name = "lblSectionData"; this.lblSectionData.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); - this.lblSectionData.Size = new System.Drawing.Size(438, 35); + this.lblSectionData.Size = new System.Drawing.Size(438, 34); this.lblSectionData.TabIndex = 101; this.lblSectionData.Text = "..."; this.lblSectionData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -204,7 +205,7 @@ private void InitializeComponent() this.tlpMain.Location = new System.Drawing.Point(0, 0); this.tlpMain.Margin = new System.Windows.Forms.Padding(0); this.tlpMain.Name = "tlpMain"; - this.tlpMain.RowCount = 20; + this.tlpMain.RowCount = 21; this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); @@ -225,12 +226,13 @@ private void InitializeComponent() this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpMain.Size = new System.Drawing.Size(438, 313); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpMain.Size = new System.Drawing.Size(438, 312); this.tlpMain.TabIndex = 0; // // lblBiosIdText // - this.lblBiosIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBiosIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBiosIdText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBiosIdText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBiosIdText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -245,7 +247,7 @@ private void InitializeComponent() // // lblModelText // - this.lblModelText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblModelText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblModelText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblModelText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblModelText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -260,7 +262,7 @@ private void InitializeComponent() // // lblEfiVersionText // - this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblEfiVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -275,7 +277,7 @@ private void InitializeComponent() // // lblBuiltByText // - this.lblBuiltByText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBuiltByText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBuiltByText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuiltByText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuiltByText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -290,7 +292,7 @@ private void InitializeComponent() // // lblDateStamptext // - this.lblDateStamptext.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblDateStamptext.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblDateStamptext.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDateStamptext.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblDateStamptext.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -305,7 +307,7 @@ private void InitializeComponent() // // lblRevisionText // - this.lblRevisionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblRevisionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblRevisionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblRevisionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblRevisionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -320,7 +322,7 @@ private void InitializeComponent() // // lblBootromText // - this.lblBootromText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBootromText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBootromText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBootromText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBootromText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -335,7 +337,7 @@ private void InitializeComponent() // // lblBuildcaveText // - this.lblBuildcaveText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBuildcaveText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBuildcaveText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildcaveText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildcaveText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -350,7 +352,7 @@ private void InitializeComponent() // // lblBuildTypeText // - this.lblBuildTypeText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBuildTypeText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBuildTypeText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildTypeText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildTypeText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -365,7 +367,7 @@ private void InitializeComponent() // // lblCompilerText // - this.lblCompilerText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblCompilerText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblCompilerText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCompilerText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCompilerText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -381,7 +383,7 @@ private void InitializeComponent() // lblBiosId // this.lblBiosId.AutoEllipsis = true; - this.lblBiosId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblBiosId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblBiosId.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBiosId.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBiosId.ForeColor = System.Drawing.Color.White; @@ -396,7 +398,7 @@ private void InitializeComponent() // lblModel // this.lblModel.AutoEllipsis = true; - this.lblModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblModel.Dock = System.Windows.Forms.DockStyle.Fill; this.lblModel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblModel.ForeColor = System.Drawing.Color.White; @@ -411,7 +413,7 @@ private void InitializeComponent() // lblEfiVersion // this.lblEfiVersion.AutoEllipsis = true; - this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblEfiVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersion.ForeColor = System.Drawing.Color.White; @@ -426,7 +428,7 @@ private void InitializeComponent() // lblBuiltBy // this.lblBuiltBy.AutoEllipsis = true; - this.lblBuiltBy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblBuiltBy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblBuiltBy.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuiltBy.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuiltBy.ForeColor = System.Drawing.Color.White; @@ -441,7 +443,7 @@ private void InitializeComponent() // lblDateStamp // this.lblDateStamp.AutoEllipsis = true; - this.lblDateStamp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblDateStamp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblDateStamp.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDateStamp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblDateStamp.ForeColor = System.Drawing.Color.White; @@ -456,7 +458,7 @@ private void InitializeComponent() // lblRevision // this.lblRevision.AutoEllipsis = true; - this.lblRevision.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblRevision.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblRevision.Dock = System.Windows.Forms.DockStyle.Fill; this.lblRevision.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblRevision.ForeColor = System.Drawing.Color.White; @@ -471,7 +473,7 @@ private void InitializeComponent() // lblBootRom // this.lblBootRom.AutoEllipsis = true; - this.lblBootRom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblBootRom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblBootRom.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBootRom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBootRom.ForeColor = System.Drawing.Color.White; @@ -486,7 +488,7 @@ private void InitializeComponent() // lblBuildcaveId // this.lblBuildcaveId.AutoEllipsis = true; - this.lblBuildcaveId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblBuildcaveId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblBuildcaveId.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildcaveId.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildcaveId.ForeColor = System.Drawing.Color.White; @@ -501,7 +503,7 @@ private void InitializeComponent() // lblBuildType // this.lblBuildType.AutoEllipsis = true; - this.lblBuildType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblBuildType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblBuildType.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildType.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildType.ForeColor = System.Drawing.Color.White; @@ -516,7 +518,7 @@ private void InitializeComponent() // lblCompiler // this.lblCompiler.AutoEllipsis = true; - this.lblCompiler.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblCompiler.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblCompiler.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCompiler.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCompiler.ForeColor = System.Drawing.Color.White; @@ -575,6 +577,8 @@ private void InitializeComponent() private System.Windows.Forms.Label lblBuildcaveText; private System.Windows.Forms.Label lblBuildTypeText; private System.Windows.Forms.Label lblCompilerText; + private System.Windows.Forms.TableLayoutPanel tlpBottom; + private System.Windows.Forms.Label lblSectionData; private System.Windows.Forms.Label lblBiosId; private System.Windows.Forms.Label lblModel; private System.Windows.Forms.Label lblEfiVersion; @@ -584,8 +588,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblBootRom; private System.Windows.Forms.Label lblBuildcaveId; private System.Windows.Forms.Label lblBuildType; - private System.Windows.Forms.TableLayoutPanel tlpBottom; - private System.Windows.Forms.Label lblSectionData; private METLabel lblCompiler; } } \ No newline at end of file diff --git a/mefit/WinForms/infoWindow.cs b/mefit/WinForms/infoWindow.cs index ef58cc6..9b6fe0b 100644 --- a/mefit/WinForms/infoWindow.cs +++ b/mefit/WinForms/infoWindow.cs @@ -35,27 +35,53 @@ public infoWindow() { InitializeComponent(); - lblTitle.MouseMove += infoWindow_MouseMove; + Load += infoWindow_Load; KeyDown += infoWindow_KeyDown; + lblTitle.MouseMove += infoWindow_MouseMove; + + InterfaceUtils.SetTableLayoutPanelHeight(tlpMain); cmdClose.Font = Program.FONT_MDL2_REG_12; cmdClose.Text = Chars.EXIT_CROSS; + } + #endregion - lblBiosId.Text = FWBase.ROMInfoSectionData.BiosId ?? "N/A"; + #region Window Events + private void infoWindow_Load(object sender, EventArgs e) + { + lblBiosId.Text = FWBase.ROMInfoSectionData.BiosId + ?? "N/A"; lblModel.Text = FWBase.ROMInfoSectionData.Model != null ? $"{FWBase.ROMInfoSectionData.Model} ({MacUtils.ConvertEfiModelCode(FWBase.ROMInfoSectionData.Model)})" : "N/A"; - lblEfiVersion.Text = FWBase.ROMInfoSectionData.EfiVersion ?? "N/A"; - lblBuiltBy.Text = FWBase.ROMInfoSectionData.BuiltBy ?? "N/A"; - lblDateStamp.Text = FWBase.ROMInfoSectionData.DateStamp ?? "N/A"; - lblRevision.Text = FWBase.ROMInfoSectionData.Revision ?? "N/A"; - lblBootRom.Text = FWBase.ROMInfoSectionData.RomVersion ?? "N/A"; - lblBuildcaveId.Text = FWBase.ROMInfoSectionData.BuildcaveId ?? "N/A"; - lblBuildType.Text = FWBase.ROMInfoSectionData.BuildType ?? "N/A"; - lblCompiler.Text = FWBase.ROMInfoSectionData.Compiler ?? "N/A"; - - lblSectionData.Text = $"Base: {FWBase.ROMInfoSectionData.SectionBase:X2}h, " + - $"Size: {FWBase.ROMInfoSectionData.SectionBytes.Length:X2}h" ?? string.Empty; + lblEfiVersion.Text = + FWBase.ROMInfoSectionData.EfiVersion + ?? "N/A"; + lblBuiltBy.Text = + FWBase.ROMInfoSectionData.BuiltBy + ?? "N/A"; + lblDateStamp.Text = + FWBase.ROMInfoSectionData.DateStamp + ?? "N/A"; + lblRevision.Text = + FWBase.ROMInfoSectionData.Revision + ?? "N/A"; + lblBootRom.Text = + FWBase.ROMInfoSectionData.RomVersion + ?? "N/A"; + lblBuildcaveId.Text = + FWBase.ROMInfoSectionData.BuildcaveId + ?? "N/A"; + lblBuildType.Text = + FWBase.ROMInfoSectionData.BuildType + ?? "N/A"; + lblCompiler.Text = + FWBase.ROMInfoSectionData.Compiler + ?? "N/A"; + lblSectionData.Text = + $"Base: {FWBase.ROMInfoSectionData.SectionBase:X2}h, " + + $"Size: {FWBase.ROMInfoSectionData.SectionBytes.Length:X2}h" + ?? string.Empty; foreach (Label label in tlpMain.Controls) { diff --git a/mefit/WinForms/mainWindow.Designer.cs b/mefit/WinForms/mainWindow.Designer.cs index 3cfc849..ecf45b6 100644 --- a/mefit/WinForms/mainWindow.Designer.cs +++ b/mefit/WinForms/mainWindow.Designer.cs @@ -96,7 +96,8 @@ private void InitializeComponent() this.tlpMenu = new System.Windows.Forms.TableLayoutPanel(); this.pnlMenuSeperator1 = new System.Windows.Forms.Panel(); this.pnlMenuSeperator0 = new System.Windows.Forms.Panel(); - this.cmdCopy = new System.Windows.Forms.Button(); + this.cmdCopyMenu = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); this.tlpTitle = new System.Windows.Forms.TableLayoutPanel(); this.cmdClose = new System.Windows.Forms.Button(); this.cmdMenu = new System.Windows.Forms.Button(); @@ -386,7 +387,7 @@ private void InitializeComponent() // lblFileCreatedDate // this.lblFileCreatedDate.AutoEllipsis = true; - this.lblFileCreatedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblFileCreatedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblFileCreatedDate.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileCreatedDate.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileCreatedDate.ForeColor = System.Drawing.Color.White; @@ -401,7 +402,7 @@ private void InitializeComponent() // lblFileModifiedDate // this.lblFileModifiedDate.AutoEllipsis = true; - this.lblFileModifiedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblFileModifiedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblFileModifiedDate.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileModifiedDate.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileModifiedDate.ForeColor = System.Drawing.Color.White; @@ -416,7 +417,7 @@ private void InitializeComponent() // lblFileCrc // this.lblFileCrc.AutoEllipsis = true; - this.lblFileCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblFileCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblFileCrc.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileCrc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileCrc.ForeColor = System.Drawing.Color.White; @@ -430,7 +431,7 @@ private void InitializeComponent() // // lblCreatedText // - this.lblCreatedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblCreatedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblCreatedText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCreatedText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCreatedText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -446,7 +447,7 @@ private void InitializeComponent() // lblFileSizeBytes // this.lblFileSizeBytes.AutoEllipsis = true; - this.lblFileSizeBytes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblFileSizeBytes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblFileSizeBytes.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileSizeBytes.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileSizeBytes.ForeColor = System.Drawing.Color.White; @@ -460,7 +461,7 @@ private void InitializeComponent() // // lblModifiedText // - this.lblModifiedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblModifiedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblModifiedText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblModifiedText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblModifiedText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -475,7 +476,7 @@ private void InitializeComponent() // // lblSizeBytesText // - this.lblSizeBytesText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblSizeBytesText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblSizeBytesText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSizeBytesText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSizeBytesText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -490,7 +491,7 @@ private void InitializeComponent() // // lblChecksumText // - this.lblChecksumText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblChecksumText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblChecksumText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblChecksumText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblChecksumText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -552,7 +553,7 @@ private void InitializeComponent() // // lblNvramText // - this.lblNvramText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblNvramText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblNvramText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNvramText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNvramText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -567,7 +568,7 @@ private void InitializeComponent() // // lblFsysStoreText // - this.lblFsysStoreText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblFsysStoreText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblFsysStoreText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFsysStoreText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFsysStoreText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -583,7 +584,7 @@ private void InitializeComponent() // lblApfsCapable // this.lblApfsCapable.AutoEllipsis = true; - this.lblApfsCapable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); + this.lblApfsCapable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblApfsCapable.Dock = System.Windows.Forms.DockStyle.Fill; this.lblApfsCapable.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblApfsCapable.ForeColor = System.Drawing.Color.White; @@ -597,7 +598,7 @@ private void InitializeComponent() // // lblEfiVersionText // - this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblEfiVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -613,7 +614,7 @@ private void InitializeComponent() // lblFitVersion // this.lblFitVersion.AutoEllipsis = true; - this.lblFitVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblFitVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblFitVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFitVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFitVersion.ForeColor = System.Drawing.Color.White; @@ -628,7 +629,7 @@ private void InitializeComponent() // lblHwc // this.lblHwc.AutoEllipsis = true; - this.lblHwc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblHwc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblHwc.Dock = System.Windows.Forms.DockStyle.Fill; this.lblHwc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblHwc.ForeColor = System.Drawing.Color.White; @@ -642,7 +643,7 @@ private void InitializeComponent() // // lblSerialText // - this.lblSerialText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblSerialText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblSerialText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSerialText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSerialText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -658,7 +659,7 @@ private void InitializeComponent() // lblApfsCapableText // this.lblApfsCapableText.AutoEllipsis = true; - this.lblApfsCapableText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblApfsCapableText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblApfsCapableText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblApfsCapableText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblApfsCapableText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -673,7 +674,7 @@ private void InitializeComponent() // // lblFitVersionText // - this.lblFitVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblFitVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblFitVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFitVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFitVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -727,7 +728,7 @@ private void InitializeComponent() // lblSerialNumber // this.lblSerialNumber.AutoEllipsis = true; - this.lblSerialNumber.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblSerialNumber.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblSerialNumber.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSerialNumber.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSerialNumber.ForeColor = System.Drawing.Color.White; @@ -741,7 +742,7 @@ private void InitializeComponent() // // lblHwcText // - this.lblHwcText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblHwcText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblHwcText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblHwcText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblHwcText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -778,7 +779,7 @@ private void InitializeComponent() // lblFsysCrc // this.lblFsysCrc.AutoEllipsis = true; - this.lblFsysCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblFsysCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblFsysCrc.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFsysCrc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFsysCrc.ForeColor = System.Drawing.Color.White; @@ -850,7 +851,7 @@ private void InitializeComponent() // lblEfiVersion // this.lblEfiVersion.AutoEllipsis = true; - this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblEfiVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersion.ForeColor = System.Drawing.Color.White; @@ -909,7 +910,7 @@ private void InitializeComponent() // lblEfiLock // this.lblEfiLock.AutoEllipsis = true; - this.lblEfiLock.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblEfiLock.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblEfiLock.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiLock.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiLock.ForeColor = System.Drawing.Color.White; @@ -923,7 +924,7 @@ private void InitializeComponent() // lblNssStore // this.lblNssStore.AutoEllipsis = true; - this.lblNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblNssStore.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNssStore.ForeColor = System.Drawing.Color.White; @@ -938,7 +939,7 @@ private void InitializeComponent() // lblSvsStore // this.lblSvsStore.AutoEllipsis = true; - this.lblSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblSvsStore.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSvsStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSvsStore.ForeColor = System.Drawing.Color.White; @@ -953,7 +954,7 @@ private void InitializeComponent() // lblVssStore // this.lblVssStore.AutoEllipsis = true; - this.lblVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblVssStore.Dock = System.Windows.Forms.DockStyle.Fill; this.lblVssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblVssStore.ForeColor = System.Drawing.Color.White; @@ -967,7 +968,7 @@ private void InitializeComponent() // // lblSonText // - this.lblSonText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblSonText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblSonText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSonText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSonText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -983,7 +984,7 @@ private void InitializeComponent() // lblOrderNo // this.lblOrderNo.AutoEllipsis = true; - this.lblOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblOrderNo.Dock = System.Windows.Forms.DockStyle.Fill; this.lblOrderNo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblOrderNo.ForeColor = System.Drawing.Color.White; @@ -997,7 +998,7 @@ private void InitializeComponent() // // lblBoardIdText // - this.lblBoardIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBoardIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBoardIdText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBoardIdText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBoardIdText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -1013,7 +1014,7 @@ private void InitializeComponent() // lblBoardId // this.lblBoardId.AutoEllipsis = true; - this.lblBoardId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); + this.lblBoardId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblBoardId.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBoardId.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBoardId.ForeColor = System.Drawing.Color.White; @@ -1027,7 +1028,7 @@ private void InitializeComponent() // // lblMeVersionText // - this.lblMeVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblMeVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblMeVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMeVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblMeVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -1061,7 +1062,7 @@ private void InitializeComponent() // lblMeVersion // this.lblMeVersion.AutoEllipsis = true; - this.lblMeVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblMeVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblMeVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMeVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblMeVersion.ForeColor = System.Drawing.Color.White; @@ -1215,7 +1216,7 @@ private void InitializeComponent() // this.tlpMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.tlpMenu.BackgroundImage = global::Mac_EFI_Toolkit.Properties.Resources.imgSprite; - this.tlpMenu.ColumnCount = 8; + this.tlpMenu.ColumnCount = 9; this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); @@ -1223,16 +1224,17 @@ private void InitializeComponent() this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 5F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 5F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 426F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpMenu.Controls.Add(this.pnlMenuSeperator1, 5, 0); this.tlpMenu.Controls.Add(this.cmdOpen, 0, 0); this.tlpMenu.Controls.Add(this.cmdReset, 2, 0); this.tlpMenu.Controls.Add(this.pnlMenuSeperator0, 3, 0); - this.tlpMenu.Controls.Add(this.cmdCopy, 4, 0); + this.tlpMenu.Controls.Add(this.cmdCopyMenu, 4, 0); this.tlpMenu.Controls.Add(this.cmdEdit, 6, 0); + this.tlpMenu.Controls.Add(this.panel1, 7, 0); this.tlpMenu.Dock = System.Windows.Forms.DockStyle.Top; this.tlpMenu.Location = new System.Drawing.Point(1, 51); this.tlpMenu.Margin = new System.Windows.Forms.Padding(2); @@ -1262,26 +1264,36 @@ private void InitializeComponent() this.pnlMenuSeperator0.Size = new System.Drawing.Size(1, 24); this.pnlMenuSeperator0.TabIndex = 7; // - // cmdCopy - // - this.cmdCopy.BackColor = System.Drawing.Color.Transparent; - this.cmdCopy.Dock = System.Windows.Forms.DockStyle.Fill; - this.cmdCopy.Enabled = false; - this.cmdCopy.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cmdCopy.FlatAppearance.BorderSize = 0; - this.cmdCopy.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cmdCopy.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.cmdCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.cmdCopy.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmdCopy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); - this.cmdCopy.Location = new System.Drawing.Point(147, 1); - this.cmdCopy.Margin = new System.Windows.Forms.Padding(1); - this.cmdCopy.Name = "cmdCopy"; - this.cmdCopy.Size = new System.Drawing.Size(68, 36); - this.cmdCopy.TabIndex = 2; - this.cmdCopy.Text = "COPY"; - this.cmdCopy.UseVisualStyleBackColor = false; - this.cmdCopy.Click += new System.EventHandler(this.cmdCopy_Click); + // cmdCopyMenu + // + this.cmdCopyMenu.BackColor = System.Drawing.Color.Transparent; + this.cmdCopyMenu.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdCopyMenu.Enabled = false; + this.cmdCopyMenu.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.cmdCopyMenu.FlatAppearance.BorderSize = 0; + this.cmdCopyMenu.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cmdCopyMenu.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.cmdCopyMenu.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cmdCopyMenu.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmdCopyMenu.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); + this.cmdCopyMenu.Location = new System.Drawing.Point(147, 1); + this.cmdCopyMenu.Margin = new System.Windows.Forms.Padding(1); + this.cmdCopyMenu.Name = "cmdCopyMenu"; + this.cmdCopyMenu.Size = new System.Drawing.Size(68, 36); + this.cmdCopyMenu.TabIndex = 2; + this.cmdCopyMenu.Text = "COPY"; + this.cmdCopyMenu.UseVisualStyleBackColor = false; + this.cmdCopyMenu.Click += new System.EventHandler(this.cmdCopy_Click); + // + // panel1 + // + this.panel1.Anchor = System.Windows.Forms.AnchorStyles.None; + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.panel1.Location = new System.Drawing.Point(303, 7); + this.panel1.Margin = new System.Windows.Forms.Padding(0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1, 24); + this.panel1.TabIndex = 9; // // tlpTitle // @@ -1313,7 +1325,7 @@ private void InitializeComponent() // this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; - this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); @@ -1366,7 +1378,7 @@ private void InitializeComponent() this.cmdMin.Location = new System.Drawing.Point(613, 0); this.cmdMin.Margin = new System.Windows.Forms.Padding(0); this.cmdMin.Name = "cmdMin"; - this.cmdMin.Padding = new System.Windows.Forms.Padding(2, 10, 0, 1); + this.cmdMin.Padding = new System.Windows.Forms.Padding(2, 0, 0, 1); this.cmdMin.Size = new System.Drawing.Size(50, 50); this.cmdMin.TabIndex = 99; this.cmdMin.TabStop = false; @@ -1849,7 +1861,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem openBuildsDirectoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openFsysStoresDirectoryToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.Button cmdCopy; + private System.Windows.Forms.Button cmdCopyMenu; private System.Windows.Forms.ToolStripMenuItem sizeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem crc32ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem createdDateToolStripMenuItem; @@ -1881,5 +1893,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem usageManualToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem homepageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem changelogToolStripMenuItem; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/mefit/WinForms/mainWindow.cs b/mefit/WinForms/mainWindow.cs index 46a60d3..049cc7a 100644 --- a/mefit/WinForms/mainWindow.cs +++ b/mefit/WinForms/mainWindow.cs @@ -71,7 +71,7 @@ public mainWindow() // Set button properties (font and text) SetButtonProperties(); - ArrowDrawer.Draw(cmdCopy, Colours.DROP_ARROW_DISABLED); + ArrowDrawer.Draw(cmdCopyMenu, Colours.DROP_ARROW_DISABLED); } #endregion @@ -181,7 +181,7 @@ private void mainWindow_KeyDown(object sender, KeyEventArgs e) cmdReset.PerformClick(); break; case Keys.C: - cmdCopy.PerformClick(); + cmdCopyMenu.PerformClick(); break; case Keys.E: cmdEdit.PerformClick(); @@ -291,7 +291,8 @@ private void cmdReset_Click(object sender, EventArgs e) return; } - DialogResult result = METMessageBox.Show(this, "Reset", "This will unload the firmware and all associated data, are you sure you want to reset?", + DialogResult result = + METMessageBox.Show(this, "Reset", "This will unload the firmware and all associated data, are you sure you want to reset?", METMessageType.Warning, METMessageButtons.YesNo); if (result == DialogResult.Yes) @@ -668,6 +669,7 @@ private void restartApplicationToolStripMenuItem_Click(object sender, EventArgs private void settingsToolStripMenuItem_Click(object sender, EventArgs e) { SetHalfOpacity(); + using (Form formWindow = new settingsWindow()) { formWindow.FormClosed += ChildWindowClosed; @@ -678,6 +680,7 @@ private void settingsToolStripMenuItem_Click(object sender, EventArgs e) private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { SetHalfOpacity(); + using (Form formWindow = new aboutWindow()) { formWindow.FormClosed += ChildWindowClosed; @@ -847,7 +850,11 @@ private void UpdateFileSizeLabel() if (!isValidSize) { lblFileSizeBytes.ForeColor = Colours.ERROR_RED; - lblFileSizeBytes.Text += isValidSize ? string.Empty : $" ({FileUtils.GetSizeDifference(fileSize)})"; + + lblFileSizeBytes.Text += + isValidSize + ? string.Empty + : $" ({FileUtils.GetSizeDifference(fileSize)})"; } } @@ -868,7 +875,8 @@ private void UpdateFileModifiedDateLabel() private void UpdateModelLabel() { - lblModel.Text = $"MODEL: {MacUtils.ConvertEfiModelCode(FWBase.EFISectionData.ModelPart) ?? "N/A"}"; + lblModel.Text = + $"MODEL: {MacUtils.ConvertEfiModelCode(FWBase.EFISectionData.ModelPart) ?? "N/A"}"; // Load and append the config code asynchronously if (FWBase.FsysStoreData.HWC != null) @@ -879,12 +887,16 @@ private void UpdateModelLabel() private void UpdateFirmwareSerialNumber() { - lblSerialNumber.Text = FWBase.FsysStoreData.Serial ?? "N/A"; + lblSerialNumber.Text = + FWBase.FsysStoreData.Serial ?? + "N/A"; } private void UpdateHardwareConfigLabel() { - lblHwc.Text = FWBase.FsysStoreData.HWC ?? "N/A"; + lblHwc.Text = + FWBase.FsysStoreData.HWC + ?? "N/A"; } private void UpdateFsysLabel() @@ -892,8 +904,10 @@ private void UpdateFsysLabel() if (FWBase.FsysStoreData.CrcString != null) { lblFsysCrc.Text = $"CRC32: {FWBase.FsysStoreData.CrcString}h"; - lblFsysCrc.ForeColor = string.Equals(FWBase.FsysStoreData.CrcCalcString, - FWBase.FsysStoreData.CrcString) ? Colours.COMPLETE_GREEN : Colours.ERROR_RED; + lblFsysCrc.ForeColor = + string.Equals(FWBase.FsysStoreData.CrcCalcString, FWBase.FsysStoreData.CrcString) + ? Colours.COMPLETE_GREEN + : Colours.ERROR_RED; } else { @@ -903,21 +917,28 @@ private void UpdateFsysLabel() private void UpdateOrderNumberLabel() { - lblOrderNo.Text = FWBase.FsysStoreData.SON ?? "N/A"; + lblOrderNo.Text = + FWBase.FsysStoreData.SON + ?? "N/A"; } private void UpdateEfiVersionLabel() { - lblEfiVersion.Text = FWBase.FirmwareVersion ?? "N/A"; + lblEfiVersion.Text = + FWBase.FirmwareVersion + ?? "N/A"; } private void UpdateNvramLabel(Label label, NvramStore storeData, string text) { label.Text = text; - Color foreColor = (!storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty) + Color foreColor = + !storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty + ? Color.White + : storeData.PrimaryStoreBase != -1 ? Colours.COMPLETE_GREEN - : (storeData.PrimaryStoreBase != -1 ? Color.White : Colours.DISABLED_TEXT); + : Colours.DISABLED_TEXT; label.ForeColor = foreColor; } @@ -958,7 +979,9 @@ private Color GetEfiLockStatusColor(EfiLockStatus lockStatus) private void UpdateBoardIdLabel() { - lblBoardId.Text = FWBase.PDRSectionData.BoardId ?? "N/A"; + lblBoardId.Text = + FWBase.PDRSectionData.BoardId + ?? "N/A"; } private void UpdateApfsCapableLabel() @@ -966,10 +989,6 @@ private void UpdateApfsCapableLabel() switch (FWBase.IsApfsCapable) { - case ApfsCapable.Unknown: - lblApfsCapable.Text = "UNKOWN"; - lblApfsCapable.ForeColor = Colours.ERROR_RED; - break; case ApfsCapable.Guid: lblApfsCapable.Text = "YES (DXE)"; break; @@ -980,23 +999,32 @@ private void UpdateApfsCapableLabel() lblApfsCapable.Text = "DRIVER NOT FOUND"; lblApfsCapable.ForeColor = Colours.WARNING_ORANGE; break; + case ApfsCapable.Unknown: + lblApfsCapable.Text = "UNKOWN"; + lblApfsCapable.ForeColor = Colours.ERROR_RED; + break; } } private void UpdateFitVersionLabel() { - lblFitVersion.Text = FWBase.FitVersion ?? "N/A"; + lblFitVersion.Text = + FWBase.FitVersion + ?? "N/A"; } private void UpdateIntelMeLabel() { - lblMeVersion.Text = FWBase.MeVersion ?? "N/A"; + lblMeVersion.Text = + FWBase.MeVersion + ?? "N/A"; if (Descriptor.MeBase != 0) { if (!string.IsNullOrEmpty(FWBase.MeVersion)) { - lblMeVersion.Text += $" ({Descriptor.MeBase:X2}h)"; + lblMeVersion.Text += + $" ({Descriptor.MeBase:X2}h)"; } } } @@ -1033,22 +1061,34 @@ private void ShowContextMenu(Control control, ContextMenuStrip menu) private void ToggleControlEnable(bool enable) { - ArrowDrawer.Update(cmdCopy, enable ? Colours.DROP_ARROW_ENABLED : Colours.DROP_ARROW_DISABLED); + ArrowDrawer.Draw + ( + cmdCopyMenu, + enable + ? Colours.DROP_ARROW_ENABLED + : Colours.DROP_ARROW_DISABLED + ); + + Button[] buttons = + { + cmdReset, cmdEdit, cmdCopyMenu, cmdNavigate, cmdReload, + cmdFixFsysCrc, cmdExportFsys , cmdAppleRomInfo, cmdExportMe + }; - Button[] buttons = { cmdReset, cmdEdit, cmdCopy, cmdNavigate, cmdReload, - cmdFixFsysCrc, cmdExportFsys , cmdAppleRomInfo, cmdExportMe}; foreach (Button button in buttons) { button.Enabled = enable; } - cmdEveryMacSearch.Enabled = (FWBase.FsysStoreData.Serial != null); + cmdEveryMacSearch.Enabled = + FWBase.FsysStoreData.Serial != null; if (FWBase.FsysStoreData.FsysBytes != null) { - cmdFixFsysCrc.Enabled = MacUtils.GetUintFsysCrc32 - (FWBase.FsysStoreData.FsysBytes).ToString("X8") == FWBase.FsysStoreData.CrcString - ? false : true; + cmdFixFsysCrc.Enabled = + MacUtils.GetUintFsysCrc32(FWBase.FsysStoreData.FsysBytes).ToString("X8") == FWBase.FsysStoreData.CrcString + ? false + : true; } else { @@ -1110,7 +1150,7 @@ private void SetTipHandlers() { Button[] buttons = { - cmdMenu, cmdOpen, cmdReset, cmdCopy, cmdEdit, cmdNavigate, + cmdMenu, cmdOpen, cmdReset, cmdCopyMenu, cmdEdit, cmdNavigate, cmdReload, cmdEveryMacSearch, cmdFixFsysCrc, cmdExportFsys, cmdAppleRomInfo, cmdExportMe }; @@ -1143,7 +1183,7 @@ private void HandleMouseEnterTip(object sender, EventArgs e) { cmdReset, "Reset (CTRL + R)" }, { cmdEdit, "Firmware Editor (CTRL + E)" }, { cmdMenu, "Application Menu (CTRL + M)"}, - { cmdCopy, "Copy (CTRL + C)" }, + { cmdCopyMenu, "Copy (CTRL + C)" }, { cmdNavigate, "Navigate to File (ALT + N)" }, { cmdReload, "Reload File from Disk (ALT + R)" }, { cmdEveryMacSearch, "Search Serial with EveryMac (ALT + S)" }, @@ -1171,8 +1211,10 @@ private void HandleMouseLeaveTip(object sender, EventArgs e) private string SetNvramStoreTip(NvramStore storeData, string storeType) { - if (!storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty) - return $"{storeType} data present in the NVRAM"; + if (!storeData.IsPrimaryStoreEmpty && !storeData.IsBackupStoreEmpty) + return $"Data present in both {storeType} stores"; + else if (!storeData.IsPrimaryStoreEmpty && storeData.IsBackupStoreEmpty) + return $"Data present in the primary {storeType} store"; else if (storeData.PrimaryStoreBase != -1) return $"{storeType} NVRAM stores are empty (0xFF)"; @@ -1202,7 +1244,8 @@ private void GetPrivateMemoryUsage(object state) { lblPrivateMemory.Invoke((Action)(() => { - lblPrivateMemory.Text = $"{Helper.GetBytesReadableSize(currentProcess.PrivateMemorySize64)}"; + lblPrivateMemory.Text = + $"{Helper.GetBytesReadableSize(currentProcess.PrivateMemorySize64)}"; })); } } diff --git a/mefit/WinForms/settingsWindow.Designer.cs b/mefit/WinForms/settingsWindow.Designer.cs index 1fead82..4335d8d 100644 --- a/mefit/WinForms/settingsWindow.Designer.cs +++ b/mefit/WinForms/settingsWindow.Designer.cs @@ -662,8 +662,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/mefit/WinForms/termsWindow.Designer.cs b/mefit/WinForms/termsWindow.Designer.cs index 8d1571d..dadcc6d 100644 --- a/mefit/WinForms/termsWindow.Designer.cs +++ b/mefit/WinForms/termsWindow.Designer.cs @@ -95,8 +95,9 @@ private void InitializeComponent() // this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); From 7027df2ea9b3e469e6fc18c03270c3c7aae25509 Mon Sep 17 00:00:00 2001 From: David R <114369357+MuertoGB@users.noreply.github.com> Date: Sun, 23 Jul 2023 13:09:16 +0100 Subject: [PATCH 2/8] Update MANUAL.md --- MANUAL.md | 2 +- files/images/met.png | Bin 36824 -> 37168 bytes files/images/met_alt.png | Bin 36205 -> 36573 bytes files/manual/nvram.png | Bin 1440 -> 1427 bytes files/manual/nvramlocked.png | Bin 1485 -> 1451 bytes 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/MANUAL.md b/MANUAL.md index 60e1e0c..adb6d1d 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -221,7 +221,7 @@ This section provides information about the firmware version, and includes one b -This section is divided into four items. The first three items represent different NVRAM store types, indicating their status. Each store type will appear white when empty, green when data is present, and grey when the store is not found. +This section is divided into four items. The first three items represent different NVRAM store types, indicating their status. Each store type will appear green when empty, white when data is present, and grey when the store is not found. The padlock item represents EFI Lock status. If the padlock icon is green and unlocked, it signifies that a Message Authentication Code (MAC) was not found, indicating that the EFI is likely not locked. Conversely, if the padlock icon is red and locked, it suggests that a Message Authentication Code (MAC) was found, indicating that the EFI is likely password locked. diff --git a/files/images/met.png b/files/images/met.png index c9c1a350cb69b8d811c894a3e6529f217e8fc879..17cad5851e622292781b001e23ca15ac17647c71 100644 GIT binary patch literal 37168 zcmcG$cU%+C|1KIjgwTXQ=pZ6ZA%r5mD$NoEB&Z-Q6cwb`00F6Lgh&yQUIY~hT|hc0 zLPS6iX$sPNhtQL|e7?VW&pEI2y61K7AF#W_?9S}$%)30#GdwZ9VaNjJ1A{;y7GtB! zW*`vtHxP)bfRP#~F%qF<0S77{GebQPp+{g5xS(~>y{-!al_xMC+tUHpOrA!!eL$cy zzNbG_xv;_nocw8Bqj`51;{FHm#8;;~ylf0k-l`^}oShmRrVHgoh()PW
z)qq%!mrt~MUr*2A-SI8%&ionh*2iyy8( {Ixi!luJm
zP2zg&b(Gnj4wy}xs N{(o6jcNsiJ6FtpI@RnTms5QQhLAp3n@alCxEwl%(0
z@wfz#yK%{$Qn&vpp54J-F+}oVgcoC!?@upJ>4yf4Jf8F~^q5aJHn%km-2a_WQor!l
zS*ZSZ1OME&+I3f#YH<>0P3-_&AaS~C)Mvi%+i*?bz`Me114Z8-*NjI+*KBeWLeRH<
z>LK|oCcRcQ{{V^7BlV!Zt&u2g6)@V5i4#b$YA6T>*e9~zVG|J+JS7O&mrnvO?|IY
zawl?!IUptQV~y+E-_FS3cKBUY>(w#heS!+91FCP&9#lSmQwl$G|2*sKmvuLhJc@%a
zAM1>$R(A4_Wqx6`YXY}_cPG0(P5*>tiZtm#3!S;kP;gd6aW=NV%)X!`s9YxG+mrSY
zz0bsI-G^7L-ox8AE#diXWyJ=27QW`cUR=i*mN;hXf4qVsck=sPlrjD>Z@R(=j2ii_
zE;gFu()RN=MLdi?6Yi6X`A$y4ciX{b(`j|qmyau24y?vE)w`Ytf7+3y%c}6H)CvrK
z4K{R0N7zQ|{*DCy;+?$u|1|fOL2-8LwrCV-Jh%r)aB18_fM6j&f;%+s?ivCO!IR)_
z!QI`uad&rudvHH5S!?a@TW43@dw1QvPaXbH)im!reLizMV~pvo2Jy3g@d=*bR$56P
z^1C#f1wY=oH4(1refZtq{pEKdg?{>wo>bHC>drgr?3zc!{n1191{cT##s*G99o(IS
z>N`BWX$sS7Wa0JExQq7DqNP*>s*n?b(66}u30C=u*|wnblP8-sGXiIy)!4n^@uR1@
z`q^wXFfjL3vRxVl_x6^&7U+fH#$0-(o?-{qY>XH^>W?N%99(hDH}Sb-DxpvFulu4G
zdqs
UG}+eIiq0nL1kRVC*?jqU9?
z%#O*`8tR}Dp(m-G^Ew4+*U(AOA(+xOj(6hf&6Z0-vDPIm?V!r%p~Ls~1Oh$AI9FFJ
zLHmpF!+xhAwWll1Otw9B2eeowxA;a=W!Vsu7HyAK_eP=n&`2go%Pv|Qj>r1=OgSBS
zad{xkc#SN@bq2L*w3EW%5IVc0
%
zbKl}9Z7`~XJ38>({6M6&-a<6`CDnjL;9k5!7nFPs8s@29>#5E)AG6pII-H_=-!%!2
z5umoRP?f9D!}`YkeV#_ujGQMQ{&JGRJGwLfYbsU5N$%2orKXN5eJI4IIF|=?OF2!C
ztizq540`!?_Q#3&D=<#+Q%!J>+{xRjFwgQ#7Ujr9NYXTn$jo9(lXT67bWYe9^q2Sd
z?>UIS4hSp&`rm_Ah7b