From 9e73edf3d4c6dcf46d7eb896ceec9ac78e22f84f Mon Sep 17 00:00:00 2001
From: nkorslund <nkorslund@ea6a568a-9f4f-0410-981a-c910a81bb256>
Date: Wed, 11 Feb 2009 10:52:13 +0000
Subject: [PATCH] Minor skin testing.

git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@88 ea6a568a-9f4f-0410-981a-c910a81bb256
---
 COMPILE-linux.txt                    |  5 +++++
 media_mygui/core.font                | 12 ------------
 media_mygui/core.xml                 |  3 ---
 media_mygui/openmw.font.xml          | 23 +++++++++++++++++++++++
 media_mygui/openmw_button.skin.xml   |  3 ++-
 media_mygui/openmw_progress.skin.xml |  2 +-
 media_mygui/openmw_windows.skin.xml  |  2 ++
 7 files changed, 33 insertions(+), 17 deletions(-)
 delete mode 100644 media_mygui/core.font

diff --git a/COMPILE-linux.txt b/COMPILE-linux.txt
index 878654ca8..e3b2354fc 100644
--- a/COMPILE-linux.txt
+++ b/COMPILE-linux.txt
@@ -62,6 +62,11 @@ Soft, which has a less hardware-dependent implementation. If you
 experience sound problems (like stuttering music), try switching to
 OpenAL Soft.
 
+Note to UBUNTU 8.10 users: There's a problem with Pulseaudio in this
+Ubuntu version. If you find that sound doesn't work or you get error
+messages related to sound, try this page:
+http://idyllictux.wordpress.com/2008/10/29/alsa-instead-of-pulseaudio-for-ubuntu-810-intrepid-a-non-destructive-way/
+
 libavcodec and libavformat are part of the FFmpeg package, which is
 part of the 'mplayer' project. Note that some of the codecs might be
 patent protected in your country or area.
diff --git a/media_mygui/core.font b/media_mygui/core.font
deleted file mode 100644
index 3ff0c3be6..000000000
--- a/media_mygui/core.font
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Font">
-	<Font name="MyGUI_CoreFont.18" source="Comic.TTF" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
-		<Code range="33 126"/>
-		<Code range="1025 1105"/>
-		<Code range="8470 8470" help="№"/>
-		<Code hide="128"/>
-		<Code hide="1026 1039"/>
-		<Code hide="1104"/>
-	</Font>
-</MyGUI>
diff --git a/media_mygui/core.xml b/media_mygui/core.xml
index 5a772d28e..2e403161d 100644
--- a/media_mygui/core.xml
+++ b/media_mygui/core.xml
@@ -3,10 +3,7 @@
 <MyGUI>
 
     <MyGUI type="List">
-	    <!--List file="core.lang" group="General"/-->
-	    <!--List file="core.layer" group="General"/-->
 	    <List file="core.skin" group="General"/>
-	    <List file="core.font" group="General"/>
 
 	    <List file="openmw_layers.xml" group="General"/>
 	    <List file="openmw.pointer.xml" group="General"/>
diff --git a/media_mygui/openmw.font.xml b/media_mygui/openmw.font.xml
index 164d1edbf..2bb698f19 100644
--- a/media_mygui/openmw.font.xml
+++ b/media_mygui/openmw.font.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Font">
+
+	<Font name="MyGUI_CoreFont.18" source="Comic.TTF" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
+		<Code range="33 126"/>
+		<Code range="1025 1105"/>
+		<Code range="8470 8470" help="№"/>
+		<Code hide="128"/>
+		<Code hide="1026 1039"/>
+		<Code hide="1104"/>
+	</Font>
 	<Font name="gothic" source="gothic.ttf" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
 		<Code range="33 126"/>
 		<Code range="1025 1105"/>
@@ -36,6 +45,10 @@
                 <Code range="33 98"/>
         </Font>
 
+        <Font name="cards2" default_height="17" source="magiccards2.ttf" size="18" resolution="50" antialias_colour="false" space_width="4" tab_width="8" cursor_width="2" distance="5" offset_height="0">
+                <Code range="33 98"/>
+        </Font>
+
 	<Font name="dorcla" source="dorcla.ttf" size="20" resolution="72" antialias_colour="false" space_width="5" tab_count="4" spacer="5">
 		<Code range="33 126"/>
 		<Code range="1025 1105"/>
@@ -53,4 +66,14 @@
 		<Code hide="1026 1039"/>
 		<Code hide="1104"/>
 	</Font>
+
+	<Font name="albertis" source="AlbertisADF.otf" size="18" resolution="50" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
+		<Code range="33 126"/>
+		<Code range="1025 1105"/>
+		<Code range="8470 8470" help="№"/>
+		<Code hide="128"/>
+		<Code hide="1026 1039"/>
+		<Code hide="1104"/>
+	</Font>
+
 </MyGUI>
diff --git a/media_mygui/openmw_button.skin.xml b/media_mygui/openmw_button.skin.xml
index 8bbbdd6a5..b38790c38 100644
--- a/media_mygui/openmw_button.skin.xml
+++ b/media_mygui/openmw_button.skin.xml
@@ -45,8 +45,9 @@
 
     <!-- Button widget -->
     <Skin name="MW_Button" size="136 24">
-        <Property key="FontName" value = "MyGUI_CoreFont.18" />
+        <Property key="FontName" value = "MyGUI_CoreFont.18"/>
         <!--Property key="FontName" value = "cards" /-->
+        <!--Property key="FontName" value = "albertis"/-->
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_CENTER" />
         <Property key="Colour" value = "0.6 0.6 0.6" />
diff --git a/media_mygui/openmw_progress.skin.xml b/media_mygui/openmw_progress.skin.xml
index 51a027ac4..594f82984 100644
--- a/media_mygui/openmw_progress.skin.xml
+++ b/media_mygui/openmw_progress.skin.xml
@@ -19,7 +19,7 @@
     </Skin>
 
     <Skin name = "ProgressText" size = "16 16">
-        <Property key="FontName" value = "MyGUI_CoreFont.18" />
+        <Property key="FontName" value = "MyGUI_CoreFont.18"/>
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_CENTER" />
         <Property key="Colour" value = "0.35 0.6 0.75" />
diff --git a/media_mygui/openmw_windows.skin.xml b/media_mygui/openmw_windows.skin.xml
index ebb853f8d..868896556 100644
--- a/media_mygui/openmw_windows.skin.xml
+++ b/media_mygui/openmw_windows.skin.xml
@@ -137,6 +137,8 @@
         <!--
         <Property key="FontName" value = "dorcla" />
         <Property key="FontHeight" value = "20" />
+        <Property key="FontName" value = "albertis" />
+        <Property key="FontName" value = "cards2" />
         -->
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />