diff --git a/resources/sys_patch/sys_patch_auto.py b/resources/sys_patch/sys_patch_auto.py index d6276de29..8817f0dd0 100644 --- a/resources/sys_patch/sys_patch_auto.py +++ b/resources/sys_patch/sys_patch_auto.py @@ -84,9 +84,9 @@ class AutomaticSysPatch: @media (prefers-color-scheme: dark) { body { color: #fff; - background-color: rgb(47,47,47); + background-color: rgb(47,47,47); } - + } """ @@ -97,7 +97,7 @@ class AutomaticSysPatch: 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.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {version} is now available - You have {self.constants.patcher_version}{'-nightly' if not self.constants.commit_info[0].startswith('refs/tags') else ''}. 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) @@ -126,14 +126,14 @@ class AutomaticSysPatch: 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: diff --git a/resources/wx_gui/gui_entry.py b/resources/wx_gui/gui_entry.py index f7d2764cf..070ca349f 100644 --- a/resources/wx_gui/gui_entry.py +++ b/resources/wx_gui/gui_entry.py @@ -58,7 +58,7 @@ class EntryPoint: self.frame: wx.Frame = entry( None, - title=f"{self.constants.patcher_name} ({self.constants.patcher_version})", + title=f"{self.constants.patcher_name} {self.constants.patcher_version}{'-nightly' if not self.constants.commit_info[0].startswith('refs/tags') else ''}", global_constants=self.constants, screen_location=None, **({"patches": patches} if "--gui_patch" in sys.argv or "--gui_unpatch" in sys.argv else {}) diff --git a/resources/wx_gui/gui_main_menu.py b/resources/wx_gui/gui_main_menu.py index d235bf69c..2c9a27ddc 100644 --- a/resources/wx_gui/gui_main_menu.py +++ b/resources/wx_gui/gui_main_menu.py @@ -70,7 +70,7 @@ class MainFrame(wx.Frame): """ # Title label: OpenCore Legacy Patcher v{X.Y.Z} - title_label = wx.StaticText(self, label=f"OpenCore Legacy Patcher {'' if self.constants.special_build else 'v'}{self.constants.patcher_version}", pos=(-1, 10)) + title_label = wx.StaticText(self, label=f"OpenCore Legacy Patcher {'' if self.constants.special_build else ''}{self.constants.patcher_version}{'-nightly' if not self.constants.commit_info[0].startswith('refs/tags') else ''}", pos=(-1, 10)) title_label.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD)) title_label.Centre(wx.HORIZONTAL) @@ -379,7 +379,7 @@ class MainFrame(wx.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.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {oclp_version} is now available - You have {self.constants.patcher_version}{'-nightly' if not self.constants.commit_info[0].startswith('refs/tags') else ''}. 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)