diff --git a/data/core/images/themes/rightside-editor.png b/data/core/images/themes/rightside-editor.png index c7b1a549f22..fcaaef5bfc3 100644 Binary files a/data/core/images/themes/rightside-editor.png and b/data/core/images/themes/rightside-editor.png differ diff --git a/data/themes/editor.cfg b/data/themes/editor.cfg index 29bd26c9cf5..3cf3f216ddf 100644 --- a/data/themes/editor.cfg +++ b/data/themes/editor.cfg @@ -8,7 +8,6 @@ [theme] name=null - hidden=yes [resolution] width=1 height=1 @@ -17,7 +16,6 @@ [theme] name=editor - hidden=yes #define DEFAULT_EDITOR_FONT_NORMAL 14 #enddef @@ -59,7 +57,7 @@ [main_map] id=main-map - rect="=,+0,+882,768" + rect="=,+0,+851,768" xanchor=left yanchor=top [/main_map] @@ -98,7 +96,7 @@ [panel] id=top-right-panel image=themes/rightside-editor.png - rect="+0,=+0,1024,+257" + rect="+0,=+0,1024,+286" xanchor=right yanchor=fixed [/panel] @@ -109,6 +107,8 @@ xanchor=right yanchor=top [/panel] + + #TODO old stuff - comment or remove #[panel] # id=bottom-right-panel # image=themes/rightside-bottom.png @@ -120,10 +120,13 @@ [menu] id=menu-editor-file title= _ "File" + #image=lite_small image=lite - items=editor-map-new,editor-map-load,editor-map-revert,editor-map-save,editor-map-save-as,editor-map-save-all,preferences,editor-settings,editor-close-map,quit,editor-quit-to-desktop + font_size=9 + items=editor-map-new,editor-map-load,editor-map-revert,editor-map-save,editor-map-save-as,editor-multiplayer-save,editor-multiplayer-save-as,preferences,editor-settings,editor-close-map,quit,editor-quit-to-desktop ref=top-panel rect="=+3,=+1,+100,=-4" + #rect="=+3,=+1,+55,=-4" xanchor=fixed yanchor=fixed [/menu] @@ -131,8 +134,11 @@ [menu] id=menu-editor-edit title= _ "Edit" + #image=lite_small image=lite - items=undo,redo,editor-cut,editor-copy,editor-paste,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 + 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,=,+55,=" rect="+2,=,+100,=" xanchor=fixed yanchor=fixed @@ -141,8 +147,11 @@ [menu] id=menu-editor-map title= _ "Map" + #image=lite_small image=lite - items=editor-map-resize,editor-map-rotate,editor-map-generate, editor-map-apply-mask,editor-map-create-mask-to, editor-refresh,editor-update-transitions,editor-auto-update-transitions,editor-refresh-image-cache,title_screen__reload_wml, editor-draw-coordinates,editor-draw-terrain-codes + font_size={DEFAULT_EDITOR_FONT_SMALL} + items=editor-map-resize,editor-map-rotate,editor-map-generate, editor-map-apply-mask,editor-map-create-mask-to, editor-refresh,editor-update-transitions,editor-auto-update-transitions,editor-refresh-image-cache, editor-draw-coordinates,editor-draw-terrain-codes + #rect="+2,=,+55,=" rect="+2,=,+100,=" xanchor=fixed yanchor=fixed @@ -151,13 +160,46 @@ [menu] id=menu-editor-window title= _ "Window" + #image=lite_small image=lite + font_size={DEFAULT_EDITOR_FONT_SMALL} items=editor-switch-map + #rect="+2,=,+55,=" rect="+2,=,+100,=" xanchor=fixed yanchor=fixed [/menu] + # [menu] + # id=menu-editor-areas + # title= _ "Areas" + # image=lite_small + # items=editor-switch-area + # rect="+2,=,+55,=" + # xanchor=fixed + # yanchor=fixed + # [/menu] + + # [menu] + # id=menu-editor-side + # title= _ "Side" + # image=lite_small + # items=editor-switch-side,editor-side-new,editor-side-modify + # rect="+2,=,+55,=" + # xanchor=fixed + # yanchor=fixed + # [/menu] + + # [panel] + # #TODO rename since we don't display turns, only sides + # id=turn-panel + # image=themes/status-bg.png + # ref=menu-editor-side + # rect="+5,=+1,+80,+19" + # xanchor=fixed + # yanchor=fixed + # [/panel] + [menu] id=menu-editor-paste-context is_context_menu=true @@ -167,7 +209,7 @@ [mini_map] id=mini-map ref=top-right-panel - rect="=+10,=+7,=-7,+143" + rect="=+10,=+7,=-7,+134" xanchor=right yanchor=fixed [/mini_map] @@ -219,13 +261,98 @@ xanchor=right yanchor=fixed [/menu] + # [menu] + # id=new_button_editor + # image=select_button_editor + # items=editor-tool-new + # # wmllint: local spelling deselects + # tooltip= _ "Left mouse button selects, right deselects. Hold Shift for magic-wand selection of tiles with same terrain." + # tooltip_name_prepend=yes + # rect="+6,=,+24,+24" + # xanchor=right + # yanchor=fixed + # [/menu] + + + + # [menu] + # id=unit_button_editor + # image=units_button_editor + # items=editor-tool-unit + # ref=draw_button_editor + # tooltip= _ "Left mouse button sets a new unit or moves a unit via drag and drop, right clears." + # tooltip_name_prepend=yes + # rect="=,+6,+24,+24" + # xanchor=right + # yanchor=fixed + # [/menu] + + # [menu] + # id=item_button_editor + # image=start_position_button_editor + # #image=item_button_editor + # items=editor-tool-item + # tooltip= _ "Left mouse button sets a new item or moves it via drag and drop, right clears." + # tooltip_name_prepend=yes + # rect="+6,=,+24,+24" + # xanchor=right + # yanchor=fixed + # [/menu] + + # #TODO + # #[menu] + # # id=path_button_editor + # # image=start_position_button_editor + # # #image=path_button_editor + # # items=editor-tool-path + # # tooltip= _ "Left mouse button sets a new node in to the path, right clears the last." + # # tooltip_name_prepend=yes + # # rect="+6,=,+24,+24" + # # xanchor=right + # # yanchor=fixed + # #[/menu] + + # [menu] + # id=village_button_editor + # image=villages_button_editor + # items=editor-tool-village + # tooltip= _ "Left mouse button sets the village ownership to the current side, right clears." + # tooltip_name_prepend=yes + # rect="+6,=,+24,+24" + # xanchor=right + # yanchor=fixed + # [/menu] + [menu] + id=label_button_editor + image=start_position_button_editor + items=editor-tool-label + tooltip= _ "Left mouse button sets or drages a label, right clears." + tooltip_name_prepend=yes + rect="+6,=,+24,+24" + xanchor=right + yanchor=fixed + [/menu] + # [menu] + # id=new2_button_editor + # image=start_position_button_editor + # items=editor-tool-map-label + # tooltip= _ "Left mouse button sets or drages a label, right clears." + # tooltip_name_prepend=yes + # rect="+6,=,+24,+24" + # xanchor=right + # yanchor=fixed + # [/menu] + + [menu] + ref=draw_button_editor id=undo_button_editor image=undo_button_editor items=undo auto_tooltip=yes - ref=draw_button_editor - rect="=,+42,+24,+24" + #ref=unit_button_editor + rect="=,+71,+24,+24" + #rect="=,+39,+24,+24" xanchor=right yanchor=fixed [/menu] @@ -256,11 +383,37 @@ xanchor=right yanchor=fixed [/menu] + [menu] + id=zoom_default_button_editor + image=zoom_out_button_editor + items=zoomdefault + auto_tooltip=yes + rect="+6,=,+24,+24" + xanchor=right + yanchor=fixed + [/menu] + + [menu] + id=menu-editor-terrain + title= _ "Terrain Group" + #image=lite_small + image=button + #image=lite + font_size=9 + items=editor-terrain-groups + ref=undo_button_editor + rect="=+0,+10,+100,+18" + #rect="=+3,=+1,+55,=-4" + xanchor=right + yanchor=fixed + [/menu] [panel] id=villages-panel image=themes/status-bg.png ref=menu-editor-window + #ref=menu-editor-side + #ref=turn-panel rect="+5,=+1,+71,+19" xanchor=fixed yanchor=fixed @@ -276,7 +429,53 @@ yanchor=fixed [/label] + # [panel] + # id=units-panel + # image=themes/status-bg.png + # ref=villages-panel + # rect="+5,=,+71,=" + # xanchor=fixed + # yanchor=fixed + # [/panel] + + # [label] + # id=units-icon + # icon=themes/units.png + # text= _ "units" + # ref=units-panel + # rect="=+5,=+1,+17,+17" + # xanchor=fixed + # yanchor=fixed + # [/label] + [status] + + [terrain_image] + id=terrain_image + ref=menu-editor-terrain + rect="+25,=-2,+25,+25" + xanchor=right + yanchor=fixed + [/terrain_image] + + # [side_playing] + # id=icon-sideplaying + # ref=turn-panel + # rect="=+3,=+2,+25,+17" + # xanchor=fixed + # yanchor=fixed + # [/side_playing] + # [turn] + # id=turn + # font_size={DEFAULT_EDITOR_FONT_SMALL} + # rect="+4,=,+55,+16" + # xanchor=fixed + # yanchor=fixed + # prefix="" #wmllint: ignore + # prefix_literal="" + # [/turn] + + #TODO old stuff from before the editor branch #[editor_tool_hint] # id=tool-hint # font_size={DEFAULT_EDITOR_FONT_REALLYTINY} @@ -288,6 +487,7 @@ # prefix_literal="" #[/editor_tool_hint] + #TODO maybe enable for the high resolution version # the time of day image # [time_of_day] # id=image-tod @@ -308,6 +508,18 @@ prefix_literal="" [/villages] + # [num_units] + # id=num-units + # font_size={DEFAULT_EDITOR_FONT_SMALL} + # ref=units-icon + # rect="+4,=,+55,+16" + # xanchor=fixed + # yanchor=fixed + # prefix="" #wmllint: ignore + # prefix_literal="" + # [/num_units] + + # This panel encloses the location information displays and the # observer icon. This separate container is used so that we can # make the terrain name display stretch to fill all available space @@ -326,49 +538,50 @@ id=status-position font_size={DEFAULT_EDITOR_FONT_SMALL} ref=terrain-panel - rect="=+15,=,+95,=" + rect="=+0,=,+95,=" xanchor=fixed yanchor=fixed [/position] [terrain] id=status-terrain - font_size={DEFAULT_EDITOR_FONT_SMALL} + font_size={DEFAULT_EDITOR_FONT_TINY} ref=terrain-panel - rect="=+115,=,=-24,=" + #rect="=+115,=,=-24,=" + rect="=+65,=,=-24,=" xanchor=left yanchor=fixed [/terrain] [/status] [/resolution] - - # # WIP support for a different theme in the editor when in lower resolutions - # # current issues: - # # * brush selection not placed by WML -> misplaced - # # * category selection not placed by WML -> misplaced - # # * terrain list (with scroll keys) not placed by WML -> misplaced - # [partialresolution] - # id=800x600 - # inherits=1024x768 - # width=800 - # height=600 - # - # # some changes to the display to have stuff look better on 800x600 - # # using a right pane with a smaller minimap to achieve this - # # use backgound with 40px less for minimap - # [change] - # id=top-right-panel - # image=themes/rightside-editor-small.png - # rect="+0,=+0,1024,+217" - # [/change] - # # reduce vertical size of minimap by 40px - # [change] - # id=mini-map - # rect="=+10,=+7,=-7,+103" - # [/change] - # #move start of buttons up by 40px - # [change] - # id=draw_button_editor - # rect="=+15,143,+24,+24" - # [/change] - # [/partialresolution] + +# # WIP support for a different theme in the editor when in lower resolutions +# # current issues: +# # * brush selection not placed by WML -> misplaced +# # * category selection not placed by WML -> misplaced +# # * terrain list (with scroll keys) not placed by WML -> misplaced +# [partialresolution] +# id=800x600 +# inherits=1024x768 +# width=800 +# height=600 +# +# # some changes to the display to have stuff look better on 800x600 +# # using a right pane with a smaller minimap to achieve this +# # use backgound with 40px less for minimap +# [change] +# id=top-right-panel +# image=themes/rightside-editor-small.png +# rect="+0,=+0,1024,+217" +# [/change] +# # reduce vertical size of minimap by 40px +# [change] +# id=mini-map +# rect="=+10,=+7,=-7,+103" +# [/change] +# #move start of buttons up by 40px +# [change] +# id=draw_button_editor +# rect="=+15,143,+24,+24" +# [/change] +# [/partialresolution] [/theme]