Author: ilor
Date: Fri Jul 25 20:28:11 2008
New Revision: 28194
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28194&view=rev
Log:
editor2 hotkey update
Modified:
trunk/data/core/editor2-hotkeys.cfg
trunk/src/hotkeys.cpp
trunk/src/hotkeys.hpp
Modified: trunk/data/core/editor2-hotkeys.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/editor2-hotkeys.cfg?rev=28194&r1=28193&r2=28194&view=diff
==============================================================================
--- trunk/data/core/editor2-hotkeys.cfg (original)
+++ trunk/data/core/editor2-hotkeys.cfg Fri Jul 25 20:28:11 2008
@@ -17,14 +17,12 @@
[hotkey]
command="editor-map-save"
- description="Save map"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-save-as"
- description="Save map as"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
shift=yes
@@ -32,88 +30,85 @@
[hotkey]
command="editor-map-new"
- description="New map"
key="n"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-map-load"
- description="Open a map file"
key="o"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
+ command="editor-terrain-palette-swap"
+ key="x"
+[/hotkey]
+
+[hotkey]
command="editor-cut"
- description="Cut selection from map"
key="x"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-copy"
- description="Copy selection from map"
key="c"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-paste"
- description="Paste selection to map"
key="v"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-select-all"
- description="Select entire map"
key="a"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-tool-next"
- description="Select the next tool"
key="n"
[/hotkey]
[hotkey]
command="editor-tool-paint"
- description="Select the paint (draw) tool"
key="d"
[/hotkey]
[hotkey]
command="editor-tool-fill"
- description="Select the fill tool"
key="f"
[/hotkey]
[hotkey]
command="editor-tool-select"
- description="Select te selection tool"
key="s"
[/hotkey]
[hotkey]
command="editor-brush-next"
- description="Select the next brush"
+ key="b"
+[/hotkey]
+
+[hotkey]
+ command="editor-brush-default"
key="b"
alt=yes
[/hotkey]
[hotkey]
command="editor-refresh"
- description="Refresh map display"
key="e"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
command="editor-update-transitions"
- description="Redraw/update terrain transitions"
- key="b"
+ key="t"
[/hotkey]
#undef IF_APPLE_CMD_ELSE_CTRL
Modified: trunk/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.cpp?rev=28194&r1=28193&r2=28194&view=diff
==============================================================================
--- trunk/src/hotkeys.cpp (original)
+++ trunk/src/hotkeys.cpp Fri Jul 25 20:28:11 2008
@@ -137,6 +137,8 @@
{ hotkey::HOTKEY_EDITOR_MAP_SAVE, "editor-map-save", N_("Save Map"),
false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_MAP_SAVE_AS, "editor-map-save-as", N_("Save Map
As"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_MAP_REVERT, "editor-map-revert", N_("Revert All
Changes"), false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_TERRAIN_PALETTE_SWAP,
"editor-terrain-palette-swap",
+ N_("Swap fore- and background terrains"), false,
hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TOOL_NEXT, "editor-tool-next", N_("Next Tool"),
false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TOOL_PAINT, "editor-tool-paint", N_("Paint
Tool"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_TOOL_FILL, "editor-tool-fill", N_("Fill Tool"),
false, hotkey::SCOPE_EDITOR },
@@ -144,6 +146,7 @@
{ hotkey::HOTKEY_EDITOR_TOOL_STARTING_POSITION,
"editor-tool-starting-position",
N_("Set Starting Positions Tool"), false, hotkey::SCOPE_EDITOR
},
{ hotkey::HOTKEY_EDITOR_BRUSH_NEXT, "editor-brush-next", N_("Next
Brush"), false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_BRUSH_DEFAULT, "editor-brush-default",
N_("Default Brush"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_CUT, "editor-cut", N_("Cut"), false,
hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_COPY, "editor-copy", N_("Copy"), false,
hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_PASTE, "editor-paste", N_("Paste"), false,
hotkey::SCOPE_EDITOR },
Modified: trunk/src/hotkeys.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.hpp?rev=28194&r1=28193&r2=28194&view=diff
==============================================================================
--- trunk/src/hotkeys.hpp (original)
+++ trunk/src/hotkeys.hpp Fri Jul 25 20:28:11 2008
@@ -74,9 +74,10 @@
HOTKEY_EDITOR_QUIT_TO_DESKTOP,
HOTKEY_EDITOR_MAP_NEW, HOTKEY_EDITOR_MAP_LOAD, HOTKEY_EDITOR_MAP_SAVE,
HOTKEY_EDITOR_MAP_SAVE_AS, HOTKEY_EDITOR_MAP_REVERT,
+ HOTKEY_EDITOR_TERRAIN_PALETTE_SWAP,
HOTKEY_EDITOR_TOOL_NEXT, HOTKEY_EDITOR_TOOL_PAINT,
HOTKEY_EDITOR_TOOL_FILL,
HOTKEY_EDITOR_TOOL_SELECT, HOTKEY_EDITOR_TOOL_STARTING_POSITION,
- HOTKEY_EDITOR_BRUSH_NEXT,
+ HOTKEY_EDITOR_BRUSH_NEXT, HOTKEY_EDITOR_BRUSH_DEFAULT,
HOTKEY_EDITOR_CUT, HOTKEY_EDITOR_COPY, HOTKEY_EDITOR_PASTE,
HOTKEY_EDITOR_SELECT_ALL,
HOTKEY_EDITOR_SELECTION_ROTATE, HOTKEY_EDITOR_SELECTION_FLIP,
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
