Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions docs/gui/quickfort.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions gui/quickfort.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
8 changes: 4 additions & 4 deletions test/gui/quickfort.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down