New multi resolution editor gui layout.
This commit is contained in:
Fabian Müller
parent
d04b0bb3de
commit
256d814097
1 changed files with 265 additions and 148 deletions
|
|
@ -93,23 +93,24 @@
|
|||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/panel]
|
||||
|
||||
# [panel]
|
||||
# id=middle-right-panel
|
||||
# image=themes/rightside-bg.png
|
||||
# rect="=,+0,=,768"
|
||||
# xanchor=right
|
||||
# yanchor=top
|
||||
# [/panel]
|
||||
|
||||
#TODO old stuff - comment or remove
|
||||
[panel]
|
||||
id=middle-right-panel
|
||||
id=bottom-right-panel
|
||||
image=themes/rightside-bg.png
|
||||
rect="=,+0,=,768"
|
||||
xanchor=right
|
||||
yanchor=top
|
||||
[/panel]
|
||||
|
||||
#TODO old stuff - comment or remove
|
||||
#[panel]
|
||||
# id=bottom-right-panel
|
||||
# image=themes/rightside-bottom.png
|
||||
# rect="=,+0,=,768"
|
||||
# xanchor=right
|
||||
# yanchor=bottom
|
||||
#[/panel]
|
||||
|
||||
[menu]
|
||||
id=menu-editor-file
|
||||
title= _ "File"
|
||||
|
|
@ -208,6 +209,7 @@
|
|||
[/mini_map]
|
||||
|
||||
# The toolbar.
|
||||
# First row.
|
||||
[menu]
|
||||
id=draw_button_editor
|
||||
image=draw_button_editor
|
||||
|
|
@ -215,18 +217,17 @@
|
|||
# wmllint: local spelling left/right Ctrl+click
|
||||
tooltip= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
|
||||
tooltip_name_prepend=yes
|
||||
ref=top-right-panel
|
||||
#harcoded since the brushes are above, which are hardcoded in src/editor/editor_layout.cpp
|
||||
rect="=+15,183,+24,+24"
|
||||
ref=mini-map
|
||||
rect="=+6,+16,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
[menu]
|
||||
id=flood_button_editor
|
||||
image=flood_button_editor
|
||||
items=editor-tool-fill
|
||||
# wmllint: local spelling fore-/background
|
||||
tooltip= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
|
||||
id=pipette_button_editor
|
||||
image=pipette_button_editor
|
||||
items=editor-tool-pipette
|
||||
tooltip= _ "Pipette Tool, Use left/right mouse button to select a terrain from the map. Not implemented yet."
|
||||
tooltip_name_prepend=yes
|
||||
tooltip_name_prepend=yes
|
||||
rect="+6,=,+24,+24"
|
||||
xanchor=right
|
||||
|
|
@ -243,6 +244,45 @@
|
|||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
[menu]
|
||||
id=item_button_editor
|
||||
image=blank_button_editor
|
||||
#image=item_button_editor
|
||||
items=editor-tool-item
|
||||
tooltip= _ "Item Placement Tool, Left mouse button sets a new item or moves it via drag and drop, right clears. Not implemented yet."
|
||||
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= _ "Village Ownership, Left mouse button sets the village ownership to the current side, right clears. Not implemented yet."
|
||||
tooltip_name_prepend=yes
|
||||
rect="+6,=,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
|
||||
|
||||
#Second Row.
|
||||
[menu]
|
||||
id=flood_button_editor
|
||||
image=flood_button_editor
|
||||
items=editor-tool-fill
|
||||
# wmllint: local spelling fore-/background
|
||||
tooltip= _ "Use left/right mouse button to draw fore-/background terrain. Hold Shift to paint base layer only. Ctrl+click to sample terrain under cursor."
|
||||
tooltip_name_prepend=yes
|
||||
ref=draw_button_editor
|
||||
rect="=,+6,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
[menu]
|
||||
id=select_button_editor
|
||||
image=select_button_editor
|
||||
|
|
@ -254,98 +294,45 @@
|
|||
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=label_button_editor
|
||||
image=label_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=soundsource_button_editor
|
||||
image=blank_button_editor
|
||||
#items=editor-tool-soundsource
|
||||
tooltip= _ "Soundsource Tool, Left mouse button sets or drages a soundsource, right clears. Not implemented yet."
|
||||
#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
|
||||
tooltip= _ "Place Unit Tool, Left mouse button sets a new unit or moves a unit via drag and drop, right clears. Not implemented yet."
|
||||
tooltip_name_prepend=yes
|
||||
rect="+6,=,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
#3rd Row.
|
||||
[menu]
|
||||
id=undo_button_editor
|
||||
ref=flood_button_editor
|
||||
image=undo_button_editor
|
||||
items=undo
|
||||
auto_tooltip=yes
|
||||
#ref=unit_button_editor
|
||||
rect="=,+71,+24,+24"
|
||||
#rect="=,+39,+24,+24"
|
||||
rect="=,+9,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
|
@ -378,7 +365,7 @@
|
|||
[/menu]
|
||||
[menu]
|
||||
id=zoom_default_button_editor
|
||||
image=zoom_out_button_editor
|
||||
image=zoom_default_button_editor
|
||||
items=zoomdefault
|
||||
auto_tooltip=yes
|
||||
rect="+6,=,+24,+24"
|
||||
|
|
@ -386,20 +373,69 @@
|
|||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
#4th Row.
|
||||
[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"
|
||||
id=resize_button_editor
|
||||
image=resize_button_editor
|
||||
items=editor-map-resize
|
||||
tooltip_name_prepend=yes
|
||||
ref=undo_button_editor
|
||||
rect="=,+6,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
[menu]
|
||||
id=toggle_grid_button_editor
|
||||
image=toggle_grid_button_editor
|
||||
items=togglegrid
|
||||
tooltip_name_prepend=yes
|
||||
rect="+6,=,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
[menu]
|
||||
id=flip_map_button_editor
|
||||
image=flip_map_button_editor
|
||||
items=flip-map
|
||||
tooltip= _ "Flip Map - Not implemented yet."
|
||||
#tooltip_name_prepend=yes
|
||||
rect="+6,=,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
[menu]
|
||||
id=blank_button_editor3
|
||||
image=blank_button_editor
|
||||
# items=editor-tool-
|
||||
# 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=blank_button_editor4
|
||||
image=blank_button_editor
|
||||
# items=editor-tool-
|
||||
# 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=menu-editor-terrain
|
||||
title= _ "Group"
|
||||
image=lite_small
|
||||
font_size=9
|
||||
items=editor-terrain-groups
|
||||
ref=bottom-right-panel
|
||||
rect="=+16,=+2,+55,+18"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
|
||||
[panel]
|
||||
id=villages-panel
|
||||
|
|
@ -446,7 +482,7 @@
|
|||
[terrain_image]
|
||||
id=terrain_image
|
||||
ref=menu-editor-terrain
|
||||
rect="+25,=-2,+25,+25"
|
||||
rect="+4,=-2,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/terrain_image]
|
||||
|
|
@ -537,44 +573,125 @@
|
|||
[/position]
|
||||
[terrain]
|
||||
id=status-terrain
|
||||
font_size={DEFAULT_EDITOR_FONT_TINY}
|
||||
# font_size={DEFAULT_EDITOR_FONT_TINY}
|
||||
ref=terrain-panel
|
||||
font_size={DEFAULT_EDITOR_FONT_SMALL}
|
||||
#rect="=+115,=,=-24,="
|
||||
rect="=+65,=,=-24,="
|
||||
xanchor=left
|
||||
yanchor=fixed
|
||||
[/terrain]
|
||||
[/status]
|
||||
|
||||
[menu]
|
||||
id=leftscroll-button-editor
|
||||
image=left_arrow-button
|
||||
items=editor-terrain-leftscroll
|
||||
ref=terrain_image
|
||||
rect="+6,=+0,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
[menu]
|
||||
id=rightscroll-button-editor
|
||||
image=right_arrow-button
|
||||
items=editor-terrain-rightscroll
|
||||
ref=leftscroll-button-editor
|
||||
rect="+6,=+0,+24,+24"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/menu]
|
||||
|
||||
[/resolution]
|
||||
|
||||
[partialresolution]
|
||||
id=1024x600
|
||||
inherits=1024x768
|
||||
width=1024
|
||||
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,+215"
|
||||
[/change]
|
||||
# reduce vertical size of minimap by 40px
|
||||
[change]
|
||||
id=mini-map
|
||||
rect="=+10,=+7,=-7,+94"
|
||||
[/change]
|
||||
|
||||
[remove]
|
||||
id=resize_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=toggle_grid_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=flip_map_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=blank_button_editor3
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=blank_button_editor4
|
||||
[/remove]
|
||||
|
||||
[/partialresolution]
|
||||
|
||||
[partialresolution]
|
||||
id=800x600
|
||||
inherits=1024x600
|
||||
width=800
|
||||
height=600
|
||||
|
||||
[change]
|
||||
id=status-terrain
|
||||
#TODO
|
||||
# ref=terrain-panel
|
||||
# rect="+115,=,=-24,="
|
||||
font_size={DEFAULT_EDITOR_FONT_TINY}
|
||||
# xanchor=left
|
||||
# yanchor=fixed
|
||||
[/change]
|
||||
|
||||
[/partialresolution]
|
||||
|
||||
[partialresolution]
|
||||
id=800x480
|
||||
inherits=800x600
|
||||
width=800
|
||||
height=480
|
||||
|
||||
[remove]
|
||||
id=undo_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=redo_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=zoom_in_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=zoom_out_button_editor
|
||||
[/remove]
|
||||
|
||||
[remove]
|
||||
id=zoom_default_button_editor
|
||||
[/remove]
|
||||
|
||||
[/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]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue