timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-04-24 03:50:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

GUI Update: Add alternative pulse for non-Metal

Browse Source
This commit is contained in:
Mykola Grymalyuk
2023-05-22 13:46:15 -06:00
parent 3132b0dcb7
commit ab9208da58
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -24,6 +24,7 @@
- Resolves cryptexd and sshd crashes - Resolves cryptexd and sshd crashes
- Resolves screen recording regression - Resolves screen recording regression
- Resolves Photo Booth on macOS Monterey and later - Resolves Photo Booth on macOS Monterey and later
- May require tccplus for permissions
- Resolve Application alias not being created with AutoPatcher - Resolve Application alias not being created with AutoPatcher
- Backend changes: - Backend changes:
- Rename OCLP-Helper to OpenCore-Patcher - Rename OCLP-Helper to OpenCore-Patcher

11
resources/wx_gui/gui_update.py
View File

@@ -71,8 +71,12 @@ class UpdateFrame(wx.Frame):
# Progress bar # Progress bar
progress_bar = wx.Gauge(self.frame, range=100, pos=(10, 50), size=(300, 20)) progress_bar = wx.Gauge(self.frame, range=100, pos=(10, 50), size=(300, 20))
progress_bar.Centre(wx.HORIZONTAL) progress_bar.Centre(wx.HORIZONTAL)
progress_bar.Pulse()
progress_bar_animation = gui_support.GaugePulseCallback(self.constants, progress_bar)
progress_bar_animation.start_pulse()
self.progress_bar = progress_bar self.progress_bar = progress_bar
self.progress_bar_animation = progress_bar_animation
self.frame.Centre() self.frame.Centre()
self.frame.Show() self.frame.Show()
@@ -89,6 +93,7 @@ class UpdateFrame(wx.Frame):
) )
if download_obj.download_complete is False: if download_obj.download_complete is False:
progress_bar_animation.stop_pulse()
progress_bar.SetValue(0) progress_bar.SetValue(0)
wx.MessageBox("Failed to download update. If you continue to have this issue, please manually download OpenCore Legacy Patcher off Github", "Critical Error!", wx.OK | wx.ICON_ERROR) wx.MessageBox("Failed to download update. If you continue to have this issue, please manually download OpenCore Legacy Patcher off Github", "Critical Error!", wx.OK | wx.ICON_ERROR)
sys.exit(1) sys.exit(1)
@@ -120,6 +125,7 @@ class UpdateFrame(wx.Frame):
# Progress bar # Progress bar
progress_bar.Hide() progress_bar.Hide()
progress_bar_animation.stop_pulse()
# Label: 0.6.6 has been installed to: # Label: 0.6.6 has been installed to:
installed_label = wx.StaticText(self.frame, label=f"{version_label} has been installed:", pos=(-1, progress_bar.GetPosition().y - 15)) installed_label = wx.StaticText(self.frame, label=f"{version_label} has been installed:", pos=(-1, progress_bar.GetPosition().y - 15))
@@ -174,6 +180,7 @@ class UpdateFrame(wx.Frame):
["ditto", "-xk", str(self.constants.payload_path / "OpenCore-Patcher-GUI.app.zip"), str(self.constants.payload_path)], capture_output=True ["ditto", "-xk", str(self.constants.payload_path / "OpenCore-Patcher-GUI.app.zip"), str(self.constants.payload_path)], capture_output=True
) )
if result.returncode != 0: if result.returncode != 0:
wx.CallAfter(self.progress_bar_animation.stop_pulse)
wx.CallAfter(self.progress_bar.SetValue, 0) wx.CallAfter(self.progress_bar.SetValue, 0)
wx.CallAfter(wx.MessageBox, f"Failed to extract update. Error: {result.stderr.decode('utf-8')}", "Critical Error!", wx.OK | wx.ICON_ERROR) wx.CallAfter(wx.MessageBox, f"Failed to extract update. Error: {result.stderr.decode('utf-8')}", "Critical Error!", wx.OK | wx.ICON_ERROR)
wx.CallAfter(sys.exit, 1) wx.CallAfter(sys.exit, 1)
@@ -183,6 +190,7 @@ class UpdateFrame(wx.Frame):
break break
if i == 1: if i == 1:
wx.CallAfter(self.progress_bar_animation.stop_pulse)
wx.CallAfter(self.progress_bar.SetValue, 0) wx.CallAfter(self.progress_bar.SetValue, 0)
wx.CallAfter(wx.MessageBox, "Failed to extract update. Error: Update file does not exist", "Critical Error!", wx.OK | wx.ICON_ERROR) wx.CallAfter(wx.MessageBox, "Failed to extract update. Error: Update file does not exist", "Critical Error!", wx.OK | wx.ICON_ERROR)
wx.CallAfter(sys.exit, 1) wx.CallAfter(sys.exit, 1)
@@ -240,6 +248,7 @@ EOF
args = [self.constants.oclp_helper_path, "/bin/sh", str(self.constants.payload_path / "update.sh")] args = [self.constants.oclp_helper_path, "/bin/sh", str(self.constants.payload_path / "update.sh")]
result = subprocess.run(args, capture_output=True) result = subprocess.run(args, capture_output=True)
if result.returncode != 0: if result.returncode != 0:
wx.CallAfter(self.progress_bar_animation.stop_pulse)
wx.CallAfter(self.progress_bar.SetValue, 0) wx.CallAfter(self.progress_bar.SetValue, 0)
if "User cancelled" in result.stderr.decode("utf-8"): if "User cancelled" in result.stderr.decode("utf-8"):
wx.CallAfter(wx.MessageBox, "User cancelled update", "Update Cancelled", wx.OK | wx.ICON_INFORMATION) wx.CallAfter(wx.MessageBox, "User cancelled update", "Update Cancelled", wx.OK | wx.ICON_INFORMATION)