Remove a few bits of never implemented editor features.
The sound source tool in particular, since showing a button to players whose only function is to tell them it's not implemented makes no sense.
This commit is contained in:
Pentarctagon
Pentarctagon
parent
d4739088da
commit
f39bd33899
5 changed files with 10 additions and 41 deletions
|
|
@ -18,7 +18,7 @@
|
|||
[section]
|
||||
id=editor_mode_scenario
|
||||
title= _ "Scenario Editor"
|
||||
topics=editor_named_area, editor_playlist, editor_tool_label, editor_tool_item, editor_tool_soundsource, editor_tool_village, editor_tool_unit
|
||||
topics=editor_named_area, editor_playlist, editor_tool_label, editor_tool_item, editor_tool_village, editor_tool_unit
|
||||
sort_topics=no
|
||||
[/section]
|
||||
|
||||
|
|
@ -137,16 +137,6 @@ Named locations can be accessed from WML using the Standard Location Filter’s
|
|||
[/topic]
|
||||
# wmllint: markcheck on
|
||||
|
||||
# wmllint: markcheck off
|
||||
[topic]
|
||||
id=editor_tool_soundsource
|
||||
title= _ "Soundsource Tool"
|
||||
text= "<img>src=icons/action/editor-tool-soundsource_60.png align=left box=yes</img>" + _ "Places Soundsources on your maps!
|
||||
|
||||
This tool has not been implemented yet."
|
||||
[/topic]
|
||||
# wmllint: markcheck on
|
||||
|
||||
# wmllint: markcheck off
|
||||
[topic]
|
||||
id=editor_tool_village
|
||||
|
|
@ -263,7 +253,6 @@ These tools are only available in scenario mode:
|
|||
|
||||
• <ref>dst='editor_tool_label' text='Label Tool'</ref>
|
||||
• <ref>dst='editor_tool_item' text='Item Tool'</ref>
|
||||
• <ref>dst='editor_tool_soundsource' text='Soundsource Tool'</ref>
|
||||
• <ref>dst='editor_tool_village' text='Village Tool'</ref>
|
||||
• <ref>dst='editor_tool_unit' text='Unit Tool'</ref>"
|
||||
[/topic]
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
[menu]
|
||||
id=menu-editor-paste-context
|
||||
is_context_menu=true
|
||||
items=describeterrain,menu-unit-facing,editor-unit-toggle-loyal,editor-change-unitid,editor-unit-recruit,renameunit,describeunit,editor-deleteunit,editor-toggle-renameable,editor-toggle-canrecruit,editor-cut,editor-copy,editor-paste,editor-tool-select,editor-select-all,editor-select-inverse,editor-select-none,editor-clipboard-rotate-cw,editor-clipboard-rotate-ccw,editor-clipboard-flip-horizontal,editor-clipboard-flip-vertical,editor-selection-fill,editor-selection-rotate,editor-selection-flip, editor-selection-generate,editor-selection-randomize,editor-save-area
|
||||
items=describeterrain,menu-unit-facing,editor-unit-toggle-loyal,editor-change-unitid,editor-unit-recruit,renameunit,describeunit,editor-deleteunit,editor-toggle-renameable,editor-toggle-canrecruit,editor-cut,editor-copy,editor-paste,editor-tool-select,editor-select-all,editor-select-inverse,editor-select-none,editor-clipboard-rotate-cw,editor-clipboard-rotate-ccw,editor-clipboard-flip-horizontal,editor-clipboard-flip-vertical,editor-selection-fill,editor-selection-rotate,editor-selection-flip,editor-selection-randomize,editor-save-area
|
||||
[/menu]
|
||||
|
||||
####### Menu Bar
|
||||
|
|
@ -75,21 +75,11 @@
|
|||
items=EDITOR-LOAD-MRU-PLACEHOLDER
|
||||
[/menu]
|
||||
|
||||
# [menu]
|
||||
# id=menu-editor-edit
|
||||
# title= _ "Edit"
|
||||
# image=lite
|
||||
# font_size={DEFAULT_EDITOR_FONT_SMALL}
|
||||
# items=undo,redo,editor-cut,editor-copy,editor-paste,editor-selection-name,editor-export-selection-coords,editor-select-all,editor-select-inverse,editor-select-none, editor-selection-fill,editor-selection-rotate,editor-selection-flip, editor-selection-generate,editor-selection-randomize
|
||||
# rect="+2,=,+100,="
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
# [/menu]
|
||||
[menu]
|
||||
id=menu-editor-map
|
||||
title= _ "Map"
|
||||
image=button_menu/menu_button_copper_H20
|
||||
items=editor-map-resize,editor-map-rotate,editor-map-generate, editor-map-apply-mask,editor-map-create-mask-to,menu-editor-transitions,editor-refresh,editor-refresh-image-cache,togglegrid,editor-draw-coordinates,editor-draw-terrain-codes,editor-draw-num-of-bitmaps
|
||||
items=editor-map-resize,editor-map-generate,editor-map-apply-mask,editor-map-create-mask-to,menu-editor-transitions,editor-refresh,editor-refresh-image-cache,togglegrid,editor-draw-coordinates,editor-draw-terrain-codes,editor-draw-num-of-bitmaps
|
||||
rect="+0,=,+100,+20"
|
||||
xanchor=fixed
|
||||
yanchor=fixed
|
||||
|
|
@ -597,7 +587,7 @@
|
|||
[/action]
|
||||
[action]
|
||||
id=tool-button9
|
||||
items=editor-tool-soundsource
|
||||
items=editor-tool-unit
|
||||
type=radiobox
|
||||
image=button_square/button_square_30
|
||||
auto_tooltip=yes
|
||||
|
|
@ -608,12 +598,9 @@
|
|||
[/action]
|
||||
[action]
|
||||
id=tool-button10
|
||||
items=editor-tool-unit
|
||||
type=radiobox
|
||||
items=null
|
||||
image=button_square/button_square_30
|
||||
auto_tooltip=yes
|
||||
tooltip_name_prepend=yes
|
||||
rect="+2,=,+24,+24"
|
||||
rect="+2,=,+30,+30"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/action]
|
||||
|
|
|
|||
|
|
@ -406,8 +406,6 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
|
|||
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_CLIPBOARD_PASTE));
|
||||
case HOTKEY_EDITOR_SELECTION_ROTATE:
|
||||
case HOTKEY_EDITOR_SELECTION_FLIP:
|
||||
case HOTKEY_EDITOR_SELECTION_GENERATE:
|
||||
return false; //not implemented
|
||||
case HOTKEY_EDITOR_CLIPBOARD_PASTE:
|
||||
return !context_manager_->clipboard_empty();
|
||||
case HOTKEY_EDITOR_CLIPBOARD_ROTATE_CW:
|
||||
|
|
@ -440,8 +438,6 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
|
|||
case HOTKEY_MINIMAP_DRAW_VILLAGES:
|
||||
case HOTKEY_EDITOR_REMOVE_LOCATION:
|
||||
return true;
|
||||
case HOTKEY_EDITOR_MAP_ROTATE:
|
||||
return false; //not implemented
|
||||
case HOTKEY_EDITOR_DRAW_COORDINATES:
|
||||
case HOTKEY_EDITOR_DRAW_TERRAIN_CODES:
|
||||
case HOTKEY_EDITOR_DRAW_NUM_OF_BITMAPS:
|
||||
|
|
|
|||
|
|
@ -195,8 +195,7 @@ std::array<hotkey_command_temp, HOTKEY_NULL - 1> master_hotkey_list {{
|
|||
{ HOTKEY_EDITOR_TOOL_STARTING_POSITION, "editor-tool-starting-position", N_("Starting Positions Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button displays player selection, right clears. Number keys scroll to the starting position, alt+number sets respective starting position under cursor, delete clears.") },
|
||||
{ HOTKEY_EDITOR_TOOL_LABEL, "editor-tool-label", N_("Label Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button sets or drags a label, right clears.") },
|
||||
{ HOTKEY_EDITOR_TOOL_UNIT, "editor-tool-unit", N_("Unit Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button sets a new unit or moves a unit via drag and drop, right brings up a context menu. Needs a defined side.") },
|
||||
{ HOTKEY_EDITOR_TOOL_ITEM, "editor-tool-item", N_("Item Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button sets a new item or moves it via drag and drop, right clears. Not implemented yet.") },
|
||||
{ HOTKEY_EDITOR_TOOL_SOUNDSOURCE, "editor-tool-soundsource", N_("Sound Source Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button sets or drags a sound source, right clears. Not implemented yet.") },
|
||||
{ HOTKEY_EDITOR_TOOL_ITEM, "editor-tool-item", N_("Item Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button sets a new item.") },
|
||||
{ HOTKEY_EDITOR_TOOL_VILLAGE, "editor-tool-village", N_("Village Tool"), false, scope_editor, HKCAT_TOOLS, N_("Left mouse button sets the village ownership to the current side, right clears. Needs a defined side.") },
|
||||
|
||||
{ HOTKEY_EDITOR_UNIT_TOGGLE_CANRECRUIT, "editor-toggle-canrecruit", N_("Can Recruit"), false, scope_editor, HKCAT_TOOLS, N_("Toggle the recruit attribute of a unit.") },
|
||||
|
|
@ -236,10 +235,8 @@ std::array<hotkey_command_temp, HOTKEY_NULL - 1> master_hotkey_list {{
|
|||
{ HOTKEY_EDITOR_SELECTION_ROTATE, "editor-selection-rotate", N_("Rotate Selection"), false, scope_editor, HKCAT_TOOLS, "" },
|
||||
{ HOTKEY_EDITOR_SELECTION_FLIP, "editor-selection-flip", N_("Flip Selection"), false, scope_editor, HKCAT_TOOLS, "" },
|
||||
{ HOTKEY_EDITOR_SELECTION_FILL, "editor-selection-fill", N_("Fill Selection"), false, scope_editor, HKCAT_TOOLS, "" },
|
||||
{ HOTKEY_EDITOR_SELECTION_GENERATE, "editor-selection-generate", N_("Generate Tiles in Selection"), false, scope_editor, HKCAT_TOOLS, "" },
|
||||
{ HOTKEY_EDITOR_SELECTION_RANDOMIZE, "editor-selection-randomize", N_("Randomize Tiles in Selection"), false, scope_editor, HKCAT_TOOLS, "" },
|
||||
{ HOTKEY_EDITOR_MAP_RESIZE, "editor-map-resize", N_("Resize Map"), false, scope_editor, HKCAT_MAP, "" },
|
||||
{ HOTKEY_EDITOR_MAP_ROTATE, "editor-map-rotate", N_("Rotate Map"), false, scope_editor, HKCAT_MAP, "" },
|
||||
{ HOTKEY_EDITOR_MAP_GENERATE, "editor-map-generate", N_("Generate Map"), false, scope_editor, HKCAT_MAP, "" },
|
||||
{ HOTKEY_EDITOR_MAP_APPLY_MASK, "editor-map-apply-mask", N_("Apply a Mask"), false, scope_editor, HKCAT_MAP, "" },
|
||||
{ HOTKEY_EDITOR_MAP_CREATE_MASK_TO, "editor-map-create-mask-to", N_("Create Mask"), false, scope_editor, HKCAT_MAP, "" },
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ enum HOTKEY_COMMAND {
|
|||
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_ITEM, HOTKEY_EDITOR_TOOL_SOUNDSOURCE,
|
||||
HOTKEY_EDITOR_TOOL_UNIT, HOTKEY_EDITOR_TOOL_VILLAGE, HOTKEY_EDITOR_TOOL_ITEM,
|
||||
|
||||
// Select
|
||||
HOTKEY_EDITOR_SELECT_ALL, HOTKEY_EDITOR_SELECT_INVERSE, HOTKEY_EDITOR_SELECT_NONE,
|
||||
|
|
@ -149,7 +149,7 @@ enum HOTKEY_COMMAND {
|
|||
HOTKEY_EDITOR_SELECTION_ROTATE, HOTKEY_EDITOR_SELECTION_FLIP,
|
||||
HOTKEY_EDITOR_SELECTION_FILL,
|
||||
HOTKEY_EDITOR_SELECTION_EXPORT,
|
||||
HOTKEY_EDITOR_SELECTION_GENERATE, HOTKEY_EDITOR_SELECTION_RANDOMIZE,
|
||||
HOTKEY_EDITOR_SELECTION_RANDOMIZE,
|
||||
|
||||
// Map
|
||||
HOTKEY_EDITOR_MAP_NEW, HOTKEY_EDITOR_MAP_LOAD, HOTKEY_EDITOR_MAP_SAVE,
|
||||
|
|
@ -157,7 +157,7 @@ enum HOTKEY_COMMAND {
|
|||
HOTKEY_EDITOR_MAP_REVERT, HOTKEY_EDITOR_MAP_INFO,
|
||||
HOTKEY_EDITOR_MAP_CLOSE,
|
||||
HOTKEY_EDITOR_MAP_SWITCH,
|
||||
HOTKEY_EDITOR_MAP_RESIZE, HOTKEY_EDITOR_MAP_ROTATE,
|
||||
HOTKEY_EDITOR_MAP_RESIZE,
|
||||
HOTKEY_EDITOR_MAP_GENERATE, HOTKEY_EDITOR_MAP_APPLY_MASK,
|
||||
HOTKEY_EDITOR_MAP_CREATE_MASK_TO,
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue