Skip to content

xcsoar-menu/openvario.xci: Fix QuickMenu slot conflicts with XCSoar default.xci#407

Merged
linuxianer99 merged 1 commit intoOpenvario:masterfrom
lordfolken:fix/openvario-xci-quickmenu-conflicts
Mar 15, 2026
Merged

xcsoar-menu/openvario.xci: Fix QuickMenu slot conflicts with XCSoar default.xci#407
linuxianer99 merged 1 commit intoOpenvario:masterfrom
lordfolken:fix/openvario-xci-quickmenu-conflicts

Conversation

@lordfolken
Copy link
Copy Markdown
Contributor

Summary

XCSoar's default.xci has expanded its RemoteStick QuickMenu layout significantly (locations 1-41), causing the OpenVario overlay to silently clobber useful default buttons.

This PR fixes three conflicts:

  • Remove ULDR gesture: already defined in default.xci since the QuickMenu gesture was upstreamed — the overlay copy is redundant
  • Move Vario from location=13 → 18: location 13 is now the Task manager button; location 18 (MacCready) is a natural fit since MC+/MC- are accessible inside the Vario_menu submenu anyway
  • Move Quit from location=31 → 63: location 31 is now the Status button; location 63 is safely beyond the default range (1-41)
  • Add Reboot (61) and Shutdown (62) buttons for OpenVario system control, also in the safe range

Before (conflicts)

Location default.xci openvario.xci (overrides)
13 Task Vario (clobbers Task)
31 Status Quit (clobbers Status)

After (no conflicts)

Location default.xci openvario.xci
13 Task (untouched)
18 MacCready Vario (MC still accessible inside Vario_menu)
31 Status (untouched)
61 (free) Reboot
62 (free) Shutdown
63 (free) Quit

Fixes #406

Test plan

  • Verify QuickMenu shows Vario button near the center (location 18)
  • Verify Task (13) and Status (31) buttons are no longer overridden
  • Verify Reboot/Shutdown/Quit appear at the end of the QuickMenu
  • Verify Vario_menu sub-mode still works (volume, STF/vario, MC+/MC-)
  • Verify V/S/M key bindings still function in default mode

…efault.xci

XCSoar's default.xci has expanded its RemoteStick QuickMenu layout
significantly (locations 1-41), causing conflicts with this overlay:

- Remove ULDR gesture: already defined in default.xci since the
  QuickMenu gesture was upstreamed
- Move Vario from location=13 to location=18: location 13 is now
  the Task manager button in default.xci; location 18 (MacCready)
  is a natural fit since MC+/MC- are accessible inside Vario_menu
- Move Quit from location=31 to location=63: location 31 is now
  the Status button in default.xci; location 63 is safely beyond
  the default range
- Add Reboot (61) and Shutdown (62) buttons for OpenVario system
  control

Fixes Openvario#406
@linuxianer99
Copy link
Copy Markdown
Member

@lordfolken Should we also bring this in the new scarthgap branch ??

@lordfolken
Copy link
Copy Markdown
Contributor Author

@linuxianer99 yes please.

@linuxianer99 linuxianer99 merged commit 8af5ddb into Openvario:master Mar 15, 2026
0 of 3 checks passed
@linuxianer99
Copy link
Copy Markdown
Member

linuxianer99 commented Mar 15, 2026

Done in b6cb875

@lordfolken lordfolken deleted the fix/openvario-xci-quickmenu-conflicts branch March 16, 2026 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

No "Task manager(Task)" in "Quick menu", when using the latest XCsoar master

2 participants