Skip to content

change hotkeys that conflict with EditField's Ctrl-a #1389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myk002 merged 3 commits into from
Feb 3, 2025
Merged

change hotkeys that conflict with EditField's Ctrl-a #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1df5035
change hotkeys that conflict with EditField's Ctrl-a
myk002 Feb 3, 2025
e684f36
resolve more conflicts
myk002 Feb 3, 2025
3a4ddc7
absorb fixes from #1383
myk002 Feb 3, 2025
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
2 changes: 1 addition & 1 deletion gui/civ-alert.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function Civalert:init()
},
widgets.HotkeyLabel{
frame={t=3, l=0},
key='CUSTOM_CTRL_W',
key='CUSTOM_CTRL_N',
label='Sound alarm! Citizens run to safety!',
on_activate=sound_alarm,
enabled=can_sound_alarm,
Expand Down
4 changes: 2 additions & 2 deletions gui/launcher.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ function TagFilterPanel:init()
widgets.HotkeyLabel{
frame={b=0, r=0},
label='Cycle all',
key='CUSTOM_CTRL_A',
key='CUSTOM_CTRL_N',
auto_width=true,
on_activate=self:callback('toggle_all')
},
Expand Down Expand Up @@ -388,7 +388,7 @@ function AutocompletePanel:init()
widgets.Label{
frame={l=0, t=3},
text={
{key='CUSTOM_CTRL_W', key_sep=': ', on_activate=open_filter_panel, text='Tags:'},
{key='CUSTOM_CTRL_F', key_sep=': ', on_activate=open_filter_panel, text='Tags:'},
{gap=1, pen=get_filter_pen, text=get_filter_text},
},
on_click=open_filter_panel,
Expand Down
2 changes: 1 addition & 1 deletion gui/manipulator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ function QuickMenu:init()
},
widgets.HotkeyLabel{
frame={b=0, l=0},
key='CUSTOM_CTRL_A',
key='CUSTOM_CTRL_N',
label='Select all',
visible=self.multiselect,
on_activate=function()
Expand Down
2 changes: 1 addition & 1 deletion gui/quickfort.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ transformations = transformations or {}

-- blueprint selection dialog, shown when the script starts or when a user wants
-- to load a new blueprint into the ui
BlueprintDialog = defclass(SelectDialog, gui.ZScreenModal)
BlueprintDialog = defclass(BlueprintDialog, gui.ZScreenModal)
BlueprintDialog.ATTRS{
focus_path='quickfort/dialog',
on_select=DEFAULT_NIL,
Expand Down
2 changes: 1 addition & 1 deletion internal/caravan/movegoods.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ function MoveGoods:init()
widgets.HotkeyLabel{
frame={l=0, b=0},
label='Select all/none',
key='CUSTOM_CTRL_A',
key='CUSTOM_CTRL_N',
on_activate=self:callback('toggle_visible'),
auto_width=true,
},
Expand Down
2 changes: 1 addition & 1 deletion internal/caravan/pedestal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ function AssignItems:init()
widgets.HotkeyLabel{
frame={l=0, b=2},
label='Select all/none',
key='CUSTOM_CTRL_A',
key='CUSTOM_CTRL_N',
on_activate=self:callback('toggle_visible'),
auto_width=true,
},
Expand Down
4 changes: 2 additions & 2 deletions internal/caravan/trade.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ function Trade:init()
widgets.HotkeyLabel{
frame={l=0, b=0},
label='Select all/none',
key='CUSTOM_CTRL_A',
key='CUSTOM_CTRL_N',
on_activate=self:callback('toggle_visible'),
auto_width=true,
},
Expand Down Expand Up @@ -891,7 +891,7 @@ function Ethics:init()
},
widgets.HotkeyLabel{
frame={l=0, b=0},
key='CUSTOM_CTRL_A',
key='CUSTOM_CTRL_N',
label='Deselect items in trade list',
auto_width=true,
on_activate=self:callback('deselect_transgressions'),
Expand Down
2 changes: 1 addition & 1 deletion internal/gm-unit/editor_civilization.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function CivBox:choose_race()
end
function CivBox:init(info)
self.subviews.list.frame={t=3,r=0,l=0}
self.subviews.list.edit.ignore_keys={"STRING_A047"},
self.subviews.list.edit.text_area.text_area.ignore_keys={"STRING_A047"}
self:addviews{
widgets.Label{frame={t=1,l=0},text={
{text="Filter race ",key="STRING_A047",key_sep="()",on_activate=self:callback("choose_race")},
Expand Down