Merge remote-tracking branch 'origin/master' into ui_remove_qt_spinner_text

system/ui/text.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import re
 import pyray as rl
-from openpilot.system.hardware import HARDWARE
+from openpilot.system.hardware import HARDWARE, PC
 from openpilot.system.ui.lib.button import gui_button, ButtonStyle
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
 from openpilot.system.ui.lib.wrapper import Wrapper
@@ -59,9 +59,12 @@ class TextWindowRenderer:
     rl.end_scissor_mode()
 
     button_bounds = rl.Rectangle(gui_app.width - MARGIN - BUTTON_SIZE.x, gui_app.height - MARGIN - BUTTON_SIZE.y, BUTTON_SIZE.x, BUTTON_SIZE.y)
-    ret = gui_button(button_bounds, "Reboot", button_style=ButtonStyle.TRANSPARENT)
+    ret = gui_button(button_bounds, "Exit" if PC else "Reboot", button_style=ButtonStyle.TRANSPARENT)
     if ret:
-      HARDWARE.reboot()
+      if PC:
+        gui_app.close()
+      else:
+        HARDWARE.reboot()
     return ret