opacity control

jurialmunkey · Feb 23, 2017 · 891f4b9 · 891f4b9
1 parent c729096
commit 891f4b9
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 29 deletions.
diff --git a/16x9/Includes_Furniture.xml b/16x9/Includes_Furniture.xml
@@ -635,15 +635,16 @@
             <visible>!Window.IsVisible(home)</visible>
             <visible>!Window.IsVisible(weather)</visible>
             <visible>!Window.IsVisible(loginscreen)</visible>
-            <animation effect="fade" start="100" end="10" condition="String.IsEqual(Skin.String(fanart.opacity),10)">Conditional</animation>
-            <animation effect="fade" start="100" end="20" condition="String.IsEqual(Skin.String(fanart.opacity),20)">Conditional</animation>
-            <animation effect="fade" start="100" end="30" condition="String.IsEqual(Skin.String(fanart.opacity),30)">Conditional</animation>
-            <animation effect="fade" start="100" end="40" condition="String.IsEqual(Skin.String(fanart.opacity),40)">Conditional</animation>
-            <animation effect="fade" start="100" end="50" condition="String.IsEqual(Skin.String(fanart.opacity),50)">Conditional</animation>
-            <animation effect="fade" start="100" end="60" condition="String.IsEqual(Skin.String(fanart.opacity),60)">Conditional</animation>
-            <animation effect="fade" start="100" end="70" condition="String.IsEqual(Skin.String(fanart.opacity),70)">Conditional</animation>
-            <animation effect="fade" start="100" end="80" condition="String.IsEqual(Skin.String(fanart.opacity),80)">Conditional</animation>
-            <animation effect="fade" start="100" end="90" condition="String.IsEqual(Skin.String(fanart.opacity),90)">Conditional</animation>
+            <animation effect="fade" start="100" end="10" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),10)">Conditional</animation>
+            <animation effect="fade" start="100" end="20" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),20)">Conditional</animation>
+            <animation effect="fade" start="100" end="30" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),30)">Conditional</animation>
+            <animation effect="fade" start="100" end="40" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),40)">Conditional</animation>
+            <animation effect="fade" start="100" end="50" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),50)">Conditional</animation>
+            <animation effect="fade" start="100" end="60" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),60)">Conditional</animation>
+            <animation effect="fade" start="100" end="70" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),70)">Conditional</animation>
+            <animation effect="fade" start="100" end="80" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),80)">Conditional</animation>
+            <animation effect="fade" start="100" end="90" condition="[!Skin.HasSetting(background.hidefanart) + [String.IsEqual(Skin.String(fanart.opacity),90) | String.IsEmpty(Skin.String(fanart.opacity))]] | Skin.HasSetting(background.hidefanart)">Conditional</animation>
+            <animation effect="fade" start="100" end="100" condition="!Skin.HasSetting(background.hidefanart) + String.IsEqual(Skin.String(fanart.opacity),100)">Conditional</animation>
         </control>
 
         <control type="image" description="Transition Fade">

diff --git a/16x9/SkinSettings.xml b/16x9/SkinSettings.xml
@@ -324,8 +324,10 @@
                         <width>100%</width>
                         <label>31021</label>
                         <radioposx>settingsradioposx</radioposx>
-                        <selected>!Skin.HasSetting(background.hidefanart)</selected>
-                        <onclick>Skin.ToggleSetting(background.hidefanart)</onclick>
+                        <selected>!Skin.HasSetting(background.hidefanart) + !String.IsEqual(Skin.String(fanart.opacity),100)</selected>
+                        <onclick condition="!String.IsEqual(Skin.String(fanart.opacity),100)">Skin.ToggleSetting(background.hidefanart)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),100)">Skin.Reset(background.hidefanart)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),100)">Skin.SetString(fanart.opacity,90)</onclick>
                         <height>72</height>
                         <include>Defs_OptionButton</include>
                         <visible>ControlGroup(8000).HasFocus(8002)</visible>
@@ -385,6 +387,23 @@
                         <include>Defs_OptionButton</include>
                         <visible>ControlGroup(8000).HasFocus(8002)</visible>
                     </control>
+                    <!-- Fanart Opacity -->
+                    <control type="button" id="8208">
+                        <width>100%</width>
+                        <label>31235</label>
+                        <height>72</height>
+                        <onclick condition="!String.IsEqual(Skin.String(fanart.opacity),50) + Skin.HasSetting(background.hidefanart)">Skin.Reset(background.hidefanart)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),100)">Skin.SetString(fanart.opacity,90)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),90) | String.IsEmpty(Skin.String(fanart.opacity))">Skin.SetString(fanart.opacity,80)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),80)">Skin.SetString(fanart.opacity,70)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),70)">Skin.SetString(fanart.opacity,60)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),60)">Skin.SetString(fanart.opacity,50)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),50)">Skin.SetBool(background.hidefanart)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),50)">Skin.SetString(fanart.opacity,100)</onclick>
+                        <label2 fallback="90%">$INFO[Skin.String(fanart.opacity),, %]</label2>
+                        <include>Defs_OptionButton</include>
+                        <visible>ControlGroup(8000).HasFocus(8002)</visible>
+                    </control>
 
                     <!-- MUSIC OSD -->
                     <control type="label" id="8301">
@@ -907,21 +926,6 @@
                         <include>Defs_OptionButton</include>
                         <visible>ControlGroup(8000).HasFocus(8009)</visible>
                     </control>
-                    <!-- Info Line -->
-                    <!-- <control type="button" id="8914">
-                        <width>100%</width>
-                        <label>Fanart opacity</label>
-                        <height>72</height>
-                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),50)">Skin.SetString(fanart.opacity,100)</onclick>
-                         <onclick condition="String.IsEqual(Skin.String(fanart.opacity),100) | String.IsEmpty(Skin.String(fanart.opacity))">Skin.SetString(fanart.opacity,90)</onclick>
-                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),90)">Skin.SetString(fanart.opacity,80)</onclick>
-                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),80)">Skin.SetString(fanart.opacity,70)</onclick>
-                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),70)">Skin.SetString(fanart.opacity,60)</onclick>
-                        <onclick condition="String.IsEqual(Skin.String(fanart.opacity),60)">Skin.SetString(fanart.opacity,50)</onclick>
-                        <label2>$INFO[Skin.String(fanart.opacity),, %]</label2>
-                        <include>Defs_OptionButton</include>
-                        <visible>ControlGroup(8000).HasFocus(8009)</visible>
-                    </control> -->
                     <!-- Div Extras Label -->
                     <control type="image" id="8904">
                         <width>100%</width>

diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
     id="skin.eminence.2"
-    version="2.5.35"
+    version="2.5.36"
     name="Eminence 2.0"
     provider-name="jurialmunkey">
     <requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.5.36[/B]
+Add opacity control for fanart fade
+
 [B]2.5.35[/B]
 Update lyrics so shows info with it 
 New Default icons to match other icon themes

diff --git a/colors/Light.xml b/colors/Light.xml
@@ -1,6 +1,6 @@
 <colors>
     <color name="Background">ffdfdfdf</color>
-    <color name="FanartFade">e2ffffff</color>
+    <color name="FanartFade">ffffffff</color>
     <color name="HomeBarBG">ffdfdfdf</color>
     <color name="HomeBarFG">ff333333</color>
     <color name="HomeBarTile">3e555555</color>

diff --git a/colors/defaults.xml b/colors/defaults.xml
@@ -1,6 +1,6 @@
 <colors>
     <color name="Background">ff181818</color>
-    <color name="FanartFade">e2181818</color>
+    <color name="FanartFade">ff181818</color>
     <color name="HomeBarBG">ff181818</color>
     <color name="HomeBarFG">ffededed</color>
     <color name="HomeBarTile">3e555555</color>

diff --git a/language/English/strings.po b/language/English/strings.po
@@ -869,3 +869,7 @@ msgstr ""
 msgctxt "#31234"
 msgid "Do you wish to unlock it and set a new view mode?"
 msgstr ""
+
+msgctxt "#31235"
+msgid "Fanart fade opacity (default is 90%)"
+msgstr ""