Merge branch 'main' into migration-assistant

2026-04-21 03:04:31 +10:00 · 2023-10-21 19:00:57 +03:00
parent 64cab85704 c27998a881
commit e6a33ed26b
6 changed files with 180 additions and 178 deletions
--- 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',
--- a/docs/TESTED.md
+++ b/docs/TESTED.md
@@ -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 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-
-:::
-
-::: details MacBook Air
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MacBookAir2,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-| MacBookAir4,2 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:red"> NO </span> | N/A | N/A | N/A | N/A |
-| MacBookAir6,2 | ^^ | ^^ | ^^ | ^^ | ^^ |
-
-:::
-
-::: details MacBook Pro
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| MacBookPro4,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-| MacBookPro5,5 | <span style="color:#30BCD5"> YES </span> | ASentientHedgehog | Stock | - | ^^ |
-| ^^ | ^^ | ParaDoX1994 | Stock | 0.4.5 | Camera/Bluetooth not working (connector broken) |
-| MacBookPro6,1 | <span style="color:red"> NO </span> | N/A | N/A | N/A | N/A |
-| MacBookPro6,2 | <span style="color:#30BCD5"> YES </span> | Jakeluke | Stock | Unknown | dGPU broken |
-| MacBookPro7,1 | ^^ | fussel132 | ^^ | 0.1.2 | N/A
-| ^^ | ^^ | casey1234 | Upgraded | 0.3.3 | Upgraded SSD |
-| MacBookPro8,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span>| jbdamiano | Stock | 0.0.19 | N/A |
-| ^^ | ^^ | dennes544 | ^^ | ^^ | ^^ |
-| ^^ | ^^ | cgrazy | ^^ | ^^ | ^^ |
-| ^^ | ^^ | LIPA85 | ^^ | ^^ | ^^ |
-| MacBookPro9,2 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span> | traviswparker | Stock | 0.0.14 | N/A |
-| ^^ | ^^ | il-rollino | Upgraded | 0.0.21 | Upgraded BCM94360CSAX |
-| MacBookPro10,2 | ^^ | akidone | ^^ | 0.3.0 | ^^ |
-| MacBookPro11,1 | <span style="color:#30BCD5"> YES </span> | ParaDoX1994 | Stock | 0.4.4 | N/A |
-| MacBookPro11,2 | ^^ | casey1234 | ^^ | 0.3.3 | ^^ |
-| MacBookPro11,3 | <span style="color:red"> NO </span> | N/A | N/A | N/A | N/A |
-:::
-
-::: details Mac mini
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| Macmini3,1 | <span style="color:#30BCD5"> YES </span> | ASentientHedgehog | Stock | N/A | N/A |
-| Macmini4,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span> | MykolaG | ^^ | 0.4.5 | N/A |
-| Macmini5,2 | ^^ | charly-black | ^^ | 0.3.1 | ^^ |
-| ^^ | ^^ | MykolaG | ^^ | 0.4.5 | SD card reader possibly broken. |
-| Macmini5,3 | <span style="color:red"> NO </span> | N/A |  N/A | N/A | N/A |
-| Macmini6,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span> | MykolaG | ^^ | 0.4.5 | ^^ |
-| Macmini8,1 | ^^ | ^^ | ^^ | 0.4.5 | ^^ |
-:::
-
-::: details iMac
-
-| SMBIOS | Tested | Tester | Model | Version | Comment |
-| :--- | :--- | :--- | :--- | :--- | :--- |
-| iMac7,1 | <span style="color:#30BCD5"> YES </span> | lulujyc | Upgraded | 0.3.1 | Upgraded with BCM94352HMB <br><br> The USB 1.1 controller is unstable on Big Sur+, using USB hubs (forcing USB 2.0) can fix unrecognized keyboard/ mouse. |
-| iMac8,1 | <span style="color:#30BCD5"> YES </span> | EduCovas | Stock | 0.0.21 | N/A |
-| iMac9,1 | <span style="color:#30BCD5"> YES </span> | Allanrfox | ^^ | ^^ | ^^ |
-| ^^ | ^^ | Jakeluke | ^^ | ^^ | ^^ |
-| iMac10,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span> | shnockdu | ^^ | ^^ | Upgraded with Kepler GPU |
-| ^^ | ^^ | StephN999 | ^^ | ^^ | Upgraded with WX4150 GPU and BCM94360CD |
-| iMac12,2 | ^^ | Ausdauersportler | ^^ | ^^ | Upgraded with Polaris GPU and BCM943602CDP |
-| iMac13,1 | <span style="color:#30BCD5"> YES </span> | alexx17xx | Stock | 0.0.19 | N/A |
-| iMac13,2 | ^^ | Alain13 | ^^ | ^^ | ^^ |
-| ^^ | ^^ | algernonpule | ^^ | ^^ | ^^ |
-| iMac13,3 | <span style="color:red"> NO </span> | N/A | N/A | N/A | ^^ |
-| iMac14,1 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span> | 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 | <span style="color:#30BCD5"> YES </span> | MykolaG | Upgraded | 0.1.6 | Upgraded RX 470 and BCM94360CD.<br/>Stock Bluetooth card removed. |
-| ^^ | ^^ | christiann | ^^ | 0.0.21 | Upgraded RX 560 and BCM94322.<br/>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.<br/>Stock Bluetooth card removed. |
-| MacPro4,1 | <span style="color:#30BCD5"> YES </span> | 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 |
-:::
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,5 @@ wxpython
 pyinstaller
 packaging
 py_sip_xnu
-py-applescript
+py-applescript
+markdown2
--- 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 = """
+    <style>
+        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;
+        padding-left: 10px;
+        }
+        a {
+            color: -apple-system-control-accent;
+        }
+        @media (prefers-color-scheme: dark) {
+            body {
+                color: #fff;
+                background-color: rgb(47,47,47);   
+            }
+            
+        }
+    </style>
+    """
+            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("<a href=", "<a target='_blank' href=")
+            self.web_view.SetPage(html_code, "")
+            self.web_view.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self._onWebviewNav)
+            self.web_view.EnableContextMenu(False)
+            self.close_button = wx.Button(panel, label="Ignore")
+            self.close_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(wx.ID_CANCEL))
+            self.view_button = wx.Button(panel, ID_GITHUB, label="View on GitHub")
+            self.view_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_GITHUB))
+            self.install_button = wx.Button(panel, label="Download and Install")
+            self.install_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_UPDATE))
+            self.install_button.SetDefault()
+
+            buttonsizer = wx.BoxSizer(wx.HORIZONTAL)
+            buttonsizer.Add(self.close_button, 0, wx.ALIGN_CENTRE | wx.RIGHT, 5)
+            buttonsizer.Add(self.view_button, 0, wx.ALIGN_CENTRE | wx.LEFT|wx.RIGHT, 5)
+            buttonsizer.Add(self.install_button, 0, wx.ALIGN_CENTRE | wx.LEFT, 5)
+            sizer = wx.BoxSizer(wx.VERTICAL)
+            sizer.Add(self.title_text, 0, wx.ALIGN_CENTRE | wx.TOP, 20)
+            sizer.Add(self.description, 0, wx.ALIGN_CENTRE | wx.BOTTOM, 20)
+            sizer.Add(self.web_view, 1, wx.EXPAND | wx.LEFT|wx.RIGHT, 10)
+            sizer.Add(buttonsizer, 0, wx.ALIGN_RIGHT | wx.ALL, 20)
+            panel.SetSizer(sizer)
+            frame.Centre()
+
+            result = frame.ShowModal()
+            
+
+            if result == ID_GITHUB:
                webbrowser.open(dict["Github Link"])
+            elif result == ID_UPDATE:
+                gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.UPDATE_APP)
+
+    
            return

        if utilities.check_seal() is True:
@@ -127,6 +197,9 @@ class AutomaticSysPatch:
        if self._determine_if_versions_match():
            self._determine_if_boot_matches()

+    def _onWebviewNav(self, event):
+        url = event.GetURL()
+        webbrowser.open(url)

    def _determine_if_versions_match(self):
        """
--- a/resources/wx_gui/gui_download.py
+++ b/resources/wx_gui/gui_download.py
@@ -50,7 +50,7 @@ class DownloadFrame(wx.Frame):
        title_label.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD))
        title_label.Centre(wx.HORIZONTAL)

-        progress_bar = wx.Gauge(frame, range=100, pos=(-1, title_label.GetPosition()[1] + title_label.GetSize()[1] + 5), size=(300, 20))
+        progress_bar = wx.Gauge(frame, range=100, pos=(-1, title_label.GetPosition()[1] + title_label.GetSize()[1] + 5), size=(300, 20), style=wx.GA_SMOOTH|wx.GA_PROGRESS)
        progress_bar.Centre(wx.HORIZONTAL)

        label_amount = wx.StaticText(frame, label="Preparing download", pos=(-1, progress_bar.GetPosition()[1] + progress_bar.GetSize()[1]))
@@ -68,7 +68,9 @@ class DownloadFrame(wx.Frame):
        self.download_obj.download()
        while self.download_obj.is_active():
            
-            percentage: int = self.download_obj.get_percent()
+            percentage: int = round(self.download_obj.get_percent())
+            if percentage == 0:
+                percentage = 1

            if percentage == -1:
                amount_str = f"{utilities.human_fmt(self.download_obj.downloaded_file_size)} downloaded ({utilities.human_fmt(self.download_obj.get_speed())}/s)"
--- a/resources/wx_gui/gui_main_menu.py
+++ b/resources/wx_gui/gui_main_menu.py
@@ -1,5 +1,10 @@
 # Generate GUI for main menu
+# Portions of this file Copyright (c) 2023 Jazzzny
+
 import wx
+import wx.html2
+import markdown2
+import requests
 import sys
 import logging
 import threading
@@ -271,7 +276,7 @@ class MainFrame(wx.Frame):
    def _check_for_updates(self):
        if self.constants.has_checked_updates is True:
            return
-
+        
        ignore_updates = global_settings.GlobalEnviromentSettings().read_property("IgnoreAppUpdates")
        if ignore_updates is True:
            self.constants.ignore_updates = True
@@ -285,20 +290,8 @@ class MainFrame(wx.Frame):

        version = dict["Version"]
        logging.info(f"New version: {version}")
-        dialog = wx.MessageDialog(
-            parent=self,
-            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", "Ignore", "View on Github")
-        response = dialog.ShowModal()
-
-        if response == wx.ID_YES:
-            wx.CallAfter(self.on_update, dict["Link"], version)
-        elif response == wx.ID_CANCEL:
-            webbrowser.open(dict["Github Link"])
-
+        
+        wx.CallAfter(self.on_update, dict["Link"], version, dict["Github Link"])

    def on_build_and_install(self, event: wx.Event = None):
        self.Hide()
@@ -345,12 +338,90 @@ class MainFrame(wx.Frame):
            screen_location=self.GetPosition()
        )

-    def on_update(self, oclp_url: str, oclp_version: str):
-        gui_update.UpdateFrame(
+    def on_update(self, oclp_url: str, oclp_version: str, oclp_github_url: str):
+
+        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 = """
+<style>
+    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);   
+        }
+        
+    }
+</style>
+"""
+        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("<a href=", "<a target='_blank' href=")
+        self.web_view.SetPage(html_code, "")
+        self.web_view.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self._onWebviewNav)
+        self.web_view.EnableContextMenu(False)
+        self.close_button = wx.Button(panel, label="Dismiss")
+        self.close_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(wx.ID_CANCEL))
+        self.view_button = wx.Button(panel, ID_GITHUB, label="View on GitHub")
+        self.view_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_GITHUB))
+        self.install_button = wx.Button(panel, label="Download and Install")
+        self.install_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_UPDATE))
+        self.install_button.SetDefault()
+
+        buttonsizer = wx.BoxSizer(wx.HORIZONTAL)
+        buttonsizer.Add(self.close_button, 0, wx.ALIGN_CENTRE | wx.RIGHT, 5)
+        buttonsizer.Add(self.view_button, 0, wx.ALIGN_CENTRE | wx.LEFT|wx.RIGHT, 5)
+        buttonsizer.Add(self.install_button, 0, wx.ALIGN_CENTRE | wx.LEFT, 5)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.title_text, 0, wx.ALIGN_CENTRE | wx.TOP, 20)
+        sizer.Add(self.description, 0, wx.ALIGN_CENTRE | wx.BOTTOM, 20)
+        sizer.Add(self.web_view, 1, wx.EXPAND | wx.LEFT|wx.RIGHT, 10)
+        sizer.Add(buttonsizer, 0, wx.ALIGN_RIGHT | wx.ALL, 20)
+        panel.SetSizer(sizer)
+        frame.Centre()
+
+        result = frame.ShowModal()
+        
+
+        if result == ID_GITHUB:
+            webbrowser.open(oclp_github_url)
+        elif result == ID_UPDATE:
+            gui_update.UpdateFrame(
            parent=self,
            title=self.title,
            global_constants=self.constants,
            screen_location=self.GetPosition(),
            url=oclp_url,
            version_label=oclp_version
-        )
+        )
+
+    def _onWebviewNav(self, event):
+        url = event.GetURL()
+        webbrowser.open(url)