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

"tiny gui support"-removal part 4:

Browse source 
basic removal from config files (not from GUI2 specific stuff!)

TODO: remove tinygui from scons build system and consider if removing
"smaller res" support should be removed from GUI2 config files
This commit is contained in:
Nils Kneuper 2011-02-12 16:41:14 +00:00
parent d3a1514d65
commit ea138d748f
3 changed files with 0 additions and 390 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/game_config.cfg
View file

@ -25,16 +25,6 @@
default_victory_music="victory.ogg,victory2.ogg"
default_defeat_music="defeat.ogg,defeat2.ogg"
#ifdef TINY
buttons_x=760
buttons_y=330
buttons_padding=4
logo_x=270
logo_y=90
tip_x=100
tip_width=495
tip_padding=4
#else
#ifdef SMALL_GUI
buttons_x=760
buttons_y=210
@ -53,7 +43,6 @@
tip_x=100
tip_width=495
tip_padding=20
#endif
#endif
lobby_refresh=1000
@ -81,11 +70,7 @@
partmoved_orb="misc/orb-partmoved.png"
enemy_orb="misc/orb-enemy.png"
ally_orb="misc/orb-ally.png"
#ifdef TINY
energy="misc/bar-energy-tinygui.png"
#else
energy="misc/bar-energy.png"
#endif
flag="flags/flag-1.png:150,flags/flag-2.png:150,flags/flag-3.png:150,flags/flag-4.png:150"
flag_icon="flags/flag-icon.png"

339
data/themes/default.cfg
View file

@ -521,8 +521,6 @@
{REPLAY_THEME {DEFAULT_FONT_SMALL}}
[/resolution]
# make sure not to use those if tinygui is set, otherwise it will look strange (it will look strange starting at 1024x768 this way)
#ifndef TINY
[partialresolution]
id=800x600
inherits=1024x768
@ -702,342 +700,5 @@
font_size={DEFAULT_FONT_REALLYTINY}
[/change]
[/partialresolution]
#endif
# Everything below is only relevant if tinygui is activated at compile time. Putting it into a #ifdef so that there is nothing to choke about if that is not the case
#ifdef TINY
[partialresolution]
id=400x300
width=400
height=300
inherits=1024x768
[change]
id=top-panel
rect="=,=,=,+15"
[/change]
[change]
id=main-map
rect="=,+0,+953,768"
[/change]
[change]
id=top-right-panel
rect="+0,=-1,1024,+125"
[/change]
[change]
id=middle-right-panel
rect="=,+0,=,+610"
[/change]
[change]
id=menu-main
rect="=,=,+5,=-2"
[/change]
[change]
id=actions-menu
rect="=+30,=,+5,="
[/change]
[change]
id=mini-map
rect="=+5,=+3,=-4,+64"
[/change]
[add]
[menu]
id=zoom-in
title="+" #wmllint: ignore
font_size={DEFAULT_FONT320_SMALL}
items=zoomin
ref=top-panel
rect="997,=,5,="
xanchor=right
yanchor=top
[/menu]
[menu]
id=zoom-out
title="-" #wmllint: ignore
font_size={DEFAULT_FONT320_SMALL}
items=zoomout
rect="=+15,=,5,="
xanchor=right
yanchor=top
[/menu]
[/add]
[change]
id=button-endturn
title= _ "End Turn"
title2= _ "End Scenario"
items=endturn
ref=bottom-right-panel
rect="=+14,=+3,+300,+14"
[/change]
[change]
id=turn-panel
ref=top-panel
rect="=+175,=+1,+80,=-1"
[/change]
[change]
id=gold-panel
rect="+3,=,+90,="
[/change]
[change]
id=villages-panel
rect="+3,=,+80,="
[/change]
[change]
id=units-panel
rect="+3,=,+80,="
[/change]
[change]
id=upkeep-panel
rect="+3,=,+90,="
[/change]
[change]
id=income-panel
rect="+3,=,+80,="
[/change]
[change]
id=label-hp
font_size={DEFAULT_FONT320_TINY}
rect="=+42,=+93,+12,+8"
[/change]
[change]
id=label-xp
font_size={DEFAULT_FONT320_TINY}
rect="=,+8,=,+8"
[/change]
[change]
id=gold-icon
rect="=+3,=+1,+16,+8"
[/change]
[change]
id=villages-icon
rect="=+4,=+1,+16,+8"
[/change]
[change]
id=units-icon
rect="=+3,=+1,+16,+8"
[/change]
[change]
id=upkeep-icon
rect="=+3,=+1,+16,+8"
[/change]
[change]
id=income-icon
rect="=+3,=+1,+16,+8"
[/change]
[change]
id=image-tod
rect="=+5,=+71,=-0,+17"
[/change]
[change]
id=icon-sideplaying
rect="=+3,=+1,+20,+8"
[/change]
# timer panel too big...
[change]
id=timeout-panel
rect="+5,=,+90,="
[/change]
[change]
id=report_timeout
font_size={DEFAULT_FONT320_SMALL}
rect="+0,=,+62,+16"
[/change]
[change]
id=time-icon
rect="=+3,=+1,+16,+8"
[/change]
# replay panel not wide enough, for the dirty hacks used see data/themes/macros.cfg
# adjust top bar
[change]
id=turn
font_size={DEFAULT_FONT320_SMALL}
rect="+4,=,+58,+8"
[/change]
[change]
id=gold
font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=villages
font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=num-units
font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=status-upkeep
font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[change]
id=status-income
font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+58,+8"
[/change]
[remove]
id=status-terrain
[/remove]
[change]
id=status-position
font_size={DEFAULT_FONT320_SMALL}
rect="+10,=,+170,+12"
[/change]
[remove]
id=observers
rect="+5,=,+8,+8"
[/remove]
# adjust right pane
[change]
id=unit-image
rect="=+5,=+92,+36,+36"
[/change]
[change]
id=unit-description
font_size={DEFAULT_FONT320_NORMAL}
rect="=+6,=+2,=-2,+10"
[/change]
[change]
id=unit-type
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[remove]
id=unit-race
[/remove]
[change]
id=unit-level
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-alignment
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-traits
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-abilities
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-moves
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-defense
font_size={DEFAULT_FONT320_SMALL}
rect="=,+0,=,+8"
[/change]
[change]
id=unit-hp
font_size={DEFAULT_FONT320_SMALL}
ref=label-hp
rect="=,+0,+54,+8"
[/change]
[change]
id=unit-xp
font_size={DEFAULT_FONT320_SMALL}
ref=label-xp
rect="=,+0,+54,+8"
[/change]
[change]
id=unit-weapons
font_size={DEFAULT_FONT320_SMALL}
[/change]
[change]
id=unit-status
font_size={DEFAULT_FONT320_SMALL}
ref=unit-level
rect="=+36,=,=+36,+10"
[/change]
[/partialresolution]
[partialresolution]
id=320x240
width=320
height=240
inherits=400x300
[change]
id=top-right-panel
rect="+0,=-1,1024,+125"
[/change]
[change]
id=middle-right-panel
rect="=,+0,=,768"
[/change]
[remove]
id=bottom-right-panel
[/remove]
[change]
id=actions-menu
title= _ "Act."
rect="=+30,=,+5,="
[/change]
[remove]
id=status-position
[/remove]
[change]
id=zoom-in
rect="982,=,5,="
[/change]
[change]
id=zoom-out
rect="=+15,=,5,="
[/change]
# replace endturn button at the buttom right with a tiny one at the top right
[remove]
id=button-endturn
title= _ "short end-turn^E." # wmllint: no spellcheck
ref=top-panel
rect="1008,=,=-2,="
yanchor=top
[/remove]
[add]
[menu]
id=button-endturn2
title= _ "short end-turn^E." # wmllint: no spellcheck
title2= _ "End Scenario"
items=endturn
ref=top-panel
rect="1008,=,=-2,="
xanchor=right
yanchor=top
[/menu]
[/add]
[/partialresolution]
#endif
[/theme]

36
data/themes/macros.cfg
View file

@ -33,22 +33,14 @@
[change]
id=main-map
ref=top-panel
#ifdef TINY
rect="=,+16,+953,768"
#else
rect="=,+26,+882,768"
#endif
[/change]
[add]
[panel]
id=replay-panel
image=themes/top-bg.png
ref=top-panel
#ifdef TINY
rect="=,+0,+953,+16"
#else
rect="=,+0,+882,+26"
#endif
xanchor=left
yanchor=fixed
[/panel]
@ -74,11 +66,7 @@
title= _ "Play"
tooltip= _ "continuous replay"
items=playreplay
#ifdef TINY
rect="+4,=,+10,="
#else
rect="+4,=-4,+23,="
#endif
xanchor=fixed
yanchor=fixed
[/menu]
@ -92,11 +80,7 @@
title= _ "Stop"
tooltip= _ "pause at end of turn"
items=stopreplay
#ifdef TINY
rect="+4,=,+10,="
#else
rect="+4,=,+23,="
#endif
xanchor=fixed
yanchor=fixed
[/menu]
@ -110,11 +94,7 @@
title= _ "Reset"
tooltip= _ "reset to beginning"
items=resetreplay
#ifdef TINY
rect="+4,=,+10,="
#else
rect="+4,=,+23,="
#endif
xanchor=fixed
yanchor=fixed
[/menu]
@ -128,11 +108,7 @@
title= _ "Next Turn"
tooltip= _ "play turn"
items=replaynextturn
#ifdef TINY
rect="+4,=,+10,="
#else
rect="+4,=,+23,="
#endif
xanchor=fixed
yanchor=fixed
[/menu]
@ -146,11 +122,7 @@
title= _ "Next Side"
tooltip= _ "play side turn"
items=replaynextside
#ifdef TINY
rect="+4,=,+10,="
#else
rect="+4,=,+23,="
#endif
xanchor=fixed
yanchor=fixed
[/menu]
@ -162,11 +134,7 @@
image=lite
title= _ "Point of view"
items=replayshowteam1,replayshoweach,replayshoweverything
#ifdef TINY
rect="+10,=-1,+60,+10"
#else
rect="+15,=+2,+100,+10"
#endif
xanchor=fixed
yanchor=fixed
[/menu]
@ -178,11 +146,7 @@
type=checkbox
title= _ "Skip animation"
items=replayskipanimation
#ifdef TINY
rect="+10,=+1,+80,+5"
#else
rect="+15,=+1,+80,+10"
#endif
xanchor=fixed
yanchor=fixed
[/menu]