diff --git a/CHANGELOG.md b/CHANGELOG.md index 63681be..b4750d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@

Version History

- V1.0.2 • + V1.0.3 • + V1.0.2 • V1.0.1 • V1.0.0 • V0.7.0 • @@ -14,6 +15,19 @@ V0.3.4

+## Version 1.0.3 + +#### New: +- Updated the firmware parser with a new feature that attempts to force find the Fsys Store if it was not initially located within the NVRAM on the first pass. This change makes the application more reliable at extracting Fsys data from corrupt firmware. + +#### Enhancements: +- Implemented a visual colour change in the presentation of NVRAM store labels in the main window. The manual has been updated to reflect this change. +- Improved the image validation logic. +- User interface improvements. + +#### Bugs: +- Fixed a scenario that caused a crash when dragging and dropping a file onto the application executable and subsequently clicking "Create a Debug Log." This issue was caused by a malformed file path in specific scenarios, and was resolved by dynamically constructing the executable file path when necessary. + ## Version 1.0.2 #### Enhancements: diff --git a/MANUAL.md b/MANUAL.md index 60e1e0c..53fb4d2 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -111,7 +111,7 @@ This section displays the name of the loaded file and includes two buttons. Clic 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. -> 🛈 8,388,615 (>7) would indicate the given file is 7 bytes too large. +> 🛈 8,388,615 (>7) would indicate the given firmware is 7 bytes too large. --- @@ -183,8 +183,13 @@ The Hardware Configuration Code (HWC) is located in the Fsys store and is derive + + + + +This section includes the checksum of the Fsys store and two buttons. If the CRC32 of the Fsys store is valid, the label will appear green and display the valid checksum. If the CRC32 is invalid, the label will appear red and display the invalid checksum. The presence of `[F]` appended to the checksum indicates the Fsys Store was force found by the application, and the firmware may be corrupt. -This section includes the checksum of the Fsys store and two buttons. If the CRC32 of the Fsys store is valid, the label will appear green and display the valid checksum. If the CRC32 is invalid, the label will appear red and display the invalid checksum. Clicking the "Wrench" button, which is enabled when the Fsys store checksum is invalid, will prompt a "Save As" dialog to export the binary file with a repaired Fsys CRC32 checksum. The "Save" button allows exporting of the 2048-byte (0x800h) Fsys store. +Clicking the "Wrench" button, which is enabled when the Fsys store checksum is invalid, will prompt a "Save As" dialog to export the binary file with a repaired Fsys CRC32 checksum. The "Save" button allows exporting of the 2048-byte (0x800h) Fsys store. --- @@ -221,7 +226,7 @@ This section provides information about the firmware version, and includes one b -This section is divided into four items. The first three items represent different NVRAM store types, indicating their status. Each store type will appear white when empty, green when data is present, and grey when the store is not found. +This section is divided into four items. The first three items represent different NVRAM store types, indicating their status. Each store type will appear green when empty, white when data is present, and grey when the store is not found. The padlock item represents EFI Lock status. If the padlock icon is green and unlocked, it signifies that a Message Authentication Code (MAC) was not found, indicating that the EFI is likely not locked. Conversely, if the padlock icon is red and locked, it suggests that a Message Authentication Code (MAC) was found, indicating that the EFI is likely password locked. diff --git a/README.md b/README.md index 6d3c578..553198d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

SMCFT Logo
-Mac EFI Toolkit V1.0.2 +Mac EFI Toolkit V1.0.3

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

@@ -81,7 +81,7 @@ This application provides support for most Mac BIOS/UEFI, with the exception of | Version| Release Date| Latest | Channel | |--------|-------------|--------|---------| -|[1.0.2](https://github.com/MuertoGB/MacEfiToolkit/releases/latest)| 18th July, 2023 | Yes | Stable | +|[1.0.3](https://github.com/MuertoGB/MacEfiToolkit/releases/latest)| 7th August, 2023 | Yes | Stable | > 📋 View the full changelog [here](CHANGELOG.md) diff --git a/files/app/version.xml b/files/app/version.xml index c3b06d7..0037570 100644 --- a/files/app/version.xml +++ b/files/app/version.xml @@ -1,10 +1,10 @@ - 1.0.2 - 1.0.2.230718.1355 - 18.07.2023 + 1.0.3 + 1.0.3.230807.2023 + 07.08.2023 Stable - e5c60bbfe544bab478110ff12c7d569c6aad7a0c3a7800035182732d7b15a9fa + 5804dc0b606f72a8c982d08be4610c51ba1ad6b4a9e7272c0d6c279f2e4333d0 \ No newline at end of file diff --git a/files/images/met.png b/files/images/met.png index c9c1a35..17cad58 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 edf88b5..d57e9c1 100644 Binary files a/files/images/met_alt.png and b/files/images/met_alt.png differ diff --git a/files/manual/apfsdxe.png b/files/manual/apfsdxe.png index 122abd6..ceee072 100644 Binary files a/files/manual/apfsdxe.png and b/files/manual/apfsdxe.png differ diff --git a/files/manual/apfslzma.png b/files/manual/apfslzma.png index 5a46d12..36ee6f1 100644 Binary files a/files/manual/apfslzma.png and b/files/manual/apfslzma.png differ diff --git a/files/manual/apfsno.png b/files/manual/apfsno.png index 4927809..90f52b4 100644 Binary files a/files/manual/apfsno.png and b/files/manual/apfsno.png differ diff --git a/files/manual/boardid.png b/files/manual/boardid.png index f80e066..40cc67a 100644 Binary files a/files/manual/boardid.png and b/files/manual/boardid.png differ diff --git a/files/manual/crc.png b/files/manual/crc.png index 71ad936..ec8997c 100644 Binary files a/files/manual/crc.png and b/files/manual/crc.png differ diff --git a/files/manual/created.png b/files/manual/created.png index 6681bc9..45bad53 100644 Binary files a/files/manual/created.png and b/files/manual/created.png differ diff --git a/files/manual/efiversion.png b/files/manual/efiversion.png index 008d9bc..8bb7f6d 100644 Binary files a/files/manual/efiversion.png and b/files/manual/efiversion.png differ diff --git a/files/manual/efiversionalt.png b/files/manual/efiversionalt.png index b84d00c..8cd75c4 100644 Binary files a/files/manual/efiversionalt.png and b/files/manual/efiversionalt.png differ diff --git a/files/manual/filesize.png b/files/manual/filesize.png index f74e33a..5856603 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 bccaf2a..9f11c86 100644 Binary files a/files/manual/filesizeinvalid.png and b/files/manual/filesizeinvalid.png differ diff --git a/files/manual/fit.png b/files/manual/fit.png index 9ced096..aa54065 100644 Binary files a/files/manual/fit.png and b/files/manual/fit.png differ diff --git a/files/manual/fsys.png b/files/manual/fsys.png index aee0ac4..6a4a5c2 100644 Binary files a/files/manual/fsys.png and b/files/manual/fsys.png differ diff --git a/files/manual/fsys_forced.png b/files/manual/fsys_forced.png new file mode 100644 index 0000000..3f1d36a Binary files /dev/null and b/files/manual/fsys_forced.png differ diff --git a/files/manual/fsysinvalid.png b/files/manual/fsysinvalid.png index 08c4b40..fc3a7e7 100644 Binary files a/files/manual/fsysinvalid.png and b/files/manual/fsysinvalid.png differ diff --git a/files/manual/hwc.png b/files/manual/hwc.png index 62cdbdf..edad444 100644 Binary files a/files/manual/hwc.png and b/files/manual/hwc.png differ diff --git a/files/manual/intelme.png b/files/manual/intelme.png index f05e671..de3d400 100644 Binary files a/files/manual/intelme.png and b/files/manual/intelme.png differ diff --git a/files/manual/modified.png b/files/manual/modified.png index 7d7f274..bb1dac4 100644 Binary files a/files/manual/modified.png and b/files/manual/modified.png differ diff --git a/files/manual/nvram.png b/files/manual/nvram.png index d13262e..5c9a804 100644 Binary files a/files/manual/nvram.png and b/files/manual/nvram.png differ diff --git a/files/manual/nvramlocked.png b/files/manual/nvramlocked.png index 5b03e6b..81c9ec2 100644 Binary files a/files/manual/nvramlocked.png and b/files/manual/nvramlocked.png differ diff --git a/files/manual/opencopymenu.png b/files/manual/opencopymenu.png deleted file mode 100644 index 7909147..0000000 Binary files a/files/manual/opencopymenu.png and /dev/null differ diff --git a/files/manual/openeditor.png b/files/manual/openeditor.png deleted file mode 100644 index 35adc16..0000000 Binary files a/files/manual/openeditor.png and /dev/null differ diff --git a/files/manual/serial.png b/files/manual/serial.png index b7cd9dd..9de69ab 100644 Binary files a/files/manual/serial.png and b/files/manual/serial.png differ diff --git a/files/manual/son.png b/files/manual/son.png index a4f1d77..af29d03 100644 Binary files a/files/manual/son.png and b/files/manual/son.png differ diff --git a/files/manual/title.png b/files/manual/title.png index 8eef645..d8639d3 100644 Binary files a/files/manual/title.png and b/files/manual/title.png differ diff --git a/mefit/Common/FWBase.cs b/mefit/Common/FWBase.cs index 8ed28d2..ef48ebc 100644 --- a/mefit/Common/FWBase.cs +++ b/mefit/Common/FWBase.cs @@ -125,6 +125,7 @@ class FWBase internal static string MeVersion = null; internal static byte[] LoadedBinaryBytes = null; internal static bool FirmwareLoaded = false; + internal static bool ForceFoundFsys = false; internal static FileInfoStore FileInfoData; internal static PdrSection PDRSectionData; @@ -179,12 +180,25 @@ internal static void LoadFirmwareBaseData(byte[] sourceBytes, string fileName) EfiLock = (SvsStoreData.PrimaryStoreBase != -1 && SvsStoreData.PrimaryStoreBytes != null) ? EfiLock = GetIsEfiLocked(SvsStoreData.PrimaryStoreBytes) : EfiLockStatus.Unknown; + + if (FsysStoreData.FsysBytes == null) + { + FsysStoreData = GetFsysStoreData(sourceBytes, false, true); + + if (FsysStoreData.FsysBytes != null) + { + ForceFoundFsys = true; + Logger.WriteToLogFile($"Force found Fsys Store at {FsysStoreData.FsysBase:X}h." + + $" The image may be misaligned or corrupt ({FileInfoData.FileNameWithExt}).", LogType.Application); + } + } } internal static void ResetFirmwareBaseData() { LoadedBinaryPath = null; LoadedBinaryBytes = null; + ForceFoundFsys = false; FileInfoData = default; PDRSectionData = default; VssStoreData = default; @@ -201,11 +215,14 @@ internal static void ResetFirmwareBaseData() internal static bool IsValidImage(byte[] sourceBytes) { - int dxeCore = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.DXE_CORE); + int dxeCore = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.DXE_CORE, 16, 16); - if (!Descriptor.DescriptorMode && dxeCore == -1) + if (!Descriptor.DescriptorMode) { - return false; + if (dxeCore == -1) + { + return false; + } } return true; @@ -280,125 +297,46 @@ private static PdrSection DefaultPdrSection() #endregion #region Fsys Store - internal static FsysStore GetFsysStoreData(byte[] sourceBytes, bool isFsysStoreOnly) + // Fsys resides in the NVRAM at either base: 20000h, or 22000h. + // Fsys size resides in the store at 0x09 and is 2 bytes in length, + // we should dynamically read it, not hardcode. + internal static FsysStore GetFsysStoreData(byte[] sourceBytes, bool isFsysStoreOnly, bool forceFind = false) { - // Base should be zero if the isFsysStoreOnly flag is set - int fsysBase = 0; - - // Arg to skip Fsys searching - if (!isFsysStoreOnly) - { - // First we need to locate the NVRAM section GUID - int guidBase = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.NVRAM_SECTION_GUID, _biosBase, _biosLimit); + // Find the base position of Fsys Store + int fsysBase = FindFsysBase(sourceBytes, isFsysStoreOnly, forceFind); - if (guidBase == -1) - { - // NVRAM store was not found so return default data - return DefaultFsysRegion(); - } - - // Get NVRAM section size from header - byte[] sectionLengthBytes = BinaryUtils.GetBytesBaseLength(sourceBytes, guidBase + GUID_LENGTH, 4); - // Convert NVRAM section size to int32 - int nvramLength = BitConverter.ToInt32(sectionLengthBytes, 0); - // Search for the Fsys store within bounds of the NVRAM section - fsysBase = BinaryUtils.GetBasePosition(sourceBytes, FSYS_SIG, guidBase - ZERO_VECTOR_LENGTH - GUID_LENGTH, nvramLength); - - // Fsys store was not found within scope of the NVRAM section - if (fsysBase == -1) - { - return DefaultFsysRegion(); - } - } - - byte[] fsysStoreBytes = BinaryUtils.GetBytesBaseLength(sourceBytes, fsysBase, FSYS_RGN_SIZE); - - // Fsys store was not loaded - if (fsysStoreBytes == null) - { + // If Fsys Store base is not found, return default data + if (fsysBase == -1) return DefaultFsysRegion(); - } - // Fsys store was not the correct size - if (fsysStoreBytes.Length != FSYS_RGN_SIZE) - { - return DefaultFsysRegion(); - } + // Retrieve FsysStore bytes + byte[] fsysStoreBytes = GetFsysStoreBytes(sourceBytes, fsysBase); - // Get the Fsys store crc stored at 0x7FC (FSYS_RGN_SIZE - CRC32_LENGTH) - byte[] crcBytes = BinaryUtils.GetBytesBaseLength(sourceBytes, fsysBase + FSYS_CRC_POS, CRC32_LENGTH); - byte[] crcEndianBytes = crcBytes.Reverse().ToArray(); // We need to flip the bytes from little endian - string crcString = BitConverter.ToString(crcEndianBytes).Replace("-", ""); + // If FsysStore is invalid, return default data + if (!IsValidFsysStore(fsysStoreBytes)) + return DefaultFsysRegion(); - // Manually calculate the Fsys store crc - uint uiCrcCalc = MacUtils.GetUintFsysCrc32(fsysStoreBytes); + // Retrieve CRC bytes and calculate CRC values + byte[] crcBytes = GetCrcBytes(sourceBytes, fsysBase); + string crcString = GetFlippedCrcString(crcBytes); + uint uiCrcCalc = CalculateFsysCrc(fsysStoreBytes); string crcCalcString = uiCrcCalc.ToString("X8"); - // Parse the serial number - int snDataStart = -1; - - // Look for the lower case system serial number signature - if ((snDataStart = BinaryUtils.GetBasePosition(sourceBytes, SSN_LOWER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - snDataStart += SSN_LOWER_SIG.Length; - - // Look for the upper case system serial number signature - if (snDataStart == -1) - { - if ((snDataStart = BinaryUtils.GetBasePosition(sourceBytes, SSN_UPPER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - snDataStart += SSN_UPPER_SIG.Length; - } - - // Look for other ssn signatures - if (snDataStart == -1) - { - if ((snDataStart = BinaryUtils.GetBasePosition(sourceBytes, SSNP_LOWER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - snDataStart += SSNP_LOWER_SIG.Length; - } - + // Find and parse various signatures within FsysStore + int snDataStart = FindSignaturePosition(sourceBytes, fsysBase, FSYS_RGN_SIZE, SSN_LOWER_SIG, SSN_UPPER_SIG, SSNP_LOWER_SIG); string serialString = ParseFsysString(sourceBytes, snDataStart); - if (serialString == null) snDataStart = -1; - - // Parse the hardware configuration code - int hwcDataStart = -1; - - // Look for the hardware configuration lower case signature - if ((hwcDataStart = BinaryUtils.GetBasePosition(sourceBytes, HWC_LOWER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - hwcDataStart += HWC_LOWER_SIG.Length; - - // Look for the hardware configuration upper case signature - if (hwcDataStart == -1) - { - if ((hwcDataStart = BinaryUtils.GetBasePosition(sourceBytes, HWC_UPPER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - hwcDataStart += HWC_UPPER_SIG.Length; - } + int hwcDataStart = FindSignaturePosition(sourceBytes, fsysBase, FSYS_RGN_SIZE, HWC_LOWER_SIG, HWC_UPPER_SIG); string hwcString = ParseFsysString(sourceBytes, hwcDataStart); - if (hwcString == null) hwcDataStart = -1; - - // Parse the system order number - int sonDataStart = -1; - - // Look for the system order number lower case signature - if ((sonDataStart = BinaryUtils.GetBasePosition(sourceBytes, SON_LOWER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - { - sonDataStart += SON_LOWER_SIG.Length; - } - - // Look for the system order number upper case signature - if (sonDataStart == -1) - { - if ((sonDataStart = BinaryUtils.GetBasePosition(sourceBytes, SON_UPPER_SIG, fsysBase, FSYS_RGN_SIZE)) != -1) - { - sonDataStart += SON_UPPER_SIG.Length; - } - } + int sonDataStart = FindSignaturePosition(sourceBytes, fsysBase, FSYS_RGN_SIZE, SON_LOWER_SIG, SON_UPPER_SIG); string sonString = ParseFsysString(sourceBytes, sonDataStart); + + // Trim trailing '/' from SON string if present if (sonString != null && sonString.EndsWith("/")) - { sonString = sonString.TrimEnd('/'); - } + // Create and return FsysStore object return new FsysStore { FsysBytes = fsysStoreBytes, @@ -416,34 +354,82 @@ internal static FsysStore GetFsysStoreData(byte[] sourceBytes, bool isFsysStoreO private static string ParseFsysString(byte[] sourceBytes, int basePos) { - // If the base is -1 return null - if (basePos == -1) - { + // Return null if base position is invalid or data size is zero + if (basePos == -1 || sourceBytes[basePos] == 0) return null; - } // Read size of the indicated variable int dataSize = sourceBytes[basePos]; - // Invalid data size + // Return null if data size is invalid if (dataSize == 0) - { return null; - } // Read the variable bytes byte[] dataBytes = BinaryUtils.GetBytesBaseLength(sourceBytes, basePos + LITERAL_POS, dataSize); - // Invalid bytes - if (dataBytes == null || dataBytes.Length > dataSize) - { + // Return null if bytes are invalid or exceed the data size + if (dataBytes == null || dataBytes.Length != dataSize) return null; - } // Return string data return _utf8.GetString(dataBytes); } + private static int FindFsysBase(byte[] sourceBytes, bool isFsysStoreOnly, bool forceFind) + { + if (isFsysStoreOnly) + return 0; + + if (forceFind) + return BinaryUtils.GetBasePosition(sourceBytes, FSYS_SIG, _biosBase, _biosLimit); + + int guidBase = BinaryUtils.GetBasePosition(sourceBytes, FSGuids.NVRAM_SECTION_GUID, _biosBase, _biosLimit); + + if (guidBase == -1) + return -1; + + int nvramLength = BitConverter.ToInt32(BinaryUtils.GetBytesBaseLength(sourceBytes, guidBase + GUID_LENGTH, 4), 0); + return BinaryUtils.GetBasePosition(sourceBytes, FSYS_SIG, guidBase - ZERO_VECTOR_LENGTH - GUID_LENGTH, nvramLength); + } + + private static bool IsValidFsysStore(byte[] fsysStoreBytes) + { + return fsysStoreBytes != null && fsysStoreBytes.Length == FSYS_RGN_SIZE; + } + + private static string GetFlippedCrcString(byte[] crcBytes) + { + byte[] crcEndianBytes = crcBytes.Reverse().ToArray(); + return BitConverter.ToString(crcEndianBytes).Replace("-", ""); + } + + private static uint CalculateFsysCrc(byte[] fsysStoreBytes) + { + return MacUtils.GetUintFsysCrc32(fsysStoreBytes); + } + + private static int FindSignaturePosition(byte[] sourceBytes, int start, int limit, params byte[][] signatures) + { + foreach (byte[] sig in signatures) + { + int dataStart = BinaryUtils.GetBasePosition(sourceBytes, sig, start, limit); + if (dataStart != -1) + return dataStart + sig.Length; + } + return -1; + } + + private static byte[] GetFsysStoreBytes(byte[] sourceBytes, int fsysBase) + { + return BinaryUtils.GetBytesBaseLength(sourceBytes, fsysBase, FSYS_RGN_SIZE); + } + + private static byte[] GetCrcBytes(byte[] sourceBytes, int fsysBase) + { + return BinaryUtils.GetBytesBaseLength(sourceBytes, fsysBase + FSYS_CRC_POS, CRC32_LENGTH); + } + private static FsysStore DefaultFsysRegion() { return new FsysStore @@ -461,7 +447,6 @@ private static FsysStore DefaultFsysRegion() }; } - // Fsys resides in the NVRAM at either base: 20000h, or 22000h. internal static readonly byte[] FSYS_SIG = { 0x46, 0x73, 0x79, 0x73, diff --git a/mefit/Debug.cs b/mefit/Debug.cs index 8a3e5be..951a721 100644 --- a/mefit/Debug.cs +++ b/mefit/Debug.cs @@ -43,41 +43,51 @@ internal static string BitnessMode() internal static string GenerateDebugReport(Exception e) { StringBuilder builder = new StringBuilder(); - byte[] appBytes = File.ReadAllBytes(METPath.FriendlyName); + string exePath = Path.Combine(METPath.CurrentDirectory, METPath.FriendlyName); - builder.AppendLine($"# // Mac EFI Toolkit Debug Log - {DateTime.Now}\r\n"); + try + { + byte[] appBytes = File.ReadAllBytes(exePath); - builder.AppendLine("<-- Application -->\r\n"); - builder.AppendLine($"Name: {Application.ProductName}"); - builder.AppendLine($"Version: {Application.ProductVersion}.{METVersion.Build}"); - builder.AppendLine($"Channel: {METVersion.Channel}"); - builder.AppendLine($"Mode: {BitnessMode()}"); - builder.AppendLine($"Debug: {IsDebugMode()}"); - builder.AppendLine($"Elevated: {IsRunAsAdmin()}"); - builder.AppendLine($"SHA256: {FileUtils.GetSha256Digest(appBytes)}\r\n"); + builder.AppendLine($"# // Mac EFI Toolkit Debug Log - {DateTime.Now}\r\n"); - builder.AppendLine("<-- Operating System -->\r\n"); - builder.AppendLine($"Name: {OSUtils.GetName}"); - builder.AppendLine($"Bitness: {OSUtils.GetBitness()}"); - builder.AppendLine($"Kernel: {OSUtils.GetKernelVersion.ProductVersion}\r\n"); + builder.AppendLine("<-- Application -->\r\n"); + builder.AppendLine($"Name: {Application.ProductName}"); + builder.AppendLine($"Version: {Application.ProductVersion}.{METVersion.Build}"); + builder.AppendLine($"Channel: {METVersion.Channel}"); + builder.AppendLine($"Mode: {BitnessMode()}"); + builder.AppendLine($"Debug: {IsDebugMode()}"); + builder.AppendLine($"Elevated: {IsRunAsAdmin()}"); + builder.AppendLine($"SHA256: {FileUtils.GetSha256Digest(appBytes)}\r\n"); - builder.AppendLine("<-- Fonts -->\r\n"); - builder.AppendLine($"Segoe UI Reg: {OSUtils.IsFontStyleAvailable("Segoe UI", FontStyle.Regular)}"); - builder.AppendLine($"Segoe UI Bol: {OSUtils.IsFontStyleAvailable("Segoe UI", FontStyle.Bold)}"); - builder.AppendLine($"Segoe UI Sem: {OSUtils.IsFontStyleAvailable("Segoe UI Semibold", FontStyle.Regular)}"); - builder.AppendLine($"Consolas Reg: {OSUtils.IsFontStyleAvailable("Consolas", FontStyle.Bold)}\r\n"); + builder.AppendLine("<-- Operating System -->\r\n"); + builder.AppendLine($"Name: {OSUtils.GetName}"); + builder.AppendLine($"Bitness: {OSUtils.GetBitness()}"); + builder.AppendLine($"Kernel: {OSUtils.GetKernelVersion.ProductVersion}\r\n"); - builder.AppendLine("<-- Exception Data -->\r\n"); - builder.AppendLine(GetExceptionData(e)); + builder.AppendLine("<-- Fonts -->\r\n"); + builder.AppendLine($"Segoe UI Reg: {OSUtils.IsFontStyleAvailable("Segoe UI", FontStyle.Regular)}"); + builder.AppendLine($"Segoe UI Bol: {OSUtils.IsFontStyleAvailable("Segoe UI", FontStyle.Bold)}"); + builder.AppendLine($"Segoe UI Sem: {OSUtils.IsFontStyleAvailable("Segoe UI Semibold", FontStyle.Regular)}"); + builder.AppendLine($"Consolas Reg: {OSUtils.IsFontStyleAvailable("Consolas", FontStyle.Bold)}\r\n"); - builder.AppendLine("<-- Firmware -->\r\n"); - builder.AppendLine(GetFirmwareData()); + builder.AppendLine("<-- Exception Data -->\r\n"); + builder.AppendLine(GetExceptionData(e)); - builder.AppendLine("<-- Modules -->\r\n"); - builder.AppendLine(GetProcessModules()); - builder.AppendLine("# // End of file"); + builder.AppendLine("<-- Firmware -->\r\n"); + builder.AppendLine(GetFirmwareData()); - return builder.ToString(); + builder.AppendLine("<-- Modules -->\r\n"); + builder.AppendLine(GetProcessModules()); + builder.AppendLine("# // End of file"); + + return builder.ToString(); + } + catch (Exception ex) + { + Logger.WriteExceptionToAppLog(ex); + return null; + } } private static string GetExceptionData(Exception e) @@ -102,32 +112,40 @@ private static string GetFirmwareData() StringBuilder builder = new StringBuilder(); - if (Descriptor.DescriptorMode) + try { - builder.AppendLine($" Descriptor ->\r\n"); - builder.AppendLine($"Des_Mode: {Descriptor.DescriptorMode}"); - builder.AppendLine($"PDR: {Descriptor.PdrBase:X2}h, {Descriptor.PdrLimit:X2}h"); - builder.AppendLine($"ME: {Descriptor.MeBase:X2}h, {Descriptor.MeLimit:X2}h"); - builder.AppendLine($"BIOS: {Descriptor.BiosBase:X2}h, {Descriptor.BiosLimit:X2}h\r\n"); + if (Descriptor.DescriptorMode) + { + builder.AppendLine($" Descriptor ->\r\n"); + builder.AppendLine($"Des_Mode: {Descriptor.DescriptorMode}"); + builder.AppendLine($"PDR: {Descriptor.PdrBase:X2}h, {Descriptor.PdrLimit:X2}h"); + builder.AppendLine($"ME: {Descriptor.MeBase:X2}h, {Descriptor.MeLimit:X2}h"); + builder.AppendLine($"BIOS: {Descriptor.BiosBase:X2}h, {Descriptor.BiosLimit:X2}h\r\n"); + } + + builder.AppendLine($" File ->\r\n"); + builder.AppendLine($"File Size: {FWBase.FileInfoData.FileLength:X2}h\r\n"); + + builder.AppendLine($" Fsys Store ->\r\n"); + builder.AppendLine($"Fsys Base: {FWBase.FsysStoreData.FsysBase:X2}h"); + builder.AppendLine($"Serial Base: {FWBase.FsysStoreData.SerialBase:X2}h"); + builder.AppendLine($"HWC Base: {FWBase.FsysStoreData.HWCBase:X2}h\r\n"); + + builder.AppendLine($" NVRAM ->\r\n"); + builder.AppendLine($"VSS Primary: Base {FWBase.VssStoreData.PrimaryStoreBase:X2}h, Size {FWBase.VssStoreData.PrimaryStoreSize:X2}h"); + builder.AppendLine($"VSS Backup: Base {FWBase.VssStoreData.BackupStoreBase:X2}h, Size {FWBase.VssStoreData.BackupStoreSize:X2}h"); + builder.AppendLine($"SVS Primary: Base {FWBase.SvsStoreData.PrimaryStoreBase:X2}h, Size {FWBase.SvsStoreData.PrimaryStoreSize:X2}h"); + builder.AppendLine($"SVS Backup: Base {FWBase.SvsStoreData.BackupStoreBase:X2}h, Size {FWBase.SvsStoreData.BackupStoreSize:X2}h"); + builder.AppendLine($"NSS Primary: Base {FWBase.NssStoreData.PrimaryStoreBase:X2}h, Size {FWBase.NssStoreData.PrimaryStoreSize:X2}h"); + builder.AppendLine($"NSS Backup: Base {FWBase.NssStoreData.BackupStoreBase:X2}h, Size {FWBase.NssStoreData.BackupStoreSize:X2}h"); + + return builder.ToString(); + } + catch (Exception e) + { + Logger.WriteExceptionToAppLog(e); + return null; } - - builder.AppendLine($" File ->\r\n"); - builder.AppendLine($"File Size: {FWBase.FileInfoData.FileLength:X2}h\r\n"); - - builder.AppendLine($" Fsys Store ->\r\n"); - builder.AppendLine($"Fsys Base: {FWBase.FsysStoreData.FsysBase:X2}h"); - builder.AppendLine($"Serial Base: {FWBase.FsysStoreData.SerialBase:X2}h"); - builder.AppendLine($"HWC Base: {FWBase.FsysStoreData.HWCBase:X2}h\r\n"); - - builder.AppendLine($" NVRAM ->\r\n"); - builder.AppendLine($"VSS Primary: Base {FWBase.VssStoreData.PrimaryStoreBase:X2}h, Size {FWBase.VssStoreData.PrimaryStoreSize:X2}h"); - builder.AppendLine($"VSS Backup: Base {FWBase.VssStoreData.BackupStoreBase:X2}h, Size {FWBase.VssStoreData.BackupStoreSize:X2}h"); - builder.AppendLine($"SVS Primary: Base {FWBase.SvsStoreData.PrimaryStoreBase:X2}h, Size {FWBase.SvsStoreData.PrimaryStoreSize:X2}h"); - builder.AppendLine($"SVS Backup: Base {FWBase.SvsStoreData.BackupStoreBase:X2}h, Size {FWBase.SvsStoreData.BackupStoreSize:X2}h"); - builder.AppendLine($"NSS Primary: Base {FWBase.NssStoreData.PrimaryStoreBase:X2}h, Size {FWBase.NssStoreData.PrimaryStoreSize:X2}h"); - builder.AppendLine($"NSS Backup: Base {FWBase.NssStoreData.BackupStoreBase:X2}h, Size {FWBase.NssStoreData.BackupStoreSize:X2}h"); - - return builder.ToString(); } private static string GetProcessModules() @@ -135,20 +153,28 @@ private static string GetProcessModules() int moduleNumber = 0; StringBuilder builder = new StringBuilder(); - foreach (ProcessModule module in Process.GetCurrentProcess().Modules) + try { - moduleNumber++; - - builder.AppendLine($" Module #{moduleNumber} -> '{module.ModuleName}'\r\n"); - builder.AppendLine($"Path: {module.FileName}"); - builder.AppendLine($"Version: {module.FileVersionInfo.FileVersion}"); - builder.AppendLine($"Description: {module.FileVersionInfo.FileDescription}"); - builder.AppendLine($"Size (Bytes): {module.ModuleMemorySize}"); - builder.AppendLine($"Base Address: {module.BaseAddress}"); - builder.AppendLine($"Entry Point: {module.EntryPointAddress}\r\n"); + foreach (ProcessModule module in Process.GetCurrentProcess().Modules) + { + moduleNumber++; + + builder.AppendLine($" Module #{moduleNumber} -> '{module.ModuleName}'\r\n"); + builder.AppendLine($"Path: {module.FileName}"); + builder.AppendLine($"Version: {module.FileVersionInfo.FileVersion}"); + builder.AppendLine($"Description: {module.FileVersionInfo.FileDescription}"); + builder.AppendLine($"Size (Bytes): {module.ModuleMemorySize}"); + builder.AppendLine($"Base Address: {module.BaseAddress}"); + builder.AppendLine($"Entry Point: {module.EntryPointAddress}\r\n"); + } + + return builder.ToString(); + } + catch (Exception e) + { + Logger.WriteExceptionToAppLog(e); + return null; } - - return builder.ToString(); } } diff --git a/mefit/Program.cs b/mefit/Program.cs index f0df909..2ffddd8 100644 --- a/mefit/Program.cs +++ b/mefit/Program.cs @@ -33,7 +33,7 @@ internal struct METPath internal struct METVersion { - internal static readonly string Build = "230718.1355"; + internal static readonly string Build = "230807.2023"; internal static readonly string Channel = "Stable"; } diff --git a/mefit/Properties/AssemblyInfo.cs b/mefit/Properties/AssemblyInfo.cs index e4cf637..fd3ace8 100644 --- a/mefit/Properties/AssemblyInfo.cs +++ b/mefit/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2")] -[assembly: AssemblyFileVersion("1.0.2")] +[assembly: AssemblyVersion("1.0.3")] +[assembly: AssemblyFileVersion("1.0.3")] [assembly: NeutralResourcesLanguage("en")] diff --git a/mefit/UI/ArrowDrawer.cs b/mefit/UI/ArrowDrawer.cs index 6e32028..a435425 100644 --- a/mefit/UI/ArrowDrawer.cs +++ b/mefit/UI/ArrowDrawer.cs @@ -14,18 +14,15 @@ public class ArrowDrawer { - private static Color arrowColor; public static void Draw(Control control, Color color) { - arrowColor = color; - control.Paint += (sender, e) => { int arrowX = control.Width / 2; int arrowY = control.Height - 6; - using (SolidBrush brush = new SolidBrush(arrowColor)) + using (SolidBrush brush = new SolidBrush(color)) { e.Graphics.SmoothingMode = SmoothingMode.AntiAlias; e.Graphics.InterpolationMode = InterpolationMode.HighQualityBilinear; @@ -42,10 +39,4 @@ public static void Draw(Control control, Color color) } }; } - - public static void Update(Control control, Color color) - { - arrowColor = color; - control.Invalidate(); - } } \ No newline at end of file diff --git a/mefit/UI/METMessageBox.Designer.cs b/mefit/UI/METMessageBox.Designer.cs index b7e5bb7..096d27c 100644 --- a/mefit/UI/METMessageBox.Designer.cs +++ b/mefit/UI/METMessageBox.Designer.cs @@ -185,8 +185,9 @@ private void InitializeComponent() // this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/mefit/WinForms/aboutWindow.Designer.cs b/mefit/WinForms/aboutWindow.Designer.cs index e813902..de0e415 100644 --- a/mefit/WinForms/aboutWindow.Designer.cs +++ b/mefit/WinForms/aboutWindow.Designer.cs @@ -315,8 +315,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/mefit/WinForms/editorWindow.Designer.cs b/mefit/WinForms/editorWindow.Designer.cs index 5c4e28b..489db7c 100644 --- a/mefit/WinForms/editorWindow.Designer.cs +++ b/mefit/WinForms/editorWindow.Designer.cs @@ -36,8 +36,10 @@ private void InitializeComponent() this.lblNvramText = new System.Windows.Forms.Label(); this.lblSerialText = new System.Windows.Forms.Label(); this.tlpSerialA = new System.Windows.Forms.TableLayoutPanel(); + this.cbxReplaceSerial = new Mac_EFI_Toolkit.UI.METCheckbox(); this.tlpFsys = new System.Windows.Forms.TableLayoutPanel(); this.cmdFsysPath = new System.Windows.Forms.Button(); + this.cbxReplaceFsysStore = new Mac_EFI_Toolkit.UI.METCheckbox(); this.lblFsysStoreText = new System.Windows.Forms.Label(); this.tlpSerialB = new System.Windows.Forms.TableLayoutPanel(); this.lblHwcText = new System.Windows.Forms.Label(); @@ -46,13 +48,20 @@ private void InitializeComponent() this.tbxHwc = new System.Windows.Forms.TextBox(); this.tlpNss = new System.Windows.Forms.TableLayoutPanel(); this.lblNssChevRight = new System.Windows.Forms.Label(); + this.cbxClearNssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); + this.cbxClearNssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); this.tlpSvs = new System.Windows.Forms.TableLayoutPanel(); + this.cbxClearSvsStore = new Mac_EFI_Toolkit.UI.METCheckbox(); + this.cbxClearSvsBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); this.lblSvsChevRight = new System.Windows.Forms.Label(); this.tlpVss = new System.Windows.Forms.TableLayoutPanel(); this.lblVssChevRight = new System.Windows.Forms.Label(); + this.cbxClearVssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); + this.cbxClearVssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); this.lblMeText = new System.Windows.Forms.Label(); this.tlpMeRegion = new System.Windows.Forms.TableLayoutPanel(); this.cmdMePath = new System.Windows.Forms.Button(); + this.cbxReplaceMeRegion = new Mac_EFI_Toolkit.UI.METCheckbox(); this.tlpLog = new System.Windows.Forms.TableLayoutPanel(); this.pnlLog = new System.Windows.Forms.Panel(); this.rtbLog = new System.Windows.Forms.RichTextBox(); @@ -68,15 +77,6 @@ private void InitializeComponent() this.cmdBuild = new System.Windows.Forms.Button(); this.cmdOpenLast = new System.Windows.Forms.Button(); this.cmdOpenBuildsDir = new System.Windows.Forms.Button(); - this.cbxReplaceSerial = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxReplaceFsysStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearNssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearNssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearSvsStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearSvsBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearVssBackup = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxClearVssStore = new Mac_EFI_Toolkit.UI.METCheckbox(); - this.cbxReplaceMeRegion = new Mac_EFI_Toolkit.UI.METCheckbox(); this.pnlMain.SuspendLayout(); this.tlpMain.SuspendLayout(); this.tlpOptions.SuspendLayout(); @@ -215,6 +215,25 @@ private void InitializeComponent() this.tlpSerialA.Size = new System.Drawing.Size(400, 30); this.tlpSerialA.TabIndex = 1; // + // cbxReplaceSerial + // + this.cbxReplaceSerial.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxReplaceSerial.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxReplaceSerial.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxReplaceSerial.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxReplaceSerial.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxReplaceSerial.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxReplaceSerial.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxReplaceSerial.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxReplaceSerial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbxReplaceSerial.Location = new System.Drawing.Point(11, 4); + this.cbxReplaceSerial.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxReplaceSerial.Name = "cbxReplaceSerial"; + this.cbxReplaceSerial.Size = new System.Drawing.Size(192, 21); + this.cbxReplaceSerial.TabIndex = 0; + this.cbxReplaceSerial.Text = "Replace Serial Number"; + this.cbxReplaceSerial.CheckedChanged += new System.EventHandler(this.cmdReplaceSerial_CheckedChanged); + // // tlpFsys // this.tlpFsys.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -252,6 +271,25 @@ private void InitializeComponent() this.cmdFsysPath.UseVisualStyleBackColor = false; this.cmdFsysPath.Click += new System.EventHandler(this.cmdFsysPath_Click); // + // cbxReplaceFsysStore + // + this.cbxReplaceFsysStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxReplaceFsysStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxReplaceFsysStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxReplaceFsysStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxReplaceFsysStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxReplaceFsysStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxReplaceFsysStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxReplaceFsysStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxReplaceFsysStore.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbxReplaceFsysStore.Location = new System.Drawing.Point(11, 4); + this.cbxReplaceFsysStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxReplaceFsysStore.Name = "cbxReplaceFsysStore"; + this.cbxReplaceFsysStore.Size = new System.Drawing.Size(163, 21); + this.cbxReplaceFsysStore.TabIndex = 0; + this.cbxReplaceFsysStore.Text = "Replace Fsys Store"; + this.cbxReplaceFsysStore.CheckedChanged += new System.EventHandler(this.cbxReplaceFsysStore_CheckedChanged); + // // lblFsysStoreText // this.lblFsysStoreText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -381,6 +419,44 @@ private void InitializeComponent() this.lblNssChevRight.Text = "."; this.lblNssChevRight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // cbxClearNssStore + // + this.cbxClearNssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearNssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearNssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearNssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearNssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearNssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearNssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearNssStore.ForeColor = System.Drawing.Color.White; + this.cbxClearNssStore.Location = new System.Drawing.Point(11, 4); + this.cbxClearNssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxClearNssStore.Name = "cbxClearNssStore"; + this.cbxClearNssStore.Size = new System.Drawing.Size(149, 21); + this.cbxClearNssStore.TabIndex = 0; + this.cbxClearNssStore.Text = "Clear NSS Store"; + this.cbxClearNssStore.CheckedChanged += new System.EventHandler(this.cbxClearNssStore_CheckedChanged); + // + // cbxClearNssBackup + // + this.cbxClearNssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearNssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearNssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearNssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearNssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearNssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearNssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearNssBackup.Enabled = false; + this.cbxClearNssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearNssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); + this.cbxClearNssBackup.Location = new System.Drawing.Point(190, 4); + this.cbxClearNssBackup.Margin = new System.Windows.Forms.Padding(0); + this.cbxClearNssBackup.Name = "cbxClearNssBackup"; + this.cbxClearNssBackup.Size = new System.Drawing.Size(210, 21); + this.cbxClearNssBackup.TabIndex = 1; + this.cbxClearNssBackup.Text = "Clear NSS Backup Store"; + // // tlpSvs // this.tlpSvs.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -400,6 +476,44 @@ private void InitializeComponent() this.tlpSvs.Size = new System.Drawing.Size(400, 30); this.tlpSvs.TabIndex = 4; // + // cbxClearSvsStore + // + this.cbxClearSvsStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearSvsStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearSvsStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearSvsStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearSvsStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearSvsStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearSvsStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearSvsStore.ForeColor = System.Drawing.Color.White; + this.cbxClearSvsStore.Location = new System.Drawing.Point(11, 4); + this.cbxClearSvsStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxClearSvsStore.Name = "cbxClearSvsStore"; + this.cbxClearSvsStore.Size = new System.Drawing.Size(149, 21); + this.cbxClearSvsStore.TabIndex = 0; + this.cbxClearSvsStore.Text = "Clear SVS Store"; + this.cbxClearSvsStore.CheckedChanged += new System.EventHandler(this.cbxClearSvsStore_CheckedChanged); + // + // cbxClearSvsBackup + // + this.cbxClearSvsBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearSvsBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearSvsBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearSvsBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearSvsBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearSvsBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearSvsBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearSvsBackup.Enabled = false; + this.cbxClearSvsBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearSvsBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); + this.cbxClearSvsBackup.Location = new System.Drawing.Point(190, 4); + this.cbxClearSvsBackup.Margin = new System.Windows.Forms.Padding(0); + this.cbxClearSvsBackup.Name = "cbxClearSvsBackup"; + this.cbxClearSvsBackup.Size = new System.Drawing.Size(210, 21); + this.cbxClearSvsBackup.TabIndex = 1; + this.cbxClearSvsBackup.Text = "Clear SVS Backup Store"; + // // lblSvsChevRight // this.lblSvsChevRight.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -447,6 +561,44 @@ private void InitializeComponent() this.lblVssChevRight.Text = "."; this.lblVssChevRight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // cbxClearVssBackup + // + this.cbxClearVssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearVssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearVssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearVssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearVssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearVssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearVssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearVssBackup.Enabled = false; + this.cbxClearVssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearVssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); + this.cbxClearVssBackup.Location = new System.Drawing.Point(190, 4); + this.cbxClearVssBackup.Margin = new System.Windows.Forms.Padding(0); + this.cbxClearVssBackup.Name = "cbxClearVssBackup"; + this.cbxClearVssBackup.Size = new System.Drawing.Size(210, 21); + this.cbxClearVssBackup.TabIndex = 1; + this.cbxClearVssBackup.Text = "Clear VSS Backup Store"; + // + // cbxClearVssStore + // + this.cbxClearVssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxClearVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxClearVssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxClearVssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxClearVssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxClearVssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxClearVssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxClearVssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxClearVssStore.ForeColor = System.Drawing.Color.White; + this.cbxClearVssStore.Location = new System.Drawing.Point(11, 4); + this.cbxClearVssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxClearVssStore.Name = "cbxClearVssStore"; + this.cbxClearVssStore.Size = new System.Drawing.Size(149, 21); + this.cbxClearVssStore.TabIndex = 0; + this.cbxClearVssStore.Text = "Clear VSS Store"; + this.cbxClearVssStore.CheckedChanged += new System.EventHandler(this.cbxClearVssStore_CheckedChanged); + // // lblMeText // this.lblMeText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -498,6 +650,25 @@ private void InitializeComponent() this.cmdMePath.UseVisualStyleBackColor = false; this.cmdMePath.Click += new System.EventHandler(this.cmdMePath_Click); // + // cbxReplaceMeRegion + // + this.cbxReplaceMeRegion.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.cbxReplaceMeRegion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cbxReplaceMeRegion.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); + this.cbxReplaceMeRegion.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.cbxReplaceMeRegion.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); + this.cbxReplaceMeRegion.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); + this.cbxReplaceMeRegion.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); + this.cbxReplaceMeRegion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxReplaceMeRegion.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cbxReplaceMeRegion.Location = new System.Drawing.Point(11, 4); + this.cbxReplaceMeRegion.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); + this.cbxReplaceMeRegion.Name = "cbxReplaceMeRegion"; + this.cbxReplaceMeRegion.Size = new System.Drawing.Size(163, 21); + this.cbxReplaceMeRegion.TabIndex = 0; + this.cbxReplaceMeRegion.Text = "Replace ME Region"; + this.cbxReplaceMeRegion.CheckedChanged += new System.EventHandler(this.cbxReplaceMeRegion_CheckedChanged); + // // tlpLog // this.tlpLog.ColumnCount = 1; @@ -638,8 +809,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -768,177 +940,6 @@ private void InitializeComponent() this.cmdOpenBuildsDir.UseVisualStyleBackColor = false; this.cmdOpenBuildsDir.Click += new System.EventHandler(this.cmdOpenBuildsDir_Click); // - // cbxReplaceSerial - // - this.cbxReplaceSerial.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxReplaceSerial.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxReplaceSerial.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxReplaceSerial.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxReplaceSerial.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxReplaceSerial.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxReplaceSerial.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxReplaceSerial.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxReplaceSerial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbxReplaceSerial.Location = new System.Drawing.Point(11, 4); - this.cbxReplaceSerial.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxReplaceSerial.Name = "cbxReplaceSerial"; - this.cbxReplaceSerial.Size = new System.Drawing.Size(192, 21); - this.cbxReplaceSerial.TabIndex = 0; - this.cbxReplaceSerial.Text = "Replace Serial Number"; - this.cbxReplaceSerial.CheckedChanged += new System.EventHandler(this.cmdReplaceSerial_CheckedChanged); - // - // cbxReplaceFsysStore - // - this.cbxReplaceFsysStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxReplaceFsysStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxReplaceFsysStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxReplaceFsysStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxReplaceFsysStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxReplaceFsysStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxReplaceFsysStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxReplaceFsysStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxReplaceFsysStore.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbxReplaceFsysStore.Location = new System.Drawing.Point(11, 4); - this.cbxReplaceFsysStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxReplaceFsysStore.Name = "cbxReplaceFsysStore"; - this.cbxReplaceFsysStore.Size = new System.Drawing.Size(163, 21); - this.cbxReplaceFsysStore.TabIndex = 0; - this.cbxReplaceFsysStore.Text = "Replace Fsys Store"; - this.cbxReplaceFsysStore.CheckedChanged += new System.EventHandler(this.cbxReplaceFsysStore_CheckedChanged); - // - // cbxClearNssStore - // - this.cbxClearNssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearNssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearNssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearNssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearNssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearNssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearNssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearNssStore.ForeColor = System.Drawing.Color.White; - this.cbxClearNssStore.Location = new System.Drawing.Point(11, 4); - this.cbxClearNssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxClearNssStore.Name = "cbxClearNssStore"; - this.cbxClearNssStore.Size = new System.Drawing.Size(149, 21); - this.cbxClearNssStore.TabIndex = 0; - this.cbxClearNssStore.Text = "Clear NSS Store"; - this.cbxClearNssStore.CheckedChanged += new System.EventHandler(this.cbxClearNssStore_CheckedChanged); - // - // cbxClearNssBackup - // - this.cbxClearNssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearNssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearNssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearNssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearNssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearNssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearNssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearNssBackup.Enabled = false; - this.cbxClearNssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearNssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.cbxClearNssBackup.Location = new System.Drawing.Point(190, 4); - this.cbxClearNssBackup.Margin = new System.Windows.Forms.Padding(0); - this.cbxClearNssBackup.Name = "cbxClearNssBackup"; - this.cbxClearNssBackup.Size = new System.Drawing.Size(210, 21); - this.cbxClearNssBackup.TabIndex = 1; - this.cbxClearNssBackup.Text = "Clear NSS Backup Store"; - // - // cbxClearSvsStore - // - this.cbxClearSvsStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearSvsStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearSvsStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearSvsStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearSvsStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearSvsStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearSvsStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearSvsStore.ForeColor = System.Drawing.Color.White; - this.cbxClearSvsStore.Location = new System.Drawing.Point(11, 4); - this.cbxClearSvsStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxClearSvsStore.Name = "cbxClearSvsStore"; - this.cbxClearSvsStore.Size = new System.Drawing.Size(149, 21); - this.cbxClearSvsStore.TabIndex = 0; - this.cbxClearSvsStore.Text = "Clear SVS Store"; - this.cbxClearSvsStore.CheckedChanged += new System.EventHandler(this.cbxClearSvsStore_CheckedChanged); - // - // cbxClearSvsBackup - // - this.cbxClearSvsBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearSvsBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearSvsBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearSvsBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearSvsBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearSvsBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearSvsBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearSvsBackup.Enabled = false; - this.cbxClearSvsBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearSvsBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.cbxClearSvsBackup.Location = new System.Drawing.Point(190, 4); - this.cbxClearSvsBackup.Margin = new System.Windows.Forms.Padding(0); - this.cbxClearSvsBackup.Name = "cbxClearSvsBackup"; - this.cbxClearSvsBackup.Size = new System.Drawing.Size(210, 21); - this.cbxClearSvsBackup.TabIndex = 1; - this.cbxClearSvsBackup.Text = "Clear SVS Backup Store"; - // - // cbxClearVssBackup - // - this.cbxClearVssBackup.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearVssBackup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearVssBackup.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearVssBackup.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearVssBackup.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearVssBackup.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearVssBackup.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearVssBackup.Enabled = false; - this.cbxClearVssBackup.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearVssBackup.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); - this.cbxClearVssBackup.Location = new System.Drawing.Point(190, 4); - this.cbxClearVssBackup.Margin = new System.Windows.Forms.Padding(0); - this.cbxClearVssBackup.Name = "cbxClearVssBackup"; - this.cbxClearVssBackup.Size = new System.Drawing.Size(210, 21); - this.cbxClearVssBackup.TabIndex = 1; - this.cbxClearVssBackup.Text = "Clear VSS Backup Store"; - // - // cbxClearVssStore - // - this.cbxClearVssStore.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxClearVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxClearVssStore.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxClearVssStore.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxClearVssStore.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxClearVssStore.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxClearVssStore.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxClearVssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxClearVssStore.ForeColor = System.Drawing.Color.White; - this.cbxClearVssStore.Location = new System.Drawing.Point(11, 4); - this.cbxClearVssStore.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxClearVssStore.Name = "cbxClearVssStore"; - this.cbxClearVssStore.Size = new System.Drawing.Size(149, 21); - this.cbxClearVssStore.TabIndex = 0; - this.cbxClearVssStore.Text = "Clear VSS Store"; - this.cbxClearVssStore.CheckedChanged += new System.EventHandler(this.cbxClearVssStore_CheckedChanged); - // - // cbxReplaceMeRegion - // - this.cbxReplaceMeRegion.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.cbxReplaceMeRegion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cbxReplaceMeRegion.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.cbxReplaceMeRegion.BorderColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.cbxReplaceMeRegion.CheckedColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(170)))), ((int)(((byte)(255))))); - this.cbxReplaceMeRegion.ClientColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); - this.cbxReplaceMeRegion.ClientColorActive = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.cbxReplaceMeRegion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxReplaceMeRegion.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cbxReplaceMeRegion.Location = new System.Drawing.Point(11, 4); - this.cbxReplaceMeRegion.Margin = new System.Windows.Forms.Padding(11, 0, 0, 0); - this.cbxReplaceMeRegion.Name = "cbxReplaceMeRegion"; - this.cbxReplaceMeRegion.Size = new System.Drawing.Size(163, 21); - this.cbxReplaceMeRegion.TabIndex = 0; - this.cbxReplaceMeRegion.Text = "Replace ME Region"; - this.cbxReplaceMeRegion.CheckedChanged += new System.EventHandler(this.cbxReplaceMeRegion_CheckedChanged); - // // editorWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); diff --git a/mefit/WinForms/infoWindow.Designer.cs b/mefit/WinForms/infoWindow.Designer.cs index 3dcfb8e..1550362 100644 --- a/mefit/WinForms/infoWindow.Designer.cs +++ b/mefit/WinForms/infoWindow.Designer.cs @@ -102,8 +102,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -149,13 +150,13 @@ private void InitializeComponent() this.tlpBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpBottom.Controls.Add(this.lblSectionData, 0, 0); - this.tlpBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tlpBottom.Location = new System.Drawing.Point(0, 311); + this.tlpBottom.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpBottom.Location = new System.Drawing.Point(0, 312); this.tlpBottom.Margin = new System.Windows.Forms.Padding(0); this.tlpBottom.Name = "tlpBottom"; this.tlpBottom.RowCount = 1; this.tlpBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpBottom.Size = new System.Drawing.Size(438, 35); + this.tlpBottom.Size = new System.Drawing.Size(438, 34); this.tlpBottom.TabIndex = 1; // // lblSectionData @@ -169,7 +170,7 @@ private void InitializeComponent() this.lblSectionData.Margin = new System.Windows.Forms.Padding(0); this.lblSectionData.Name = "lblSectionData"; this.lblSectionData.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0); - this.lblSectionData.Size = new System.Drawing.Size(438, 35); + this.lblSectionData.Size = new System.Drawing.Size(438, 34); this.lblSectionData.TabIndex = 101; this.lblSectionData.Text = "..."; this.lblSectionData.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -204,7 +205,7 @@ private void InitializeComponent() this.tlpMain.Location = new System.Drawing.Point(0, 0); this.tlpMain.Margin = new System.Windows.Forms.Padding(0); this.tlpMain.Name = "tlpMain"; - this.tlpMain.RowCount = 20; + this.tlpMain.RowCount = 21; this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); @@ -225,12 +226,13 @@ private void InitializeComponent() this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 1F)); - this.tlpMain.Size = new System.Drawing.Size(438, 313); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpMain.Size = new System.Drawing.Size(438, 312); this.tlpMain.TabIndex = 0; // // lblBiosIdText // - this.lblBiosIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBiosIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBiosIdText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBiosIdText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBiosIdText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -245,7 +247,7 @@ private void InitializeComponent() // // lblModelText // - this.lblModelText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblModelText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblModelText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblModelText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblModelText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -260,7 +262,7 @@ private void InitializeComponent() // // lblEfiVersionText // - this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblEfiVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -275,7 +277,7 @@ private void InitializeComponent() // // lblBuiltByText // - this.lblBuiltByText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBuiltByText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBuiltByText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuiltByText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuiltByText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -290,7 +292,7 @@ private void InitializeComponent() // // lblDateStamptext // - this.lblDateStamptext.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblDateStamptext.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblDateStamptext.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDateStamptext.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblDateStamptext.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -305,7 +307,7 @@ private void InitializeComponent() // // lblRevisionText // - this.lblRevisionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblRevisionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblRevisionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblRevisionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblRevisionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -320,7 +322,7 @@ private void InitializeComponent() // // lblBootromText // - this.lblBootromText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBootromText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBootromText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBootromText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBootromText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -335,7 +337,7 @@ private void InitializeComponent() // // lblBuildcaveText // - this.lblBuildcaveText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBuildcaveText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBuildcaveText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildcaveText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildcaveText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -350,7 +352,7 @@ private void InitializeComponent() // // lblBuildTypeText // - this.lblBuildTypeText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBuildTypeText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBuildTypeText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildTypeText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildTypeText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -365,7 +367,7 @@ private void InitializeComponent() // // lblCompilerText // - this.lblCompilerText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblCompilerText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblCompilerText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCompilerText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCompilerText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -381,7 +383,7 @@ private void InitializeComponent() // lblBiosId // this.lblBiosId.AutoEllipsis = true; - this.lblBiosId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblBiosId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblBiosId.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBiosId.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBiosId.ForeColor = System.Drawing.Color.White; @@ -396,7 +398,7 @@ private void InitializeComponent() // lblModel // this.lblModel.AutoEllipsis = true; - this.lblModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblModel.Dock = System.Windows.Forms.DockStyle.Fill; this.lblModel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblModel.ForeColor = System.Drawing.Color.White; @@ -411,7 +413,7 @@ private void InitializeComponent() // lblEfiVersion // this.lblEfiVersion.AutoEllipsis = true; - this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblEfiVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersion.ForeColor = System.Drawing.Color.White; @@ -426,7 +428,7 @@ private void InitializeComponent() // lblBuiltBy // this.lblBuiltBy.AutoEllipsis = true; - this.lblBuiltBy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblBuiltBy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblBuiltBy.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuiltBy.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuiltBy.ForeColor = System.Drawing.Color.White; @@ -441,7 +443,7 @@ private void InitializeComponent() // lblDateStamp // this.lblDateStamp.AutoEllipsis = true; - this.lblDateStamp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblDateStamp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblDateStamp.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDateStamp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblDateStamp.ForeColor = System.Drawing.Color.White; @@ -456,7 +458,7 @@ private void InitializeComponent() // lblRevision // this.lblRevision.AutoEllipsis = true; - this.lblRevision.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblRevision.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblRevision.Dock = System.Windows.Forms.DockStyle.Fill; this.lblRevision.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblRevision.ForeColor = System.Drawing.Color.White; @@ -471,7 +473,7 @@ private void InitializeComponent() // lblBootRom // this.lblBootRom.AutoEllipsis = true; - this.lblBootRom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblBootRom.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblBootRom.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBootRom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBootRom.ForeColor = System.Drawing.Color.White; @@ -486,7 +488,7 @@ private void InitializeComponent() // lblBuildcaveId // this.lblBuildcaveId.AutoEllipsis = true; - this.lblBuildcaveId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblBuildcaveId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblBuildcaveId.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildcaveId.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildcaveId.ForeColor = System.Drawing.Color.White; @@ -501,7 +503,7 @@ private void InitializeComponent() // lblBuildType // this.lblBuildType.AutoEllipsis = true; - this.lblBuildType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.lblBuildType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblBuildType.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBuildType.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBuildType.ForeColor = System.Drawing.Color.White; @@ -516,7 +518,7 @@ private void InitializeComponent() // lblCompiler // this.lblCompiler.AutoEllipsis = true; - this.lblCompiler.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); + this.lblCompiler.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblCompiler.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCompiler.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCompiler.ForeColor = System.Drawing.Color.White; @@ -575,6 +577,8 @@ private void InitializeComponent() private System.Windows.Forms.Label lblBuildcaveText; private System.Windows.Forms.Label lblBuildTypeText; private System.Windows.Forms.Label lblCompilerText; + private System.Windows.Forms.TableLayoutPanel tlpBottom; + private System.Windows.Forms.Label lblSectionData; private System.Windows.Forms.Label lblBiosId; private System.Windows.Forms.Label lblModel; private System.Windows.Forms.Label lblEfiVersion; @@ -584,8 +588,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblBootRom; private System.Windows.Forms.Label lblBuildcaveId; private System.Windows.Forms.Label lblBuildType; - private System.Windows.Forms.TableLayoutPanel tlpBottom; - private System.Windows.Forms.Label lblSectionData; private METLabel lblCompiler; } } \ No newline at end of file diff --git a/mefit/WinForms/infoWindow.cs b/mefit/WinForms/infoWindow.cs index ef58cc6..9b6fe0b 100644 --- a/mefit/WinForms/infoWindow.cs +++ b/mefit/WinForms/infoWindow.cs @@ -35,27 +35,53 @@ public infoWindow() { InitializeComponent(); - lblTitle.MouseMove += infoWindow_MouseMove; + Load += infoWindow_Load; KeyDown += infoWindow_KeyDown; + lblTitle.MouseMove += infoWindow_MouseMove; + + InterfaceUtils.SetTableLayoutPanelHeight(tlpMain); cmdClose.Font = Program.FONT_MDL2_REG_12; cmdClose.Text = Chars.EXIT_CROSS; + } + #endregion - lblBiosId.Text = FWBase.ROMInfoSectionData.BiosId ?? "N/A"; + #region Window Events + private void infoWindow_Load(object sender, EventArgs e) + { + lblBiosId.Text = FWBase.ROMInfoSectionData.BiosId + ?? "N/A"; lblModel.Text = FWBase.ROMInfoSectionData.Model != null ? $"{FWBase.ROMInfoSectionData.Model} ({MacUtils.ConvertEfiModelCode(FWBase.ROMInfoSectionData.Model)})" : "N/A"; - lblEfiVersion.Text = FWBase.ROMInfoSectionData.EfiVersion ?? "N/A"; - lblBuiltBy.Text = FWBase.ROMInfoSectionData.BuiltBy ?? "N/A"; - lblDateStamp.Text = FWBase.ROMInfoSectionData.DateStamp ?? "N/A"; - lblRevision.Text = FWBase.ROMInfoSectionData.Revision ?? "N/A"; - lblBootRom.Text = FWBase.ROMInfoSectionData.RomVersion ?? "N/A"; - lblBuildcaveId.Text = FWBase.ROMInfoSectionData.BuildcaveId ?? "N/A"; - lblBuildType.Text = FWBase.ROMInfoSectionData.BuildType ?? "N/A"; - lblCompiler.Text = FWBase.ROMInfoSectionData.Compiler ?? "N/A"; - - lblSectionData.Text = $"Base: {FWBase.ROMInfoSectionData.SectionBase:X2}h, " + - $"Size: {FWBase.ROMInfoSectionData.SectionBytes.Length:X2}h" ?? string.Empty; + lblEfiVersion.Text = + FWBase.ROMInfoSectionData.EfiVersion + ?? "N/A"; + lblBuiltBy.Text = + FWBase.ROMInfoSectionData.BuiltBy + ?? "N/A"; + lblDateStamp.Text = + FWBase.ROMInfoSectionData.DateStamp + ?? "N/A"; + lblRevision.Text = + FWBase.ROMInfoSectionData.Revision + ?? "N/A"; + lblBootRom.Text = + FWBase.ROMInfoSectionData.RomVersion + ?? "N/A"; + lblBuildcaveId.Text = + FWBase.ROMInfoSectionData.BuildcaveId + ?? "N/A"; + lblBuildType.Text = + FWBase.ROMInfoSectionData.BuildType + ?? "N/A"; + lblCompiler.Text = + FWBase.ROMInfoSectionData.Compiler + ?? "N/A"; + lblSectionData.Text = + $"Base: {FWBase.ROMInfoSectionData.SectionBase:X2}h, " + + $"Size: {FWBase.ROMInfoSectionData.SectionBytes.Length:X2}h" + ?? string.Empty; foreach (Label label in tlpMain.Controls) { diff --git a/mefit/WinForms/mainWindow.Designer.cs b/mefit/WinForms/mainWindow.Designer.cs index 3cfc849..3b54824 100644 --- a/mefit/WinForms/mainWindow.Designer.cs +++ b/mefit/WinForms/mainWindow.Designer.cs @@ -42,6 +42,7 @@ private void InitializeComponent() this.tlpFilename = new System.Windows.Forms.TableLayoutPanel(); this.cmdReload = new System.Windows.Forms.Button(); this.cmdNavigate = new System.Windows.Forms.Button(); + this.lblFilename = new METLabel(); this.lblModel = new System.Windows.Forms.Label(); this.tlpFile = new System.Windows.Forms.TableLayoutPanel(); this.lblFileCreatedDate = new System.Windows.Forms.Label(); @@ -96,13 +97,13 @@ private void InitializeComponent() this.tlpMenu = new System.Windows.Forms.TableLayoutPanel(); this.pnlMenuSeperator1 = new System.Windows.Forms.Panel(); this.pnlMenuSeperator0 = new System.Windows.Forms.Panel(); - this.cmdCopy = new System.Windows.Forms.Button(); + this.cmdCopyMenu = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); this.tlpTitle = new System.Windows.Forms.TableLayoutPanel(); this.cmdClose = new System.Windows.Forms.Button(); this.cmdMenu = new System.Windows.Forms.Button(); this.cmdMin = new System.Windows.Forms.Button(); this.tlpVersionLabel = new System.Windows.Forms.TableLayoutPanel(); - this.lblFilename = new METLabel(); this.cmsMainMenu = new Mac_EFI_Toolkit.UI.METContextMenuStrip(); this.openLocalFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openBuildsDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -339,6 +340,19 @@ private void InitializeComponent() this.cmdNavigate.UseVisualStyleBackColor = false; this.cmdNavigate.Click += new System.EventHandler(this.cmdNavigate_Click); // + // lblFilename + // + this.lblFilename.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.lblFilename.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblFilename.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold); + this.lblFilename.ForeColor = System.Drawing.Color.White; + 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(6, 0, 0, 0); + this.lblFilename.Size = new System.Drawing.Size(639, 36); + this.lblFilename.TabIndex = 6; + // // lblModel // this.lblModel.AutoEllipsis = true; @@ -386,7 +400,7 @@ private void InitializeComponent() // lblFileCreatedDate // this.lblFileCreatedDate.AutoEllipsis = true; - this.lblFileCreatedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblFileCreatedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblFileCreatedDate.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileCreatedDate.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileCreatedDate.ForeColor = System.Drawing.Color.White; @@ -401,7 +415,7 @@ private void InitializeComponent() // lblFileModifiedDate // this.lblFileModifiedDate.AutoEllipsis = true; - this.lblFileModifiedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblFileModifiedDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblFileModifiedDate.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileModifiedDate.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileModifiedDate.ForeColor = System.Drawing.Color.White; @@ -416,7 +430,7 @@ private void InitializeComponent() // lblFileCrc // this.lblFileCrc.AutoEllipsis = true; - this.lblFileCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblFileCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblFileCrc.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileCrc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileCrc.ForeColor = System.Drawing.Color.White; @@ -430,7 +444,7 @@ private void InitializeComponent() // // lblCreatedText // - this.lblCreatedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblCreatedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblCreatedText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCreatedText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCreatedText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -446,7 +460,7 @@ private void InitializeComponent() // lblFileSizeBytes // this.lblFileSizeBytes.AutoEllipsis = true; - this.lblFileSizeBytes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblFileSizeBytes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblFileSizeBytes.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFileSizeBytes.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFileSizeBytes.ForeColor = System.Drawing.Color.White; @@ -460,7 +474,7 @@ private void InitializeComponent() // // lblModifiedText // - this.lblModifiedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblModifiedText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblModifiedText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblModifiedText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblModifiedText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -475,7 +489,7 @@ private void InitializeComponent() // // lblSizeBytesText // - this.lblSizeBytesText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblSizeBytesText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblSizeBytesText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSizeBytesText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSizeBytesText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -490,7 +504,7 @@ private void InitializeComponent() // // lblChecksumText // - this.lblChecksumText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblChecksumText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblChecksumText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblChecksumText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblChecksumText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -552,7 +566,7 @@ private void InitializeComponent() // // lblNvramText // - this.lblNvramText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblNvramText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblNvramText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNvramText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNvramText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -567,7 +581,7 @@ private void InitializeComponent() // // lblFsysStoreText // - this.lblFsysStoreText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblFsysStoreText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblFsysStoreText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFsysStoreText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFsysStoreText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -583,7 +597,7 @@ private void InitializeComponent() // lblApfsCapable // this.lblApfsCapable.AutoEllipsis = true; - this.lblApfsCapable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); + this.lblApfsCapable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblApfsCapable.Dock = System.Windows.Forms.DockStyle.Fill; this.lblApfsCapable.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblApfsCapable.ForeColor = System.Drawing.Color.White; @@ -597,7 +611,7 @@ private void InitializeComponent() // // lblEfiVersionText // - this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblEfiVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblEfiVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -613,7 +627,7 @@ private void InitializeComponent() // lblFitVersion // this.lblFitVersion.AutoEllipsis = true; - this.lblFitVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblFitVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblFitVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFitVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFitVersion.ForeColor = System.Drawing.Color.White; @@ -628,7 +642,7 @@ private void InitializeComponent() // lblHwc // this.lblHwc.AutoEllipsis = true; - this.lblHwc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblHwc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblHwc.Dock = System.Windows.Forms.DockStyle.Fill; this.lblHwc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblHwc.ForeColor = System.Drawing.Color.White; @@ -642,7 +656,7 @@ private void InitializeComponent() // // lblSerialText // - this.lblSerialText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblSerialText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblSerialText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSerialText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSerialText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -658,7 +672,7 @@ private void InitializeComponent() // lblApfsCapableText // this.lblApfsCapableText.AutoEllipsis = true; - this.lblApfsCapableText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblApfsCapableText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblApfsCapableText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblApfsCapableText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblApfsCapableText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -673,7 +687,7 @@ private void InitializeComponent() // // lblFitVersionText // - this.lblFitVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblFitVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblFitVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFitVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFitVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -727,7 +741,7 @@ private void InitializeComponent() // lblSerialNumber // this.lblSerialNumber.AutoEllipsis = true; - this.lblSerialNumber.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblSerialNumber.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblSerialNumber.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSerialNumber.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSerialNumber.ForeColor = System.Drawing.Color.White; @@ -741,7 +755,7 @@ private void InitializeComponent() // // lblHwcText // - this.lblHwcText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblHwcText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblHwcText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblHwcText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblHwcText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -778,7 +792,7 @@ private void InitializeComponent() // lblFsysCrc // this.lblFsysCrc.AutoEllipsis = true; - this.lblFsysCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblFsysCrc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblFsysCrc.Dock = System.Windows.Forms.DockStyle.Fill; this.lblFsysCrc.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFsysCrc.ForeColor = System.Drawing.Color.White; @@ -850,7 +864,7 @@ private void InitializeComponent() // lblEfiVersion // this.lblEfiVersion.AutoEllipsis = true; - this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblEfiVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblEfiVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiVersion.ForeColor = System.Drawing.Color.White; @@ -909,7 +923,7 @@ private void InitializeComponent() // lblEfiLock // this.lblEfiLock.AutoEllipsis = true; - this.lblEfiLock.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblEfiLock.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblEfiLock.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEfiLock.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblEfiLock.ForeColor = System.Drawing.Color.White; @@ -923,7 +937,7 @@ private void InitializeComponent() // lblNssStore // this.lblNssStore.AutoEllipsis = true; - this.lblNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblNssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblNssStore.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNssStore.ForeColor = System.Drawing.Color.White; @@ -938,7 +952,7 @@ private void InitializeComponent() // lblSvsStore // this.lblSvsStore.AutoEllipsis = true; - this.lblSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblSvsStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblSvsStore.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSvsStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSvsStore.ForeColor = System.Drawing.Color.White; @@ -953,7 +967,7 @@ private void InitializeComponent() // lblVssStore // this.lblVssStore.AutoEllipsis = true; - this.lblVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblVssStore.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblVssStore.Dock = System.Windows.Forms.DockStyle.Fill; this.lblVssStore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblVssStore.ForeColor = System.Drawing.Color.White; @@ -967,7 +981,7 @@ private void InitializeComponent() // // lblSonText // - this.lblSonText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblSonText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblSonText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSonText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSonText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -983,7 +997,7 @@ private void InitializeComponent() // lblOrderNo // this.lblOrderNo.AutoEllipsis = true; - this.lblOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.lblOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblOrderNo.Dock = System.Windows.Forms.DockStyle.Fill; this.lblOrderNo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblOrderNo.ForeColor = System.Drawing.Color.White; @@ -997,7 +1011,7 @@ private void InitializeComponent() // // lblBoardIdText // - this.lblBoardIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblBoardIdText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblBoardIdText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBoardIdText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBoardIdText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -1013,7 +1027,7 @@ private void InitializeComponent() // lblBoardId // this.lblBoardId.AutoEllipsis = true; - this.lblBoardId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(54)))), ((int)(((byte)(54))))); + this.lblBoardId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); this.lblBoardId.Dock = System.Windows.Forms.DockStyle.Fill; this.lblBoardId.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBoardId.ForeColor = System.Drawing.Color.White; @@ -1027,7 +1041,7 @@ private void InitializeComponent() // // lblMeVersionText // - this.lblMeVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(23)))), ((int)(((byte)(23)))), ((int)(((byte)(23))))); + this.lblMeVersionText.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(35)))), ((int)(((byte)(35)))), ((int)(((byte)(35))))); this.lblMeVersionText.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMeVersionText.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblMeVersionText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(225)))), ((int)(((byte)(240))))); @@ -1061,7 +1075,7 @@ private void InitializeComponent() // lblMeVersion // this.lblMeVersion.AutoEllipsis = true; - this.lblMeVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.lblMeVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); this.lblMeVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMeVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblMeVersion.ForeColor = System.Drawing.Color.White; @@ -1215,7 +1229,7 @@ private void InitializeComponent() // this.tlpMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.tlpMenu.BackgroundImage = global::Mac_EFI_Toolkit.Properties.Resources.imgSprite; - this.tlpMenu.ColumnCount = 8; + this.tlpMenu.ColumnCount = 10; this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 1F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); @@ -1223,16 +1237,16 @@ private void InitializeComponent() this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 5F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 5F)); + this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 426F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tlpMenu.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tlpMenu.Controls.Add(this.pnlMenuSeperator1, 5, 0); this.tlpMenu.Controls.Add(this.cmdOpen, 0, 0); this.tlpMenu.Controls.Add(this.cmdReset, 2, 0); this.tlpMenu.Controls.Add(this.pnlMenuSeperator0, 3, 0); - this.tlpMenu.Controls.Add(this.cmdCopy, 4, 0); + this.tlpMenu.Controls.Add(this.cmdCopyMenu, 4, 0); this.tlpMenu.Controls.Add(this.cmdEdit, 6, 0); + this.tlpMenu.Controls.Add(this.panel1, 7, 0); this.tlpMenu.Dock = System.Windows.Forms.DockStyle.Top; this.tlpMenu.Location = new System.Drawing.Point(1, 51); this.tlpMenu.Margin = new System.Windows.Forms.Padding(2); @@ -1262,26 +1276,36 @@ private void InitializeComponent() this.pnlMenuSeperator0.Size = new System.Drawing.Size(1, 24); this.pnlMenuSeperator0.TabIndex = 7; // - // cmdCopy - // - this.cmdCopy.BackColor = System.Drawing.Color.Transparent; - this.cmdCopy.Dock = System.Windows.Forms.DockStyle.Fill; - this.cmdCopy.Enabled = false; - this.cmdCopy.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); - this.cmdCopy.FlatAppearance.BorderSize = 0; - this.cmdCopy.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); - this.cmdCopy.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.cmdCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.cmdCopy.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmdCopy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); - this.cmdCopy.Location = new System.Drawing.Point(147, 1); - this.cmdCopy.Margin = new System.Windows.Forms.Padding(1); - this.cmdCopy.Name = "cmdCopy"; - this.cmdCopy.Size = new System.Drawing.Size(68, 36); - this.cmdCopy.TabIndex = 2; - this.cmdCopy.Text = "COPY"; - this.cmdCopy.UseVisualStyleBackColor = false; - this.cmdCopy.Click += new System.EventHandler(this.cmdCopy_Click); + // cmdCopyMenu + // + this.cmdCopyMenu.BackColor = System.Drawing.Color.Transparent; + this.cmdCopyMenu.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdCopyMenu.Enabled = false; + this.cmdCopyMenu.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.cmdCopyMenu.FlatAppearance.BorderSize = 0; + this.cmdCopyMenu.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); + this.cmdCopyMenu.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.cmdCopyMenu.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cmdCopyMenu.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cmdCopyMenu.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(225)))), ((int)(((byte)(225))))); + this.cmdCopyMenu.Location = new System.Drawing.Point(147, 1); + this.cmdCopyMenu.Margin = new System.Windows.Forms.Padding(1); + this.cmdCopyMenu.Name = "cmdCopyMenu"; + this.cmdCopyMenu.Size = new System.Drawing.Size(68, 36); + this.cmdCopyMenu.TabIndex = 2; + this.cmdCopyMenu.Text = "COPY"; + this.cmdCopyMenu.UseVisualStyleBackColor = false; + this.cmdCopyMenu.Click += new System.EventHandler(this.cmdCopy_Click); + // + // panel1 + // + this.panel1.Anchor = System.Windows.Forms.AnchorStyles.None; + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.panel1.Location = new System.Drawing.Point(303, 7); + this.panel1.Margin = new System.Windows.Forms.Padding(0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1, 24); + this.panel1.TabIndex = 9; // // tlpTitle // @@ -1313,7 +1337,7 @@ private void InitializeComponent() // this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; - this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); @@ -1366,7 +1390,7 @@ private void InitializeComponent() this.cmdMin.Location = new System.Drawing.Point(613, 0); this.cmdMin.Margin = new System.Windows.Forms.Padding(0); this.cmdMin.Name = "cmdMin"; - this.cmdMin.Padding = new System.Windows.Forms.Padding(2, 10, 0, 1); + this.cmdMin.Padding = new System.Windows.Forms.Padding(2, 0, 0, 1); this.cmdMin.Size = new System.Drawing.Size(50, 50); this.cmdMin.TabIndex = 99; this.cmdMin.TabStop = false; @@ -1388,19 +1412,6 @@ private void InitializeComponent() this.tlpVersionLabel.Size = new System.Drawing.Size(60, 50); this.tlpVersionLabel.TabIndex = 100; // - // lblFilename - // - this.lblFilename.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.lblFilename.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblFilename.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold); - this.lblFilename.ForeColor = System.Drawing.Color.White; - 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(6, 0, 0, 0); - this.lblFilename.Size = new System.Drawing.Size(639, 36); - this.lblFilename.TabIndex = 6; - // // cmsMainMenu // this.cmsMainMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); @@ -1849,7 +1860,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem openBuildsDirectoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openFsysStoresDirectoryToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.Button cmdCopy; + private System.Windows.Forms.Button cmdCopyMenu; private System.Windows.Forms.ToolStripMenuItem sizeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem crc32ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem createdDateToolStripMenuItem; @@ -1881,5 +1892,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem usageManualToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem homepageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem changelogToolStripMenuItem; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/mefit/WinForms/mainWindow.cs b/mefit/WinForms/mainWindow.cs index 46a60d3..cb66ffd 100644 --- a/mefit/WinForms/mainWindow.cs +++ b/mefit/WinForms/mainWindow.cs @@ -71,7 +71,7 @@ public mainWindow() // Set button properties (font and text) SetButtonProperties(); - ArrowDrawer.Draw(cmdCopy, Colours.DROP_ARROW_DISABLED); + ArrowDrawer.Draw(cmdCopyMenu, Colours.DROP_ARROW_DISABLED); } #endregion @@ -181,7 +181,7 @@ private void mainWindow_KeyDown(object sender, KeyEventArgs e) cmdReset.PerformClick(); break; case Keys.C: - cmdCopy.PerformClick(); + cmdCopyMenu.PerformClick(); break; case Keys.E: cmdEdit.PerformClick(); @@ -291,7 +291,8 @@ private void cmdReset_Click(object sender, EventArgs e) return; } - DialogResult result = METMessageBox.Show(this, "Reset", "This will unload the firmware and all associated data, are you sure you want to reset?", + DialogResult result = + METMessageBox.Show(this, "Reset", "This will unload the firmware and all associated data, are you sure you want to reset?", METMessageType.Warning, METMessageButtons.YesNo); if (result == DialogResult.Yes) @@ -301,6 +302,12 @@ private void cmdReset_Click(object sender, EventArgs e) } } + private void cmdCopy_Click(object sender, EventArgs e) + { + Control control = sender as Control; + ShowContextMenu(control, cmsCopy); + } + private void cmdEdit_Click(object sender, EventArgs e) { if (FWBase.LoadedBinaryBytes == null) @@ -334,12 +341,6 @@ private void cmdEdit_Click(object sender, EventArgs e) } } - private void cmdCopy_Click(object sender, EventArgs e) - { - Control control = sender as Control; - ShowContextMenu(control, cmsCopy); - } - private void cmdEveryMacSearch_Click(object sender, EventArgs e) { @@ -668,6 +669,7 @@ private void restartApplicationToolStripMenuItem_Click(object sender, EventArgs private void settingsToolStripMenuItem_Click(object sender, EventArgs e) { SetHalfOpacity(); + using (Form formWindow = new settingsWindow()) { formWindow.FormClosed += ChildWindowClosed; @@ -678,6 +680,7 @@ private void settingsToolStripMenuItem_Click(object sender, EventArgs e) private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { SetHalfOpacity(); + using (Form formWindow = new aboutWindow()) { formWindow.FormClosed += ChildWindowClosed; @@ -847,7 +850,11 @@ private void UpdateFileSizeLabel() if (!isValidSize) { lblFileSizeBytes.ForeColor = Colours.ERROR_RED; - lblFileSizeBytes.Text += isValidSize ? string.Empty : $" ({FileUtils.GetSizeDifference(fileSize)})"; + + lblFileSizeBytes.Text += + isValidSize + ? string.Empty + : $" ({FileUtils.GetSizeDifference(fileSize)})"; } } @@ -868,7 +875,8 @@ private void UpdateFileModifiedDateLabel() private void UpdateModelLabel() { - lblModel.Text = $"MODEL: {MacUtils.ConvertEfiModelCode(FWBase.EFISectionData.ModelPart) ?? "N/A"}"; + lblModel.Text = + $"MODEL: {MacUtils.ConvertEfiModelCode(FWBase.EFISectionData.ModelPart) ?? "N/A"}"; // Load and append the config code asynchronously if (FWBase.FsysStoreData.HWC != null) @@ -879,21 +887,27 @@ private void UpdateModelLabel() private void UpdateFirmwareSerialNumber() { - lblSerialNumber.Text = FWBase.FsysStoreData.Serial ?? "N/A"; + lblSerialNumber.Text = + FWBase.FsysStoreData.Serial ?? + "N/A"; } private void UpdateHardwareConfigLabel() { - lblHwc.Text = FWBase.FsysStoreData.HWC ?? "N/A"; + lblHwc.Text = + FWBase.FsysStoreData.HWC + ?? "N/A"; } private void UpdateFsysLabel() { if (FWBase.FsysStoreData.CrcString != null) { - lblFsysCrc.Text = $"CRC32: {FWBase.FsysStoreData.CrcString}h"; - lblFsysCrc.ForeColor = string.Equals(FWBase.FsysStoreData.CrcCalcString, - FWBase.FsysStoreData.CrcString) ? Colours.COMPLETE_GREEN : Colours.ERROR_RED; + lblFsysCrc.Text = + $"CRC: {FWBase.FsysStoreData.CrcString}h{(FWBase.ForceFoundFsys ? " [F]" : string.Empty)}"; + lblFsysCrc.ForeColor = string.Equals(FWBase.FsysStoreData.CrcCalcString, FWBase.FsysStoreData.CrcString) + ? Colours.COMPLETE_GREEN + : Colours.ERROR_RED; } else { @@ -903,21 +917,28 @@ private void UpdateFsysLabel() private void UpdateOrderNumberLabel() { - lblOrderNo.Text = FWBase.FsysStoreData.SON ?? "N/A"; + lblOrderNo.Text = + FWBase.FsysStoreData.SON + ?? "N/A"; } private void UpdateEfiVersionLabel() { - lblEfiVersion.Text = FWBase.FirmwareVersion ?? "N/A"; + lblEfiVersion.Text = + FWBase.FirmwareVersion + ?? "N/A"; } private void UpdateNvramLabel(Label label, NvramStore storeData, string text) { label.Text = text; - Color foreColor = (!storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty) + Color foreColor = + !storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty + ? Color.White + : storeData.PrimaryStoreBase != -1 ? Colours.COMPLETE_GREEN - : (storeData.PrimaryStoreBase != -1 ? Color.White : Colours.DISABLED_TEXT); + : Colours.DISABLED_TEXT; label.ForeColor = foreColor; } @@ -958,7 +979,9 @@ private Color GetEfiLockStatusColor(EfiLockStatus lockStatus) private void UpdateBoardIdLabel() { - lblBoardId.Text = FWBase.PDRSectionData.BoardId ?? "N/A"; + lblBoardId.Text = + FWBase.PDRSectionData.BoardId + ?? "N/A"; } private void UpdateApfsCapableLabel() @@ -966,10 +989,6 @@ private void UpdateApfsCapableLabel() switch (FWBase.IsApfsCapable) { - case ApfsCapable.Unknown: - lblApfsCapable.Text = "UNKOWN"; - lblApfsCapable.ForeColor = Colours.ERROR_RED; - break; case ApfsCapable.Guid: lblApfsCapable.Text = "YES (DXE)"; break; @@ -980,23 +999,32 @@ private void UpdateApfsCapableLabel() lblApfsCapable.Text = "DRIVER NOT FOUND"; lblApfsCapable.ForeColor = Colours.WARNING_ORANGE; break; + case ApfsCapable.Unknown: + lblApfsCapable.Text = "UNKNOWN"; + lblApfsCapable.ForeColor = Colours.ERROR_RED; + break; } } private void UpdateFitVersionLabel() { - lblFitVersion.Text = FWBase.FitVersion ?? "N/A"; + lblFitVersion.Text = + FWBase.FitVersion + ?? "N/A"; } private void UpdateIntelMeLabel() { - lblMeVersion.Text = FWBase.MeVersion ?? "N/A"; + lblMeVersion.Text = + FWBase.MeVersion + ?? "N/A"; if (Descriptor.MeBase != 0) { if (!string.IsNullOrEmpty(FWBase.MeVersion)) { - lblMeVersion.Text += $" ({Descriptor.MeBase:X2}h)"; + lblMeVersion.Text += + $" ({Descriptor.MeBase:X2}h)"; } } } @@ -1033,22 +1061,34 @@ private void ShowContextMenu(Control control, ContextMenuStrip menu) private void ToggleControlEnable(bool enable) { - ArrowDrawer.Update(cmdCopy, enable ? Colours.DROP_ARROW_ENABLED : Colours.DROP_ARROW_DISABLED); + ArrowDrawer.Draw + ( + cmdCopyMenu, + enable + ? Colours.DROP_ARROW_ENABLED + : Colours.DROP_ARROW_DISABLED + ); + + Button[] buttons = + { + cmdReset, cmdEdit, cmdCopyMenu, cmdNavigate, cmdReload, + cmdFixFsysCrc, cmdExportFsys , cmdAppleRomInfo, cmdExportMe + }; - Button[] buttons = { cmdReset, cmdEdit, cmdCopy, cmdNavigate, cmdReload, - cmdFixFsysCrc, cmdExportFsys , cmdAppleRomInfo, cmdExportMe}; foreach (Button button in buttons) { button.Enabled = enable; } - cmdEveryMacSearch.Enabled = (FWBase.FsysStoreData.Serial != null); + cmdEveryMacSearch.Enabled = + FWBase.FsysStoreData.Serial != null; if (FWBase.FsysStoreData.FsysBytes != null) { - cmdFixFsysCrc.Enabled = MacUtils.GetUintFsysCrc32 - (FWBase.FsysStoreData.FsysBytes).ToString("X8") == FWBase.FsysStoreData.CrcString - ? false : true; + cmdFixFsysCrc.Enabled = + MacUtils.GetUintFsysCrc32(FWBase.FsysStoreData.FsysBytes).ToString("X8") == FWBase.FsysStoreData.CrcString + ? false + : true; } else { @@ -1110,7 +1150,7 @@ private void SetTipHandlers() { Button[] buttons = { - cmdMenu, cmdOpen, cmdReset, cmdCopy, cmdEdit, cmdNavigate, + cmdMenu, cmdOpen, cmdReset, cmdCopyMenu, cmdEdit, cmdNavigate, cmdReload, cmdEveryMacSearch, cmdFixFsysCrc, cmdExportFsys, cmdAppleRomInfo, cmdExportMe }; @@ -1143,7 +1183,7 @@ private void HandleMouseEnterTip(object sender, EventArgs e) { cmdReset, "Reset (CTRL + R)" }, { cmdEdit, "Firmware Editor (CTRL + E)" }, { cmdMenu, "Application Menu (CTRL + M)"}, - { cmdCopy, "Copy (CTRL + C)" }, + { cmdCopyMenu, "Copy (CTRL + C)" }, { cmdNavigate, "Navigate to File (ALT + N)" }, { cmdReload, "Reload File from Disk (ALT + R)" }, { cmdEveryMacSearch, "Search Serial with EveryMac (ALT + S)" }, @@ -1171,8 +1211,10 @@ private void HandleMouseLeaveTip(object sender, EventArgs e) private string SetNvramStoreTip(NvramStore storeData, string storeType) { - if (!storeData.IsPrimaryStoreEmpty || !storeData.IsBackupStoreEmpty) - return $"{storeType} data present in the NVRAM"; + if (!storeData.IsPrimaryStoreEmpty && !storeData.IsBackupStoreEmpty) + return $"Data present in both {storeType} stores"; + else if (!storeData.IsPrimaryStoreEmpty && storeData.IsBackupStoreEmpty) + return $"Data present in the primary {storeType} store"; else if (storeData.PrimaryStoreBase != -1) return $"{storeType} NVRAM stores are empty (0xFF)"; @@ -1202,7 +1244,8 @@ private void GetPrivateMemoryUsage(object state) { lblPrivateMemory.Invoke((Action)(() => { - lblPrivateMemory.Text = $"{Helper.GetBytesReadableSize(currentProcess.PrivateMemorySize64)}"; + lblPrivateMemory.Text = + $"{Helper.GetBytesReadableSize(currentProcess.PrivateMemorySize64)}"; })); } } diff --git a/mefit/WinForms/settingsWindow.Designer.cs b/mefit/WinForms/settingsWindow.Designer.cs index 1fead82..4335d8d 100644 --- a/mefit/WinForms/settingsWindow.Designer.cs +++ b/mefit/WinForms/settingsWindow.Designer.cs @@ -662,8 +662,9 @@ private void InitializeComponent() this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/mefit/WinForms/termsWindow.Designer.cs b/mefit/WinForms/termsWindow.Designer.cs index 8d1571d..dadcc6d 100644 --- a/mefit/WinForms/termsWindow.Designer.cs +++ b/mefit/WinForms/termsWindow.Designer.cs @@ -95,8 +95,9 @@ private void InitializeComponent() // this.cmdClose.BackColor = System.Drawing.Color.Transparent; this.cmdClose.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmdClose.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.cmdClose.FlatAppearance.BorderSize = 0; - this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.cmdClose.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); this.cmdClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cmdClose.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));