From 6faff5d52a14778810a0a4ea3a7382111db3f74e Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Thu, 18 May 2023 20:48:49 -0600 Subject: [PATCH] GUI: Misc adjustments --- resources/wx_gui/gui_install_oc.py | 5 +++-- resources/wx_gui/gui_settings.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/wx_gui/gui_install_oc.py b/resources/wx_gui/gui_install_oc.py index 3ba1fbc04..6d0b38669 100644 --- a/resources/wx_gui/gui_install_oc.py +++ b/resources/wx_gui/gui_install_oc.py @@ -116,7 +116,8 @@ class InstallOCFrame(wx.Frame): # Add buttons for each disk if self.available_disks: - disk_root = self.constants.booted_oc_disk + # Only show booted disk if building for host + disk_root = self.constants.booted_oc_disk if self.constants.custom_model is None else None if disk_root: # disk6s1 -> disk6 disk_root = self.constants.booted_oc_disk.strip("disk") @@ -197,7 +198,7 @@ class InstallOCFrame(wx.Frame): disk_button = wx.Button(dialog, label=f"{partitions[partition]['partition']} - {partitions[partition]['name']} - {partitions[partition]['size']}", size=(longest_label,30), pos=(-1, text_label.GetPosition()[1] + text_label.GetSize()[1] + 5)) disk_button.Centre(wx.HORIZONTAL) disk_button.Bind(wx.EVT_BUTTON, lambda event, partition=partition: self._install_oc_process(partition)) - if partitions[partition]['partition'].startswith(f"{disk}s") or items == 1: + if items == 1 or self.constants.booted_oc_disk == partitions[partition]['partition']: disk_button.SetDefault() # Add button: Return to main menu diff --git a/resources/wx_gui/gui_settings.py b/resources/wx_gui/gui_settings.py index 06fbfcecc..a7ef5f53e 100644 --- a/resources/wx_gui/gui_settings.py +++ b/resources/wx_gui/gui_settings.py @@ -958,6 +958,7 @@ Booted Information: Booted OS: XNU {self.constants.detected_os} ({self.constants.detected_os_version}) Booted Patcher Version: {self.constants.computer.oclp_version} Booted OpenCore Version: {self.constants.computer.opencore_version} + Booted OpenCore Disk: {self.constants.booted_oc_disk} Hardware Information: {pprint.pformat(self.constants.computer, indent=4)}