From 37290d963847fc0d2d32d9a6d668ab891e0a2285 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 21 Mar 2012 19:23:32 +0100
Subject: [PATCH] fix text colours

---
 .../openmw_resources/openmw_console.skin.xml  |  2 +-
 .../openmw_dialogue_window_layout.xml         |  2 +-
 .../openmw_resources/openmw_hud_layout.xml    | 10 ++++-----
 .../openmw_inventory_window_layout.xml        |  2 +-
 .../openmw_resources/openmw_list.skin.xml     |  4 ++--
 .../openmw_stats_window_layout.xml            |  6 ++---
 .../openmw_resources/openmw_text.skin.xml     | 22 +++++++++----------
 .../openmw_resources/openmw_windows.skin.xml  |  2 +-
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
index afb692e20..1c3efa0eb 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
@@ -6,7 +6,7 @@
         <Property key="FontHeight" value = "17" />
         <Property key="AlignText" value = "ALIGN_CENTER" />
         <Property key="Colour" value = "0.8 0.8 0.8" />
-        <Property key="ToStick" value = "true" />
+        <Property key="Snap" value = "true" />
 
         <Child type="Widget" skin="BlackBG" offset = "4 4 248 46" align = "ALIGN_STRETCH" name = "Client"/>
 
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
index 20ce87200..c611aceda 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
@@ -18,7 +18,7 @@
         </Widget>
 
 		<!-- The disposition bar-->
-        <Widget type="Progress" skin="MW_EnergyBar_Blue" position="432 39 132 18"
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="432 39 132 18"
             align="Right Top" name="Disposition">		
 			<Widget type="Edit" skin="MW_DispositionEdit" position_real = "0.25 0 0.5 1" name = "DispositionText"/>	
 		</Widget>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml
index 8b8f6aa97..86f4df172 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml
@@ -3,11 +3,11 @@
 <MyGUI type="Layout">
     <Widget type="Widget" layer="HUD" position="0 0 300 200" name="_Main">
         <!-- Energy bars -->
-        <Widget type="Progress" skin="MW_EnergyBar_Red" position="13 146 65 12"
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Red" position="13 146 65 12"
             align="Left Bottom" name="Health"/>
-        <Widget type="Progress" skin="MW_EnergyBar_Blue" position="13 161 65 12"
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="13 161 65 12"
             align="Left Bottom" name="Magicka"/>
-        <Widget type="Progress" skin="MW_EnergyBar_Green" position="13 176 65 12"
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Green" position="13 176 65 12"
             align="Left Bottom" name="Stamina"/>
 
         <!-- Equipped weapon box -->
@@ -16,7 +16,7 @@
             <Widget type="ImageBox" skin="ImageBox" position="2 2 32 32" align="Left Top"
                 name="WeapImage"/>
         </Widget>
-        <Widget type="Progress" skin="MW_EnergyBar_Red" position="82 182 36 6"
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Red" position="82 182 36 6"
             align="Left Bottom" name="WeapStatus"/>
 
         <!-- Selected spell box -->
@@ -25,7 +25,7 @@
             <Widget type="ImageBox" skin="ImageBox" position="2 2 32 32" align="Left Top"
                 name="SpellImage"/>
         </Widget>
-        <Widget type="Progress" skin="MW_EnergyBar_Red" position="122 182 36 6"
+        <Widget type="ProgressBar" skin="MW_EnergyBar_Red" position="122 182 36 6"
             align="Left Bottom" name="SpellStatus"/>
 
         <!-- Spell effects box -->
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml
index 1f7f2d705..c69b6d8fe 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml
@@ -4,7 +4,7 @@
     <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 600 300" name="_Main">
 
         <!-- Player enumbrance -->
-        <Widget type="Progress" skin="MW_Progress_Blue" position="8 8 212 18" name="EncumbranceBar">
+        <Widget type="ProgressBar" skin="MW_Progress_Blue" position="8 8 212 18" name="EncumbranceBar">
             <Widget type="TextBox" skin="ProgressText" position="0 0 212 18" align="Center" name="EncumbranceBarT"/>
         </Widget>
 
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
index 163af4b7f..62b4715a4 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
@@ -198,7 +198,7 @@
         <Child type="VScroll" skin="MW_VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
         </Child>
 
-        <Child type="Widget" skin="DefaultClient" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
+        <Child type="Widget" skin="ClientDefaultSkin" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
         </Child>
 
         <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
@@ -234,7 +234,7 @@
 
         <Property key="SkinList" value = "MW_MultiSubList" />
 
-        <Child type="Widget" skin="DefaultClient" offset = "3 3 516 516" align = "ALIGN_STRETCH" name = "Client">
+        <Child type="Widget" skin="ClientDefaultSkin" offset = "3 3 516 516" align = "ALIGN_STRETCH" name = "Client">
         </Child>
 
         <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml
index fc9baacf4..0f5520738 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml
@@ -8,9 +8,9 @@
             <Widget type="TextBox" skin="NormalText" position="4 4 70 18" name="Health_str"/>
             <Widget type="TextBox" skin="NormalText" position="4 22 70 18" name="Magicka_str"/>
             <Widget type="TextBox" skin="NormalText" position="4 40 70 18" name="Fatigue_str"/>
-            <Widget type="Progress" skin="MW_Progress_Red" position="78 4 130 18" name="HBar"/>
-            <Widget type="Progress" skin="MW_Progress_Blue" position="78 22 130 18" name="MBar"/>
-            <Widget type="Progress" skin="MW_Progress_Green" position="78 40 130 18" name="FBar"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Red" position="78 4 130 18" name="HBar"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Blue" position="78 22 130 18" name="MBar"/>
+            <Widget type="ProgressBar" skin="MW_Progress_Green" position="78 40 130 18" name="FBar"/>
             <Widget type="TextBox" skin="ProgressText" position="78 4 130 18" align="Center" name="HBarT"/>
             <Widget type="TextBox" skin="ProgressText" position="78 22 130 18" align="Center" name="MBarT"/>
             <Widget type="TextBox" skin="ProgressText" position="78 40 130 18" align="Center" name="FBarT"/>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml
index d97aedb83..f1e2d7424 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml
@@ -5,7 +5,7 @@
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.87 0.78 0.62" />
+        <Property key="TextColour" value = "0.87 0.78 0.62" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16" align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -13,7 +13,7 @@
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_HCENTER ALIGN_BOTTOM" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextColour" value = "1 1 1" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16" align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -21,7 +21,7 @@
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -29,7 +29,7 @@
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "TOP HCENTER" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -37,7 +37,7 @@
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_RIGHT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.75 0.6 0.35" />
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
             <State name="normal" colour = "0.75 0.6 0.35"/>
             <State name="increased" colour = "0.757 0.679 0.539"/>
@@ -49,7 +49,7 @@
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <Property key="Colour" value = "0.85 0.76 0.60" />
+        <Property key="TextColour" value = "0.85 0.76 0.60" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -57,7 +57,7 @@
         <Property key="FontName" value = "daedric36" />
         <Property key="FontHeight" value = "36" />
         <Property key="AlignText" value = "ALIGN_DEFAULT" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextColour" value = "1 1 1" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -65,7 +65,7 @@
         <Property key="FontName" value = "daedric_orig36" />
         <Property key="FontHeight" value = "36" />
         <Property key="AlignText" value = "ALIGN_DEFAULT" />
-        <Property key="Colour" value = "1 1 1" />
+        <Property key="TextColour" value = "1 1 1" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
     </Skin>
 
@@ -102,19 +102,19 @@
 
     <Skin name = "MW_DynamicStat_Red" size = "204 18">
         <Child type="TextBox" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="Progress" skin="MW_Progress_Red" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
+        <Child type="ProgressBar" skin="MW_Progress_Red" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
         <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
     </Skin>
 
     <Skin name = "MW_DynamicStat_Blue" size = "204 18">
         <Child type="TextBox" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="Progress" skin="MW_Progress_Blue" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
+        <Child type="ProgressBar" skin="MW_Progress_Blue" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
         <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
     </Skin>
 
     <Skin name = "MW_DynamicStat_Green" size = "204 18">
         <Child type="TextBox" skin="SandText" offset = "0 0 70 18" align = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="Progress" skin="MW_Progress_Green" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
+        <Child type="ProgressBar" skin="MW_Progress_Green" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
         <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "BarText" />
     </Skin>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml
index ae04eb3a9..f6d84eb2f 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml
@@ -225,7 +225,7 @@
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_CENTER" />
         <Property key="Colour" value = "0.8 0.8 0.8" />
-        <Property key="ToStick" value = "true" />
+        <Property key="Snap" value = "true" />
 
         <Child type="Widget" skin="BlackBG" offset = "8 28 240 18" align = "ALIGN_STRETCH" name = "Client"/>