diff --git a/CHANGELOG.md b/CHANGELOG.md index bf49da4b9..b26fe15a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ - Resolve graphics corruption on wake for TeraScale 1 - Patch currently limited to Ventura and newer - Backend changes: - - Rename OCLP-Helper to OpenCore-Patcher-Helper + - Rename OCLP-Helper to OpenCore-Patcher - Allows for better identification when displaying prompts - Reimplement wxPython GUI into modularized system: - Allows for easier maintenance and future expansion diff --git a/payloads/Tools/OpenCore-Patcher-Helper.app/Contents/Resources/OC-Patcher.icns b/payloads/Tools/OpenCore-Patcher-Helper.app/Contents/Resources/OC-Patcher.icns deleted file mode 100644 index 7673f0bd9..000000000 Binary files a/payloads/Tools/OpenCore-Patcher-Helper.app/Contents/Resources/OC-Patcher.icns and /dev/null differ diff --git a/payloads/Tools/OpenCore-Patcher-Helper.app/Contents/Info.plist b/payloads/Tools/OpenCore-Patcher.app/Contents/Info.plist similarity index 84% rename from payloads/Tools/OpenCore-Patcher-Helper.app/Contents/Info.plist rename to payloads/Tools/OpenCore-Patcher.app/Contents/Info.plist index 082a4cdf7..29f687b78 100644 --- a/payloads/Tools/OpenCore-Patcher-Helper.app/Contents/Info.plist +++ b/payloads/Tools/OpenCore-Patcher.app/Contents/Info.plist @@ -3,9 +3,9 @@ CFBundleDisplayName - OpenCore-Patcher-Helper + OpenCore-Patcher CFBundleExecutable - OpenCore-Patcher-Helper + OpenCore-Patcher CFBundleIconFile OC-Patcher.icns CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - OpenCore-Patcher-Helper + OpenCore-Patcher CFBundlePackageType APPL LSMinimumSystemVersion @@ -22,5 +22,7 @@ NSHumanReadableCopyright Copyright © 2020-2023 Dortania + LSUIElement + diff --git a/payloads/Tools/OpenCore-Patcher-Helper.app/Contents/MacOS/OpenCore-Patcher-Helper b/payloads/Tools/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher similarity index 100% rename from payloads/Tools/OpenCore-Patcher-Helper.app/Contents/MacOS/OpenCore-Patcher-Helper rename to payloads/Tools/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher diff --git a/payloads/Tools/OpenCore-Patcher.app/Contents/Resources/OC-Patcher.icns b/payloads/Tools/OpenCore-Patcher.app/Contents/Resources/OC-Patcher.icns new file mode 100644 index 000000000..f023ac743 Binary files /dev/null and b/payloads/Tools/OpenCore-Patcher.app/Contents/Resources/OC-Patcher.icns differ diff --git a/resources/constants.py b/resources/constants.py index 033851390..cad29a2a2 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -618,7 +618,7 @@ class Constants: @property def oclp_helper_path(self): - return self.payload_path / Path("Tools/OpenCore-Patcher-Helper.app/Contents/MacOS/OpenCore-Patcher-Helper") + return self.payload_path / Path("Tools/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher") @property def rsrrepair_userspace_path(self): diff --git a/resources/sys_patch/sys_patch_auto.py b/resources/sys_patch/sys_patch_auto.py index 0c88ea48e..027afd8e6 100644 --- a/resources/sys_patch/sys_patch_auto.py +++ b/resources/sys_patch/sys_patch_auto.py @@ -1,11 +1,12 @@ # Copyright (C) 2022, Mykola Grymalyuk +import wx +import logging import plistlib import subprocess -import webbrowser -import logging + from pathlib import Path -import wx + from resources import utilities, updates, global_settings, network_handler, constants from resources.sys_patch import sys_patch_detect