Author: ilor
Date: Mon Jul 14 18:41:01 2008
New Revision: 28026
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28026&view=rev
Log:
Editor2: hotkey update (fixed some weird behaviour too, actually use the
defaults, conflicts to be resolved later).
Modified:
trunk/data/core/_main.cfg
trunk/data/core/editor2-hotkeys.cfg
trunk/src/game.cpp
trunk/src/hotkeys.cpp
trunk/src/hotkeys.hpp
Modified: trunk/data/core/_main.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/_main.cfg?rev=28026&r1=28025&r2=28026&view=diff
==============================================================================
--- trunk/data/core/_main.cfg (original)
+++ trunk/data/core/_main.cfg Mon Jul 14 18:41:01 2008
@@ -21,5 +21,6 @@
{core/units.cfg}
#ifdef EDITOR2
{core/editor-groups.cfg}
+{core/editor2-hotkeys.cfg}
#endif
#endif
Modified: trunk/data/core/editor2-hotkeys.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/editor2-hotkeys.cfg?rev=28026&r1=28025&r2=28026&view=diff
==============================================================================
--- trunk/data/core/editor2-hotkeys.cfg (original)
+++ trunk/data/core/editor2-hotkeys.cfg Mon Jul 14 18:41:01 2008
@@ -9,53 +9,104 @@
#enddef
[hotkey]
- command="editor-undo"
- description="Undo"
- key="u"
-[/hotkey]
-
-[hotkey]
- command="editor-redo"
- description="Redo"
- key="r"
-[/hotkey]
-
-[hotkey]
- command="editor-save"
+ command="editor-map-save"
description="Save map"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
- command="editor-saveas"
+ command="editor-map-save-as"
description="Save map as"
key="s"
{IF_APPLE_CMD_ELSE_CTRL}
- alt=yes
+ shift=yes
[/hotkey]
[hotkey]
- command="editor-quit"
- description="Quit map editor"
- key="q"
- {IF_APPLE_CMD_ELSE_CTRL}
-[/hotkey]
-
-
-[hotkey]
- command="editor-new"
+ command="editor-map-new"
description="New map"
key="n"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
- command="editor-load"
- description="Load map from file"
- key="l"
+ command="editor-map-load"
+ description="Open a map file"
+ key="o"
{IF_APPLE_CMD_ELSE_CTRL}
[/hotkey]
[hotkey]
- command="editor-edit-cut"
+ 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-draw"
+ description="Select the 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"
+ 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"
+[/hotkey]
+
+#undef IF_APPLE_CMD_ELSE_CTRL
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=28026&r1=28025&r2=28026&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Mon Jul 14 18:41:01 2008
@@ -2366,6 +2366,7 @@
reset_game_cfg();
defines_map_["EDITOR2"] = preproc_define();
refresh_game_cfg();
+ hotkey::load_hotkeys(game_config_);
return editor2::start(game_config_, video_);
}
#endif
Modified: trunk/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.cpp?rev=28026&r1=28025&r2=28026&view=diff
==============================================================================
--- trunk/src/hotkeys.cpp (original)
+++ trunk/src/hotkeys.cpp Mon Jul 14 18:41:01 2008
@@ -137,11 +137,13 @@
{ 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_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 },
{ hotkey::HOTKEY_EDITOR_TOOL_SELECT, "editor-tool-select",
N_("Selection Tool"), false, hotkey::SCOPE_EDITOR },
{ 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_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=28026&r1=28025&r2=28026&view=diff
==============================================================================
--- trunk/src/hotkeys.hpp (original)
+++ trunk/src/hotkeys.hpp Mon Jul 14 18:41:01 2008
@@ -74,8 +74,9 @@
HOTKEY_EDITOR_QUIT,
HOTKEY_EDITOR_MAP_NEW, HOTKEY_EDITOR_MAP_LOAD, HOTKEY_EDITOR_MAP_SAVE,
HOTKEY_EDITOR_MAP_SAVE_AS, HOTKEY_EDITOR_MAP_REVERT,
- HOTKEY_EDITOR_TOOL_PAINT, HOTKEY_EDITOR_TOOL_FILL,
+ 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_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
