Merge branch 'master' of git@gitorious.org:tmw/mainline

7 files changed, 17 insertions, 19 deletions

diff --git a/data/branding.xml b/data/branding.xml
index 29974ab4..fd5779f6 100644
--- a/data/branding.xml
+++ b/data/branding.xml
@@ -15,7 +15,7 @@ writing a branding.xml for their forks.
  <option name="appIcon" value="icons/tmw.png"/>
  <option name="loginMusic" value="Magick - Real.ogg"/>
  <option name="defaultServer" value="server.themanaworld.org"/>
- <option name="defaultPort" value="9601"/>
+ <option name="defaultPort" value="6901"/>
  <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/>
  <option name="font" value="fonts/dejavusans.ttf" />
  <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 78fde595..920f3b88 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,5 +1,4 @@
 SET (FILES
-    bg_quad_dis.png
     bubble.png
     button.png
     button_disabled.png
@@ -10,7 +9,6 @@ SET (FILES
     circle-green.png
     close_button.png
     deepbox.png
-    default.png
     gui.xml
     hscroll_left_default.png
     hscroll_left_highlight.png
@@ -43,6 +41,7 @@ SET (FILES
     vscroll_up_default.png
     vscroll_up_highlight.png
     vscroll_up_pressed.png
+    window.png
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/gui)
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 98a0c2a5..a2bafb29 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -2,7 +2,6 @@
 guidir = $(pkgdatadir)/data/graphics/gui
 
 gui_DATA =				\
-	bg_quad_dis.png			\
 	bubble.png			\
 	button.png			\
 	button_disabled.png		\
@@ -13,7 +12,6 @@ gui_DATA =				\
 	circle-green.png		\
 	close_button.png		\
 	deepbox.png			\
-	default.png			\
 	gui.xml				\
 	hscroll_left_default.png	\
 	hscroll_left_highlight.png	\
@@ -45,7 +43,8 @@ gui_DATA =				\
 	vscroll_grey.png		\
 	vscroll_up_default.png		\
 	vscroll_up_highlight.png	\
-	vscroll_up_pressed.png
+	vscroll_up_pressed.png		\
+	window.png
 
 EXTRA_DIST =				\
 	$(gui_DATA)
diff --git a/data/graphics/gui/bg_quad_dis.png b/data/graphics/gui/bg_quad_dis.png
deleted file mode 100644
index 3a0354bb..00000000
--- a/data/graphics/gui/bg_quad_dis.png
+++ /dev/null
diff --git a/data/graphics/gui/default.png b/data/graphics/gui/default.png
deleted file mode 100644
index a8bc5baf..00000000
--- a/data/graphics/gui/default.png
+++ /dev/null
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml
index fe62528e..f27dbc7f 100644
--- a/data/graphics/gui/gui.xml
+++ b/data/graphics/gui/gui.xml
@@ -1,18 +1,18 @@
-<skinset name="Default" image="default.png">
-    <widget type="Window">
-        <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
-		<part type="top-edge" xpos="4" ypos="0" width="3" height="4" />
-		<part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" />
+<skinset name="Default" image="window.png">
+	<widget type="Window">
+		<!-- Top Row -->
+		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+		<part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
+		<part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" />
 
 		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="4" width="4" height="10" />
-		<part type="bg-quad" xpos="11" ypos="0" width="32" height="32" />
-		<part type="right-edge" xpos="7" ypos="4" width="4" height="10" />
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="216" />
+		<part type="bg-quad" xpos="4" ypos="4" width="32" height="216" />
+		<part type="right-edge" xpos="36" ypos="4" width="4" height="216" />
 
 		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" />
-		<part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" />
-		<part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" />
+		<part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" />
+		<part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" />
 	</widget>
-</skinset>
\ No newline at end of file
+</skinset>
diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png
new file mode 100644
index 00000000..f0ef1af4
--- /dev/null
+++ b/data/graphics/gui/window.png