From 3ea10840b626cd04c91c919518413df69af93277 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 28 Feb 2010 20:11:37 -0700
Subject: Rename gui.xml to window.xml

---
 data/graphics/gui/CMakeLists.txt |  2 +-
 data/graphics/gui/Makefile.am    |  4 ++--
 data/graphics/gui/gui.xml        | 18 ------------------
 data/graphics/gui/window.xml     | 18 ++++++++++++++++++
 src/gui/widgets/window.h         |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 data/graphics/gui/gui.xml
 create mode 100644 data/graphics/gui/window.xml

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 01b8674f..fc825139 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -9,7 +9,6 @@ SET (FILES
     circle-green.png
     close_button.png
     deepbox.png
-    gui.xml
     hscroll_left_default.png
     hscroll_left_highlight.png
     hscroll_left_pressed.png
@@ -48,6 +47,7 @@ SET (FILES
     vscroll_up_highlight.png
     vscroll_up_pressed.png
     window.png
+    window.xml
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/gui)
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index ed48c012..68d11bf7 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -12,7 +12,6 @@ gui_DATA =				\
 	circle-green.png		\
 	close_button.png		\
 	deepbox.png			\
-	gui.xml				\
 	hscroll_left_default.png	\
 	hscroll_left_highlight.png	\
 	hscroll_left_pressed.png	\
@@ -50,7 +49,8 @@ gui_DATA =				\
 	vscroll_up_default.png		\
 	vscroll_up_highlight.png	\
 	vscroll_up_pressed.png		\
-	window.png
+	window.png			\
+	window.xml
 
 EXTRA_DIST =				\
 	$(gui_DATA)
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml
deleted file mode 100644
index f27dbc7f..00000000
--- a/data/graphics/gui/gui.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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="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="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>
diff --git a/data/graphics/gui/window.xml b/data/graphics/gui/window.xml
new file mode 100644
index 00000000..f27dbc7f
--- /dev/null
+++ b/data/graphics/gui/window.xml
@@ -0,0 +1,18 @@
+<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="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="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>
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index fd7fd6b7..b72be9d4 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -57,7 +57,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          * @param skin    The location where the window's skin XML can be found.
          */
         Window(const std::string &caption = "Window", bool modal = false,
-               Window *parent = NULL, const std::string &skin = "gui.xml");
+               Window *parent = NULL, const std::string &skin = "window.xml");
 
         /**
          * Destructor. Deletes all the added widgets.
-- 
cgit v1.2.3-70-g09d2