diff --git a/CHANGELOG.md b/CHANGELOG.md index 4358e34..524060e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@

Version History

+ V1.1.3 • V1.1.2 • V1.1.1 • V1.1.0 • @@ -18,6 +19,20 @@ V0.3.4

+## Version 1.1.3 + +#### Enhancements: +- Added hexadecimal format to the main window file size data. +- Enabled the 'All Files' option, and modified the default filename when exporting Fsys Store or ME Region binary data in the main window. +- The patcher window now triggers a 'Save As' dialog upon clicking the 'Build' button, allowing users to choose the desired save location and filename. +- Introduced button 'Show Last Build' in the patcher window that opens file explorer and highlights the last build when clicked. +- User Interface layout changes. +- Added LZMA SDK version to the debug log, and about window. + +#### Bugs: +- Fixed a malformed string in the debug log navigation prompt. +- Fixed inaccurate main window tooltip stating both designated NVRAM stores were 'empty' when only the backup store contained data. + ## Version 1.1.2 #### Enhancements: diff --git a/MANUAL.md b/MANUAL.md index 5f9d785..895902c 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -96,7 +96,7 @@ Clicking the 'Explorer' button will open Windows Explorer at the location of the --- -#### Size (Bytes): +#### Size: @@ -105,9 +105,9 @@ Clicking the 'Explorer' button will open Windows Explorer at the location of the -The file size of the loaded file is measured in bytes. If the file size is invalid, the label will appear red, and any discrepancy in bytes will be calculated and displayed. +The loaded file's size is displayed in bytes, followed by the hexadecimal representation. If the file size is invalid, the data will be shown in red, and any byte discrepancies will be calculated and appended. -> 🛈 8,388,615 (>7) would indicate the given firmware is 7 bytes too large. +> 🛈 8,388,672 • 800040h (>64) would indicate the given firmware is 64 bytes too large. --- @@ -361,22 +361,25 @@ The output log serves as a valuable source of information during the validation --- -#### Editor Buttons: +#### Patcher Buttons: - + **Reset:**\ When you click the 'Reset' button, it initiates a process that resets the editor and unloads any loaded files, such as the Fsys store and ME region. -**Open Build Directory:**\ +**Builds Folder:**\ Navigates to the Builds directory within the working directory, this is where edited binaries are automatically saved when the 'Build' button is used. -**Open Last Build:**\ -Clicking 'Open Last Build' will close the firmware editor window and load in the last successfully built binary into the main window. +**Show Last Build:**\ +Navigates to the latest build in the file explorer and highlights the file. -**Build**\ +**Load Last Build:**\ +Clicking this button will close the firmware editor window and load in the last successfully built binary into the main window. + +**Build:**\ The 'Build' button generates a new binary file based on the user specified preferences. --- \ No newline at end of file diff --git a/README.md b/README.md index db1332d..36c1da9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

SMCFT Logo
-Mac EFI Toolkit V1.1.2 +Mac EFI Toolkit V1.1.3

A tool for analysis of Mac BIOS/UEFI, with limited editing capabilities.

@@ -83,8 +83,8 @@ This application provides support for most Mac BIOS/UEFI, with the exception of | Version| Release Date| Latest | Channel | |--------|-------------|--------|---------| -|[1.1.2](https://github.com/MuertoGB/MacEfiToolkit/releases/latest)| 25th September, 2023 | Yes | Stable | -|[1.1.1](https://github.com/MuertoGB/MacEfiToolkit/releases/111)| 2nd September, 2023 | No | Stable | +|[1.1.3](https://github.com/MuertoGB/MacEfiToolkit/releases/latest)| 28th September, 2023 | Yes | Stable | +|[1.1.2](https://github.com/MuertoGB/MacEfiToolkit/releases/112)| 25th September, 2023 | No | Stable | > 📋 View the full changelog [here](CHANGELOG.md) diff --git a/files/app/version.xml b/files/app/version.xml index 8098169..2e30f6e 100644 --- a/files/app/version.xml +++ b/files/app/version.xml @@ -1,11 +1,11 @@ - 1.1.2 - 230925.2100 - 25.09.2023 + 1.1.3 + 230928.0615 + 28.09.2023 Stable - 3d0372b74fd1301a90cf44f12d975839471c13b779e4658d4b6c07ae230e46f3 - https://www.virustotal.com/gui/file/3d0372b74fd1301a90cf44f12d975839471c13b779e4658d4b6c07ae230e46f3> + 0c8f574198596d5d3f7b16d3f1f0774106e5b68b934fbcad712eb2e99dde90a9 + https://www.virustotal.com/gui/file/0c8f574198596d5d3f7b16d3f1f0774106e5b68b934fbcad712eb2e99dde90a9> \ No newline at end of file diff --git a/files/images/firmware_patcher.png b/files/images/firmware_patcher.png index bab7504..b85dd03 100644 Binary files a/files/images/firmware_patcher.png and b/files/images/firmware_patcher.png differ diff --git a/files/images/met.png b/files/images/met.png index b2e06d5..e636012 100644 Binary files a/files/images/met.png and b/files/images/met.png differ diff --git a/files/images/met_alt.png b/files/images/met_alt.png index 93ba6e2..392cd17 100644 Binary files a/files/images/met_alt.png and b/files/images/met_alt.png differ diff --git a/files/manual/editorbuttons.png b/files/manual/editorbuttons.png deleted file mode 100644 index 8d4339f..0000000 Binary files a/files/manual/editorbuttons.png and /dev/null differ diff --git a/files/manual/filesize.png b/files/manual/filesize.png index 5856603..3e55af0 100644 Binary files a/files/manual/filesize.png and b/files/manual/filesize.png differ diff --git a/files/manual/filesizeinvalid.png b/files/manual/filesizeinvalid.png index 9f11c86..5abf4f5 100644 Binary files a/files/manual/filesizeinvalid.png and b/files/manual/filesizeinvalid.png differ diff --git a/files/manual/patcher_buttons.png b/files/manual/patcher_buttons.png new file mode 100644 index 0000000..a3c6c42 Binary files /dev/null and b/files/manual/patcher_buttons.png differ diff --git a/mefit/Debug.cs b/mefit/Debug.cs index 9b37a41..a43ab7d 100644 --- a/mefit/Debug.cs +++ b/mefit/Debug.cs @@ -54,6 +54,7 @@ internal static string GenerateDebugReport(Exception e) builder.AppendLine("<-- Application -->\r\n"); builder.AppendLine($"Name: {Application.ProductName}"); builder.AppendLine($"Version: {Application.ProductVersion}.{METVersion.Build}"); + builder.AppendLine($"LZMA SDK: {METVersion.SDK}"); builder.AppendLine($"Channel: {METVersion.Channel}"); builder.AppendLine($"Mode: {BitnessMode()}"); builder.AppendLine($"Debug: {IsDebugMode()}"); diff --git a/mefit/Program.cs b/mefit/Program.cs index afeef08..2ee3763 100644 --- a/mefit/Program.cs +++ b/mefit/Program.cs @@ -34,7 +34,8 @@ internal struct METPath internal struct METVersion { - internal static readonly string Build = "230925.2100"; + internal static readonly string SDK = "23.01"; + internal static readonly string Build = "230928.0615"; internal static readonly string Channel = "Stable"; } diff --git a/mefit/Properties/AssemblyInfo.cs b/mefit/Properties/AssemblyInfo.cs index 2501e50..015ac84 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.1.2")] -[assembly: AssemblyFileVersion("1.1.2")] +[assembly: AssemblyVersion("1.1.3")] +[assembly: AssemblyFileVersion("1.1.3")] [assembly: NeutralResourcesLanguage("en")] diff --git a/mefit/WinForms/aboutWindow.cs b/mefit/WinForms/aboutWindow.cs index bf75492..89c58a2 100644 --- a/mefit/WinForms/aboutWindow.cs +++ b/mefit/WinForms/aboutWindow.cs @@ -50,7 +50,7 @@ public aboutWindow() private void aboutWindow_Load(object sender, EventArgs e) { lblBuild.Text = $"{Application.ProductVersion}.{METVersion.Build}"; - lblChannel.Text = METVersion.Channel.ToUpper(); + lblChannel.Text = $"{METVersion.Channel.ToUpper()} • SDK {METVersion.SDK}"; } #endregion diff --git a/mefit/WinForms/mainWindow.Designer.cs b/mefit/WinForms/mainWindow.Designer.cs index c90a91b..a38349a 100644 --- a/mefit/WinForms/mainWindow.Designer.cs +++ b/mefit/WinForms/mainWindow.Designer.cs @@ -180,10 +180,10 @@ private void InitializeComponent() this.pnlMain.Controls.Add(this.tlpMain); this.pnlMain.Controls.Add(this.pnlSeperator); this.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlMain.Location = new System.Drawing.Point(1, 107); + this.pnlMain.Location = new System.Drawing.Point(1, 89); this.pnlMain.Margin = new System.Windows.Forms.Padding(2); this.pnlMain.Name = "pnlMain"; - this.pnlMain.Size = new System.Drawing.Size(885, 422); + this.pnlMain.Size = new System.Drawing.Size(737, 352); this.pnlMain.TabIndex = 2; // // tlpMain @@ -200,16 +200,16 @@ private void InitializeComponent() this.tlpMain.Margin = new System.Windows.Forms.Padding(0); this.tlpMain.Name = "tlpMain"; this.tlpMain.RowCount = 9; - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 43F)); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); 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, 80F)); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); 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, 43F)); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F)); 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, 203F)); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 169F)); 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.Percent, 100F)); - this.tlpMain.Size = new System.Drawing.Size(885, 420); + this.tlpMain.Size = new System.Drawing.Size(737, 350); this.tlpMain.TabIndex = 2; // // tlpStatusBar @@ -217,20 +217,20 @@ private void InitializeComponent() this.tlpStatusBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tlpStatusBar.ColumnCount = 4; this.tlpStatusBar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpStatusBar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 43F)); + this.tlpStatusBar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tlpStatusBar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpStatusBar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 108F)); + this.tlpStatusBar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F)); this.tlpStatusBar.Controls.Add(this.lblPrivateMemory, 3, 0); this.tlpStatusBar.Controls.Add(this.tlpStatusBarImage, 1, 0); this.tlpStatusBar.Controls.Add(this.lblMessage, 0, 0); this.tlpStatusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpStatusBar.Location = new System.Drawing.Point(0, 373); + this.tlpStatusBar.Location = new System.Drawing.Point(0, 312); this.tlpStatusBar.Margin = new System.Windows.Forms.Padding(0); this.tlpStatusBar.Name = "tlpStatusBar"; this.tlpStatusBar.RowCount = 1; this.tlpStatusBar.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpStatusBar.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 47F)); - this.tlpStatusBar.Size = new System.Drawing.Size(885, 47); + this.tlpStatusBar.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); + this.tlpStatusBar.Size = new System.Drawing.Size(737, 38); this.tlpStatusBar.TabIndex = 99; // // lblPrivateMemory @@ -239,10 +239,10 @@ private void InitializeComponent() this.lblPrivateMemory.Dock = System.Windows.Forms.DockStyle.Fill; this.lblPrivateMemory.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblPrivateMemory.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); - this.lblPrivateMemory.Location = new System.Drawing.Point(777, 0); + this.lblPrivateMemory.Location = new System.Drawing.Point(647, 0); this.lblPrivateMemory.Margin = new System.Windows.Forms.Padding(0); this.lblPrivateMemory.Name = "lblPrivateMemory"; - this.lblPrivateMemory.Size = new System.Drawing.Size(108, 47); + this.lblPrivateMemory.Size = new System.Drawing.Size(90, 38); this.lblPrivateMemory.TabIndex = 99; this.lblPrivateMemory.Text = "..."; this.lblPrivateMemory.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -252,15 +252,15 @@ private void InitializeComponent() this.tlpStatusBarImage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); this.tlpStatusBarImage.ColumnCount = 1; this.tlpStatusBarImage.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpStatusBarImage.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 24F)); + this.tlpStatusBarImage.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpStatusBarImage.Controls.Add(this.pbxLoad, 0, 0); this.tlpStatusBarImage.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpStatusBarImage.Location = new System.Drawing.Point(733, 0); + this.tlpStatusBarImage.Location = new System.Drawing.Point(610, 0); this.tlpStatusBarImage.Margin = new System.Windows.Forms.Padding(0); this.tlpStatusBarImage.Name = "tlpStatusBarImage"; this.tlpStatusBarImage.RowCount = 1; this.tlpStatusBarImage.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpStatusBarImage.Size = new System.Drawing.Size(43, 47); + this.tlpStatusBarImage.Size = new System.Drawing.Size(36, 38); this.tlpStatusBarImage.TabIndex = 99; // // pbxLoad @@ -268,10 +268,10 @@ private void InitializeComponent() this.pbxLoad.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbxLoad.BackColor = System.Drawing.Color.Transparent; this.pbxLoad.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pbxLoad.Location = new System.Drawing.Point(7, 9); + this.pbxLoad.Location = new System.Drawing.Point(6, 7); this.pbxLoad.Margin = new System.Windows.Forms.Padding(0); this.pbxLoad.Name = "pbxLoad"; - this.pbxLoad.Size = new System.Drawing.Size(29, 29); + this.pbxLoad.Size = new System.Drawing.Size(24, 24); this.pbxLoad.TabIndex = 100; this.pbxLoad.TabStop = false; // @@ -285,8 +285,8 @@ private void InitializeComponent() this.lblMessage.Location = new System.Drawing.Point(0, 0); this.lblMessage.Margin = new System.Windows.Forms.Padding(0); this.lblMessage.Name = "lblMessage"; - this.lblMessage.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblMessage.Size = new System.Drawing.Size(733, 47); + this.lblMessage.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblMessage.Size = new System.Drawing.Size(610, 38); this.lblMessage.TabIndex = 99; this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -296,11 +296,11 @@ private void InitializeComponent() this.tlpFilename.ColumnCount = 7; this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 43F)); + this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 43F)); + this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 43F)); + this.tlpFilename.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 36F)); this.tlpFilename.Controls.Add(this.lblFilename, 0, 0); this.tlpFilename.Controls.Add(this.cmdNavigate, 2, 0); this.tlpFilename.Controls.Add(this.cmdReload, 4, 0); @@ -311,7 +311,7 @@ private void InitializeComponent() this.tlpFilename.Name = "tlpFilename"; this.tlpFilename.RowCount = 1; this.tlpFilename.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpFilename.Size = new System.Drawing.Size(885, 43); + this.tlpFilename.Size = new System.Drawing.Size(737, 36); this.tlpFilename.TabIndex = 0; // // lblFilename @@ -323,8 +323,8 @@ private void InitializeComponent() this.lblFilename.Location = new System.Drawing.Point(0, 0); this.lblFilename.Margin = new System.Windows.Forms.Padding(0); this.lblFilename.Name = "lblFilename"; - this.lblFilename.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0); - this.lblFilename.Size = new System.Drawing.Size(753, 43); + this.lblFilename.Padding = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblFilename.Size = new System.Drawing.Size(626, 36); this.lblFilename.TabIndex = 6; // // cmdNavigate @@ -339,11 +339,11 @@ private void InitializeComponent() this.cmdNavigate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdNavigate.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdNavigate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdNavigate.Location = new System.Drawing.Point(754, 0); + this.cmdNavigate.Location = new System.Drawing.Point(627, 0); this.cmdNavigate.Margin = new System.Windows.Forms.Padding(0); this.cmdNavigate.Name = "cmdNavigate"; this.cmdNavigate.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.cmdNavigate.Size = new System.Drawing.Size(43, 43); + this.cmdNavigate.Size = new System.Drawing.Size(36, 36); this.cmdNavigate.TabIndex = 0; this.cmdNavigate.Text = "N"; this.cmdNavigate.UseVisualStyleBackColor = false; @@ -361,11 +361,11 @@ private void InitializeComponent() this.cmdReload.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdReload.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdReload.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdReload.Location = new System.Drawing.Point(798, 0); + this.cmdReload.Location = new System.Drawing.Point(664, 0); this.cmdReload.Margin = new System.Windows.Forms.Padding(0); this.cmdReload.Name = "cmdReload"; this.cmdReload.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.cmdReload.Size = new System.Drawing.Size(43, 43); + this.cmdReload.Size = new System.Drawing.Size(36, 36); this.cmdReload.TabIndex = 1; this.cmdReload.Text = "R"; this.cmdReload.UseVisualStyleBackColor = false; @@ -383,11 +383,11 @@ private void InitializeComponent() this.cmdBackupToZip.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdBackupToZip.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdBackupToZip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdBackupToZip.Location = new System.Drawing.Point(842, 0); + this.cmdBackupToZip.Location = new System.Drawing.Point(701, 0); this.cmdBackupToZip.Margin = new System.Windows.Forms.Padding(0); this.cmdBackupToZip.Name = "cmdBackupToZip"; this.cmdBackupToZip.Padding = new System.Windows.Forms.Padding(2, 0, 0, 0); - this.cmdBackupToZip.Size = new System.Drawing.Size(43, 43); + this.cmdBackupToZip.Size = new System.Drawing.Size(36, 36); this.cmdBackupToZip.TabIndex = 2; this.cmdBackupToZip.Text = "A"; this.cmdBackupToZip.UseVisualStyleBackColor = false; @@ -397,11 +397,11 @@ private void InitializeComponent() // this.tlpFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.tlpFile.ColumnCount = 7; - this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 156F)); + this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 156F)); + this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpFile.Controls.Add(this.lblFileCreatedDate, 2, 2); @@ -414,14 +414,14 @@ private void InitializeComponent() this.tlpFile.Controls.Add(this.lblChecksumText, 4, 0); this.tlpFile.Dock = System.Windows.Forms.DockStyle.Fill; this.tlpFile.Enabled = false; - this.tlpFile.Location = new System.Drawing.Point(0, 44); + this.tlpFile.Location = new System.Drawing.Point(0, 37); this.tlpFile.Margin = new System.Windows.Forms.Padding(0); this.tlpFile.Name = "tlpFile"; this.tlpFile.RowCount = 3; this.tlpFile.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpFile.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpFile.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpFile.Size = new System.Drawing.Size(885, 80); + this.tlpFile.Size = new System.Drawing.Size(737, 67); this.tlpFile.TabIndex = 99; // // lblFileCreatedDate @@ -431,11 +431,11 @@ private void InitializeComponent() 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; - this.lblFileCreatedDate.Location = new System.Drawing.Point(157, 40); + this.lblFileCreatedDate.Location = new System.Drawing.Point(131, 34); this.lblFileCreatedDate.Margin = new System.Windows.Forms.Padding(0); this.lblFileCreatedDate.Name = "lblFileCreatedDate"; - this.lblFileCreatedDate.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblFileCreatedDate.Size = new System.Drawing.Size(285, 40); + this.lblFileCreatedDate.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblFileCreatedDate.Size = new System.Drawing.Size(237, 33); this.lblFileCreatedDate.TabIndex = 99; this.lblFileCreatedDate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -446,11 +446,11 @@ private void InitializeComponent() 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; - this.lblFileModifiedDate.Location = new System.Drawing.Point(600, 40); + this.lblFileModifiedDate.Location = new System.Drawing.Point(500, 34); this.lblFileModifiedDate.Margin = new System.Windows.Forms.Padding(0); this.lblFileModifiedDate.Name = "lblFileModifiedDate"; - this.lblFileModifiedDate.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblFileModifiedDate.Size = new System.Drawing.Size(285, 40); + this.lblFileModifiedDate.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblFileModifiedDate.Size = new System.Drawing.Size(237, 33); this.lblFileModifiedDate.TabIndex = 99; this.lblFileModifiedDate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -461,11 +461,11 @@ private void InitializeComponent() 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; - this.lblFileCrc.Location = new System.Drawing.Point(600, 0); + this.lblFileCrc.Location = new System.Drawing.Point(500, 0); this.lblFileCrc.Margin = new System.Windows.Forms.Padding(0); this.lblFileCrc.Name = "lblFileCrc"; - this.lblFileCrc.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblFileCrc.Size = new System.Drawing.Size(285, 39); + this.lblFileCrc.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblFileCrc.Size = new System.Drawing.Size(237, 33); this.lblFileCrc.TabIndex = 99; this.lblFileCrc.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -475,11 +475,11 @@ private void InitializeComponent() 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))))); - this.lblCreatedText.Location = new System.Drawing.Point(0, 40); + this.lblCreatedText.Location = new System.Drawing.Point(0, 34); this.lblCreatedText.Margin = new System.Windows.Forms.Padding(0); this.lblCreatedText.Name = "lblCreatedText"; - this.lblCreatedText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblCreatedText.Size = new System.Drawing.Size(156, 40); + this.lblCreatedText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblCreatedText.Size = new System.Drawing.Size(130, 33); this.lblCreatedText.TabIndex = 99; this.lblCreatedText.Text = "Created:"; this.lblCreatedText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -491,11 +491,11 @@ private void InitializeComponent() 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; - this.lblFileSizeBytes.Location = new System.Drawing.Point(157, 0); + this.lblFileSizeBytes.Location = new System.Drawing.Point(131, 0); this.lblFileSizeBytes.Margin = new System.Windows.Forms.Padding(0); this.lblFileSizeBytes.Name = "lblFileSizeBytes"; - this.lblFileSizeBytes.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblFileSizeBytes.Size = new System.Drawing.Size(285, 39); + this.lblFileSizeBytes.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblFileSizeBytes.Size = new System.Drawing.Size(237, 33); this.lblFileSizeBytes.TabIndex = 99; this.lblFileSizeBytes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -505,11 +505,11 @@ private void InitializeComponent() 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))))); - this.lblModifiedText.Location = new System.Drawing.Point(443, 40); + this.lblModifiedText.Location = new System.Drawing.Point(369, 34); this.lblModifiedText.Margin = new System.Windows.Forms.Padding(0); this.lblModifiedText.Name = "lblModifiedText"; - this.lblModifiedText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblModifiedText.Size = new System.Drawing.Size(156, 40); + this.lblModifiedText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblModifiedText.Size = new System.Drawing.Size(130, 33); this.lblModifiedText.TabIndex = 99; this.lblModifiedText.Text = "Modified:"; this.lblModifiedText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -523,10 +523,10 @@ private void InitializeComponent() this.lblSizeBytesText.Location = new System.Drawing.Point(0, 0); this.lblSizeBytesText.Margin = new System.Windows.Forms.Padding(0); this.lblSizeBytesText.Name = "lblSizeBytesText"; - this.lblSizeBytesText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblSizeBytesText.Size = new System.Drawing.Size(156, 39); + this.lblSizeBytesText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblSizeBytesText.Size = new System.Drawing.Size(130, 33); this.lblSizeBytesText.TabIndex = 99; - this.lblSizeBytesText.Text = "Size (Bytes):"; + this.lblSizeBytesText.Text = "Size:"; this.lblSizeBytesText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lblChecksumText @@ -535,11 +535,11 @@ private void InitializeComponent() 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))))); - this.lblChecksumText.Location = new System.Drawing.Point(443, 0); + this.lblChecksumText.Location = new System.Drawing.Point(369, 0); this.lblChecksumText.Margin = new System.Windows.Forms.Padding(0); this.lblChecksumText.Name = "lblChecksumText"; - this.lblChecksumText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblChecksumText.Size = new System.Drawing.Size(156, 39); + this.lblChecksumText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblChecksumText.Size = new System.Drawing.Size(130, 33); this.lblChecksumText.TabIndex = 99; this.lblChecksumText.Text = "CRC32:"; this.lblChecksumText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -548,11 +548,11 @@ private void InitializeComponent() // this.tlpRom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.tlpRom.ColumnCount = 7; - this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 156F)); + this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 156F)); + this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpRom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpRom.Controls.Add(this.lblNvramText, 4, 4); @@ -577,7 +577,7 @@ private void InitializeComponent() this.tlpRom.Controls.Add(this.tlpSerial, 6, 0); this.tlpRom.Dock = System.Windows.Forms.DockStyle.Fill; this.tlpRom.Enabled = false; - this.tlpRom.Location = new System.Drawing.Point(0, 169); + this.tlpRom.Location = new System.Drawing.Point(0, 142); this.tlpRom.Margin = new System.Windows.Forms.Padding(0); this.tlpRom.Name = "tlpRom"; this.tlpRom.RowCount = 9; @@ -590,8 +590,8 @@ private void InitializeComponent() this.tlpRom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tlpRom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpRom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tlpRom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tlpRom.Size = new System.Drawing.Size(885, 203); + this.tlpRom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); + this.tlpRom.Size = new System.Drawing.Size(737, 169); this.tlpRom.TabIndex = 2; // // lblNvramText @@ -600,11 +600,11 @@ private void InitializeComponent() 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))))); - this.lblNvramText.Location = new System.Drawing.Point(443, 80); + this.lblNvramText.Location = new System.Drawing.Point(369, 68); this.lblNvramText.Margin = new System.Windows.Forms.Padding(0); this.lblNvramText.Name = "lblNvramText"; - this.lblNvramText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblNvramText.Size = new System.Drawing.Size(156, 39); + this.lblNvramText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblNvramText.Size = new System.Drawing.Size(130, 33); this.lblNvramText.TabIndex = 99; this.lblNvramText.Text = "NVRAM:"; this.lblNvramText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -615,11 +615,11 @@ private void InitializeComponent() 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))))); - this.lblEfiVersionText.Location = new System.Drawing.Point(0, 80); + this.lblEfiVersionText.Location = new System.Drawing.Point(0, 68); this.lblEfiVersionText.Margin = new System.Windows.Forms.Padding(0); this.lblEfiVersionText.Name = "lblEfiVersionText"; - this.lblEfiVersionText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblEfiVersionText.Size = new System.Drawing.Size(156, 39); + this.lblEfiVersionText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblEfiVersionText.Size = new System.Drawing.Size(130, 33); this.lblEfiVersionText.TabIndex = 99; this.lblEfiVersionText.Text = "EFI Version:"; this.lblEfiVersionText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -630,11 +630,11 @@ private void InitializeComponent() 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))))); - this.lblSerialText.Location = new System.Drawing.Point(443, 0); + this.lblSerialText.Location = new System.Drawing.Point(369, 0); this.lblSerialText.Margin = new System.Windows.Forms.Padding(0); this.lblSerialText.Name = "lblSerialText"; - this.lblSerialText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblSerialText.Size = new System.Drawing.Size(156, 39); + this.lblSerialText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblSerialText.Size = new System.Drawing.Size(130, 33); this.lblSerialText.TabIndex = 99; this.lblSerialText.Text = "Serial:"; this.lblSerialText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -645,11 +645,11 @@ private void InitializeComponent() 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))))); - this.lblHwcText.Location = new System.Drawing.Point(0, 40); + this.lblHwcText.Location = new System.Drawing.Point(0, 34); this.lblHwcText.Margin = new System.Windows.Forms.Padding(0); this.lblHwcText.Name = "lblHwcText"; - this.lblHwcText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblHwcText.Size = new System.Drawing.Size(156, 39); + this.lblHwcText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblHwcText.Size = new System.Drawing.Size(130, 33); this.lblHwcText.TabIndex = 99; this.lblHwcText.Text = "HWC:"; this.lblHwcText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -659,16 +659,16 @@ private void InitializeComponent() this.tlpEfiVer.ColumnCount = 3; this.tlpEfiVer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpEfiVer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpEfiVer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tlpEfiVer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tlpEfiVer.Controls.Add(this.lblEfiVersion, 0, 0); this.tlpEfiVer.Controls.Add(this.cmdAppleRomInfo, 2, 0); this.tlpEfiVer.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpEfiVer.Location = new System.Drawing.Point(157, 80); + this.tlpEfiVer.Location = new System.Drawing.Point(131, 68); this.tlpEfiVer.Margin = new System.Windows.Forms.Padding(0); this.tlpEfiVer.Name = "tlpEfiVer"; this.tlpEfiVer.RowCount = 1; this.tlpEfiVer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpEfiVer.Size = new System.Drawing.Size(285, 39); + this.tlpEfiVer.Size = new System.Drawing.Size(237, 33); this.tlpEfiVer.TabIndex = 1; // // lblEfiVersion @@ -681,8 +681,8 @@ private void InitializeComponent() this.lblEfiVersion.Location = new System.Drawing.Point(0, 0); this.lblEfiVersion.Margin = new System.Windows.Forms.Padding(0); this.lblEfiVersion.Name = "lblEfiVersion"; - this.lblEfiVersion.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblEfiVersion.Size = new System.Drawing.Size(244, 39); + this.lblEfiVersion.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblEfiVersion.Size = new System.Drawing.Size(203, 33); this.lblEfiVersion.TabIndex = 100; this.lblEfiVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -698,10 +698,10 @@ private void InitializeComponent() this.cmdAppleRomInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdAppleRomInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdAppleRomInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdAppleRomInfo.Location = new System.Drawing.Point(245, 0); + this.cmdAppleRomInfo.Location = new System.Drawing.Point(204, 0); this.cmdAppleRomInfo.Margin = new System.Windows.Forms.Padding(0); this.cmdAppleRomInfo.Name = "cmdAppleRomInfo"; - this.cmdAppleRomInfo.Size = new System.Drawing.Size(40, 39); + this.cmdAppleRomInfo.Size = new System.Drawing.Size(33, 33); this.cmdAppleRomInfo.TabIndex = 0; this.cmdAppleRomInfo.Text = "I"; this.cmdAppleRomInfo.UseVisualStyleBackColor = false; @@ -713,19 +713,19 @@ private void InitializeComponent() this.tlpFsys.ColumnCount = 5; this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tlpFsys.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tlpFsys.Controls.Add(this.lblFsysCrc, 0, 0); this.tlpFsys.Controls.Add(this.cmdFixFsysCrc, 2, 0); this.tlpFsys.Controls.Add(this.cmdExportFsys, 4, 0); this.tlpFsys.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpFsys.Location = new System.Drawing.Point(157, 0); + this.tlpFsys.Location = new System.Drawing.Point(131, 0); this.tlpFsys.Margin = new System.Windows.Forms.Padding(0); this.tlpFsys.Name = "tlpFsys"; this.tlpFsys.RowCount = 1; this.tlpFsys.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpFsys.Size = new System.Drawing.Size(285, 39); + this.tlpFsys.Size = new System.Drawing.Size(237, 33); this.tlpFsys.TabIndex = 0; // // lblFsysCrc @@ -738,8 +738,8 @@ private void InitializeComponent() this.lblFsysCrc.Location = new System.Drawing.Point(0, 0); this.lblFsysCrc.Margin = new System.Windows.Forms.Padding(0); this.lblFsysCrc.Name = "lblFsysCrc"; - this.lblFsysCrc.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblFsysCrc.Size = new System.Drawing.Size(203, 39); + this.lblFsysCrc.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblFsysCrc.Size = new System.Drawing.Size(169, 33); this.lblFsysCrc.TabIndex = 15; this.lblFsysCrc.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -755,10 +755,10 @@ private void InitializeComponent() this.cmdFixFsysCrc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdFixFsysCrc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdFixFsysCrc.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdFixFsysCrc.Location = new System.Drawing.Point(204, 0); + this.cmdFixFsysCrc.Location = new System.Drawing.Point(170, 0); this.cmdFixFsysCrc.Margin = new System.Windows.Forms.Padding(0); this.cmdFixFsysCrc.Name = "cmdFixFsysCrc"; - this.cmdFixFsysCrc.Size = new System.Drawing.Size(40, 39); + this.cmdFixFsysCrc.Size = new System.Drawing.Size(33, 33); this.cmdFixFsysCrc.TabIndex = 0; this.cmdFixFsysCrc.Text = "F"; this.cmdFixFsysCrc.UseVisualStyleBackColor = false; @@ -776,10 +776,10 @@ private void InitializeComponent() this.cmdExportFsys.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdExportFsys.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdExportFsys.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdExportFsys.Location = new System.Drawing.Point(245, 0); + this.cmdExportFsys.Location = new System.Drawing.Point(204, 0); this.cmdExportFsys.Margin = new System.Windows.Forms.Padding(0); this.cmdExportFsys.Name = "cmdExportFsys"; - this.cmdExportFsys.Size = new System.Drawing.Size(40, 39); + this.cmdExportFsys.Size = new System.Drawing.Size(33, 33); this.cmdExportFsys.TabIndex = 1; this.cmdExportFsys.Text = "E"; this.cmdExportFsys.UseVisualStyleBackColor = false; @@ -794,18 +794,18 @@ private void InitializeComponent() this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 24F)); - this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 24F)); + this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tlpNvram.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpNvram.Controls.Add(this.lblNssStore, 4, 0); this.tlpNvram.Controls.Add(this.lblSvsStore, 2, 0); this.tlpNvram.Controls.Add(this.lblVssStore, 0, 0); this.tlpNvram.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpNvram.Location = new System.Drawing.Point(600, 80); + this.tlpNvram.Location = new System.Drawing.Point(500, 68); this.tlpNvram.Margin = new System.Windows.Forms.Padding(0); this.tlpNvram.Name = "tlpNvram"; this.tlpNvram.RowCount = 1; this.tlpNvram.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpNvram.Size = new System.Drawing.Size(285, 39); + this.tlpNvram.Size = new System.Drawing.Size(237, 33); this.tlpNvram.TabIndex = 3; // // lblNssStore @@ -815,11 +815,11 @@ private void InitializeComponent() 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; - this.lblNssStore.Location = new System.Drawing.Point(190, 0); + this.lblNssStore.Location = new System.Drawing.Point(158, 0); this.lblNssStore.Margin = new System.Windows.Forms.Padding(0); this.lblNssStore.Name = "lblNssStore"; - this.lblNssStore.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblNssStore.Size = new System.Drawing.Size(95, 39); + this.lblNssStore.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblNssStore.Size = new System.Drawing.Size(79, 33); this.lblNssStore.TabIndex = 100; this.lblNssStore.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -830,11 +830,11 @@ private void InitializeComponent() 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; - this.lblSvsStore.Location = new System.Drawing.Point(95, 0); + this.lblSvsStore.Location = new System.Drawing.Point(79, 0); this.lblSvsStore.Margin = new System.Windows.Forms.Padding(0); this.lblSvsStore.Name = "lblSvsStore"; - this.lblSvsStore.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblSvsStore.Size = new System.Drawing.Size(94, 39); + this.lblSvsStore.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblSvsStore.Size = new System.Drawing.Size(78, 33); this.lblSvsStore.TabIndex = 100; this.lblSvsStore.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -848,8 +848,8 @@ private void InitializeComponent() this.lblVssStore.Location = new System.Drawing.Point(0, 0); this.lblVssStore.Margin = new System.Windows.Forms.Padding(0); this.lblVssStore.Name = "lblVssStore"; - this.lblVssStore.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblVssStore.Size = new System.Drawing.Size(94, 39); + this.lblVssStore.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblVssStore.Size = new System.Drawing.Size(78, 33); this.lblVssStore.TabIndex = 99; this.lblVssStore.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -859,11 +859,11 @@ private void InitializeComponent() 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))))); - this.lblSonText.Location = new System.Drawing.Point(443, 40); + this.lblSonText.Location = new System.Drawing.Point(369, 34); this.lblSonText.Margin = new System.Windows.Forms.Padding(0); this.lblSonText.Name = "lblSonText"; - this.lblSonText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblSonText.Size = new System.Drawing.Size(156, 39); + this.lblSonText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblSonText.Size = new System.Drawing.Size(130, 33); this.lblSonText.TabIndex = 99; this.lblSonText.Text = "Order No:"; this.lblSonText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -875,11 +875,11 @@ private void InitializeComponent() 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; - this.lblOrderNo.Location = new System.Drawing.Point(600, 40); + this.lblOrderNo.Location = new System.Drawing.Point(500, 34); this.lblOrderNo.Margin = new System.Windows.Forms.Padding(0); this.lblOrderNo.Name = "lblOrderNo"; - this.lblOrderNo.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblOrderNo.Size = new System.Drawing.Size(285, 39); + this.lblOrderNo.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblOrderNo.Size = new System.Drawing.Size(237, 33); this.lblOrderNo.TabIndex = 99; this.lblOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -889,11 +889,11 @@ private void InitializeComponent() 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))))); - this.lblMeVersionText.Location = new System.Drawing.Point(443, 160); + this.lblMeVersionText.Location = new System.Drawing.Point(369, 136); this.lblMeVersionText.Margin = new System.Windows.Forms.Padding(0); this.lblMeVersionText.Name = "lblMeVersionText"; - this.lblMeVersionText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblMeVersionText.Size = new System.Drawing.Size(156, 43); + this.lblMeVersionText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblMeVersionText.Size = new System.Drawing.Size(130, 33); this.lblMeVersionText.TabIndex = 99; this.lblMeVersionText.Text = "Intel ME:"; this.lblMeVersionText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -903,16 +903,16 @@ private void InitializeComponent() this.tlpIntelMe.ColumnCount = 3; this.tlpIntelMe.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpIntelMe.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpIntelMe.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tlpIntelMe.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tlpIntelMe.Controls.Add(this.lblMeVersion, 0, 0); this.tlpIntelMe.Controls.Add(this.cmdExportMe, 2, 0); this.tlpIntelMe.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpIntelMe.Location = new System.Drawing.Point(600, 160); + this.tlpIntelMe.Location = new System.Drawing.Point(500, 136); this.tlpIntelMe.Margin = new System.Windows.Forms.Padding(0); this.tlpIntelMe.Name = "tlpIntelMe"; this.tlpIntelMe.RowCount = 1; this.tlpIntelMe.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpIntelMe.Size = new System.Drawing.Size(285, 43); + this.tlpIntelMe.Size = new System.Drawing.Size(237, 33); this.tlpIntelMe.TabIndex = 5; // // lblMeVersion @@ -925,8 +925,8 @@ private void InitializeComponent() this.lblMeVersion.Location = new System.Drawing.Point(0, 0); this.lblMeVersion.Margin = new System.Windows.Forms.Padding(0); this.lblMeVersion.Name = "lblMeVersion"; - this.lblMeVersion.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblMeVersion.Size = new System.Drawing.Size(244, 43); + this.lblMeVersion.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblMeVersion.Size = new System.Drawing.Size(203, 33); this.lblMeVersion.TabIndex = 100; this.lblMeVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -942,10 +942,10 @@ private void InitializeComponent() this.cmdExportMe.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdExportMe.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdExportMe.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdExportMe.Location = new System.Drawing.Point(245, 0); + this.cmdExportMe.Location = new System.Drawing.Point(204, 0); this.cmdExportMe.Margin = new System.Windows.Forms.Padding(0); this.cmdExportMe.Name = "cmdExportMe"; - this.cmdExportMe.Size = new System.Drawing.Size(40, 43); + this.cmdExportMe.Size = new System.Drawing.Size(33, 33); this.cmdExportMe.TabIndex = 101; this.cmdExportMe.Text = "M"; this.cmdExportMe.UseVisualStyleBackColor = false; @@ -958,11 +958,11 @@ private void InitializeComponent() 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; - this.lblBoardId.Location = new System.Drawing.Point(600, 120); + this.lblBoardId.Location = new System.Drawing.Point(500, 102); this.lblBoardId.Margin = new System.Windows.Forms.Padding(0); this.lblBoardId.Name = "lblBoardId"; - this.lblBoardId.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblBoardId.Size = new System.Drawing.Size(285, 39); + this.lblBoardId.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblBoardId.Size = new System.Drawing.Size(237, 33); this.lblBoardId.TabIndex = 99; this.lblBoardId.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -972,11 +972,11 @@ private void InitializeComponent() 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))))); - this.lblBoardIdText.Location = new System.Drawing.Point(443, 120); + this.lblBoardIdText.Location = new System.Drawing.Point(369, 102); this.lblBoardIdText.Margin = new System.Windows.Forms.Padding(0); this.lblBoardIdText.Name = "lblBoardIdText"; - this.lblBoardIdText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblBoardIdText.Size = new System.Drawing.Size(156, 39); + this.lblBoardIdText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblBoardIdText.Size = new System.Drawing.Size(130, 33); this.lblBoardIdText.TabIndex = 99; this.lblBoardIdText.Text = "Board ID:"; this.lblBoardIdText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -988,11 +988,11 @@ private void InitializeComponent() this.lblEfiLockText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiLockText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiLockText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.lblEfiLockText.Location = new System.Drawing.Point(0, 120); + this.lblEfiLockText.Location = new System.Drawing.Point(0, 102); this.lblEfiLockText.Margin = new System.Windows.Forms.Padding(0); this.lblEfiLockText.Name = "lblEfiLockText"; - this.lblEfiLockText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblEfiLockText.Size = new System.Drawing.Size(156, 39); + this.lblEfiLockText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblEfiLockText.Size = new System.Drawing.Size(130, 33); this.lblEfiLockText.TabIndex = 102; this.lblEfiLockText.Text = "EFI Lock:"; this.lblEfiLockText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1004,11 +1004,11 @@ private void InitializeComponent() 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; - this.lblApfsCapable.Location = new System.Drawing.Point(157, 160); + this.lblApfsCapable.Location = new System.Drawing.Point(131, 136); this.lblApfsCapable.Margin = new System.Windows.Forms.Padding(0); this.lblApfsCapable.Name = "lblApfsCapable"; - this.lblApfsCapable.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblApfsCapable.Size = new System.Drawing.Size(285, 43); + this.lblApfsCapable.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblApfsCapable.Size = new System.Drawing.Size(237, 33); this.lblApfsCapable.TabIndex = 99; this.lblApfsCapable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -1019,11 +1019,11 @@ private void InitializeComponent() 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))))); - this.lblApfsCapableText.Location = new System.Drawing.Point(0, 160); + this.lblApfsCapableText.Location = new System.Drawing.Point(0, 136); this.lblApfsCapableText.Margin = new System.Windows.Forms.Padding(0); this.lblApfsCapableText.Name = "lblApfsCapableText"; - this.lblApfsCapableText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblApfsCapableText.Size = new System.Drawing.Size(156, 43); + this.lblApfsCapableText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblApfsCapableText.Size = new System.Drawing.Size(130, 33); this.lblApfsCapableText.TabIndex = 99; this.lblApfsCapableText.Text = "APFS Capable:"; this.lblApfsCapableText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1033,16 +1033,16 @@ private void InitializeComponent() this.tlpEfiLock.ColumnCount = 3; this.tlpEfiLock.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpEfiLock.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpEfiLock.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tlpEfiLock.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tlpEfiLock.Controls.Add(this.cmdInvalidateEfiLock, 2, 0); this.tlpEfiLock.Controls.Add(this.lblEfiLockStatus, 0, 0); this.tlpEfiLock.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpEfiLock.Location = new System.Drawing.Point(157, 120); + this.tlpEfiLock.Location = new System.Drawing.Point(131, 102); this.tlpEfiLock.Margin = new System.Windows.Forms.Padding(0); this.tlpEfiLock.Name = "tlpEfiLock"; this.tlpEfiLock.RowCount = 1; this.tlpEfiLock.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpEfiLock.Size = new System.Drawing.Size(285, 39); + this.tlpEfiLock.Size = new System.Drawing.Size(237, 33); this.tlpEfiLock.TabIndex = 3; // // cmdInvalidateEfiLock @@ -1057,10 +1057,10 @@ private void InitializeComponent() this.cmdInvalidateEfiLock.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdInvalidateEfiLock.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdInvalidateEfiLock.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdInvalidateEfiLock.Location = new System.Drawing.Point(245, 0); + this.cmdInvalidateEfiLock.Location = new System.Drawing.Point(204, 0); this.cmdInvalidateEfiLock.Margin = new System.Windows.Forms.Padding(0); this.cmdInvalidateEfiLock.Name = "cmdInvalidateEfiLock"; - this.cmdInvalidateEfiLock.Size = new System.Drawing.Size(40, 39); + this.cmdInvalidateEfiLock.Size = new System.Drawing.Size(33, 33); this.cmdInvalidateEfiLock.TabIndex = 0; this.cmdInvalidateEfiLock.Text = "K"; this.cmdInvalidateEfiLock.UseVisualStyleBackColor = false; @@ -1076,8 +1076,8 @@ private void InitializeComponent() this.lblEfiLockStatus.Location = new System.Drawing.Point(0, 0); this.lblEfiLockStatus.Margin = new System.Windows.Forms.Padding(0); this.lblEfiLockStatus.Name = "lblEfiLockStatus"; - this.lblEfiLockStatus.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblEfiLockStatus.Size = new System.Drawing.Size(244, 39); + this.lblEfiLockStatus.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblEfiLockStatus.Size = new System.Drawing.Size(203, 33); this.lblEfiLockStatus.TabIndex = 99; this.lblEfiLockStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -1088,11 +1088,11 @@ private void InitializeComponent() 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; - this.lblHwc.Location = new System.Drawing.Point(157, 40); + this.lblHwc.Location = new System.Drawing.Point(131, 34); this.lblHwc.Margin = new System.Windows.Forms.Padding(0); this.lblHwc.Name = "lblHwc"; - this.lblHwc.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblHwc.Size = new System.Drawing.Size(285, 39); + this.lblHwc.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblHwc.Size = new System.Drawing.Size(237, 33); this.lblHwc.TabIndex = 99; this.lblHwc.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -1105,8 +1105,8 @@ private void InitializeComponent() this.lblFsysStoreText.Location = new System.Drawing.Point(0, 0); this.lblFsysStoreText.Margin = new System.Windows.Forms.Padding(0); this.lblFsysStoreText.Name = "lblFsysStoreText"; - this.lblFsysStoreText.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.lblFsysStoreText.Size = new System.Drawing.Size(156, 39); + this.lblFsysStoreText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); + this.lblFsysStoreText.Size = new System.Drawing.Size(130, 33); this.lblFsysStoreText.TabIndex = 99; this.lblFsysStoreText.Text = "Fsys Store:"; this.lblFsysStoreText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1117,16 +1117,16 @@ private void InitializeComponent() this.tlpSerial.ColumnCount = 3; this.tlpSerial.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpSerial.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpSerial.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tlpSerial.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tlpSerial.Controls.Add(this.cmdEveryMacSearch, 2, 0); this.tlpSerial.Controls.Add(this.lblSerialNumber, 0, 0); this.tlpSerial.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpSerial.Location = new System.Drawing.Point(600, 0); + this.tlpSerial.Location = new System.Drawing.Point(500, 0); this.tlpSerial.Margin = new System.Windows.Forms.Padding(0); this.tlpSerial.Name = "tlpSerial"; this.tlpSerial.RowCount = 1; this.tlpSerial.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpSerial.Size = new System.Drawing.Size(285, 39); + this.tlpSerial.Size = new System.Drawing.Size(237, 33); this.tlpSerial.TabIndex = 4; // // cmdEveryMacSearch @@ -1141,10 +1141,10 @@ private void InitializeComponent() this.cmdEveryMacSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdEveryMacSearch.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdEveryMacSearch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(220)))), ((int)(((byte)(230))))); - this.cmdEveryMacSearch.Location = new System.Drawing.Point(245, 0); + this.cmdEveryMacSearch.Location = new System.Drawing.Point(204, 0); this.cmdEveryMacSearch.Margin = new System.Windows.Forms.Padding(0); this.cmdEveryMacSearch.Name = "cmdEveryMacSearch"; - this.cmdEveryMacSearch.Size = new System.Drawing.Size(40, 39); + this.cmdEveryMacSearch.Size = new System.Drawing.Size(33, 33); this.cmdEveryMacSearch.TabIndex = 0; this.cmdEveryMacSearch.Text = "S"; this.cmdEveryMacSearch.UseVisualStyleBackColor = false; @@ -1160,8 +1160,8 @@ private void InitializeComponent() this.lblSerialNumber.Location = new System.Drawing.Point(0, 0); this.lblSerialNumber.Margin = new System.Windows.Forms.Padding(0); this.lblSerialNumber.Name = "lblSerialNumber"; - this.lblSerialNumber.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.lblSerialNumber.Size = new System.Drawing.Size(244, 39); + this.lblSerialNumber.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.lblSerialNumber.Size = new System.Drawing.Size(203, 33); this.lblSerialNumber.TabIndex = 99; this.lblSerialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -1169,15 +1169,15 @@ private void InitializeComponent() // this.tlpModel.ColumnCount = 1; this.tlpModel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpModel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 24F)); + this.tlpModel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpModel.Controls.Add(this.lblModel, 0, 0); this.tlpModel.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpModel.Location = new System.Drawing.Point(0, 125); + this.tlpModel.Location = new System.Drawing.Point(0, 105); this.tlpModel.Margin = new System.Windows.Forms.Padding(0); this.tlpModel.Name = "tlpModel"; this.tlpModel.RowCount = 1; this.tlpModel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpModel.Size = new System.Drawing.Size(885, 43); + this.tlpModel.Size = new System.Drawing.Size(737, 36); this.tlpModel.TabIndex = 100; // // lblModel @@ -1190,8 +1190,8 @@ private void InitializeComponent() this.lblModel.Location = new System.Drawing.Point(0, 0); this.lblModel.Margin = new System.Windows.Forms.Padding(0); this.lblModel.Name = "lblModel"; - this.lblModel.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0); - this.lblModel.Size = new System.Drawing.Size(885, 43); + this.lblModel.Padding = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblModel.Size = new System.Drawing.Size(737, 36); this.lblModel.TabIndex = 99; this.lblModel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -1202,7 +1202,7 @@ private void InitializeComponent() this.pnlSeperator.Location = new System.Drawing.Point(0, 0); this.pnlSeperator.Margin = new System.Windows.Forms.Padding(2); this.pnlSeperator.Name = "pnlSeperator"; - this.pnlSeperator.Size = new System.Drawing.Size(885, 2); + this.pnlSeperator.Size = new System.Drawing.Size(737, 2); this.pnlSeperator.TabIndex = 94; // // lblVersion @@ -1214,10 +1214,10 @@ private void InitializeComponent() this.lblVersion.Cursor = System.Windows.Forms.Cursors.Hand; this.lblVersion.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblVersion.ForeColor = System.Drawing.Color.White; - this.lblVersion.Location = new System.Drawing.Point(160, 16); - this.lblVersion.Margin = new System.Windows.Forms.Padding(0, 0, 6, 0); + this.lblVersion.Location = new System.Drawing.Point(132, 14); + this.lblVersion.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); this.lblVersion.Name = "lblVersion"; - this.lblVersion.Size = new System.Drawing.Size(26, 27); + this.lblVersion.Size = new System.Drawing.Size(23, 22); this.lblVersion.TabIndex = 99; this.lblVersion.Text = "..."; this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1234,10 +1234,10 @@ private void InitializeComponent() this.cmdPatch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdPatch.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdPatch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); - this.cmdPatch.Location = new System.Drawing.Point(255, 1); + this.cmdPatch.Location = new System.Drawing.Point(212, 1); this.cmdPatch.Margin = new System.Windows.Forms.Padding(1); this.cmdPatch.Name = "cmdPatch"; - this.cmdPatch.Size = new System.Drawing.Size(106, 44); + this.cmdPatch.Size = new System.Drawing.Size(88, 36); this.cmdPatch.TabIndex = 3; this.cmdPatch.Text = "PATCHER"; this.cmdPatch.UseVisualStyleBackColor = false; @@ -1255,10 +1255,10 @@ private void InitializeComponent() this.cmdReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdReset.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdReset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); - this.cmdReset.Location = new System.Drawing.Point(84, 1); + this.cmdReset.Location = new System.Drawing.Point(70, 1); this.cmdReset.Margin = new System.Windows.Forms.Padding(1); this.cmdReset.Name = "cmdReset"; - this.cmdReset.Size = new System.Drawing.Size(80, 44); + this.cmdReset.Size = new System.Drawing.Size(66, 36); this.cmdReset.TabIndex = 1; this.cmdReset.Text = "RESET"; this.cmdReset.UseVisualStyleBackColor = false; @@ -1278,7 +1278,7 @@ private void InitializeComponent() this.cmdOpen.Location = new System.Drawing.Point(1, 1); this.cmdOpen.Margin = new System.Windows.Forms.Padding(1); this.cmdOpen.Name = "cmdOpen"; - this.cmdOpen.Size = new System.Drawing.Size(80, 44); + this.cmdOpen.Size = new System.Drawing.Size(66, 36); this.cmdOpen.TabIndex = 0; this.cmdOpen.Text = "OPEN"; this.cmdOpen.UseVisualStyleBackColor = false; @@ -1290,10 +1290,10 @@ private void InitializeComponent() this.lblWindowTitle.Dock = System.Windows.Forms.DockStyle.Fill; this.lblWindowTitle.Font = new System.Drawing.Font("Segoe UI Semibold", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblWindowTitle.ForeColor = System.Drawing.Color.White; - this.lblWindowTitle.Location = new System.Drawing.Point(60, 0); + this.lblWindowTitle.Location = new System.Drawing.Point(50, 0); this.lblWindowTitle.Margin = new System.Windows.Forms.Padding(0); this.lblWindowTitle.Name = "lblWindowTitle"; - this.lblWindowTitle.Size = new System.Drawing.Size(513, 60); + this.lblWindowTitle.Size = new System.Drawing.Size(427, 50); this.lblWindowTitle.TabIndex = 99; this.lblWindowTitle.Text = "Mac EFI Toolkit"; this.lblWindowTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1305,10 +1305,10 @@ private void InitializeComponent() this.pbxLogo.BackColor = System.Drawing.Color.Transparent; this.pbxLogo.BackgroundImage = global::Mac_EFI_Toolkit.Properties.Resources.logo32px; this.pbxLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pbxLogo.Location = new System.Drawing.Point(10, 11); - this.pbxLogo.Margin = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.pbxLogo.Location = new System.Drawing.Point(8, 9); + this.pbxLogo.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.pbxLogo.Name = "pbxLogo"; - this.pbxLogo.Size = new System.Drawing.Size(38, 38); + this.pbxLogo.Size = new System.Drawing.Size(32, 32); this.pbxLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pbxLogo.TabIndex = 1; this.pbxLogo.TabStop = false; @@ -1319,19 +1319,19 @@ 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 = 14; - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); 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, 82F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); 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, 82F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 6F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 108F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 6F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 113F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); + 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, 90F)); + 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, 94F)); 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, 86F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72F)); 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, 46F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpMenu.Controls.Add(this.pnlMenuSeperator1, 5, 0); this.tlpMenu.Controls.Add(this.cmdCopyMenu, 4, 0); @@ -1343,22 +1343,22 @@ private void InitializeComponent() this.tlpMenu.Controls.Add(this.cmdAbout, 10, 0); this.tlpMenu.Controls.Add(this.cmdMore, 12, 0); this.tlpMenu.Dock = System.Windows.Forms.DockStyle.Top; - this.tlpMenu.Location = new System.Drawing.Point(1, 61); + this.tlpMenu.Location = new System.Drawing.Point(1, 51); this.tlpMenu.Margin = new System.Windows.Forms.Padding(2); this.tlpMenu.Name = "tlpMenu"; this.tlpMenu.RowCount = 1; this.tlpMenu.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpMenu.Size = new System.Drawing.Size(885, 46); + this.tlpMenu.Size = new System.Drawing.Size(737, 38); this.tlpMenu.TabIndex = 0; // // pnlMenuSeperator1 // this.pnlMenuSeperator1.Anchor = System.Windows.Forms.AnchorStyles.None; this.pnlMenuSeperator1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.pnlMenuSeperator1.Location = new System.Drawing.Point(250, 13); + this.pnlMenuSeperator1.Location = new System.Drawing.Point(208, 11); this.pnlMenuSeperator1.Margin = new System.Windows.Forms.Padding(0); this.pnlMenuSeperator1.Name = "pnlMenuSeperator1"; - this.pnlMenuSeperator1.Size = new System.Drawing.Size(1, 19); + this.pnlMenuSeperator1.Size = new System.Drawing.Size(1, 16); this.pnlMenuSeperator1.TabIndex = 8; // // cmdCopyMenu @@ -1373,10 +1373,10 @@ private void InitializeComponent() 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(167, 1); + this.cmdCopyMenu.Location = new System.Drawing.Point(139, 1); this.cmdCopyMenu.Margin = new System.Windows.Forms.Padding(1); this.cmdCopyMenu.Name = "cmdCopyMenu"; - this.cmdCopyMenu.Size = new System.Drawing.Size(80, 44); + this.cmdCopyMenu.Size = new System.Drawing.Size(66, 36); this.cmdCopyMenu.TabIndex = 2; this.cmdCopyMenu.Text = "COPY"; this.cmdCopyMenu.UseVisualStyleBackColor = false; @@ -1386,10 +1386,10 @@ private void InitializeComponent() // this.panel1.Anchor = System.Windows.Forms.AnchorStyles.None; this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.panel1.Location = new System.Drawing.Point(364, 13); + this.panel1.Location = new System.Drawing.Point(303, 11); this.panel1.Margin = new System.Windows.Forms.Padding(0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1, 19); + this.panel1.Size = new System.Drawing.Size(1, 16); this.panel1.TabIndex = 10; // // cmdSettings @@ -1403,10 +1403,10 @@ private void InitializeComponent() this.cmdSettings.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdSettings.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdSettings.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); - this.cmdSettings.Location = new System.Drawing.Point(369, 1); + this.cmdSettings.Location = new System.Drawing.Point(307, 1); this.cmdSettings.Margin = new System.Windows.Forms.Padding(1); this.cmdSettings.Name = "cmdSettings"; - this.cmdSettings.Size = new System.Drawing.Size(111, 44); + this.cmdSettings.Size = new System.Drawing.Size(92, 36); this.cmdSettings.TabIndex = 4; this.cmdSettings.Text = "SETTINGS"; this.cmdSettings.UseVisualStyleBackColor = false; @@ -1423,10 +1423,10 @@ private void InitializeComponent() this.cmdAbout.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdAbout.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdAbout.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); - this.cmdAbout.Location = new System.Drawing.Point(483, 1); + this.cmdAbout.Location = new System.Drawing.Point(402, 1); this.cmdAbout.Margin = new System.Windows.Forms.Padding(1); this.cmdAbout.Name = "cmdAbout"; - this.cmdAbout.Size = new System.Drawing.Size(84, 44); + this.cmdAbout.Size = new System.Drawing.Size(70, 36); this.cmdAbout.TabIndex = 5; this.cmdAbout.Text = "ABOUT"; this.cmdAbout.UseVisualStyleBackColor = false; @@ -1443,11 +1443,11 @@ private void InitializeComponent() this.cmdMore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdMore.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdMore.ForeColor = System.Drawing.Color.White; - this.cmdMore.Location = new System.Drawing.Point(570, 1); + this.cmdMore.Location = new System.Drawing.Point(475, 1); this.cmdMore.Margin = new System.Windows.Forms.Padding(1); this.cmdMore.Name = "cmdMore"; this.cmdMore.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.cmdMore.Size = new System.Drawing.Size(44, 44); + this.cmdMore.Size = new System.Drawing.Size(36, 36); this.cmdMore.TabIndex = 6; this.cmdMore.Text = "..."; this.cmdMore.UseVisualStyleBackColor = false; @@ -1458,11 +1458,11 @@ private void InitializeComponent() this.tlpTitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.tlpTitle.BackgroundImage = global::Mac_EFI_Toolkit.Properties.Resources.imgSprite; this.tlpTitle.ColumnCount = 5; - this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F)); + this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F)); this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 192F)); - this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F)); + this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F)); + this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F)); + this.tlpTitle.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 50F)); this.tlpTitle.Controls.Add(this.lblWindowTitle, 1, 0); this.tlpTitle.Controls.Add(this.cmdClose, 4, 0); this.tlpTitle.Controls.Add(this.pbxLogo, 0, 0); @@ -1473,8 +1473,8 @@ private void InitializeComponent() this.tlpTitle.Margin = new System.Windows.Forms.Padding(0); this.tlpTitle.Name = "tlpTitle"; this.tlpTitle.RowCount = 1; - this.tlpTitle.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.tlpTitle.Size = new System.Drawing.Size(885, 60); + this.tlpTitle.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); + this.tlpTitle.Size = new System.Drawing.Size(737, 50); this.tlpTitle.TabIndex = 99; // // cmdClose @@ -1488,11 +1488,11 @@ private void InitializeComponent() 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))); this.cmdClose.ForeColor = System.Drawing.Color.White; - this.cmdClose.Location = new System.Drawing.Point(825, 0); + this.cmdClose.Location = new System.Drawing.Point(687, 0); this.cmdClose.Margin = new System.Windows.Forms.Padding(0); this.cmdClose.Name = "cmdClose"; this.cmdClose.Padding = new System.Windows.Forms.Padding(2, 2, 0, 1); - this.cmdClose.Size = new System.Drawing.Size(60, 60); + this.cmdClose.Size = new System.Drawing.Size(50, 50); this.cmdClose.TabIndex = 99; this.cmdClose.TabStop = false; this.cmdClose.Text = "C"; @@ -1510,11 +1510,11 @@ private void InitializeComponent() this.cmdMin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdMin.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdMin.ForeColor = System.Drawing.Color.White; - this.cmdMin.Location = new System.Drawing.Point(765, 0); + this.cmdMin.Location = new System.Drawing.Point(637, 0); this.cmdMin.Margin = new System.Windows.Forms.Padding(0); this.cmdMin.Name = "cmdMin"; this.cmdMin.Padding = new System.Windows.Forms.Padding(2, 0, 0, 1); - this.cmdMin.Size = new System.Drawing.Size(60, 60); + this.cmdMin.Size = new System.Drawing.Size(50, 50); this.cmdMin.TabIndex = 99; this.cmdMin.TabStop = false; this.cmdMin.Text = "—"; @@ -1528,12 +1528,12 @@ private void InitializeComponent() this.tlpVersionLabel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpVersionLabel.Controls.Add(this.lblVersion, 0, 0); this.tlpVersionLabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpVersionLabel.Location = new System.Drawing.Point(573, 0); + this.tlpVersionLabel.Location = new System.Drawing.Point(477, 0); this.tlpVersionLabel.Margin = new System.Windows.Forms.Padding(0); this.tlpVersionLabel.Name = "tlpVersionLabel"; this.tlpVersionLabel.RowCount = 1; this.tlpVersionLabel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpVersionLabel.Size = new System.Drawing.Size(192, 60); + this.tlpVersionLabel.Size = new System.Drawing.Size(160, 50); this.tlpVersionLabel.TabIndex = 100; this.tlpVersionLabel.Click += new System.EventHandler(this.tlpVersionLabel_Click); // @@ -1558,14 +1558,14 @@ private void InitializeComponent() this.toolStripSeparator1, this.restartApplicationToolStripMenuItem}); this.cmsOverflow.Name = "cmsMainMenu"; - this.cmsOverflow.Size = new System.Drawing.Size(286, 418); + this.cmsOverflow.Size = new System.Drawing.Size(245, 330); // // backupsDirectoryToolStripMenuItem // this.backupsDirectoryToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.backupsDirectoryToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.folder; this.backupsDirectoryToolStripMenuItem.Name = "backupsDirectoryToolStripMenuItem"; - this.backupsDirectoryToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.backupsDirectoryToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.backupsDirectoryToolStripMenuItem.Text = "Backups Folder"; this.backupsDirectoryToolStripMenuItem.Click += new System.EventHandler(this.backupsDirectoryToolStripMenuItem_Click); // @@ -1575,7 +1575,7 @@ private void InitializeComponent() this.openBuildsDirectoryToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.folder; this.openBuildsDirectoryToolStripMenuItem.Name = "openBuildsDirectoryToolStripMenuItem"; this.openBuildsDirectoryToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.openBuildsDirectoryToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.openBuildsDirectoryToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.openBuildsDirectoryToolStripMenuItem.Text = "Builds Folder"; this.openBuildsDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openBuildsDirectoryToolStripMenuItem_Click); // @@ -1585,7 +1585,7 @@ private void InitializeComponent() this.openFsysStoresDirectoryToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.folder; this.openFsysStoresDirectoryToolStripMenuItem.Name = "openFsysStoresDirectoryToolStripMenuItem"; this.openFsysStoresDirectoryToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.openFsysStoresDirectoryToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.openFsysStoresDirectoryToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.openFsysStoresDirectoryToolStripMenuItem.Text = "Fsys Store Folder"; this.openFsysStoresDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openFsysDirectoryToolStripMenuItem_Click); // @@ -1595,7 +1595,7 @@ private void InitializeComponent() this.openMeRegionDirectoryToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.folder; this.openMeRegionDirectoryToolStripMenuItem.Name = "openMeRegionDirectoryToolStripMenuItem"; this.openMeRegionDirectoryToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.openMeRegionDirectoryToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.openMeRegionDirectoryToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.openMeRegionDirectoryToolStripMenuItem.Text = "ME Region Folder"; this.openMeRegionDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openMeRegionDirectoryToolStripMenuItem_Click); // @@ -1605,21 +1605,21 @@ private void InitializeComponent() this.openLocalFolderToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.folder; this.openLocalFolderToolStripMenuItem.Name = "openLocalFolderToolStripMenuItem"; this.openLocalFolderToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.openLocalFolderToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.openLocalFolderToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.openLocalFolderToolStripMenuItem.Text = "Working Directory"; this.openLocalFolderToolStripMenuItem.Click += new System.EventHandler(this.openLocalFolderToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(282, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(241, 6); // // changelogToolStripMenuItem // this.changelogToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.changelogToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.changelog; this.changelogToolStripMenuItem.Name = "changelogToolStripMenuItem"; - this.changelogToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.changelogToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.changelogToolStripMenuItem.Text = "Changelog"; this.changelogToolStripMenuItem.Click += new System.EventHandler(this.changelogToolStripMenuItem_Click); // @@ -1628,7 +1628,7 @@ private void InitializeComponent() this.homepageToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.homepageToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.home; this.homepageToolStripMenuItem.Name = "homepageToolStripMenuItem"; - this.homepageToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.homepageToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.homepageToolStripMenuItem.Text = "Homepage"; this.homepageToolStripMenuItem.Click += new System.EventHandler(this.homepageToolStripMenuItem_Click); // @@ -1637,21 +1637,21 @@ private void InitializeComponent() this.usageManualToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.usageManualToolStripMenuItem.Image = global::Mac_EFI_Toolkit.Properties.Resources.manual; this.usageManualToolStripMenuItem.Name = "usageManualToolStripMenuItem"; - this.usageManualToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.usageManualToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.usageManualToolStripMenuItem.Text = "Usage Manual"; this.usageManualToolStripMenuItem.Click += new System.EventHandler(this.usageManualToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(282, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(241, 6); // // createADebugLogToolStripMenuItem // this.createADebugLogToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.createADebugLogToolStripMenuItem.Name = "createADebugLogToolStripMenuItem"; this.createADebugLogToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.createADebugLogToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.createADebugLogToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.createADebugLogToolStripMenuItem.Text = "Create a Debug Log"; this.createADebugLogToolStripMenuItem.Click += new System.EventHandler(this.createADebugLogToolStripMenuItem_Click); // @@ -1660,21 +1660,21 @@ private void InitializeComponent() this.viewLogToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.viewLogToolStripMenuItem.Name = "viewLogToolStripMenuItem"; this.viewLogToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.viewLogToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.viewLogToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.viewLogToolStripMenuItem.Text = "View Application Log"; this.viewLogToolStripMenuItem.Click += new System.EventHandler(this.viewLogToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(282, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(241, 6); // // restartApplicationToolStripMenuItem // this.restartApplicationToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.restartApplicationToolStripMenuItem.Name = "restartApplicationToolStripMenuItem"; this.restartApplicationToolStripMenuItem.ShortcutKeyDisplayString = ""; - this.restartApplicationToolStripMenuItem.Size = new System.Drawing.Size(285, 36); + this.restartApplicationToolStripMenuItem.Size = new System.Drawing.Size(244, 28); this.restartApplicationToolStripMenuItem.Text = "Restart Application"; this.restartApplicationToolStripMenuItem.Click += new System.EventHandler(this.restartApplicationToolStripMenuItem_Click); // @@ -1689,7 +1689,7 @@ private void InitializeComponent() this.exitToolStripMenuItem}); this.cmsApplication.Name = "cmsApplication"; this.cmsApplication.ShowImageMargin = false; - this.cmsApplication.Size = new System.Drawing.Size(228, 118); + this.cmsApplication.Size = new System.Drawing.Size(191, 94); // // minimizeToolStripMenuItem // @@ -1697,7 +1697,7 @@ private void InitializeComponent() this.minimizeToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.minimizeToolStripMenuItem.Name = "minimizeToolStripMenuItem"; this.minimizeToolStripMenuItem.ShortcutKeyDisplayString = "(M)"; - this.minimizeToolStripMenuItem.Size = new System.Drawing.Size(227, 36); + this.minimizeToolStripMenuItem.Size = new System.Drawing.Size(190, 28); this.minimizeToolStripMenuItem.Text = "Minimize"; this.minimizeToolStripMenuItem.Click += new System.EventHandler(this.minimizeToolStripMenuItem_Click); // @@ -1707,14 +1707,14 @@ private void InitializeComponent() this.resetPositionToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.resetPositionToolStripMenuItem.Name = "resetPositionToolStripMenuItem"; this.resetPositionToolStripMenuItem.ShortcutKeyDisplayString = "(R)"; - this.resetPositionToolStripMenuItem.Size = new System.Drawing.Size(227, 36); + this.resetPositionToolStripMenuItem.Size = new System.Drawing.Size(190, 28); this.resetPositionToolStripMenuItem.Text = "Reset Position"; this.resetPositionToolStripMenuItem.Click += new System.EventHandler(this.resetPositionToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(224, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(187, 6); // // exitToolStripMenuItem // @@ -1723,7 +1723,7 @@ private void InitializeComponent() this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeyDisplayString = ""; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(227, 36); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(190, 28); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -1756,13 +1756,13 @@ private void InitializeComponent() this.biosBaseToolStripMenuItem}); this.cmsClipboard.Name = "cmsCopy"; this.cmsClipboard.ShowImageMargin = false; - this.cmsClipboard.Size = new System.Drawing.Size(195, 700); + this.cmsClipboard.Size = new System.Drawing.Size(164, 548); // // filenameToolStripMenuItem // this.filenameToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.filenameToolStripMenuItem.Name = "filenameToolStripMenuItem"; - this.filenameToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.filenameToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.filenameToolStripMenuItem.Text = "Filename"; this.filenameToolStripMenuItem.Click += new System.EventHandler(this.filenameToolStripMenuItem_Click); // @@ -1770,7 +1770,7 @@ private void InitializeComponent() // this.sizeBytesToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.sizeBytesToolStripMenuItem.Name = "sizeBytesToolStripMenuItem"; - this.sizeBytesToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.sizeBytesToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.sizeBytesToolStripMenuItem.Text = "Size (Bytes)"; this.sizeBytesToolStripMenuItem.Click += new System.EventHandler(this.sizeBytesToolStripMenuItem_Click); // @@ -1778,7 +1778,7 @@ private void InitializeComponent() // this.sizeHexToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.sizeHexToolStripMenuItem.Name = "sizeHexToolStripMenuItem"; - this.sizeHexToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.sizeHexToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.sizeHexToolStripMenuItem.Text = "Size (Hex)"; this.sizeHexToolStripMenuItem.Click += new System.EventHandler(this.sizeHexToolStripMenuItem_Click); // @@ -1786,7 +1786,7 @@ private void InitializeComponent() // this.crc32ToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.crc32ToolStripMenuItem.Name = "crc32ToolStripMenuItem"; - this.crc32ToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.crc32ToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.crc32ToolStripMenuItem.Text = "CRC32"; this.crc32ToolStripMenuItem.Click += new System.EventHandler(this.crc32ToolStripMenuItem_Click); // @@ -1794,7 +1794,7 @@ private void InitializeComponent() // this.createdDateToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.createdDateToolStripMenuItem.Name = "createdDateToolStripMenuItem"; - this.createdDateToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.createdDateToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.createdDateToolStripMenuItem.Text = "Created Date"; this.createdDateToolStripMenuItem.Click += new System.EventHandler(this.createdDateToolStripMenuItem_Click); // @@ -1802,20 +1802,20 @@ private void InitializeComponent() // this.modifiedDateToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.modifiedDateToolStripMenuItem.Name = "modifiedDateToolStripMenuItem"; - this.modifiedDateToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.modifiedDateToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.modifiedDateToolStripMenuItem.Text = "Modified Date"; this.modifiedDateToolStripMenuItem.Click += new System.EventHandler(this.modifiedDateToolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(160, 6); // // modelToolStripMenuItem // this.modelToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.modelToolStripMenuItem.Name = "modelToolStripMenuItem"; - this.modelToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.modelToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.modelToolStripMenuItem.Text = "Model"; this.modelToolStripMenuItem.Click += new System.EventHandler(this.modelToolStripMenuItem_Click); // @@ -1823,7 +1823,7 @@ private void InitializeComponent() // this.configCodeToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.configCodeToolStripMenuItem.Name = "configCodeToolStripMenuItem"; - this.configCodeToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.configCodeToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.configCodeToolStripMenuItem.Text = "Config Code"; this.configCodeToolStripMenuItem.Click += new System.EventHandler(this.configCodeToolStripMenuItem_Click); // @@ -1831,7 +1831,7 @@ private void InitializeComponent() // this.serialToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.serialToolStripMenuItem.Name = "serialToolStripMenuItem"; - this.serialToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.serialToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.serialToolStripMenuItem.Text = "Serial"; this.serialToolStripMenuItem.Click += new System.EventHandler(this.serialToolStripMenuItem_Click); // @@ -1839,7 +1839,7 @@ private void InitializeComponent() // this.hwcToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.hwcToolStripMenuItem.Name = "hwcToolStripMenuItem"; - this.hwcToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.hwcToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.hwcToolStripMenuItem.Text = "HWC"; this.hwcToolStripMenuItem.Click += new System.EventHandler(this.hwcToolStripMenuItem_Click); // @@ -1847,7 +1847,7 @@ private void InitializeComponent() // this.fsysCRC32ToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.fsysCRC32ToolStripMenuItem.Name = "fsysCRC32ToolStripMenuItem"; - this.fsysCRC32ToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.fsysCRC32ToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.fsysCRC32ToolStripMenuItem.Text = "Fsys CRC32"; this.fsysCRC32ToolStripMenuItem.Click += new System.EventHandler(this.fsysCRC32ToolStripMenuItem_Click); // @@ -1855,7 +1855,7 @@ private void InitializeComponent() // this.orderNoToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.orderNoToolStripMenuItem.Name = "orderNoToolStripMenuItem"; - this.orderNoToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.orderNoToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.orderNoToolStripMenuItem.Text = "Order No"; this.orderNoToolStripMenuItem.Click += new System.EventHandler(this.orderNoToolStripMenuItem_Click); // @@ -1863,7 +1863,7 @@ private void InitializeComponent() // this.efiVersionToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.efiVersionToolStripMenuItem.Name = "efiVersionToolStripMenuItem"; - this.efiVersionToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.efiVersionToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.efiVersionToolStripMenuItem.Text = "EFI Version"; this.efiVersionToolStripMenuItem.Click += new System.EventHandler(this.efiVersionToolStripMenuItem_Click); // @@ -1871,7 +1871,7 @@ private void InitializeComponent() // this.boardIDToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.boardIDToolStripMenuItem.Name = "boardIDToolStripMenuItem"; - this.boardIDToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.boardIDToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.boardIDToolStripMenuItem.Text = "Board ID"; this.boardIDToolStripMenuItem.Click += new System.EventHandler(this.boardIDToolStripMenuItem_Click); // @@ -1879,7 +1879,7 @@ private void InitializeComponent() // this.fitVersionToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.fitVersionToolStripMenuItem.Name = "fitVersionToolStripMenuItem"; - this.fitVersionToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.fitVersionToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.fitVersionToolStripMenuItem.Text = "FIT Version"; this.fitVersionToolStripMenuItem.Click += new System.EventHandler(this.fitVersionToolStripMenuItem_Click); // @@ -1887,20 +1887,20 @@ private void InitializeComponent() // this.meVersionToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.meVersionToolStripMenuItem.Name = "meVersionToolStripMenuItem"; - this.meVersionToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.meVersionToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.meVersionToolStripMenuItem.Text = "ME Version"; this.meVersionToolStripMenuItem.Click += new System.EventHandler(this.meVersionToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(191, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(160, 6); // // pdrBaseToolStripMenuItem // this.pdrBaseToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.pdrBaseToolStripMenuItem.Name = "pdrBaseToolStripMenuItem"; - this.pdrBaseToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.pdrBaseToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.pdrBaseToolStripMenuItem.Text = "PDR Base"; this.pdrBaseToolStripMenuItem.Click += new System.EventHandler(this.pdrBaseToolStripMenuItem_Click); // @@ -1908,7 +1908,7 @@ private void InitializeComponent() // this.meBaseToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.meBaseToolStripMenuItem.Name = "meBaseToolStripMenuItem"; - this.meBaseToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.meBaseToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.meBaseToolStripMenuItem.Text = "ME Base"; this.meBaseToolStripMenuItem.Click += new System.EventHandler(this.meBaseToolStripMenuItem_Click); // @@ -1916,19 +1916,19 @@ private void InitializeComponent() // this.biosBaseToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.biosBaseToolStripMenuItem.Name = "biosBaseToolStripMenuItem"; - this.biosBaseToolStripMenuItem.Size = new System.Drawing.Size(194, 36); + this.biosBaseToolStripMenuItem.Size = new System.Drawing.Size(163, 28); this.biosBaseToolStripMenuItem.Text = "BIOS Base"; this.biosBaseToolStripMenuItem.Click += new System.EventHandler(this.biosBaseToolStripMenuItem_Click); // // mainWindow // this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F); + this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.ClientSize = new System.Drawing.Size(887, 530); + this.ClientSize = new System.Drawing.Size(739, 442); this.Controls.Add(this.pnlMain); this.Controls.Add(this.tlpMenu); this.Controls.Add(this.tlpTitle); @@ -1939,7 +1939,7 @@ private void InitializeComponent() this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(2); this.MaximizeBox = false; - this.MinimumSize = new System.Drawing.Size(887, 530); + this.MinimumSize = new System.Drawing.Size(739, 442); this.Name = "mainWindow"; this.Padding = new System.Windows.Forms.Padding(1); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; diff --git a/mefit/WinForms/mainWindow.cs b/mefit/WinForms/mainWindow.cs index 043a3c5..411d2e1 100644 --- a/mefit/WinForms/mainWindow.cs +++ b/mefit/WinForms/mainWindow.cs @@ -576,8 +576,8 @@ private void cmdExportFsys_Click(object sender, EventArgs e) // Set SaveFileDialog params using (SaveFileDialog dialog = new SaveFileDialog { - Filter = "Binary Files (*.bin)|*.bin", - FileName = string.Concat("FSYS_STORE_", FWBase.FileInfoData.FileNameNoExt, ".bin"), + Filter = "Binary Files (*.bin)|*.bin|All Files (*.*)|*.*", + FileName = $"FSYS_{FWBase.FsysStoreData.Serial}_{FWBase.EfiBiosIdSectionData.ModelPart}", OverwritePrompt = true, InitialDirectory = METPath.FsysDirectory }) @@ -790,8 +790,9 @@ private void cmdExportMe_Click(object sender, EventArgs e) // Set SaveFileDialog params using (SaveFileDialog dialog = new SaveFileDialog { - Filter = "Binary Files (*.bin)|*.bin", - FileName = string.Concat("ME_REGION_", FWBase.FileInfoData.FileNameNoExt, ".bin"), + Filter = "Binary Files (*.bin)|*.bin|All Files (*.*)|*.*", + //FileName = $"ME_{FWBase.MeVersion}_{FWBase.FsysStoreData.Serial}_{FWBase.EfiBiosIdSectionData.ModelPart}", + FileName = $"ME_REGION_{FWBase.FsysStoreData.Serial}_{FWBase.EfiBiosIdSectionData.ModelPart}", OverwritePrompt = true, InitialDirectory = METPath.MeDirectory }) @@ -889,7 +890,7 @@ private void createADebugLogToolStripMenuItem_Click(object sender, EventArgs e) if (File.Exists(METPath.DebugLog)) { - ShowExplorerNavigationPrompt("Debug log", METPath.DebugLog); + ShowExplorerNavigationPrompt("Debug log created successfully.", METPath.DebugLog); } } @@ -947,7 +948,7 @@ private void sizeBytesToolStripMenuItem_Click(object sender, EventArgs e) private void sizeHexToolStripMenuItem_Click(object sender, EventArgs e) { - SetClipboardText($"0x{FWBase.FileInfoData.FileLength:X}h"); + SetClipboardText($"{FWBase.FileInfoData.FileLength:X}h"); } private void crc32ToolStripMenuItem_Click(object sender, EventArgs e) @@ -1097,10 +1098,10 @@ private void UpdateFileNameLabel() private void UpdateFileSizeLabel() { - int fileSize = (int)FWBase.FileInfoData.FileLength; - bool isValidSize = FileUtils.GetIsValidBinSize(fileSize); + int fileSizeDecimal = (int)FWBase.FileInfoData.FileLength; + bool isValidSize = FileUtils.GetIsValidBinSize(fileSizeDecimal); - lblFileSizeBytes.Text = FileUtils.FormatFileSize(fileSize); + lblFileSizeBytes.Text = $"{FileUtils.FormatFileSize(fileSizeDecimal)} • {fileSizeDecimal:X}h"; if (!isValidSize) { @@ -1109,7 +1110,7 @@ private void UpdateFileSizeLabel() lblFileSizeBytes.Text += isValidSize ? string.Empty - : $" ({FileUtils.GetSizeDifference(fileSize)})"; + : $" ({FileUtils.GetSizeDifference(fileSizeDecimal)})"; } } @@ -1193,12 +1194,11 @@ private void UpdateNvramLabel(Label label, NvramStore storeData, string text) { label.Text = text; - Color foreColor = - !storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty + Color foreColor = storeData.PrimaryStoreBase == -1 + ? Colours.DISABLED_TEXT + : !storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty ? Color.White - : storeData.PrimaryStoreBase != -1 - ? Colours.COMPLETE_GREEN - : Colours.DISABLED_TEXT; + : Colours.COMPLETE_GREEN; label.ForeColor = foreColor; } @@ -1531,6 +1531,8 @@ private string SetNvramStoreTip(NvramStore storeData, string storeType) return $"Data present in both {storeType} stores"; else if (!storeData.IsPrimaryStoreEmpty && storeData.IsBackupStoreEmpty) return $"Data present in the primary {storeType} store"; + else if (storeData.IsPrimaryStoreEmpty && !storeData.IsBackupStoreEmpty) + return $"Data present in the backup {storeType} store"; else if (storeData.PrimaryStoreBase != -1) return $"{storeType} NVRAM stores are empty (0xFF)"; diff --git a/mefit/WinForms/patcherWindow.Designer.cs b/mefit/WinForms/patcherWindow.Designer.cs index c2ab00b..75cf2e2 100644 --- a/mefit/WinForms/patcherWindow.Designer.cs +++ b/mefit/WinForms/patcherWindow.Designer.cs @@ -76,10 +76,11 @@ private void InitializeComponent() this.cmdClose = new System.Windows.Forms.Button(); this.pnlSeperator = new System.Windows.Forms.Panel(); this.tlpButtons = new System.Windows.Forms.TableLayoutPanel(); - this.cmdReset = new System.Windows.Forms.Button(); this.cmdBuild = new System.Windows.Forms.Button(); - this.cmdOpenLast = new System.Windows.Forms.Button(); - this.cmdOpenBuildsDir = new System.Windows.Forms.Button(); + this.cmdLoadLastBuild = new System.Windows.Forms.Button(); + this.cmdReset = new System.Windows.Forms.Button(); + this.cmdBuildsFolder = new System.Windows.Forms.Button(); + this.cmdShowLastBuild = new System.Windows.Forms.Button(); this.pnlMain.SuspendLayout(); this.tlpMain.SuspendLayout(); this.tlpOptions.SuspendLayout(); @@ -106,7 +107,7 @@ private void InitializeComponent() this.pnlMain.Location = new System.Drawing.Point(1, 43); this.pnlMain.Margin = new System.Windows.Forms.Padding(2); this.pnlMain.Name = "pnlMain"; - this.pnlMain.Size = new System.Drawing.Size(908, 385); + this.pnlMain.Size = new System.Drawing.Size(838, 385); this.pnlMain.TabIndex = 0; // // tlpMain @@ -123,7 +124,7 @@ private void InitializeComponent() this.tlpMain.Name = "tlpMain"; this.tlpMain.RowCount = 1; this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpMain.Size = new System.Drawing.Size(908, 385); + this.tlpMain.Size = new System.Drawing.Size(838, 385); this.tlpMain.TabIndex = 0; this.tlpMain.TabStop = true; // @@ -708,7 +709,7 @@ private void InitializeComponent() this.tlpLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpLog.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpLog.Size = new System.Drawing.Size(507, 385); + this.tlpLog.Size = new System.Drawing.Size(437, 385); this.tlpLog.TabIndex = 1; // // pnlLog @@ -720,7 +721,7 @@ private void InitializeComponent() this.pnlLog.Margin = new System.Windows.Forms.Padding(0); this.pnlLog.Name = "pnlLog"; this.pnlLog.Padding = new System.Windows.Forms.Padding(4); - this.pnlLog.Size = new System.Drawing.Size(507, 349); + this.pnlLog.Size = new System.Drawing.Size(437, 349); this.pnlLog.TabIndex = 3; // // rtbLog @@ -734,7 +735,7 @@ private void InitializeComponent() this.rtbLog.Margin = new System.Windows.Forms.Padding(0); this.rtbLog.Name = "rtbLog"; this.rtbLog.ReadOnly = true; - this.rtbLog.Size = new System.Drawing.Size(499, 341); + this.rtbLog.Size = new System.Drawing.Size(429, 341); this.rtbLog.TabIndex = 0; this.rtbLog.TabStop = false; this.rtbLog.Text = ""; @@ -756,7 +757,7 @@ private void InitializeComponent() this.tlpOutput.Name = "tlpOutput"; this.tlpOutput.RowCount = 1; this.tlpOutput.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpOutput.Size = new System.Drawing.Size(507, 34); + this.tlpOutput.Size = new System.Drawing.Size(437, 34); this.tlpOutput.TabIndex = 6; // // lblOutputText @@ -769,7 +770,7 @@ private void InitializeComponent() this.lblOutputText.Margin = new System.Windows.Forms.Padding(0); this.lblOutputText.Name = "lblOutputText"; this.lblOutputText.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); - this.lblOutputText.Size = new System.Drawing.Size(416, 34); + this.lblOutputText.Size = new System.Drawing.Size(346, 34); this.lblOutputText.TabIndex = 99; this.lblOutputText.Text = "OUTPUT"; this.lblOutputText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -785,7 +786,7 @@ private void InitializeComponent() this.cmdSaveLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdSaveLog.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdSaveLog.ForeColor = System.Drawing.Color.White; - this.cmdSaveLog.Location = new System.Drawing.Point(417, 0); + this.cmdSaveLog.Location = new System.Drawing.Point(347, 0); this.cmdSaveLog.Margin = new System.Windows.Forms.Padding(0); this.cmdSaveLog.Name = "cmdSaveLog"; this.cmdSaveLog.Size = new System.Drawing.Size(90, 34); @@ -811,7 +812,7 @@ private void InitializeComponent() this.tlpTitle.Name = "tlpTitle"; this.tlpTitle.RowCount = 1; this.tlpTitle.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpTitle.Size = new System.Drawing.Size(908, 40); + this.tlpTitle.Size = new System.Drawing.Size(838, 40); this.tlpTitle.TabIndex = 99; // // pbxLogo @@ -836,7 +837,7 @@ private void InitializeComponent() this.lblTitle.Location = new System.Drawing.Point(40, 0); this.lblTitle.Margin = new System.Windows.Forms.Padding(0); this.lblTitle.Name = "lblTitle"; - this.lblTitle.Size = new System.Drawing.Size(828, 40); + this.lblTitle.Size = new System.Drawing.Size(758, 40); this.lblTitle.TabIndex = 99; this.lblTitle.Text = "Firmware Patcher"; this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -853,7 +854,7 @@ private void InitializeComponent() 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))); this.cmdClose.ForeColor = System.Drawing.Color.White; - this.cmdClose.Location = new System.Drawing.Point(868, 0); + this.cmdClose.Location = new System.Drawing.Point(798, 0); this.cmdClose.Margin = new System.Windows.Forms.Padding(0); this.cmdClose.MaximumSize = new System.Drawing.Size(40, 40); this.cmdClose.MinimumSize = new System.Drawing.Size(40, 40); @@ -874,33 +875,76 @@ private void InitializeComponent() this.pnlSeperator.Location = new System.Drawing.Point(1, 41); this.pnlSeperator.Margin = new System.Windows.Forms.Padding(2); this.pnlSeperator.Name = "pnlSeperator"; - this.pnlSeperator.Size = new System.Drawing.Size(908, 2); + this.pnlSeperator.Size = new System.Drawing.Size(838, 2); this.pnlSeperator.TabIndex = 97; // // tlpButtons // this.tlpButtons.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.tlpButtons.ColumnCount = 4; + this.tlpButtons.ColumnCount = 6; + this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 126F)); this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 195F)); + this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150F)); this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 155F)); this.tlpButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tlpButtons.Controls.Add(this.cmdBuild, 5, 0); + this.tlpButtons.Controls.Add(this.cmdLoadLastBuild, 4, 0); this.tlpButtons.Controls.Add(this.cmdReset, 0, 0); - this.tlpButtons.Controls.Add(this.cmdBuild, 3, 0); - this.tlpButtons.Controls.Add(this.cmdOpenLast, 2, 0); - this.tlpButtons.Controls.Add(this.cmdOpenBuildsDir, 1, 0); + this.tlpButtons.Controls.Add(this.cmdBuildsFolder, 1, 0); + this.tlpButtons.Controls.Add(this.cmdShowLastBuild, 3, 0); this.tlpButtons.Dock = System.Windows.Forms.DockStyle.Bottom; this.tlpButtons.Location = new System.Drawing.Point(1, 428); this.tlpButtons.Margin = new System.Windows.Forms.Padding(0); this.tlpButtons.Name = "tlpButtons"; this.tlpButtons.RowCount = 1; this.tlpButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpButtons.Size = new System.Drawing.Size(908, 46); + this.tlpButtons.Size = new System.Drawing.Size(838, 46); this.tlpButtons.TabIndex = 1; // + // cmdBuild + // + this.cmdBuild.Anchor = System.Windows.Forms.AnchorStyles.None; + this.cmdBuild.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); + this.cmdBuild.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); + this.cmdBuild.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); + this.cmdBuild.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); + this.cmdBuild.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cmdBuild.Font = new System.Drawing.Font("Segoe UI Semibold", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmdBuild.ForeColor = System.Drawing.Color.White; + this.cmdBuild.Location = new System.Drawing.Point(763, 5); + this.cmdBuild.Margin = new System.Windows.Forms.Padding(0); + this.cmdBuild.Name = "cmdBuild"; + this.cmdBuild.Size = new System.Drawing.Size(70, 36); + this.cmdBuild.TabIndex = 4; + this.cmdBuild.Text = "Build"; + this.cmdBuild.UseVisualStyleBackColor = false; + this.cmdBuild.Click += new System.EventHandler(this.cmdBuild_Click); + // + // cmdLoadLastBuild + // + this.cmdLoadLastBuild.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.cmdLoadLastBuild.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); + this.cmdLoadLastBuild.Enabled = false; + this.cmdLoadLastBuild.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); + this.cmdLoadLastBuild.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); + this.cmdLoadLastBuild.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); + this.cmdLoadLastBuild.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cmdLoadLastBuild.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmdLoadLastBuild.ForeColor = System.Drawing.Color.White; + this.cmdLoadLastBuild.Location = new System.Drawing.Point(608, 5); + this.cmdLoadLastBuild.Margin = new System.Windows.Forms.Padding(0); + this.cmdLoadLastBuild.Name = "cmdLoadLastBuild"; + this.cmdLoadLastBuild.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); + this.cmdLoadLastBuild.Size = new System.Drawing.Size(150, 36); + this.cmdLoadLastBuild.TabIndex = 3; + this.cmdLoadLastBuild.Text = "Load Last Build"; + this.cmdLoadLastBuild.UseVisualStyleBackColor = false; + this.cmdLoadLastBuild.Click += new System.EventHandler(this.cmdLoadLastBuild_Click); + // // cmdReset // - this.cmdReset.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.cmdReset.Anchor = System.Windows.Forms.AnchorStyles.None; this.cmdReset.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); this.cmdReset.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); this.cmdReset.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); @@ -908,7 +952,7 @@ private void InitializeComponent() this.cmdReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdReset.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmdReset.ForeColor = System.Drawing.Color.White; - this.cmdReset.Location = new System.Drawing.Point(408, 5); + this.cmdReset.Location = new System.Drawing.Point(5, 5); this.cmdReset.Margin = new System.Windows.Forms.Padding(0); this.cmdReset.Name = "cmdReset"; this.cmdReset.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); @@ -918,65 +962,46 @@ private void InitializeComponent() this.cmdReset.UseVisualStyleBackColor = false; this.cmdReset.Click += new System.EventHandler(this.cmdReset_Click); // - // cmdBuild - // - this.cmdBuild.Anchor = System.Windows.Forms.AnchorStyles.None; - this.cmdBuild.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); - this.cmdBuild.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); - this.cmdBuild.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); - this.cmdBuild.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); - this.cmdBuild.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.cmdBuild.Font = new System.Drawing.Font("Segoe UI Semibold", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmdBuild.ForeColor = System.Drawing.Color.White; - this.cmdBuild.Location = new System.Drawing.Point(833, 5); - this.cmdBuild.Margin = new System.Windows.Forms.Padding(0); - this.cmdBuild.Name = "cmdBuild"; - this.cmdBuild.Size = new System.Drawing.Size(70, 36); - this.cmdBuild.TabIndex = 3; - this.cmdBuild.Text = "Build"; - this.cmdBuild.UseVisualStyleBackColor = false; - this.cmdBuild.Click += new System.EventHandler(this.cmdBuild_Click); - // - // cmdOpenLast - // - this.cmdOpenLast.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.cmdOpenLast.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); - this.cmdOpenLast.Enabled = false; - this.cmdOpenLast.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); - this.cmdOpenLast.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); - this.cmdOpenLast.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); - this.cmdOpenLast.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.cmdOpenLast.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmdOpenLast.ForeColor = System.Drawing.Color.White; - this.cmdOpenLast.Location = new System.Drawing.Point(678, 5); - this.cmdOpenLast.Margin = new System.Windows.Forms.Padding(0); - this.cmdOpenLast.Name = "cmdOpenLast"; - this.cmdOpenLast.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.cmdOpenLast.Size = new System.Drawing.Size(150, 36); - this.cmdOpenLast.TabIndex = 2; - this.cmdOpenLast.Text = "Open Last Build"; - this.cmdOpenLast.UseVisualStyleBackColor = false; - this.cmdOpenLast.Click += new System.EventHandler(this.cmdOpenLast_Click); - // - // cmdOpenBuildsDir - // - this.cmdOpenBuildsDir.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.cmdOpenBuildsDir.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); - this.cmdOpenBuildsDir.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); - this.cmdOpenBuildsDir.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); - this.cmdOpenBuildsDir.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); - this.cmdOpenBuildsDir.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.cmdOpenBuildsDir.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmdOpenBuildsDir.ForeColor = System.Drawing.Color.White; - this.cmdOpenBuildsDir.Location = new System.Drawing.Point(483, 5); - this.cmdOpenBuildsDir.Margin = new System.Windows.Forms.Padding(0); - this.cmdOpenBuildsDir.Name = "cmdOpenBuildsDir"; - this.cmdOpenBuildsDir.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.cmdOpenBuildsDir.Size = new System.Drawing.Size(190, 36); - this.cmdOpenBuildsDir.TabIndex = 1; - this.cmdOpenBuildsDir.Text = "Open Builds Folder"; - this.cmdOpenBuildsDir.UseVisualStyleBackColor = false; - this.cmdOpenBuildsDir.Click += new System.EventHandler(this.cmdOpenBuildsDir_Click); + // cmdBuildsFolder + // + this.cmdBuildsFolder.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.cmdBuildsFolder.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); + this.cmdBuildsFolder.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); + this.cmdBuildsFolder.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); + this.cmdBuildsFolder.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); + this.cmdBuildsFolder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cmdBuildsFolder.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmdBuildsFolder.ForeColor = System.Drawing.Color.White; + this.cmdBuildsFolder.Location = new System.Drawing.Point(80, 5); + this.cmdBuildsFolder.Margin = new System.Windows.Forms.Padding(0); + this.cmdBuildsFolder.Name = "cmdBuildsFolder"; + this.cmdBuildsFolder.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); + this.cmdBuildsFolder.Size = new System.Drawing.Size(126, 36); + this.cmdBuildsFolder.TabIndex = 1; + this.cmdBuildsFolder.Text = "Builds Folder"; + this.cmdBuildsFolder.UseVisualStyleBackColor = false; + this.cmdBuildsFolder.Click += new System.EventHandler(this.cmdBuildsFolder_Click); + // + // cmdShowLastBuild + // + this.cmdShowLastBuild.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.cmdShowLastBuild.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(50)))), ((int)(((byte)(60))))); + this.cmdShowLastBuild.Enabled = false; + this.cmdShowLastBuild.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(80)))), ((int)(((byte)(90))))); + this.cmdShowLastBuild.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(100)))), ((int)(((byte)(120))))); + this.cmdShowLastBuild.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(70)))), ((int)(((byte)(80))))); + this.cmdShowLastBuild.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cmdShowLastBuild.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmdShowLastBuild.ForeColor = System.Drawing.Color.White; + this.cmdShowLastBuild.Location = new System.Drawing.Point(453, 5); + this.cmdShowLastBuild.Margin = new System.Windows.Forms.Padding(0); + this.cmdShowLastBuild.Name = "cmdShowLastBuild"; + this.cmdShowLastBuild.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); + this.cmdShowLastBuild.Size = new System.Drawing.Size(150, 36); + this.cmdShowLastBuild.TabIndex = 2; + this.cmdShowLastBuild.Text = "Show Last Build"; + this.cmdShowLastBuild.UseVisualStyleBackColor = false; + this.cmdShowLastBuild.Click += new System.EventHandler(this.cmdShowLastBuild_Click); // // patcherWindow // @@ -985,7 +1010,7 @@ private void InitializeComponent() this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.ClientSize = new System.Drawing.Size(910, 475); + this.ClientSize = new System.Drawing.Size(840, 475); this.Controls.Add(this.pnlMain); this.Controls.Add(this.pnlSeperator); this.Controls.Add(this.tlpTitle); @@ -996,7 +1021,7 @@ private void InitializeComponent() this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(2); this.MaximizeBox = false; - this.MinimumSize = new System.Drawing.Size(910, 475); + this.MinimumSize = new System.Drawing.Size(840, 475); this.Name = "patcherWindow"; this.Padding = new System.Windows.Forms.Padding(1); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -1061,8 +1086,8 @@ private void InitializeComponent() private UI.METCheckbox cbxClearNssStore; private System.Windows.Forms.Button cmdBuild; private System.Windows.Forms.Button cmdSaveLog; - private System.Windows.Forms.Button cmdOpenBuildsDir; - private System.Windows.Forms.Button cmdOpenLast; + private System.Windows.Forms.Button cmdBuildsFolder; + private System.Windows.Forms.Button cmdLoadLastBuild; private System.Windows.Forms.Button cmdReset; private System.Windows.Forms.TableLayoutPanel tlpMeRegion; private System.Windows.Forms.Button cmdMePath; @@ -1077,5 +1102,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblReplaceFsysStore; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button cmdShowLastBuild; } } \ No newline at end of file diff --git a/mefit/WinForms/patcherWindow.cs b/mefit/WinForms/patcherWindow.cs index c16b077..69fc72f 100644 --- a/mefit/WinForms/patcherWindow.cs +++ b/mefit/WinForms/patcherWindow.cs @@ -131,7 +131,7 @@ private void CloseWindow() } } - private void cmdOpenBuildsDir_Click(object sender, EventArgs e) + private void cmdBuildsFolder_Click(object sender, EventArgs e) { if (!Directory.Exists(METPath.BuildsDirectory)) { @@ -252,7 +252,8 @@ private void cmdBuild_Click(object sender, EventArgs e) return; Logger.WriteLogTextToRtb($"Process Completed!", RtbLogPrefix.Complete, rtbLog); - cmdOpenLast.Enabled = true; + cmdShowLastBuild.Enabled = true; + cmdLoadLastBuild.Enabled = true; } finally { @@ -272,24 +273,58 @@ private bool SaveBuild() } } - string filename = FWBase.FileInfoData.FileNameWithExt.StartsWith("outimage_") - ? $"{FWBase.FileInfoData.FileNameNoExt}_{DateTime.Now:yyyyMMddHHmmss}.bin" - : $"outimage_{FWBase.FileInfoData.FileNameNoExt}_{DateTime.Now:yyyyMMddHHmmss}.bin"; + if (_bytesNewBinary == null) + { + METMessageBox.Show(this, "MET", "New binary data is empty. Cannot continue.", METMessageType.Error, METMessageButtons.Okay); + return false; + } - _fullBuildPath = Path.Combine(METPath.BuildsDirectory, filename); + FsysStore fsysStore = FWBase.GetFsysStoreData(_bytesNewBinary, false); + string serialNumber = string.IsNullOrEmpty(fsysStore.Serial) ? "SERIALNUM" : fsysStore.Serial; + string fileName = $"outimage_{serialNumber}_{MacUtils.GetFirmwareVersion()}"; - if (!FileUtils.WriteAllBytesEx(_fullBuildPath, _bytesNewBinary)) + using (SaveFileDialog saveFileDialog = new SaveFileDialog { - Logger.WriteLogTextToRtb($"'WriteAllBytesEx' returned false, file could not be saved!", RtbLogPrefix.Error, rtbLog); - return false; + Filter = "Binary Files (*.bin)|*.bin|All Files (*.*)|*.*", + InitialDirectory = METPath.BuildsDirectory, + OverwritePrompt = true, + FileName = fileName + }) + { + if (saveFileDialog.ShowDialog() == DialogResult.OK) + { + _fullBuildPath = saveFileDialog.FileName; + + if (!FileUtils.WriteAllBytesEx(_fullBuildPath, _bytesNewBinary)) + { + Logger.WriteLogTextToRtb($"'WriteAllBytesEx' returned false, file could not be saved!", RtbLogPrefix.Error, rtbLog); + return false; + } + + Logger.WriteLogTextToRtb($"Save path: {_fullBuildPath}", RtbLogPrefix.Info, rtbLog); + + return true; + } + else + { + Logger.WriteLogTextToRtb($"Build action cancelled by user", RtbLogPrefix.Warning, rtbLog); + return false; + } } + } - Logger.WriteLogTextToRtb($"Save path: {_fullBuildPath}", RtbLogPrefix.Info, rtbLog); + private void cmdShowLastBuild_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(_fullBuildPath)) + { + FileUtils.HighlightPathInExplorer(_fullBuildPath); + return; + } - return true; + Logger.WriteLogTextToRtb($"The last build path is empty!", RtbLogPrefix.Warning, rtbLog); } - private void cmdOpenLast_Click(object sender, EventArgs e) + private void cmdLoadLastBuild_Click(object sender, EventArgs e) { if (!string.IsNullOrEmpty(_fullBuildPath)) { @@ -321,7 +356,8 @@ private void cmdReset_Click(object sender, EventArgs e) cbxClearNssStore.Checked = false; swReplaceMeRegion.Checked = false; - cmdOpenLast.Enabled = false; + cmdShowLastBuild.Enabled = false; + cmdLoadLastBuild.Enabled = false; } private void swReplaceSerialNumber_CheckedChanged(object sender, EventArgs e) @@ -344,7 +380,7 @@ private void cmdSaveLog_Click(object sender, EventArgs e) using (SaveFileDialog dialog = new SaveFileDialog { Filter = "Text Files (*.txt)|*.txt", - FileName = $"metlog_{DateTime.Now:yyMMdd_HHmmss}.txt", + FileName = $"patcherlog_{DateTime.Now:yyMMdd_HHmmss}", OverwritePrompt = true, InitialDirectory = METPath.CurrentDirectory })