gui_main.py: Fix additional typos

This commit is contained in:
Mykola Grymalyuk
2022-07-16 14:24:58 -06:00
parent bbb087db63
commit 2897e6cf74
8 changed files with 30 additions and 30 deletions
+6 -6
View File
@@ -17,7 +17,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
### ACPI -> Add ### ACPI -> Add
* SSDT-CPBG * SSDT-CPBG
* Reason: Resolves Kernel Panic on Arrendale Macs in early Big Sur builds * Reason: Resolves Kernel Panic on Arrandale Macs in early Big Sur builds
* Logic: Disable dummy CPBG device in ACPI * Logic: Disable dummy CPBG device in ACPI
* Models: MacBookPro6,x and iMac11,x * Models: MacBookPro6,x and iMac11,x
* SSDT-PCI * SSDT-PCI
@@ -28,7 +28,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
* Reason: Allows for software based deMUX disabling dGPUs in 2011 MacBook Pros * Reason: Allows for software based deMUX disabling dGPUs in 2011 MacBook Pros
* Logic: Sends power down request to dGPU via ACPI * Logic: Sends power down request to dGPU via ACPI
* Models: MacBookPro8,2 and MacBookPro8,3 with dead dGPUs * Models: MacBookPro8,2 and MacBookPro8,3 with dead dGPUs
### ACPI -> Patch ### ACPI -> Patch
* `EHCx` and `XHC1` Patches * `EHCx` and `XHC1` Patches
@@ -39,13 +39,13 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
* Reason: To be paired with SSDT-PCI * Reason: To be paired with SSDT-PCI
* `_INI` to `XINI` Patch * `_INI` to `XINI` Patch
* Reason: To be paired with SSDT-DGPU * Reason: To be paired with SSDT-DGPU
### Booter -> Patch ### Booter -> Patch
* Reroute `HW_BID` to `OC_BID` * Reroute `HW_BID` to `OC_BID`
* Reason: Allows macOS installers to be used on unsupported models * Reason: Allows macOS installers to be used on unsupported models
* Logic: Reroutes Board ID macOS checks to custom variable * Logic: Reroutes Board ID macOS checks to custom variable
* Models: All systems using VMM spoofing * Models: All systems using VMM spoofing
### Booter -> Quirks ### Booter -> Quirks
@@ -146,7 +146,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
* Reason: Used for proper output on machines with UGA firmware but GOP GPU * Reason: Used for proper output on machines with UGA firmware but GOP GPU
* Logic: Provide GOP protocol instances on top of UGA protocol instances * Logic: Provide GOP protocol instances on top of UGA protocol instances
* Models: MacPro3,1, MacBook4,1 iMac7,1-8,1 * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
::: :::
## Injected Kext ## Injected Kext
@@ -173,7 +173,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
* Reason: Patches BlueTool to enable bluetooth functionality on Monterey * Reason: Patches BlueTool to enable bluetooth functionality on Monterey
* Models: All models with pre-BCM94360 wireless cards or 3rd-party chipsets * Models: All models with pre-BCM94360 wireless cards or 3rd-party chipsets
* Bluetooth-Spoof * Bluetooth-Spoof
* Reason: Injects extra data into certain bluetooth chipsets for recognition by the system * Reason: Injects extra data into certain bluetooth chipsets for recognition by the system
* Models: Models with the BCM2070 or BCM2046 chipsets * Models: Models with the BCM2070 or BCM2046 chipsets
* FeatureUnlock (Night Shift) * FeatureUnlock (Night Shift)
* Reason: Patches CoreBrightness.framework to enable Night Shift on unsupported models * Reason: Patches CoreBrightness.framework to enable Night Shift on unsupported models
+2 -2
View File
@@ -4,7 +4,7 @@
To install UEFI is actually super simple! All it requires is to boot Windows' Installer through OpenCore to force a UEFI setup. Here we'll be going a bit more step by step in the process including partitioning and such. To install UEFI is actually super simple! All it requires is to boot Windows' Installer through OpenCore to force a UEFI setup. Here we'll be going a bit more step by step in the process including partitioning and such.
* Note: UEFI Windows is generally quite usable for Arrendale and newer models, however machines with Penryn CPUs may experience issues * Note: UEFI Windows is generally quite usable for Arrandale and newer models, however machines with Penryn CPUs may experience issues
* Recommended Models: * Recommended Models:
* MacBookAir4,x - 5,x * MacBookAir4,x - 5,x
* MacBookPro8,x - 10,x * MacBookPro8,x - 10,x
@@ -75,7 +75,7 @@ rsync -vha -P --exclude=sources/install.wim /Volumes/CCCOMA_X64/ /Volumes/W10USB
# Use wimlib to split the install.wim file into a size that fits # Use wimlib to split the install.wim file into a size that fits
wimlib-imagex split /Volumes/CCCOMA_X64/sources/install.wim /Volumes/W10USB/sources/install.swm 4000 wimlib-imagex split /Volumes/CCCOMA_X64/sources/install.wim /Volumes/W10USB/sources/install.swm 4000
``` ```
Once that's completed, you can continue. Once that's completed, you can continue.
::: :::
+15 -15
View File
@@ -141,7 +141,7 @@ class wx_python_gui:
self.popup = wx.MessageDialog( self.popup = wx.MessageDialog(
self.frame, self.frame,
f"During unpacking of our internal files, we seemed to have encountered an error.\n\nIf you keep seeing this error, please try rebooting and redownloading the application.", f"During unpacking of our internal files, we seemed to have encountered an error.\n\nIf you keep seeing this error, please try rebooting and redownloading the application.",
"Internal Error occured!", "Internal Error occurred!",
style = wx.OK | wx.ICON_EXCLAMATION style = wx.OK | wx.ICON_EXCLAMATION
) )
self.popup.ShowModal() self.popup.ShowModal()
@@ -199,10 +199,10 @@ class wx_python_gui:
style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION
) )
self.dialog.SetYesNoCancelLabels("View on Github", "Always Ignore", "Ignore Once") self.dialog.SetYesNoCancelLabels("View on Github", "Always Ignore", "Ignore Once")
responce = self.dialog.ShowModal() response = self.dialog.ShowModal()
if responce == wx.ID_YES: if response == wx.ID_YES:
webbrowser.open(github_link) webbrowser.open(github_link)
elif responce == wx.ID_NO: elif response == wx.ID_NO:
print("- Setting IgnoreAppUpdates to True") print("- Setting IgnoreAppUpdates to True")
self.constants.ignore_updates = True self.constants.ignore_updates = True
global_settings.global_settings().write_property("IgnoreAppUpdates", True) global_settings.global_settings().write_property("IgnoreAppUpdates", True)
@@ -1104,7 +1104,7 @@ class wx_python_gui:
# Create popup window to inform user of error # Create popup window to inform user of error
self.popup = wx.MessageDialog( self.popup = wx.MessageDialog(
self.frame_modal, self.frame_modal,
"A problem occured trying to download PatcherSupportPkg binaries\n\nIf you continue to have this error, download an Offline build from Github\nThese builds don't require a network connection to root patch", "A problem occurred trying to download PatcherSupportPkg binaries\n\nIf you continue to have this error, download an Offline build from Github\nThese builds don't require a network connection to root patch",
"Network Error", "Network Error",
wx.YES_NO | wx.ICON_ERROR wx.YES_NO | wx.ICON_ERROR
) )
@@ -1180,11 +1180,11 @@ class wx_python_gui:
try: try:
sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_patch() sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_patch()
except Exception as e: except Exception as e:
self.text_box.AppendText(f"- An internal error occured while running the Root Patcher:\n{str(e)}") self.text_box.AppendText(f"- An internal error occurred while running the Root Patcher:\n{str(e)}")
pass pass
sys.stdout = self.stock_stdout sys.stdout = self.stock_stdout
sys.stderr = self.stock_stderr sys.stderr = self.stock_stderr
if self.constants.root_patcher_succeded is True: if self.constants.root_patcher_succeeded is True:
print("- Root Patcher finished successfully") print("- Root Patcher finished successfully")
if self.constants.needs_to_open_preferences is True: if self.constants.needs_to_open_preferences is True:
# Create dialog box to open System Preferences -> Security and Privacy # Create dialog box to open System Preferences -> Security and Privacy
@@ -1290,11 +1290,11 @@ class wx_python_gui:
try: try:
sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_unpatch() sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_unpatch()
except Exception as e: except Exception as e:
self.text_box.AppendText(f"- An internal error occured while running the Root Patcher:\n{str(e)}") self.text_box.AppendText(f"- An internal error occurred while running the Root Patcher:\n{str(e)}")
pass pass
sys.stdout = self.stock_stdout sys.stdout = self.stock_stdout
sys.stderr = self.stock_stderr sys.stderr = self.stock_stderr
if self.constants.root_patcher_succeded is True: if self.constants.root_patcher_succeeded is True:
print("- Root Patcher finished successfully") print("- Root Patcher finished successfully")
self.reboot_system(message="Root Patcher finished successfully\nWould you like to reboot now?") self.reboot_system(message="Root Patcher finished successfully\nWould you like to reboot now?")
self.return_to_main_menu.Enable() self.return_to_main_menu.Enable()
@@ -1602,7 +1602,7 @@ class wx_python_gui:
wx.App.Get().Yield() wx.App.Get().Yield()
integrity_path = Path(Path(self.constants.payload_path) / Path(apple_integrity_file_link.split("/")[-1])) integrity_path = Path(Path(self.constants.payload_path) / Path(apple_integrity_file_link.split("/")[-1]))
if utilities.download_file(apple_integrity_file_link, integrity_path, verify_checksum=False): if utilities.download_file(apple_integrity_file_link, integrity_path, verify_checksum=False):
# If we're unable to download the integrity file immediately after downloading the IA, there's a legitmate issue # If we're unable to download the integrity file immediately after downloading the IA, there's a legitimate issue
# on Apple's end. # on Apple's end.
# Fail gracefully and just head to installing the IA. # Fail gracefully and just head to installing the IA.
utilities.disable_sleep_while_running() utilities.disable_sleep_while_running()
@@ -1936,8 +1936,8 @@ class wx_python_gui:
style=wx.YES_NO | wx.ICON_QUESTION style=wx.YES_NO | wx.ICON_QUESTION
) )
self.dialog.SetYesNoLabels("Install OpenCore to disk", "Skip") self.dialog.SetYesNoLabels("Install OpenCore to disk", "Skip")
responce = self.dialog.ShowModal() response = self.dialog.ShowModal()
if responce == wx.ID_YES: if response == wx.ID_YES:
self.constants.start_build_install = True self.constants.start_build_install = True
self.build_install_menu() self.build_install_menu()
else: else:
@@ -2016,7 +2016,7 @@ class wx_python_gui:
# Define Menu # Define Menu
# - Header: Settings # - Header: Settings
# - Dropdown: Model # - Dropdown: Model
# - Chechboxes: # - Checkboxes:
# - Verbose # - Verbose
# - Kext Debug # - Kext Debug
# - OpenCore Debug # - OpenCore Debug
@@ -2375,7 +2375,7 @@ class wx_python_gui:
self.disable_battery_throttling_checkbox.SetPosition(wx.Point( self.disable_battery_throttling_checkbox.SetPosition(wx.Point(
self.hibernation_checkbox.GetPosition().x, self.hibernation_checkbox.GetPosition().x,
self.hibernation_checkbox.GetPosition().y + self.hibernation_checkbox.GetSize().height)) self.hibernation_checkbox.GetPosition().y + self.hibernation_checkbox.GetSize().height))
self.disable_battery_throttling_checkbox.SetToolTip(wx.ToolTip("This will forcefully disable MSR Power Control on Arrendale and newer Macs\nMainly applicable for systems with severe throttling due to missing battery or display")) self.disable_battery_throttling_checkbox.SetToolTip(wx.ToolTip("This will forcefully disable MSR Power Control on Arrandale and newer Macs\nMainly applicable for systems with severe throttling due to missing battery or display"))
# Disable XCPM # Disable XCPM
self.disable_xcpm_checkbox = wx.CheckBox(self.frame_modal, label="Disable XCPM") self.disable_xcpm_checkbox = wx.CheckBox(self.frame_modal, label="Disable XCPM")
@@ -3107,7 +3107,7 @@ OpenCore Legacy Patcher by default knows the most ideal
self.subheader_2.SetSize(wx.Size(self.frame_modal.GetSize().width, 30)) self.subheader_2.SetSize(wx.Size(self.frame_modal.GetSize().width, 30))
self.subheader_2.Centre(wx.HORIZONTAL) self.subheader_2.Centre(wx.HORIZONTAL)
# Label: Set FeatreUnlock status # Label: Set FeatureUnlock status
self.feature_unlock_label = wx.StaticText(self.frame_modal, label="Feature Unlock Status:", style=wx.ALIGN_CENTRE) self.feature_unlock_label = wx.StaticText(self.frame_modal, label="Feature Unlock Status:", style=wx.ALIGN_CENTRE)
self.feature_unlock_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)) self.feature_unlock_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
self.feature_unlock_label.SetPosition(wx.Point(0, self.subheader_2.GetPosition().y + self.subheader_2.GetSize().height -5)) self.feature_unlock_label.SetPosition(wx.Point(0, self.subheader_2.GetPosition().y + self.subheader_2.GetSize().height -5))
+1 -1
View File
@@ -1,4 +1,4 @@
/* Disable the non-existant Co-processor Bridge found on Arrendale, Lynnfield and Clarkdale Macs. /* Disable the non-existant Co-processor Bridge found on Arrandale, Lynnfield and Clarkdale Macs.
* IOPCIFamily in macOS 11.0 up-to 11.2 was unable to handle ACPI probing when device was not present, * IOPCIFamily in macOS 11.0 up-to 11.2 was unable to handle ACPI probing when device was not present,
* therefore kernel panicing the machine. * therefore kernel panicing the machine.
* *
+1 -1
View File
@@ -19,7 +19,7 @@
<key>Enabled</key> <key>Enabled</key>
<false/> <false/>
<key>Comment</key> <key>Comment</key>
<string>Patch CPBG for Arrendale, Lynnfield and Clarkdale</string> <string>Patch CPBG for Arrandale, Lynnfield and Clarkdale</string>
<key>Path</key> <key>Path</key>
<string>SSDT-CPBG.aml</string> <string>SSDT-CPBG.aml</string>
</dict> </dict>
+1 -1
View File
@@ -857,7 +857,7 @@ Supported Options:
3. Disable FeatureUnlock 3. Disable FeatureUnlock
""" """
) )
change_menu = input("Set FeatreUnlock (ie. 1): ") change_menu = input("Set FeatureUnlock (ie. 1): ")
if change_menu == "1": if change_menu == "1":
self.constants.fu_status = True self.constants.fu_status = True
self.constants.fu_arguments = None self.constants.fu_arguments = None
+1 -1
View File
@@ -187,7 +187,7 @@ class Constants:
self.set_content_caching = False # Set Content Caching self.set_content_caching = False # Set Content Caching
self.allow_nvme_fixing = True # Allow NVMe Kernel Space Patches self.allow_nvme_fixing = True # Allow NVMe Kernel Space Patches
self.disable_xcpm = False # Disable XCPM (X86PlatformPlugin.kext) self.disable_xcpm = False # Disable XCPM (X86PlatformPlugin.kext)
self.root_patcher_succeded = False # Determine if root patcher succeeded self.root_patcher_succeeded = False # Determine if root patcher succeeded
self.booted_oc_disk = None # Determine current disk OCLP booted from self.booted_oc_disk = None # Determine current disk OCLP booted from
self.start_build_install = False # Determine if build install should be started self.start_build_install = False # Determine if build install should be started
self.host_is_non_metal = False # Determine if host is non-metal (ie. enable UI hacks) self.host_is_non_metal = False # Determine if host is non-metal (ie. enable UI hacks)
+3 -3
View File
@@ -44,7 +44,7 @@ class PatchSysVolume:
self.computer = self.constants.computer self.computer = self.constants.computer
self.root_mount_path = None self.root_mount_path = None
self.root_supports_snapshot = utilities.check_if_root_is_apfs_snapshot() self.root_supports_snapshot = utilities.check_if_root_is_apfs_snapshot()
self.constants.root_patcher_succeded = False # Reset Variable each time we start self.constants.root_patcher_succeeded = False # Reset Variable each time we start
self.constants.needs_to_open_preferences = False self.constants.needs_to_open_preferences = False
self.patch_set_dictionary = {} self.patch_set_dictionary = {}
self.needs_kmutil_exemptions = False # For '/Library/Extensions' rebuilds self.needs_kmutil_exemptions = False # For '/Library/Extensions' rebuilds
@@ -113,7 +113,7 @@ class PatchSysVolume:
else: else:
self.clean_skylight_plugins() self.clean_skylight_plugins()
self.delete_nonmetal_enforcement() self.delete_nonmetal_enforcement()
self.constants.root_patcher_succeded = True self.constants.root_patcher_succeeded = True
print("- Unpatching complete") print("- Unpatching complete")
print("\nPlease reboot the machine for patches to take effect") print("\nPlease reboot the machine for patches to take effect")
@@ -172,7 +172,7 @@ class PatchSysVolume:
print("\nPlease reboot the machine for patches to take effect") print("\nPlease reboot the machine for patches to take effect")
if self.needs_kmutil_exemptions is True: if self.needs_kmutil_exemptions is True:
print("Note: Apple will require you to open System Preferences -> Security to allow the new kernel extensions to be loaded") print("Note: Apple will require you to open System Preferences -> Security to allow the new kernel extensions to be loaded")
self.constants.root_patcher_succeded = True self.constants.root_patcher_succeeded = True
if self.constants.gui_mode is False: if self.constants.gui_mode is False:
input("\nPress [ENTER] to continue") input("\nPress [ENTER] to continue")