From 398906e131deb99cd47bbe35fd37c0afc64c84bc Mon Sep 17 00:00:00 2001
From: Karol Nowak <grzywacz@gmail.com>
Date: Thu, 3 Aug 2006 17:41:10 +0000
Subject: [PATCH] The default theme should now be usable at 320x240

---
 data/themes/default.cfg | 66 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/data/themes/default.cfg b/data/themes/default.cfg
index d1fcc2a54df..309143b90a2 100644
--- a/data/themes/default.cfg
+++ b/data/themes/default.cfg
@@ -19,9 +19,9 @@ name=Default
 #define FONT320_NORMAL
 8 #enddef
 #define FONT320_SMALL
-6 #enddef
+7 #enddef
 #define FONT320_TINY
-6 #enddef
+7 #enddef
 
 {themes/macros.cfg}
 
@@ -504,7 +504,7 @@ inherits=800x600
 
 	[change]
 	id=top-panel
-	rect="=,=,=,+13"
+	rect="=,=,=,+15"
 	[/change]
 
 	[change]
@@ -528,13 +528,13 @@ inherits=800x600
 
 	[change]
 	id=menu-main
-	rect="=+1,=,+5,=-2"
+	rect="=,=,+5,=-2"
 	[/change]
 
 	[change]
 	id=actions-menu
 	title= _ "Act."
-	rect="=+21,=,+5,="
+	rect="=+30,=,+5,="
 	[/change]
 
 	[change]
@@ -549,7 +549,7 @@ inherits=800x600
 		font_size={FONT320_SMALL}
 		items=zoomin
 		ref=top-panel
-		rect="980,=,+6,="
+		rect="982,=,5,="
 		xanchor=right
 		yanchor=top
 		[/menu]
@@ -558,7 +558,7 @@ inherits=800x600
 		title="-"
 		font_size={FONT320_SMALL}
 		items=zoomout
-		rect="=+11,=,+6,="
+		rect="=+15,=,5,="
 		xanchor=right
 		yanchor=top
 		[/menu]
@@ -566,42 +566,42 @@ inherits=800x600
 
 	[change]
 	id=button-endturn
-	title= _ "short end-turn^End"
+	title= _ "short end-turn^E."
 	ref=top-panel
-	rect="1002,=,=-2,="
+	rect="1008,=,=-2,="
 	yanchor=top
 	[/change]
 
 	[change]
 	id=turn-panel
 	ref=top-panel
-	rect="=+120,=+1,+80,=-1"
+	rect="=+175,=+1,+80,=-1"
 	[/change]
 	[change]
 	id=gold-panel
-	rect="+5,=,+80,="
+	rect="+3,=,+90,="
 	[/change]
 	[change]
 	id=villages-panel
-	rect="+5,=,+80,="
+	rect="+3,=,+80,="
 	[/change]
 	[change]
 	id=units-panel
-	rect="+5,=,+80,="
+	rect="+3,=,+80,="
 	[/change]
 	[change]
 	id=upkeep-panel
-	rect="+5,=,+80,="
+	rect="+3,=,+90,="
 	[/change]
 	[change]
 	id=income-panel
-	rect="+5,=,+80,="
+	rect="+3,=,+80,="
 	[/change]
 
 	[change]
 	id=label-hp
 	font_size={FONT320_TINY}
-	rect="=+40,=+93,+12,+8"
+	rect="=+45,=+93,+12,+8"
 	[/change]
 	[change]
 	id=label-xp
@@ -612,15 +612,15 @@ inherits=800x600
 
 	[change]
 	id=gold-icon
-	rect="=+3,=+1,+8,+8"
+	rect="=+3,=+1,+16,+8"
 	[/change]
 	[change]
 	id=villages-icon
-	rect="=+3,=+1,+8,+8"
+	rect="=+4,=+1,+16,+8"
 	[/change]
 	[change]
 	id=units-icon
-	rect="=+3,=+1,+8,+8"
+	rect="=+3,=+1,+16,+8"
 	[/change]
 	[change]
 	id=upkeep-icon
@@ -633,7 +633,7 @@ inherits=800x600
 
 	[change]
 	id=image-tod
-	rect="=+5,=+71,=-4,+17"
+	rect="=+9,=+71,=-0,+17"
 	[/change]
 
 	[change]
@@ -644,42 +644,42 @@ inherits=800x600
 	[change]
 		id=turn
 		font_size={FONT320_SMALL}
-		rect="+4,=,+58,+8"
+		rect="+15,=,+58,+8"
 	[/change]
 	[change]
 		id=gold
 		font_size={FONT320_SMALL}
-		rect="+4,=,+58,+8"
+		rect="+10,=,+58,+8"
 	[/change]
 	[change]
 		id=villages
 		font_size={FONT320_SMALL}
-		rect="+4,=,+58,+8"
+		rect="+10,=,+58,+8"
 	[/change]
 	[change]
 		id=num-units
 		font_size={FONT320_SMALL}
-		rect="+4,=,+58,+8"
+		rect="+10,=,+58,+8"
 	[/change]
 	[change]
 		id=status-upkeep
 		font_size={FONT320_SMALL}
-		rect="+4,=,+58,+8"
+		rect="+10,=,+58,+8"
 	[/change]
 	[change]
 		id=status-income
 		font_size={FONT320_SMALL}
-		rect="+4,=,+58,+8"
+		rect="+10,=,+58,+8"
 	[/change]
-	[change]
+	[remove]
 		id=status-position
 		font_size={FONT320_SMALL}
-		rect="+5,=,+130,+8"
-	[/change]
-	[change]
+		rect="+15,=,+130,+8"
+	[/remove]
+	[remove]
 		id=observers
 		rect="+5,=,+8,+8"
-	[/change]
+	[/remove]
 	[change]
 		id=unit-image
 		rect="=+12,=+100,+20,+20"
@@ -734,13 +734,13 @@ inherits=800x600
 	[change]
 		id=unit-weapons
 		font_size={FONT320_SMALL}
-		rect="=,+0,=,768"
+		rect="=+8,+0,=,768"
 	[/change]
 	[change]
 		id=unit-status
 		font_size={FONT320_SMALL}
 		ref=label-xp
-		rect="=,+2,=,+8"
+		rect="=+8,+2,=,+8"
 	[/change]
 
 [/partialresolution]