Author: fendrin
Date: Fri Mar 11 16:06:55 2011
New Revision: 48842
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48842&view=rev
Log:
Merged the hotkeys in.
Modified:
branches/editor/src/hotkeys.cpp
branches/editor/src/hotkeys.hpp
Modified: branches/editor/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/hotkeys.cpp?rev=48842&r1=48841&r2=48842&view=diff
==============================================================================
--- branches/editor/src/hotkeys.cpp (original)
+++ branches/editor/src/hotkeys.cpp Fri Mar 11 16:06:55 2011
@@ -117,15 +117,22 @@
{ hotkey::HOTKEY_EDITOR_QUIT_TO_DESKTOP, "editor-quit-to-desktop",
N_("Quit to Desktop"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_CLOSE_MAP, "editor-close-map", N_("Close Map"),
false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_SWITCH_MAP, "editor-switch-map", N_("Switch
Map"), false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_SWITCH_SIDE, "editor-switch-side", N_("Switch
Side"), false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_SWITCH_AREA, "editor-switch-area", N_("Switch
Area"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_SETTINGS, "editor-settings", N_("Editor
Settings"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_PARTIAL_UNDO, "editor-partial-undo",
N_("Partial Undo"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_MAP_NEW, "editor-map-new", N_("New Map"),
false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_SIDE_NEW, "editor-side-new", N_("New Side"),
false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_MAP_LOAD, "editor-map-load", N_("Load Map"),
false, hotkey::SCOPE_EDITOR },
{ 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_SAVE_ALL, "editor-map-save-all", N_("Save
All Maps"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_MAP_REVERT, "editor-map-revert", N_("Revert All
Changes"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_MAP_INFO, "editor-map-info", N_("Map
Information"), false, hotkey::SCOPE_EDITOR },
+
+ { hotkey::HOTKEY_EDITOR_MULTIPLAYER_SAVE, "editor-multiplayer-save",
N_("Save Multiplayer Scenario"), false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_MULTIPLAYER_SAVE_AS,
"editor-multiplayer-save-as", N_("Save Multiplayer Scenario As"), 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 },
@@ -134,6 +141,16 @@
{ 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_TOOL_LABEL, "editor-tool-map-label",
+ N_("Set Map Label Tool"), false,
hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_TOOL_UNIT, "editor-tool-unit",
+ N_("Place Unit Tool"), false,
hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_TOOL_VILLAGE, "editor-tool-village",
+ N_("Village Ownership Tool"), false,
hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_TOOL_PATH, "editor-tool-path",
+ N_("Unit Path 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 },
@@ -160,6 +177,8 @@
N_("Flip Selection"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_SELECTION_FILL, "editor-selection-fill",
N_("Fill Selection"), false, hotkey::SCOPE_EDITOR },
+ { hotkey::HOTKEY_EDITOR_SELECTION_NAME, "editor-selection-name",
+ N_("Name Selection"), false,
hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_SELECTION_GENERATE, "editor-selection-generate",
N_("Generate Tiles In Selection"), false, hotkey::SCOPE_EDITOR
},
{ hotkey::HOTKEY_EDITOR_SELECTION_RANDOMIZE,
"editor-selection-randomize",
Modified: branches/editor/src/hotkeys.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/hotkeys.hpp?rev=48842&r1=48841&r2=48842&view=diff
==============================================================================
--- branches/editor/src/hotkeys.hpp (original)
+++ branches/editor/src/hotkeys.hpp Fri Mar 11 16:06:55 2011
@@ -70,14 +70,22 @@
HOTKEY_EDITOR_QUIT_TO_DESKTOP,
HOTKEY_EDITOR_CLOSE_MAP, HOTKEY_EDITOR_SWITCH_MAP,
+ HOTKEY_EDITOR_SWITCH_AREA, HOTKEY_EDITOR_SWITCH_SIDE,
HOTKEY_EDITOR_SETTINGS,
HOTKEY_EDITOR_PARTIAL_UNDO,
HOTKEY_EDITOR_MAP_NEW, HOTKEY_EDITOR_MAP_LOAD, HOTKEY_EDITOR_MAP_SAVE,
+ HOTKEY_EDITOR_MULTIPLAYER_SAVE, HOTKEY_EDITOR_MULTIPLAYER_SAVE_AS,
+ HOTKEY_EDITOR_SIDE_NEW,
HOTKEY_EDITOR_MAP_SAVE_AS, HOTKEY_EDITOR_MAP_SAVE_ALL,
HOTKEY_EDITOR_MAP_REVERT, HOTKEY_EDITOR_MAP_INFO,
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_TOOL_LABEL,
+ HOTKEY_EDITOR_TOOL_UNIT,
+ HOTKEY_EDITOR_TOOL_VILLAGE,
+ HOTKEY_EDITOR_TOOL_PATH,
+
HOTKEY_EDITOR_BRUSH_NEXT, HOTKEY_EDITOR_BRUSH_DEFAULT,
HOTKEY_EDITOR_CUT, HOTKEY_EDITOR_COPY, HOTKEY_EDITOR_PASTE,
HOTKEY_EDITOR_EXPORT_SELECTION_COORDS,
@@ -87,6 +95,7 @@
HOTKEY_EDITOR_CLIPBOARD_FLIP_HORIZONTAL,
HOTKEY_EDITOR_CLIPBOARD_FLIP_VERTICAL,
HOTKEY_EDITOR_SELECTION_ROTATE, HOTKEY_EDITOR_SELECTION_FLIP,
HOTKEY_EDITOR_SELECTION_FILL,
+ HOTKEY_EDITOR_SELECTION_NAME,
HOTKEY_EDITOR_SELECTION_GENERATE, HOTKEY_EDITOR_SELECTION_RANDOMIZE,
HOTKEY_EDITOR_MAP_RESIZE, HOTKEY_EDITOR_MAP_ROTATE,
HOTKEY_EDITOR_MAP_GENERATE, HOTKEY_EDITOR_MAP_APPLY_MASK,
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
