mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-07 06:32:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: rename BigConfirmationDialogV2 (#37578)

Browse Source 
* ui: rename BigConfirmationDialogV2

* clean up
This commit is contained in:
Shane Smiskol
2026-03-06 17:33:50 -08:00
committed by GitHub
parent ac1dd692af
commit 4651bc6a1f
8 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/mici/layouts/onboarding.py
+8 -8
View File
@@ -15,7 +15,7 @@ from openpilot.system.ui.lib.multilang import tr
from openpilot.system.version import terms_version, training_version
from openpilot.selfdrive.ui.ui_state import ui_state, device
from openpilot.selfdrive.ui.mici.widgets.button import BigCircleButton
from openpilot.selfdrive.ui.mici.widgets.dialog import BigConfirmationDialogV2
from openpilot.selfdrive.ui.mici.widgets.dialog import BigConfirmationDialog
from openpilot.selfdrive.ui.mici.onroad.driver_state import DriverStateRenderer
from openpilot.selfdrive.ui.mici.onroad.driver_camera_dialog import BaseDriverCameraDialog
@@ -220,15 +220,15 @@ class TrainingGuideRecordFront(NavScroller):
ui_state.params.put_bool_nonblocking("RecordFront", True)
continue_callback()
gui_app.push_widget(BigConfirmationDialogV2("allow data uploading", "icons_mici/setup/driver_monitoring/dm_check.png", exit_on_confirm=False,
confirm_callback=on_accept))
gui_app.push_widget(BigConfirmationDialog("allow data uploading", "icons_mici/setup/driver_monitoring/dm_check.png", exit_on_confirm=False,
confirm_callback=on_accept))
def show_decline_dialog():
def on_decline():
ui_state.params.put_bool_nonblocking("RecordFront", False)
continue_callback()
gui_app.push_widget(BigConfirmationDialogV2("no, don't upload", "icons_mici/setup/cancel.png", exit_on_confirm=False, confirm_callback=on_decline))
gui_app.push_widget(BigConfirmationDialog("no, don't upload", "icons_mici/setup/cancel.png", exit_on_confirm=False, confirm_callback=on_decline))
self._accept_button = BigCircleButton("icons_mici/setup/driver_monitoring/dm_check.png")
self._accept_button.set_click_callback(show_accept_dialog)
@@ -324,12 +324,12 @@ class TermsPage(Scroller):
super().__init__()
def show_accept_dialog():
gui_app.push_widget(BigConfirmationDialogV2("accept\nterms", "icons_mici/setup/driver_monitoring/dm_check.png",
confirm_callback=on_accept))
gui_app.push_widget(BigConfirmationDialog("accept\nterms", "icons_mici/setup/driver_monitoring/dm_check.png",
confirm_callback=on_accept))
def show_decline_dialog():
gui_app.push_widget(BigConfirmationDialogV2("decline &\nuninstall", "icons_mici/setup/cancel.png",
red=True, exit_on_confirm=False, confirm_callback=on_decline))
gui_app.push_widget(BigConfirmationDialog("decline &\nuninstall", "icons_mici/setup/cancel.png",
red=True, exit_on_confirm=False, confirm_callback=on_decline))
self._accept_button = BigCircleButton("icons_mici/setup/driver_monitoring/dm_check.png")
self._accept_button.set_click_callback(show_accept_dialog)
selfdrive/ui/mici/layouts/settings/device.py
+4 -4
View File
@@ -9,7 +9,7 @@ from openpilot.common.params import Params
from openpilot.common.time_helpers import system_time_valid
from openpilot.system.ui.widgets.scroller import NavRawScrollPanel, NavScroller
from openpilot.selfdrive.ui.mici.widgets.button import BigButton, BigCircleButton
from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigConfirmationDialogV2
from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigConfirmationDialog
from openpilot.selfdrive.ui.mici.widgets.pairing_dialog import PairingDialog
from openpilot.selfdrive.ui.mici.onroad.driver_camera_dialog import DriverCameraDialog
from openpilot.selfdrive.ui.mici.layouts.onboarding import TrainingGuide, TermsPage
@@ -85,9 +85,9 @@ def _engaged_confirmation_callback(callback: Callable, action_text: str):
# TODO: check
icon = "icons_mici/settings/comma_icon.png"
dlg: BigConfirmationDialogV2 | BigDialog = BigConfirmationDialogV2(f"slide to\n{action_text.lower()}", icon, red=red,
exit_on_confirm=action_text == "reset",
confirm_callback=confirm_callback)
dlg: BigConfirmationDialog | BigDialog = BigConfirmationDialog(f"slide to\n{action_text.lower()}", icon, red=red,
exit_on_confirm=action_text == "reset",
confirm_callback=confirm_callback)
gui_app.push_widget(dlg)
else:
dlg = BigDialog(f"Disengage to {action_text}", "")
selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
+3 -5
View File
@@ -4,7 +4,7 @@ import pyray as rl
from collections.abc import Callable
from openpilot.common.swaglog import cloudlog
from openpilot.selfdrive.ui.mici.widgets.dialog import BigInputDialog, BigConfirmationDialogV2
from openpilot.selfdrive.ui.mici.widgets.dialog import BigInputDialog, BigConfirmationDialog
from openpilot.selfdrive.ui.mici.widgets.button import BigButton, LABEL_COLOR
from openpilot.system.ui.lib.application import gui_app, MousePos, FontWeight
from openpilot.system.ui.widgets import Widget
@@ -246,8 +246,8 @@ class ForgetButton(Widget):
def _handle_mouse_release(self, mouse_pos: MousePos):
super()._handle_mouse_release(mouse_pos)
dlg = BigConfirmationDialogV2("slide to forget", "icons_mici/settings/network/new/trash.png", red=True,
confirm_callback=self._forget_network)
dlg = BigConfirmationDialog("slide to forget", "icons_mici/settings/network/new/trash.png", red=True,
confirm_callback=self._forget_network)
gui_app.push_widget(dlg)
def _render(self, _):
@@ -390,5 +390,3 @@ class WifiUIMici(NavScroller):
super()._update_state()
self._move_network_to_front(self._wifi_manager.wifi_state.ssid)
selfdrive/ui/mici/tests/test_widget_leaks.py
+3 -3
View File
@@ -10,7 +10,7 @@ from openpilot.system.ui.widgets import Widget
from openpilot.selfdrive.ui.mici.layouts.onboarding import TrainingGuide as MiciTrainingGuide, OnboardingWindow as MiciOnboardingWindow
from openpilot.selfdrive.ui.mici.onroad.driver_camera_dialog import DriverCameraDialog as MiciDriverCameraDialog
from openpilot.selfdrive.ui.mici.widgets.pairing_dialog import PairingDialog as MiciPairingDialog
from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigConfirmationDialogV2, BigInputDialog
from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigConfirmationDialog, BigInputDialog
from openpilot.selfdrive.ui.mici.layouts.settings.device import MiciFccModal
# tici dialogs
@@ -44,7 +44,7 @@ KNOWN_LEAKS = {
"openpilot.system.ui.widgets.scroller_tici.Scroller",
"openpilot.system.ui.widgets.label.UnifiedLabel",
"openpilot.system.ui.widgets.mici_keyboard.MiciKeyboard",
"openpilot.selfdrive.ui.mici.widgets.dialog.BigConfirmationDialogV2",
"openpilot.selfdrive.ui.mici.widgets.dialog.BigConfirmationDialog",
"openpilot.system.ui.widgets.keyboard.Keyboard",
"openpilot.system.ui.widgets.slider.BigSlider",
"openpilot.selfdrive.ui.mici.widgets.dialog.BigInputDialog",
@@ -72,7 +72,7 @@ def test_dialogs_do_not_leak():
lambda: MiciTrainingGuide(lambda: None),
lambda: MiciOnboardingWindow(lambda: None),
lambda: BigDialog("test", "test"),
lambda: BigConfirmationDialogV2("test", "icons_mici/settings/network/new/trash.png"),
lambda: BigConfirmationDialog("test", "icons_mici/settings/network/new/trash.png"),
lambda: BigInputDialog("test"),
lambda: MiciFccModal(text="test"),
# tici
selfdrive/ui/mici/widgets/dialog.py
+1 -1
View File
@@ -63,7 +63,7 @@ class BigDialog(BigDialogBase):
alignment=rl.GuiTextAlignment.TEXT_ALIGN_CENTER)
class BigConfirmationDialogV2(BigDialogBase):
class BigConfirmationDialog(BigDialogBase):
def __init__(self, title: str, icon: str, red: bool = False,
exit_on_confirm: bool = True,
confirm_callback: Callable | None = None):
system/ui/mici_reset.py
+7 -7
View File
@@ -11,7 +11,7 @@ from openpilot.system.ui.lib.application import gui_app
from openpilot.system.ui.widgets.scroller import Scroller
from openpilot.system.ui.widgets.nav_widget import NavWidget
from openpilot.system.ui.mici_setup import GreyBigButton, FailedPage
from openpilot.selfdrive.ui.mici.widgets.dialog import BigConfirmationDialogV2
from openpilot.selfdrive.ui.mici.widgets.dialog import BigConfirmationDialog
from openpilot.selfdrive.ui.mici.widgets.button import BigCircleButton
USERDATA = "/dev/disk/by-partlabel/userdata"
@@ -71,18 +71,18 @@ class Reset(Scroller):
self._reset_failed_page = ResetFailedPage()
def show_confirm_dialog():
dialog = BigConfirmationDialogV2("erase\ndevice", "icons_mici/settings/device/uninstall.png", red=True,
confirm_callback=self.start_reset)
dialog = BigConfirmationDialog("erase\ndevice", "icons_mici/settings/device/uninstall.png", red=True,
confirm_callback=self.start_reset)
gui_app.push_widget(dialog)
def show_cancel_dialog():
dialog = BigConfirmationDialogV2("normal\nstartup", "icons_mici/settings/device/reboot.png",
exit_on_confirm=False, confirm_callback=gui_app.request_close)
dialog = BigConfirmationDialog("normal\nstartup", "icons_mici/settings/device/reboot.png",
exit_on_confirm=False, confirm_callback=gui_app.request_close)
gui_app.push_widget(dialog)
def show_reboot_dialog():
dialog = BigConfirmationDialogV2("reboot\ndevice", "icons_mici/settings/device/reboot.png",
exit_on_confirm=False, confirm_callback=HARDWARE.reboot)
dialog = BigConfirmationDialog("reboot\ndevice", "icons_mici/settings/device/reboot.png",
exit_on_confirm=False, confirm_callback=HARDWARE.reboot)
gui_app.push_widget(dialog)
self._reset_button = BigCircleButton("icons_mici/settings/device/uninstall.png", red=True)
system/ui/mici_setup.py
+3 -3
View File
@@ -28,7 +28,7 @@ from openpilot.system.ui.widgets.scroller import Scroller, NavScroller, ITEM_SPA
from openpilot.system.ui.widgets.slider import LargerSlider
from openpilot.selfdrive.ui.mici.layouts.settings.network import WifiNetworkButton
from openpilot.selfdrive.ui.mici.layouts.settings.network.wifi_ui import WifiUIMici
from openpilot.selfdrive.ui.mici.widgets.dialog import BigInputDialog, BigConfirmationDialogV2
from openpilot.selfdrive.ui.mici.widgets.dialog import BigInputDialog, BigConfirmationDialog
from openpilot.selfdrive.ui.mici.widgets.button import BigCircleButton, BigButton
NetworkType = log.DeviceState.NetworkType
@@ -248,8 +248,8 @@ class FailedPage(NavScroller):
self.set_back_callback(retry_callback)
def show_reboot_dialog():
dialog = BigConfirmationDialogV2("slide to reboot", "icons_mici/settings/device/reboot.png",
exit_on_confirm=False, confirm_callback=HARDWARE.reboot)
dialog = BigConfirmationDialog("slide to reboot", "icons_mici/settings/device/reboot.png",
exit_on_confirm=False, confirm_callback=HARDWARE.reboot)
gui_app.push_widget(dialog)
reboot_button = BigCircleButton("icons_mici/settings/device/reboot.png", red=False, icon_size=(64, 70))
system/ui/widgets/slider.py
+1 -1
View File
@@ -13,7 +13,7 @@ class SmallSlider(Widget):
CONFIRM_DELAY = 0.2
def __init__(self, title: str, confirm_callback: Callable | None = None):
# TODO: unify this with BigConfirmationDialogV2
# TODO: unify this with BigConfirmationDialog
super().__init__()
self._confirm_callback = confirm_callback