0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged the editor hotkeys.cfg with the default one.

Browse source 
Having different config files for each scope is no longer supported
with the newly modified hotkeys system.
This commit is contained in:
Fabian Müller 2012-10-26 12:40:17 +00:00
parent 735f2d495d
commit 35b82080c4
3 changed files with 149 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/core/editor/_main.cfg
View file

@ -8,7 +8,6 @@
{multiplayer/}
#endif
{core/editor/brushes.cfg}
{core/editor/hotkeys.cfg}
{core/editor/music.cfg}
{core/editor/terrain-groups.cfg}
{core/editor/time-of-day.cfg}

159
data/core/editor/hotkeys.cfg
View file

@ -1,159 +0,0 @@
#textdomain wesnoth-editor
# Editor key definitions
#define IF_APPLE_CMD_ELSE_CTRL
#ifdef APPLE
cmd=yes
#else
ctrl=yes
#endif
#enddef
[hotkey]
command="editor-quit-to-desktop"
key="q"
shift=yes
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-partial-undo"
key="z"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-save"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-save-as"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
shift=yes
[/hotkey]
[hotkey]
command="editor-map-save-all"
key="s"
alt=yes
[/hotkey]
[hotkey]
command="editor-map-new"
key="n"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-load"
key="o"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-terrain-palette-swap"
key="x"
[/hotkey]
[hotkey]
command="editor-cut"
key="x"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-copy"
key="c"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-paste"
key="v"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-select-all"
key="a"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-select-inverse"
key="i"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-clipboard-rotate-cw"
key="r"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-clipboard-rotate-ccw"
key="r"
shift=yes
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-tool-next"
key="n"
[/hotkey]
[hotkey]
command="editor-tool-paint"
key="d"
[/hotkey]
[hotkey]
command="editor-tool-fill"
key="f"
[/hotkey]
[hotkey]
command="editor-tool-select"
key="s"
[/hotkey]
[hotkey]
command="editor-brush-next"
key="b"
[/hotkey]
[hotkey]
command="editor-brush-default"
key="b"
alt=yes
[/hotkey]
[hotkey]
command="editor-refresh"
key="e"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-update-transitions"
key="t"
[/hotkey]
[hotkey]
command="editor-update-transitions"
key="t"
[/hotkey]
[hotkey]
command="editor-draw-coordinates"
key="o"
[/hotkey]
[hotkey]
command="editor-draw-terrain-codes"
key="i"
[/hotkey]
#undef IF_APPLE_CMD_ELSE_CTRL

149
data/core/hotkeys.cfg
View file

@ -304,4 +304,153 @@
key=F10
[/hotkey]
# Editor key definitions
[hotkey]
command="editor-quit-to-desktop"
key="q"
shift=yes
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-partial-undo"
key="z"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-save"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-save-as"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
shift=yes
[/hotkey]
[hotkey]
command="editor-map-save-all"
key="s"
alt=yes
[/hotkey]
[hotkey]
command="editor-map-new"
key="n"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-load"
key="o"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-terrain-palette-swap"
key="x"
[/hotkey]
[hotkey]
command="editor-cut"
key="x"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-copy"
key="c"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-paste"
key="v"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-select-all"
key="a"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-select-inverse"
key="i"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-clipboard-rotate-cw"
key="r"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-clipboard-rotate-ccw"
key="r"
shift=yes
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-tool-next"
key="n"
[/hotkey]
[hotkey]
command="editor-tool-paint"
key="d"
[/hotkey]
[hotkey]
command="editor-tool-fill"
key="f"
[/hotkey]
[hotkey]
command="editor-tool-select"
key="s"
[/hotkey]
[hotkey]
command="editor-brush-next"
key="b"
[/hotkey]
[hotkey]
command="editor-brush-default"
key="b"
alt=yes
[/hotkey]
[hotkey]
command="editor-refresh"
key="e"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-update-transitions"
key="t"
[/hotkey]
[hotkey]
command="editor-update-transitions"
key="t"
[/hotkey]
[hotkey]
command="editor-draw-coordinates"
key="o"
[/hotkey]
[hotkey]
command="editor-draw-terrain-codes"
key="i"
[/hotkey]
#undef IF_APPLE_CMD_ELSE_CTRL