GUI: Fix sys_patch spacing

This commit is contained in:
Mykola Grymalyuk
2023-05-08 17:52:08 -06:00
parent 324d7362c7
commit 2a002d8e82
3 changed files with 11 additions and 12 deletions
+3 -4
View File
@@ -155,8 +155,8 @@ class DetectRootPatch:
device_probe.AMD.Archs.Polaris,
]:
if self.constants.detected_os > os_data.os_data.monterey:
# if self.constants.computer.rosetta_active is True:
# continue
if self.constants.computer.rosetta_active is True:
continue
if gpu.arch == device_probe.AMD.Archs.Polaris:
# Check if host supports AVX2.0
@@ -201,8 +201,7 @@ class DetectRootPatch:
self.amfi_shim_bins = True
self.legacy_keyboard_backlight = self._check_legacy_keyboard_backlight()
self.requires_root_kc = True
# elif gpu.arch == device_probe.Intel.Archs.Ivy_Bridge:
if True:
elif gpu.arch == device_probe.Intel.Archs.Ivy_Bridge:
if self.constants.detected_os > os_data.os_data.big_sur:
self.ivy_gpu = True
if self.constants.detected_os >= os_data.os_data.ventura:
+4 -4
View File
@@ -80,7 +80,7 @@ class InstallOCFrame(wx.Frame):
self.progress_bar.Hide()
# Create wxDialog for disk selection
dialog = wx.Dialog(self, title=self.title, size=(370, -1))
dialog = wx.Dialog(self, title=self.title, size=(380, -1))
# Title label: Install OpenCore
title_label = wx.StaticText(dialog, label="Install OpenCore", pos=(-1,5))
@@ -146,7 +146,7 @@ class InstallOCFrame(wx.Frame):
return_button.Bind(wx.EVT_BUTTON, self.on_return_to_main_menu)
# Set size
dialog.SetSize((370, return_button.GetPosition()[1] + return_button.GetSize()[1] + 40))
dialog.SetSize((-1, return_button.GetPosition()[1] + return_button.GetSize()[1] + 40))
dialog.ShowWindowModal()
self.dialog = dialog
@@ -163,7 +163,7 @@ class InstallOCFrame(wx.Frame):
self,
title=f"Volumes on {disk}",
style=wx.CAPTION | wx.CLOSE_BOX,
size=(370, 300)
size=(300, 300)
)
# Add text: "Volumes on {disk}"
@@ -189,7 +189,7 @@ class InstallOCFrame(wx.Frame):
return_button.Bind(wx.EVT_BUTTON, self.on_return_to_main_menu)
# Set size
dialog.SetSize((370, return_button.GetPosition()[1] + return_button.GetSize()[1] + 40))
dialog.SetSize((-1, return_button.GetPosition()[1] + return_button.GetSize()[1] + 40))
# Show dialog
dialog.ShowWindowModal()
+4 -4
View File
@@ -172,12 +172,12 @@ class SysPatchMenu(wx.Frame):
if (not patch.startswith("Settings") and not patch.startswith("Validation") and patches[patch] is True):
i = i + 20
logging.info(f"- Adding patch: {patch} - {patches[patch]}")
patch_label = wx.StaticText(frame, label=f"- {patch}", pos=(available_label.GetPosition()[0], available_label.GetPosition()[1] + i))
patch_label = wx.StaticText(frame, label=f"- {patch}", pos=(available_label.GetPosition()[0] + 20, available_label.GetPosition()[1] + i))
patch_label.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
if patches["Validation: Patching Possible"] is False:
# Cannot patch due to the following reasons:
patch_label = wx.StaticText(frame, label="Cannot patch due to the following reasons:", pos=(-1, patch_label.GetPosition().y + i - 10))
patch_label = wx.StaticText(frame, label="Cannot patch due to the following reasons:", pos=(-1, patch_label.GetPosition().y + 25))
patch_label.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont"))
patch_label.Center(wx.HORIZONTAL)
@@ -198,7 +198,7 @@ class SysPatchMenu(wx.Frame):
patch_text = f"{self.constants.computer.oclp_sys_version}, {date}"
patch_label = wx.StaticText(frame, label="Root Volume last patched:", pos=(-1, patch_label.GetPosition().y + i + 20))
patch_label = wx.StaticText(frame, label="Root Volume last patched:", pos=(-1, patch_label.GetPosition().y + 25))
patch_label.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont"))
patch_label.Center(wx.HORIZONTAL)
@@ -208,7 +208,7 @@ class SysPatchMenu(wx.Frame):
# Button: Start Root Patching
start_button = wx.Button(frame, label="Start Root Patching", pos=(10, patch_label.GetPosition().y + 30), size=(170, 30))
start_button = wx.Button(frame, label="Start Root Patching", pos=(10, patch_label.GetPosition().y + 25), size=(170, 30))
start_button.Bind(wx.EVT_BUTTON, lambda event: self.start_root_patching(frame, patches, no_new_patches))
start_button.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
start_button.Center(wx.HORIZONTAL)