diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index aa73aa941..0aae265cc 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -149,7 +149,6 @@ module.exports = { sidebarDepth: 1, children: [ 'ISSUES-HOLD', - 'TESTED', 'TERMS', 'HOW', 'PATCHEXPLAIN', diff --git a/docs/TESTED.md b/docs/TESTED.md deleted file mode 100644 index 25a3fbaf3..000000000 --- a/docs/TESTED.md +++ /dev/null @@ -1,144 +0,0 @@ -# Tested Models on OpenCore Legacy Patcher - -To aid users in troubleshooting, we've compiled a list of users who've reported success with OpenCore Legacy Patcher as well as the version used. This should aid users in verifying whether issues with the patcher are regression-related with newer versions. - -::: details MacBook - -| SMBIOS | Tested | Tester | Model | Version | Comment | -| :--- | :--- | :--- | :--- | :--- | :--- | -| MacBook4,1 | YES | Mami | Stock | Unknown | Couldn't install due to broken USB support | -| MacBook5,1 | ^^ | air.man | ^^ | 0.0.19 | N/A | -| MacBook5,2 | ^^ | Finder352 | ^^ | ^^ | ^^ | -| MacBook6,1 | ^^ | Finder352 | ^^ | ^^ | ^^ | -| MacBook7,1 | ^^ | MykolaG | ^^ | ^^ | ^^ | -| ^^ | ^^ | Jazzzny | ^^ | ^^ | ^^ | -| ^^ | ^^ | AlexSakha67 | ^^ | 0.0.20 | ^^ | -| MacBook8,1 | NO | N/A | N/A | N/A | ^^ | - -::: - -::: details MacBook Air - -| SMBIOS | Tested | Tester | Model | Version | Comment | -| :--- | :--- | :--- | :--- | :--- | :--- | -| MacBookAir2,1 | YES | Bruno | Stock | 0.4.5 | Slow to the point of being unusable. | -| MacBookAir3,1 | ^^ | uvesten | Stock | 0.3.3 | N/A | -| MacBookAir3,2 | ^^ | houser42 | ^^ | Unknown | ^^ | -| MacBookAir4,1 | NO | N/A | N/A | N/A | ^^ | -| MacBookAir4,2 | YES | bdwilson1907 | Stock | 0.3.1 | Intermittent keyboard backlight | -| MacBookAir5,1 | ^^ | Ausdauersportler | ^^ | 0.0.9 | N/A | -| ^^ | ^^ | webg3 | ^^ | Unknown | ^^ | -| MacBookAir5,2 | ^^ | Bab-droid | ^^ | 0.0.19 | ^^ | -| ^^ | ^^ | K-Hobert | ^^ | Unknown | ^^ | -| ^^ | ^^ | cboukouv | ^^ | 0.0.21 | ^^ | -| MacBookAir6,1 | NO | N/A | N/A | N/A | N/A | -| MacBookAir6,2 | ^^ | ^^ | ^^ | ^^ | ^^ | - -::: - -::: details MacBook Pro - -| SMBIOS | Tested | Tester | Model | Version | Comment | -| :--- | :--- | :--- | :--- | :--- | :--- | -| MacBookPro4,1 | YES | cboukouv | Stock | 0.0.19 | N/A | -| MacBookPro5,1 | ^^ | GURU_Jasho#5736 | ^^ | 0.0.21 | ^^ | -| MacBookPro5,2 | ^^ | hvds | ^^ | ^^ | ^^ | -| MacBookPro5,3 | ^^ | kommtzeitkonrad | ^^ | 0.0.22 | ^^ | -| MacBookPro5,4 | NO | N/A | N/A | N/A | ^^ | -| MacBookPro5,5 | YES | ASentientHedgehog | Stock | - | ^^ | -| ^^ | ^^ | ParaDoX1994 | Stock | 0.4.5 | Camera/Bluetooth not working (connector broken) | -| MacBookPro6,1 | NO | N/A | N/A | N/A | N/A | -| MacBookPro6,2 | YES | Jakeluke | Stock | Unknown | dGPU broken | -| MacBookPro7,1 | ^^ | fussel132 | ^^ | 0.1.2 | N/A -| ^^ | ^^ | casey1234 | Upgraded | 0.3.3 | Upgraded SSD | -| MacBookPro8,1 | YES | AvaQueen | Stock | 0.0.19 | N/A | -| MacBookPro8,1 | ^^ | charly-black | Upgraded | 0.3.1 | Upgraded BCM94331PCIEBT4CAX | -| MacBookPro8,2 | ^^ | air.man | Stock | 0.0.22 | dGPU disabled | -| ^^ | ^^ | cboukouv | ^^ | 0.0.19 | N/A | -| MacBookPro8,3 | ^^ | lulujyc | ^^ | 0.1.4 | dGPU disabled | -| MacBookPro9,1 | YES | jbdamiano | Stock | 0.0.19 | N/A | -| ^^ | ^^ | dennes544 | ^^ | ^^ | ^^ | -| ^^ | ^^ | cgrazy | ^^ | ^^ | ^^ | -| ^^ | ^^ | LIPA85 | ^^ | ^^ | ^^ | -| MacBookPro9,2 | YES | alexx17xx | ^^ | ^^ | ^^ | -| ^^ | ^^ | Arvxistanx | ^^ | ^^ | ^^ | -| ^^ | ^^ | CyberDroid1 | ^^ | 0.0.16 | ^^ | -| ^^ | ^^ | woefi | Upgraded | 0.0.13 | Upgraded BCM94331CAX | -| ^^ | ^^ | whgmkeller | Stock | 0.0.11 | N/A | -| ^^ | ^^ | vinaypundith | Unknown | 0.0.7 | ^^ | -| ^^ | ^^ | casey1234 | Upgraded | 0.3.3 | Upgraded RAM and SSD | -| ^^ | ^^ | crystall1nedev | Upgraded | 0.4.4 | ^^ | -| MacBookPro10,1 | YES | traviswparker | Stock | 0.0.14 | N/A | -| ^^ | ^^ | il-rollino | Upgraded | 0.0.21 | Upgraded BCM94360CSAX | -| MacBookPro10,2 | ^^ | akidone | ^^ | 0.3.0 | ^^ | -| MacBookPro11,1 | YES | ParaDoX1994 | Stock | 0.4.4 | N/A | -| MacBookPro11,2 | ^^ | casey1234 | ^^ | 0.3.3 | ^^ | -| MacBookPro11,3 | NO | N/A | N/A | N/A | N/A | -::: - -::: details Mac mini - -| SMBIOS | Tested | Tester | Model | Version | Comment | -| :--- | :--- | :--- | :--- | :--- | :--- | -| Macmini3,1 | YES | ASentientHedgehog | Stock | N/A | N/A | -| Macmini4,1 | YES | Towster15#6369 | ^^ | 0.4.4 | Does not have internal SATA cable, booted and installed to SSD over USB 2.0 instead | -| ^^ | ^^ | MykolaG | ^^ | 0.4.5 | SD card reader possibly broken. | -| Macmini5,1 | YES | MykolaG | ^^ | 0.4.5 | N/A | -| Macmini5,2 | ^^ | charly-black | ^^ | 0.3.1 | ^^ | -| ^^ | ^^ | MykolaG | ^^ | 0.4.5 | SD card reader possibly broken. | -| Macmini5,3 | NO | N/A | N/A | N/A | N/A | -| Macmini6,1 | YES | cicofz | Stock | 0.0.21 | ^^ | -| ^^ | ^^ | Stig124 | ^^ | 0.0.19 | ^^ | -| ^^ | ^^ | mwidjaya | ^^ |0.0.18 | ^^ | -| ^^| ^^ | MykolaG | ^^ | 0.4.5 | ^^ | -| Macmini6,2 | ^^ | Shelbs | ^^ | 0.0.16 | ^^ | -| Macmini7,1 | YES | MykolaG | ^^ | 0.4.5 | ^^ | -| Macmini8,1 | ^^ | ^^ | ^^ | 0.4.5 | ^^ | -::: - -::: details iMac - -| SMBIOS | Tested | Tester | Model | Version | Comment | -| :--- | :--- | :--- | :--- | :--- | :--- | -| iMac7,1 | YES | lulujyc | Upgraded | 0.3.1 | Upgraded with BCM94352HMB

The USB 1.1 controller is unstable on Big Sur+, using USB hubs (forcing USB 2.0) can fix unrecognized keyboard/ mouse. | -| iMac8,1 | YES | EduCovas | Stock | 0.0.21 | N/A | -| iMac9,1 | YES | Allanrfox | ^^ | ^^ | ^^ | -| ^^ | ^^ | Jakeluke | ^^ | ^^ | ^^ | -| iMac10,1 | YES | Ausdauersportler | Upgraded | Unknown | Upgraded with WX4150 | -| iMac11,1 | ^^ | internetzel | ^^ | ^^ | Upgraded RX580 mobile | -| iMac11,2 | ^^ | MykolaG | Stock | 0.0.21 | N/A | -| ^^ | ^^ | iMac-iPad | ^^ | ^^ | ^^ | -| ^^ | ^^ | vinaypundith | Unknown | 0.0.19 | ^^ | -| iMac11,3 | ^^ | Ausdauersportler | Upgraded | 0.0.21 | Upgraded with Polaris GPU and BCM943602CDP | -| iMac12,1 | YES | shnockdu | ^^ | ^^ | Upgraded with Kepler GPU | -| ^^ | ^^ | StephN999 | ^^ | ^^ | Upgraded with WX4150 GPU and BCM94360CD | -| iMac12,2 | ^^ | Ausdauersportler | ^^ | ^^ | Upgraded with Polaris GPU and BCM943602CDP | -| iMac13,1 | YES | alexx17xx | Stock | 0.0.19 | N/A | -| iMac13,2 | ^^ | Alain13 | ^^ | ^^ | ^^ | -| ^^ | ^^ | algernonpule | ^^ | ^^ | ^^ | -| iMac13,3 | NO | N/A | N/A | N/A | ^^ | -| iMac14,1 | YES | woefi | Upgraded | 0.0.21 | Upgraded NVMe | -| ^^ | ^^ | mikeboss | Stock | 0.0.19 | N/A | -| iMac14,2 | ^^ | OKonnel | ^^ | 0.0.22 | ^^ | -| ^^ | ^^ | mibaxx | ^^ | 0.0.21 | ^^ | -| iMac14,3 | ^^ | StupeFied | ^^ | 0.4.5 | ^^ | -| iMac15,1 | YES | JakubMazur | Upgraded | 0.4.1 | Upgraded RAM, Radeon R9 M295X and Quad-Core Intel Core i7 | -::: - -::: details Mac Pro - -| SMBIOS | Tested | Tester | Model | Version | Comment | -| :--- | :--- | :--- | :--- | :--- | :--- | -| MacPro3,1 | YES | MykolaG | Upgraded | 0.1.6 | Upgraded RX 470 and BCM94360CD.
Stock Bluetooth card removed. | -| ^^ | ^^ | christiann | ^^ | 0.0.21 | Upgraded RX 560 and BCM94322.
Stock Bluetooth card removed. | -| ^^ | ^^ | gw463 | ^^ | 0.0.22 | Upgraded GTX 680 and BCM94360 | -| ^^ | ^^ | AlexSakha67 | ^^ | 0.0.20 | Upgraded R9 280 | -| ^^ | ^^ | nekton1 | ^^ | ^^ | Upgraded GTX 680 | -| ^^ | ^^ | Pri-est | Unknown | 0.0.9 | N/A | -| ^^ | ^^ | vinaypundith | Upgraded | 0.0.6 | Upgraded with GTX 680 and BCM94360CD. | -| ^^ | ^^ | ParaDoX1994 | ^^ | 0.4.4 | Upgraded with HD 7950.
Stock Bluetooth card removed. | -| MacPro4,1 | YES | vinaypundith | Unknown | 0.0.9 | N/A | -| MacPro5,1 | ^^ | woefi | Upgraded | 0.0.21 | Upgraded with RX 580. | -| ^^ | ^^ | Mabrouk Oscar | Unknown | ^^ | N/A | -| ^^ | ^^ | astuffedtiger | Flashed | 0.0.18 | MacPro4,1 flashed to 5,1 | -::: diff --git a/requirements.txt b/requirements.txt index a79dd44b2..a802b0603 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,5 @@ wxpython pyinstaller packaging py_sip_xnu -py-applescript \ No newline at end of file +py-applescript +markdown2 \ No newline at end of file diff --git a/resources/sys_patch/sys_patch_auto.py b/resources/sys_patch/sys_patch_auto.py index 0c275919a..d6276de29 100644 --- a/resources/sys_patch/sys_patch_auto.py +++ b/resources/sys_patch/sys_patch_auto.py @@ -1,6 +1,10 @@ # Copyright (C) 2022, Mykola Grymalyuk +# Copyright (c) 2023 Jazzzny import wx +import wx.html2 +import requests +import markdown2 import logging import plistlib import subprocess @@ -51,19 +55,85 @@ class AutomaticSysPatch: logging.info(f"- Found new version: {version}") app = wx.App() - frame = wx.Frame(None, -1, "OpenCore Legacy Patcher") - dialog = wx.MessageDialog( - parent=frame, - message=f"Current Version: {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}\nNew version: {version}\nWould you like to update?", - caption="Update Available for OpenCore Legacy Patcher!", - style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION - ) - dialog.SetYesNoCancelLabels("Download and install", "View on Github", "Ignore") - response = dialog.ShowModal() - if response == wx.ID_YES: - gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.UPDATE_APP) - elif response == wx.ID_NO: + mainframe = wx.Frame(None, -1, "OpenCore Legacy Patcher") + + ID_GITHUB = wx.NewId() + ID_UPDATE = wx.NewId() + + url = "https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest" + response = requests.get(url).json() + changelog = response["body"].split("## Asset Information")[0] + + html_markdown = markdown2.markdown(changelog) + html_css = """ + + """ + frame = wx.Dialog(None, -1, title="", size=(600, 500)) + frame.SetMinSize((600, 500)) + frame.SetWindowStyle(wx.STAY_ON_TOP) + panel = wx.Panel(frame) + sizer = wx.BoxSizer(wx.VERTICAL) + sizer.AddSpacer(10) + self.title_text = wx.StaticText(panel, label="A new version of OpenCore Legacy Patcher is available!") + self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {version} is now available - You have {self.constants.patcher_version}. Would you like to update?") + self.title_text.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont")) + self.description.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont")) + self.web_view = wx.html2.WebView.New(panel, style=wx.BORDER_SUNKEN) + html_code = html_css+html_markdown.replace(" + body { + font-family: system-ui, -apple-system, BlinkMacSystemFont, sans-serif; + line-height: 1.5; + font-size: 13px; + margin-top: 20px; + background-color: rgb(238,238,238); + } + h2 { + line-height: 0.5; + } + a { + color: -apple-system-control-accent; + } + @media (prefers-color-scheme: dark) { + body { + color: #fff; + background-color: rgb(47,47,47); + } + + } + +""" + frame = wx.Dialog(None, -1, title="", size=(600, 500)) + frame.SetMinSize((600, 500)) + frame.SetWindowStyle(wx.STAY_ON_TOP) + panel = wx.Panel(frame) + sizer = wx.BoxSizer(wx.VERTICAL) + sizer.AddSpacer(10) + self.title_text = wx.StaticText(panel, label="A new version of OpenCore Legacy Patcher is available!") + self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {oclp_version} is now available - You have {self.constants.patcher_version}. Would you like to update?") + self.title_text.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont")) + self.description.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont")) + self.web_view = wx.html2.WebView.New(panel, style=wx.BORDER_SUNKEN) + html_code = html_css+html_markdown.replace("