From ea74c336c53550aa5d829bb16cb7f05d8a2c1f18 Mon Sep 17 00:00:00 2001 From: Alistair-Afton Date: Wed, 16 Sep 2026 06:09:04 +0200 Subject: [PATCH] gui/quickfort: change transform hotkeys to ,.[] In the game font, () is easily mistaken for <>, which made the displayed rotate keys look wrong. Use ,. for rotate and [] for flips, which are unambiguous. Update the stale transform_widgets test keys to match. Fixes DFHack/dfhack#5710 --- changelog.txt | 1 + docs/gui/quickfort.rst | 8 ++++---- gui/quickfort.lua | 8 ++++---- test/gui/quickfort.lua | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/changelog.txt b/changelog.txt index 1ed30ae501..d13996311a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -40,6 +40,7 @@ Template for new versions: ## Misc Improvements - `caravan`: the ``Bring goods to depot``, ``Trade``, and ``Assign items for display`` overlays now allow searching for items with non-ASCII characters in their description - `caravan`: the ``Trade`` overlay will use the trader's appraisal skill instead of the broker's to round/obfuscate the value of items +- `gui/quickfort`: transform hotkeys changed from ``()_=`` to ``,.[]`` since ``()`` is easily confused with ``<>`` in the game font ## Removed - `confirm`: removed the ``squad-disband`` and ``hotkey-reset`` confirmations; the game asks for both itself now ("Really disband?" and "Really overwrite") diff --git a/docs/gui/quickfort.rst b/docs/gui/quickfort.rst index d658ea30a5..ebaefc660d 100644 --- a/docs/gui/quickfort.rst +++ b/docs/gui/quickfort.rst @@ -44,10 +44,10 @@ filters, the id numbers in the list may not be contiguous. To rotate or flip the blueprint around, enable transformations with :kbd:`t` and use the following keys to add a transformation step: -:kbd:`(`: Rotate counterclockwise (ccw) -:kbd:`)`: Rotate clockwise (cw) -:kbd:`_`: Flip vertically (vflip) -:kbd:`=`: Flip horizontally (hflip) +:kbd:`,`: Rotate counterclockwise (ccw) +:kbd:`.`: Rotate clockwise (cw) +:kbd:`[`: Flip vertically (vflip) +:kbd:`]`: Flip horizontally (hflip) If you have applied several transformations, but there is a shorter sequence that can be used to get the blueprint into the configuration you want, it will diff --git a/gui/quickfort.lua b/gui/quickfort.lua index 3928cfb33c..7a30656822 100644 --- a/gui/quickfort.lua +++ b/gui/quickfort.lua @@ -428,16 +428,16 @@ function Quickfort:init() widgets.ResizingPanel{view_id='transform_panel', visible=function() return transform and self.blueprint_name end, subviews={ - widgets.HotkeyLabel{key='STRING_A040', + widgets.HotkeyLabel{key='STRING_A044', frame={t=1, l=2, w=1}, key_sep='', on_activate=self:callback('on_transform', 'ccw')}, - widgets.HotkeyLabel{key='STRING_A041', + widgets.HotkeyLabel{key='STRING_A046', frame={t=1, l=3, w=1}, key_sep='', on_activate=self:callback('on_transform', 'cw')}, - widgets.HotkeyLabel{key='STRING_A095', + widgets.HotkeyLabel{key='STRING_A091', frame={t=1, l=4, w=1}, key_sep='', on_activate=self:callback('on_transform', 'flipv')}, - widgets.HotkeyLabel{key='STRING_A061', + widgets.HotkeyLabel{key='STRING_A093', frame={t=1, l=5, w=1}, key_sep=':', on_activate=self:callback('on_transform', 'fliph')}, widgets.WrappedLabel{ diff --git a/test/gui/quickfort.lua b/test/gui/quickfort.lua index f511f232f5..6048723202 100644 --- a/test/gui/quickfort.lua +++ b/test/gui/quickfort.lua @@ -429,13 +429,13 @@ function test.transform_widgets() expect.true_(view.subviews.transform_panel.visible) expect.table_eq({}, q.transformations) - send_keys('A_MOVE_E_DOWN') + send_keys('STRING_A046') expect.table_eq({'cw'}, q.transformations) - send_keys('A_MOVE_W_DOWN') + send_keys('STRING_A044') expect.table_eq({}, q.transformations, 'ccw undoes cw') - send_keys('A_MOVE_N_DOWN', 'A_MOVE_S_DOWN') + send_keys('STRING_A091', 'STRING_A093') expect.table_eq({'flipv', 'fliph'}, q.transformations) - send_keys('A_MOVE_E_DOWN') + send_keys('STRING_A046') expect.table_eq({'ccw'}, q.transformations, 'flipv+fliph+cw=ccw') view:refresh_preview()