timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-06-19 22:00:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix up

Browse Source
This commit is contained in:
Jazzzny
2023-10-04 17:12:51 -04:00
parent 04a2e55d24
commit 526594a90d
2 changed files with 106 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/wx_gui/gui_main_menu.py
+21 -13
View File
@@ -1,4 +1,6 @@
# Generate GUI for main menu
# Portions of this file Copyright (c) 2023 Jazzzny
import wx
import wx.html2
import markdown2
@@ -338,6 +340,9 @@ class MainFrame(wx.Frame):
def on_update(self, oclp_url: str, oclp_version: str, oclp_github_url: str):
ID_GITHUB = wx.NewId()
ID_UPDATE = wx.NewId()
url = f"https://raw.githubusercontent.com/dortania/OpenCore-Legacy-Patcher/{oclp_version}/CHANGELOG.md"
response = requests.get(url)
changelog = response.text.split(f"## {self.constants.patcher_version}\n")[0]
@@ -368,7 +373,7 @@ class MainFrame(wx.Frame):
}
</style>
"""
frame = wx.Frame(None, -1, title="", size=(600, 400))
frame = wx.Dialog(None, -1, title="", size=(600, 400))
frame.SetMinSize((600, 400))
frame.SetWindowStyle(wx.STAY_ON_TOP)
panel = wx.Panel(frame)
@@ -384,11 +389,11 @@ class MainFrame(wx.Frame):
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.Close())
self.view_button = wx.Button(panel, label="View on GitHub")
self.view_button.Bind(wx.EVT_BUTTON, lambda event: (webbrowser.open(oclp_github_url), frame.Close()))
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: self._onUpdateChosen(frame, oclp_url, oclp_version))
self.install_button.Bind(wx.EVT_BUTTON, lambda event: frame.EndModal(ID_UPDATE))
self.install_button.SetDefault()
buttonsizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -401,20 +406,23 @@ class MainFrame(wx.Frame):
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.Show()
frame.Centre()
def _onWebviewNav(self, event):
url = event.GetURL()
webbrowser.open(url)
result = frame.ShowModal()
def _onUpdateChosen(self, frame, oclp_url, oclp_version):
frame.Close()
gui_update.UpdateFrame(
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)