From c3853b376d917dc6a6e71c61ace41a853bfaca7c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Oct 2014 21:45:28 +0200
Subject: [PATCH] Fix outdated core_layouteditor.xml

---
 files/mygui/CMakeLists.txt        |  2 ++
 files/mygui/core.xml              | 20 +-------------------
 files/mygui/core_layouteditor.xml | 19 +------------------
 files/mygui/skins.xml             | 25 +++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 37 deletions(-)
 create mode 100644 files/mygui/skins.xml

diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 0099f9a46..638266b0c 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -8,6 +8,7 @@ set(MYGUI_FILES
     white.png
     core.skin
     core.xml
+    core_layouteditor.xml
     openmw_alchemy_window.layout
     openmw_book.layout
     openmw_box.skin.xml
@@ -88,6 +89,7 @@ set(MYGUI_FILES
     DejaVuLGCSansMono.ttf
     ../launcher/images/openmw.png
     OpenMWResourcePlugin.xml
+    skins.xml
 )
 
 
diff --git a/files/mygui/core.xml b/files/mygui/core.xml
index f3b482d50..23697890d 100644
--- a/files/mygui/core.xml
+++ b/files/mygui/core.xml
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI>
     <MyGUI type="List">
-        <List file="core.skin" />
-        <List file="openmw_resources.xml" />
+        <List file="skins.xml" />
         <List file="openmw_layers.xml" />
         <List file="openmw_pointer.xml" />
-        <List file="openmw_font.xml" />
-        <List file="openmw_text.skin.xml" />
-        <List file="openmw_windows.skin.xml" />
-        <List file="openmw_button.skin.xml" />
-        <List file="openmw_list.skin.xml" />
-        <List file="openmw_edit.skin.xml" />
-        <List file="openmw_box.skin.xml" />
-        <List file="openmw_progress.skin.xml" />
-        <List file="openmw_hud_energybar.skin.xml" />
-        <List file="openmw_hud_box.skin.xml" />
-        <List file="openmw_mainmenu.skin.xml" />
-        <List file="openmw_console.skin.xml" />
-        <List file="openmw_journal.skin.xml" />
-        <List file="openmw_map_window.skin.xml" />
-        <List file="openmw_dialogue_window.skin.xml" />
-        <List file="openmw_scroll.skin.xml" />
         <List file="openmw_settings.xml" />
-        <List file="openmw_debug_window.skin.xml" />
     </MyGUI>
 </MyGUI>
 
diff --git a/files/mygui/core_layouteditor.xml b/files/mygui/core_layouteditor.xml
index a945f2aae..3c38945c7 100644
--- a/files/mygui/core_layouteditor.xml
+++ b/files/mygui/core_layouteditor.xml
@@ -2,24 +2,7 @@
 <MyGUI>
     <MyGUI type="List">
         <List file="OpenMWResourcePlugin.xml"/> <!-- Must be first -->
-        <List file="core.skin"/>
-        <List file="openmw_resources.xml"/>
-        <List file="openmw_font.xml"/>
-        <List file="openmw_text.skin.xml"/>
-        <List file="openmw_windows.skin.xml"/>
-        <List file="openmw_button.skin.xml"/>
-        <List file="openmw_list.skin.xml"/>
-        <List file="openmw_edit.skin.xml"/>
-        <List file="openmw_box.skin.xml"/>
-        <List file="openmw_progress.skin.xml"/>
-        <List file="openmw_hud_energybar.skin.xml"/>
-        <List file="openmw_hud_box.skin.xml"/>
-        <List file="openmw_mainmenu_skin.xml"/>
-        <List file="openmw_console.skin.xml"/>
-        <List file="openmw_journal_skin.xml"/>
-        <List file="openmw_map_window_skin.xml"/>
-        <List file="openmw_dialogue_window_skin.xml"/>
-        <List file="openmw_scroll_skin.xml"/>
+        <List file="skins.xml"/>
         <List file="openmw_settings.xml"/>
     </MyGUI>
 </MyGUI>
diff --git a/files/mygui/skins.xml b/files/mygui/skins.xml
new file mode 100644
index 000000000..1811afb83
--- /dev/null
+++ b/files/mygui/skins.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI>
+    <MyGUI type="List">
+        <List file="core.skin"/>
+        <List file="openmw_resources.xml"/>
+        <List file="openmw_font.xml"/>
+        <List file="openmw_text.skin.xml"/>
+        <List file="openmw_windows.skin.xml"/>
+        <List file="openmw_button.skin.xml"/>
+        <List file="openmw_list.skin.xml"/>
+        <List file="openmw_edit.skin.xml"/>
+        <List file="openmw_box.skin.xml"/>
+        <List file="openmw_progress.skin.xml"/>
+        <List file="openmw_hud_energybar.skin.xml"/>
+        <List file="openmw_hud_box.skin.xml"/>
+        <List file="openmw_mainmenu.skin.xml"/>
+        <List file="openmw_console.skin.xml"/>
+        <List file="openmw_journal.skin.xml"/>
+        <List file="openmw_map_window.skin.xml"/>
+        <List file="openmw_dialogue_window.skin.xml"/>
+        <List file="openmw_scroll.skin.xml"/>
+        <List file="openmw_debug_window.skin.xml" />
+    </MyGUI>
+</MyGUI>
+