0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change editor theme to work in 800x600, too

Browse source 
move minimap to the topright to increase space for the terrain list

decrease center button area to increase available space for terrain list

comment out unused/broken items in the editor theme

add TODO markers for enhancement of themeability for the editor
This commit is contained in:
Nils Kneuper 2008-02-17 16:38:40 +00:00
parent 91a9439e97
commit 4ec550135a
5 changed files with 200 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -19,6 +19,8 @@ Version 1.3.16+svn:
* add support for 800x480 when using the configure option
--enable-small-gui, not everything displays correctly (preferences,
mp-creation/lobby, ...), but normal gameplay should work perfectly
* improved editor theme so that it works in 800x600, too
* increase space for terrains in the mapeditor by rearanging items a little
* quick replays no longer scroll to leaders
* scrolling to the leader the very first time happens instantly now
* Various tunings about the transparency of hp/xp bars (avoid confusion like

BIN
data/core/images/themes/rightside-editor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 18 KiB

330
data/themes/editor.cfg
View file

@ -495,15 +495,35 @@
#endif
[resolution]
#everywhere in here 1024x768 is seen as basic reference due to some hardcoded values
id=800x600
width=800
height=600
[screen]
# this is only useful as a ref for other rects
id=screen
rect="0,0,1024,768"
[/screen]
# top panel
[panel]
id=top-panel
image=themes/top-bg.png
ref=screen
rect="=,=,882,+26"
xanchor=top
yanchor=fixed
[/panel]
[main_map]
rect=0,26,882,768
id=main-map
rect="=,+0,+882,768"
xanchor=left
yanchor=top
[/main_map]
#not shown/used in the editor but might eventually be activated...
[main_map_border]
border_size = 0.5
background_image = "terrain/off-map/background.png"
@ -534,201 +554,221 @@
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
[/main_map_border]
# rightside panel
[panel]
id=top-right-panel
image=themes/rightside-editor.png
rect="+0,0,1024,+304"
#rect=882,359,1024,722
xanchor=right
yanchor=fixed
[/panel]
[panel]
id=middle-right-panel
image=themes/rightside-bg.png
rect="=,+0,=,768"
#rect=882,25,1024,359
xanchor=right
yanchor=fixed
[/panel]
# ain't working anyway in the way it should, the space can be better used otherwise
# [panel]
# id=bottom-right-panel
# image=themes/rightside-bottom.png
# rect=882,722,1024,768
# xanchor=right
# yanchor=bottom
# [/panel]
[menu]
id=file-menu
title=_"File"
image=lite
items=editnewmap,editloadmap,editsaveas,editsavemap,editrevert,editquit
rect=3,1,103,22
ref=top-panel
rect="=+3,=+1,+100,=-4"
xanchor=fixed
yanchor=fixed
[/menu]
[menu]
id=edit-menu
title=_"Edit"
image=lite
items=undo,redo,editcut,editcopy,editpaste,editselectall,editfillselection,editrotateselection,editresize,editflip,editrefresh,editupdate,
rect=107,1,207,22
rect="+2,=,+100,="
xanchor=fixed
yanchor=fixed
[/menu]
[menu]
id=settings-menu
title=_"Settings"
image=lite
items=changelanguage,preferences,editautoupdate
rect=211,1,311,22
[/menu]
# The toolbar.
[menu]
image=draw_button_editor
items=editdraw
rect=913,229,937,254
xanchor=right
rect="+2,=,+100,="
xanchor=fixed
yanchor=fixed
[/menu]
[menu]
image=flood_button_editor
items=editfloodfill
rect=945,229,969,254
xanchor=right
yanchor=fixed
[/menu]
[menu]
image=start_position_button_editor
items=editsetstartpos
rect=977,229,1001,254
xanchor=right
yanchor=fixed
[/menu]
[menu]
image=resize_button_editor
items=editresize
rect=913,264,937,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=flip_map_button_editor
items=editflip
rect=945,264,969,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=undo_button_editor
items=undo
rect=957,304,981,328
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=redo_button_editor
items=redo
rect=985,304,1009,328
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=toggle_grid_button_editor
items=togglegrid
rect=977,264,1001,288
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=zoom_in_button_editor
items=zoomin
rect=900,304,924,328
xanchor=right
yachnor=fixed
[/menu]
[menu]
image=zoom_out_button_editor
items=zoomout
rect=928,304,952,328
xanchor=right
yanchor=fixed
[/menu]
# top panel
[panel]
image=themes/top-bg.png
rect=0,0,1024,26
xanchor=top
yanchor=fixed
[/panel]
[panel]
image=themes/rightside-bg.png
rect=882,359,1024,722
xanchor=right
yanchor=top
[/panel]
[panel]
image=themes/rightside-bottom.png
rect=882,722,1024,768
xanchor=right
yanchor=bottom
[/panel]
[panel]
image=themes/rightside-editor.png
rect=882,25,1024,359
xanchor=right
yanchor=fixed
[/panel]
[panel]
id=villages-panel
ref=settings-menu
image=themes/status-bg.png
rect="+5,=,+71,="
xanchor=proportional
ref=settings-menu
rect="+2,=+1,+65,+19"
xanchor=fixed
yanchor=fixed
[/panel]
[mini_map]
rect=892,32,1017,175
xanchor=right
yanchor=fixed
[/mini_map]
[label]
id=villages-icon
icon=themes/villages.png
text= _ "villages"
ref=villages-panel
rect="=+5,=+1,+17,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
[mini_map]
ref=top-right-panel
rect="=+10,=+7,=-7,+143"
#rect=892,32,1017,175
xanchor=right
yanchor=fixed
[/mini_map]
# The toolbar.
[menu]
id=draw_button_editor
image=draw_button_editor
items=editdraw
ref=top-right-panel
#harcoded since the brushes are above, which are hardcoded in src/editor/editor_layout.cpp
rect="=+27,200,+24,+24"
xanchor=right
yanchor=fixed
[/menu]
[menu]
id=flood_button_editor
image=flood_button_editor
items=editfloodfill
rect="+10,=,+24,+24"
xanchor=right
yanchor=fixed
[/menu]
[menu]
id=start_position_button_editor
image=start_position_button_editor
items=editsetstartpos
rect="+10,=,+24,+24"
xanchor=right
yanchor=fixed
[/menu]
[menu]
id=resize_button_editor
image=resize_button_editor
items=editresize
ref=draw_button_editor
rect="=,+10,+24,+24"
xanchor=right
yachnor=fixed
[/menu]
[menu]
id=flip_map_button_editor
image=flip_map_button_editor
items=editflip
rect="+10,=,+24,+24"
xanchor=right
yachnor=fixed
[/menu]
[menu]
id=toggle_grid_button_editor
image=toggle_grid_button_editor
items=togglegrid
rect="+10,=,+24,+24"
xanchor=right
yachnor=fixed
[/menu]
[menu]
id=undo_button_editor
image=undo_button_editor
items=undo
ref=resize_button_editor
rect="=-9,+10,+24,+24"
xanchor=right
yachnor=fixed
[/menu]
[menu]
id=redo_button_editor
image=redo_button_editor
items=redo
rect="+4,=,+24,+24"
xanchor=right
yachnor=fixed
[/menu]
[menu]
id=zoom_in_button_editor
image=zoom_in_button_editor
items=zoomin
rect="+4,=,+24,+24"
xanchor=right
yachnor=fixed
[/menu]
[menu]
id=zoom_out_button_editor
image=zoom_out_button_editor
items=zoomout
rect="+4,=,+24,+24"
xanchor=right
yanchor=fixed
[/menu]
[status]
[villages]
id=villages
ref=villages-icon
rect="+4,=,+55,+16"
rect="+2,=+1,+41,+16"
font_size=12
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/villages]
[terrain]
id=status-terrain
ref=villages-panel
font_size=12
rect=820,4,920,20
xanchor=proportional
rect="+10,=+1,+200,+16"
xanchor=fixed
yanchor=fixed
[/terrain]
[position]
id=status-position
font_size=12
rect=925,4,1020,20
xanchor=proportional
ref=status-terrain
rect="822,=,+60,="
xanchor=right
yanchor=fixed
[/position]
#what is this supposed to do? seems to do *nothing* regarding the theme
#->commenting out
#[edit_left_button_function]
# font_size=10
# rect=900,330,1024,345
# xanchor=right
# yanchor=fixed
#[/edit_left_button_function]
[edit_left_button_function]
font_size=10
rect=900,330,1024,345
xanchor=right
yanchor=fixed
[/edit_left_button_function]
[selected_terrain]
font_size=10
rect=890,730,1024,20
xanchor=right
yanchor=bottom
[/selected_terrain]
#broken since I don't know when, commenting out
#[selected_terrain]
# font_size=10
# rect=890,730,1024,20
# xanchor=right
# yanchor=bottom
#[/selected_terrain]
[/status]
[/resolution]
[/theme]

5
players_changelog
View file

@ -18,7 +18,10 @@ Version 1.3.16+svn:
* Added the option to use a resolution of 800x480 when using
--enable-small-gui at configure time. This is especially usefull for
devices like the eeePC or other handheld devices.
* Various tunings about the transparency of hp/xp bars
* Improved editor theme so that it works as intended in 800x600.
* Increase available space for the terrain list in the map editor by
rearanging items.
* Various tunings about the transparency of hp/xp bars.
Version 1.3.16:
* Language and translations

14
src/editor/editor_layout.cpp
View file

@ -41,12 +41,16 @@ size_specs::size_specs() {
}
void adjust_sizes(const display &disp, size_specs &sizes) {
sizes.brush_x = disp.map_outside_area().w + 23;
sizes.brush_y = 190;
sizes.palette_x = disp.map_outside_area().w + 13;
sizes.palette_y = sizes.brush_y + 160 + 10;
//hardcoded coordinates for brush selection, TODO: make it themeable
sizes.brush_x = disp.map_outside_area().w + 22;
sizes.brush_y = 165;
//hardcoded coordinates for terrain palette, TODO: make it themeable
sizes.palette_x = disp.map_outside_area().w + 16;
sizes.palette_y = sizes.brush_y + 132 + 10;
sizes.palette_w = sizes.terrain_space * default_palette_width;
sizes.palette_h = disp.h() - sizes.palette_y - 60;
//the '-5' make sure that the scroll down button can not be outside of
//the window, this is probably a bug in placement anyway...
sizes.palette_h = disp.h() - sizes.palette_y - 5;
}
} // end namespace map_editor