From dac0b7090abc046a938f38de5597987455c8bdec Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 09:14:14 +0200
Subject: [PATCH] Get rid of bigbars.png and smallbars.png

Changed loading bar colour to match vanilla
---
 apps/openmw/mwgui/hud.cpp                 |   2 +-
 files/mygui/CMakeLists.txt                |   2 -
 files/mygui/bigbars.png                   | Bin 387 -> 0 bytes
 files/mygui/openmw_hud.layout             |   2 +-
 files/mygui/openmw_hud_energybar.skin.xml |  28 ++++++-----
 files/mygui/openmw_progress.skin.xml      |  57 +++++++++++++---------
 files/mygui/smallbars.png                 | Bin 2985 -> 0 bytes
 7 files changed, 53 insertions(+), 38 deletions(-)
 delete mode 100644 files/mygui/bigbars.png
 delete mode 100644 files/mygui/smallbars.png

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 946259e10..be4a9a14e 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -625,7 +625,7 @@ namespace MWGui
         if (mIsDrowning)
         {
             float intensity = (cos(mDrowningFlashTheta) + 1.0f) / 2.0f;
-            mDrowningFlash->setColour(MyGUI::Colour(intensity, intensity, intensity));
+            mDrowningFlash->setColour(MyGUI::Colour(intensity, 0, 0));
         }
     }
 
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index ef223a617..2135f4dde 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -4,7 +4,6 @@ set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
 
 set(MYGUI_FILES
-    bigbars.png
     black.png
     core.skin
     core.xml
@@ -81,7 +80,6 @@ set(MYGUI_FILES
     openmw_companion_window.layout
     openmw_savegame_dialog.layout
     openmw_recharge_dialog.layout
-    smallbars.png
     DejaVuLGCSansMono.ttf
     markers.png
     ../launcher/images/openmw.png
diff --git a/files/mygui/bigbars.png b/files/mygui/bigbars.png
deleted file mode 100644
index ee91da19e3bc85b5601375d9e84fb45384da5ced..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000C4002D*0ssI21?FE&00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0tXKrA*QRh;Q#;u6-h)vR4C7N
zl1)wnF${%2XN-{8vEl|uY&aALV8>}VBdAn`cJkxLqBD~e)GQ)>vg15I+uolaSdS;O
z4xR{+j1Vb@0?xPZO7ygk(gv6Z_#7j-sl)L<7zq3n0&bJdA+IK&N*D<UZPgy%dI1|%
z+cZfsGf5t`kdj)ElGk$RX(jIln7_uzzC+Y9K%2+N3}A-j5gD*_qbMF$0aO>&Xp!xQ
zm%Cm72Q7U&ZUiI<oH>|`A|`Xb>+oiu2iT2p7=&^h=0hH)z$sw+v@{GnQNl3+)V8T!
z-#p#FUf7FtZaXao0A?Qbv`*13P5fi;V0_I#qrLf>*DV8Plhih^C#ktCkfeaK>Mj&x
h-3y1lAs1=a;TPg<to~Z%D0Kh;002ovPDHLkV1kgtm1Y0{

diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout
index 72d337e45..4f93b42f8 100644
--- a/files/mygui/openmw_hud.layout
+++ b/files/mygui/openmw_hud.layout
@@ -42,7 +42,7 @@
                 <Property key="TextShadow" value="true"/>
                 <Property key="TextShadowColour" value="0 0 0"/>
             </Widget>
-            <Widget type="ProgressBar" skin="MW_Progress_Loading" position="12 36 196 8" align="Center Top" name="Drowning">
+            <Widget type="ProgressBar" skin="MW_Progress_LightBlue" position="12 36 196 8" align="Center Top" name="Drowning">
                 <Property key="NeedMouse" value="false"/>
             </Widget>
             <Widget type="Widget" skin="MW_Progress_Drowning" position="14 38 192 4" align="Center Top" name="Flash"/>
diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
index f10908d7b..d5078e994 100644
--- a/files/mygui/openmw_hud_energybar.skin.xml
+++ b/files/mygui/openmw_hud_energybar.skin.xml
@@ -19,24 +19,28 @@
     </Skin>
 
     <!-- Progress bar track, various colors -->
-    <Skin name="MW_BarTrack_Red" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 0 4 8"/>
+    <Skin name="MW_BarTrack_Red" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.8274 0.2431 0.129"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BarTrack_Green" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 16 4 8"/>
+    <Skin name="MW_BarTrack_Green" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0 0.6823 0.2745"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BarTrack_Blue" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 8 4 8"/>
+    <Skin name="MW_BarTrack_Blue" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.2470 0.3176 0.7411"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BarTrack_Yellow" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 32 4 8"/>
+    <Skin name="MW_BarTrack_Yellow" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="1 1 0"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
 
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index f5418e3f8..a09011e10 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -2,35 +2,48 @@
 
 <MyGUI type="Skin">
     <!-- Progress bar track, various colors -->
-    <Skin name="MW_BigTrack_Red" size="2 14" texture="bigbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch">
-            <State name="normal" offset="0 0 2 14"/>
+    <Skin name="MW_Track_Red" size="16 16" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.8274 0.2431 0.129"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Blue" size="2 14" texture="bigbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch">
-            <State name="normal" offset="0 14 2 14"/>
+    <Skin name="MW_Track_Blue" size="2 14" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.2470 0.3176 0.7411"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Green" size="2 14" texture="bigbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch">
-            <State name="normal" offset="0 28 2 14"/>
+    <Skin name="MW_Track_Green" size="2 14" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0 0.6823 0.2745"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Progress_Red_Small" size="2 6" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch">
-            <State name="normal" offset="0 0 2 8"/>
+    <!-- Lighter variants (only uses top half of the gradient) -->
+    <Skin name="MW_BigTrack_Progress_Red_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="1 0 0"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Progress_Blue_Small" size="2 6" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch">
-            <State name="normal" offset="0 26 2 6"/>
+    <Skin name="MW_BigTrack_Progress_Blue_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.3 0.3 1"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="MW_BigTrack_Progress_Green_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.298 0.784 0.780"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
 
+
     <Skin name="ProgressText" size="16 16">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center"/>
+        <Property key="TextAlign" value="Top HCenter"/>
         <Property key="TextColour" value="0.75 0.6 0.35"/>
 
         <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
@@ -39,7 +52,7 @@
     <!-- Main energy bar widget definitions. There's one for each color.-->
 
     <Skin name="MW_Progress_Red" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Red"/>
+        <Property key="TrackSkin" value="MW_Track_Red"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
@@ -47,7 +60,7 @@
     </Skin>
 
     <Skin name="MW_Progress_Green" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Green"/>
+        <Property key="TrackSkin" value="MW_Track_Green"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
@@ -55,15 +68,15 @@
     </Skin>
 
     <Skin name="MW_Progress_Blue" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Blue"/>
+        <Property key="TrackSkin" value="MW_Track_Blue"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
-    <Skin name="MW_Progress_Loading" size="64 6">
-    <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
+    <Skin name="MW_Progress_LightBlue" size="64 6">
+        <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
@@ -82,7 +95,7 @@
         <Property key="MoveToClick" value="false"/>
 
         <Child type="Widget" skin="BlackBG" offset="2 2 60 2" align="Stretch" name="Client"/>
-        <Child type="Button" skin="MW_BigTrack_Progress_Blue_Small" offset="0 0 1 6" align="Left VStretch" name="Track"/>
+        <Child type="Button" skin="MW_BigTrack_Progress_Green_Small" offset="0 0 1 6" align="Left VStretch" name="Track"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
     </Skin>
diff --git a/files/mygui/smallbars.png b/files/mygui/smallbars.png
deleted file mode 100644
index 3c007a55cea32c99bbb4acb41e27419cc0290d49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2985
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