fix(dialog): label vehicle reboot prompt Reboot/Continue - #14976
Conversation
Ok was the highlighted action and rebooted the vehicle, so changing several reboot-required parameters (PWM protocol per timer, etc.) caused accidental reboots.
Build ResultsPlatform Status
All builds passed. Pre-commit
Pre-commit hooks: 2 passed, 75 failed, 7 skipped. Test Resultslinux-coverage-integration: 50 passed, 0 skipped Code CoverageCoverage: 70.4% No baseline available for comparison Artifact Sizes
Updated: 2026-08-27 18:41:54 UTC • Commit: 169e4c3 • Triggered by: Windows |
| title: dialogTitle, | ||
| text: dialogText + " " + qsTr("Click Reboot to reboot the vehicle now."), | ||
| buttons: Dialog.Ok | Dialog.Cancel, | ||
| acceptButtonText: qsTr("Reboot"), |
There was a problem hiding this comment.
Huh! I never thought of just doing that. I think it works...
There was a problem hiding this comment.
Oh, wait you modded the dialog code as well. I see.
fallenmi
left a comment
fallenmi
left a comment
There was a problem hiding this comment.
Reviewed exact head 169e4c3204284421eedc94dcc6d83f17978b9798.
The custom labels preserve the existing dialog semantics: the reboot prompt still uses Dialog.Ok | Dialog.Cancel, Reboot remains the accepted action, and Continue remains the rejected/dismiss action. The accepted path still null-checks the active vehicle before calling rebootVehicle(), while the Cancel role keeps Escape dismissal enabled.
Verification:
- A focused exact-source QML/JavaScript oracle passed on the submitted head and a conflict-free integration tree against live
master: custom labels, accept/reject routing, close behavior, and both active-vehicle/null-vehicle callback paths were exercised for 20 iterations across 10 repeated runs. git diff --checkpassed.- Exact-head CI reports 47 successful checks (plus one skipped documentation deploy), including 447 passing tests, Linux ASan+UBSan, platform builds, CodeQL, and grype.
No blocking issues found.
Disclosure: I used OpenAI Codex to assist with inspecting the exact diff, repository instructions and interaction history, checking CI, and constructing the focused oracle. I verified the evidence and own this review.
dakejahl
left a comment
dakejahl
left a comment
There was a problem hiding this comment.
What's the verdict @DonLakeFlyer ? Shall we merge it?
3 participants
Summary
Rename the vehicle-reboot-required dialog buttons from Ok/Cancel to Reboot/Continue.
Problem
Ok is the highlighted action and reboots the vehicle. Configuring several reboot-required parameters makes it easy to reboot after each change.
Solution
Keep the Ok/Cancel roles, override the labels to Reboot and Continue, and match the prompt text. Continue dismisses; Reboot still reboots.