Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 776bb21 + 11c3ac2 commit a8afb22f57c87a35a42edb6be9f3e7ad3b650f4c @eriksoderblom committed Dec 30, 2012
View
@@ -178,46 +178,25 @@
<include condition="Skin.HasSetting(effect_bg)">BG_Effect_Home</include>
<!-- LiveTV Info -->
<control type="group">
- <visible>!Skin.HasSetting(lowermainmenu) + Skin.HasSetting(DisableGlowbar)</visible>
- <include>Animation_VisibleChangeDelayed</include>
+ <visible>Skin.HasSetting(DisableGlowbar) + IsEmpty(Window(home).Property(DisableWidgets))</visible>
+ <include>Animation_VisibleChangeDelayed</include>
<include>Animation_WindowFade200</include>
- <control type="image">
- <posy>360</posy>
- <width>1920</width>
- <height>945</height>
- <texture>home/nowplaying_shadow.png</texture>
- <visible>[Control.HasFocus(8000) | Control.IsVisible(5000) | Substring(Control.GetLabel(4321),weather)] + IsEmpty(Window(home).Property(DisableWidgets))</visible>
- <include>Animation_VisibleChangeDelayed</include>
- <animation effect="slide" time="400" tween="cubic" easing="inout" end="0,-225" condition="Skin.HasSetting(lowermainmenu)">Conditional</animation>
- </control>
- <control type="image">
- <width>1920</width>
- <height>945</height>
- <texture flipy="true">home/nowplaying_shadow.png</texture>
- <include>Animation_VisibleChangeDelayed</include>
- <visible>Control.IsVisible(8995) | [[Control.HasFocus(7000) | Control.IsVisible(6000) | Substring(Control.GetLabel(4325),weather)] + IsEmpty(Window(home).Property(DisableWidgets))]</visible>
- <animation effect="slide" time="400" tween="cubic" easing="inout" end="0,-225" condition="Skin.HasSetting(lowermainmenu)">Conditional</animation>
- </control>
- </control>
- <control type="group">
- <visible>Skin.HasSetting(lowermainmenu) + Skin.HasSetting(DisableGlowbar)</visible>
- <include>Animation_WindowFade200</include>
- <include>Animation_VisibleChangeDelayed</include>
- <control type="image">
- <posy>160</posy>
- <width>1920</width>
- <height>694</height>
- <texture>home/nowplaying_shadow.png</texture>
- <visible>[Control.HasFocus(8000) | Control.IsVisible(5000) | Substring(Control.GetLabel(4321),weather)] + IsEmpty(Window(home).Property(DisableWidgets))</visible>
- <include>Animation_VisibleChangeDelayed</include>
- </control>
- <control type="image">
- <width>1920</width>
- <height>545</height>
- <texture flipy="true">home/nowplaying_shadow.png</texture>
- <include>Animation_VisibleChangeDelayed</include>
- <visible>Control.IsVisible(8995) | [[Control.HasFocus(7000) | Control.IsVisible(6000) | Substring(Control.GetLabel(4325),weather)] + IsEmpty(Window(home).Property(DisableWidgets))]</visible>
- </control>
+ <control type="image">
+ <posy>480</posy>
+ <width>1920</width>
+ <height>600</height>
+ <texture>home/nowplaying_shadow.png</texture>
+ <visible>Control.HasFocus(8000) | Control.IsVisible(5000) | Substring(Control.GetLabel(4321),weather)</visible>
+ <include>Animation_VisibleChangeDelayed</include>
+ <animation effect="slide" time="400" tween="cubic" easing="inout" end="0,-225" condition="Skin.HasSetting(lowermainmenu)">Conditional</animation>
+ </control>
+ <control type="image">
+ <width>1920</width>
+ <height>600</height>
+ <texture flipy="true">home/nowplaying_shadow.png</texture>
+ <include>Animation_VisibleChangeDelayed</include>
+ <visible>Control.IsVisible(8995) | Control.HasFocus(7000) | Control.IsVisible(6000) | Substring(Control.GetLabel(4325),weather)</visible>
+ </control>
</control>
<include>RSSPanel</include>
<include>MainMenuBottomBar</include>
@@ -248,9 +227,7 @@
<texture>arrowdown.png</texture>
<!-- <animation effect="slide" end="0,40" time="0" condition="[!Skin.HasSetting(rsshomelow) + !Skin.HasSetting(DisableRSS)]">Conditional</animation>
-->
- <visible>Control.HasFocus(9000)</visible>
- <visible>!Skin.HasSetting(showsubmenu)</visible>
- <visible>!IsEmpty(Container(9000).ListItem.Property(SubMenu))</visible>
+ <visible>Control.HasFocus(9000) + !Skin.HasSetting(showsubmenu) + IntegerGreaterThan(Container(9010).NumItems,0)</visible>
<animation effect="zoom" start="100,0" end="100,100" time="500" delay="200" tween="cubic" center="0,613" easing="inout">VisibleChange</animation>
</control>
<control type="group" id="9001">
@@ -895,6 +895,7 @@
<animation effect="slide" end="0,-270" time="400" tween="cubic" easing="inout" condition="Skin.HasSetting(lowermainmenu)">Conditional</animation>
<animation effect="slide" time="200" end="0,-38" condition="!Skin.HasSetting(lowermainmenu) + Skin.HasSetting(rsshomelow)">Conditional</animation>
<!--Unfocused widget-->
+
<control type="group">
<visible>!Control.HasFocus(8000)</visible>
<animation effect="slide" start="450" end="0" time="300" delay="300" tween="quadratic">Visible</animation>
@@ -959,67 +960,6 @@
</control>
<control type="group">
<visible>!Stringcompare(Control.GetLabel(4321),systemclassicdefault)</visible>
- <control type="group" id="8030">
- <posx>10</posx>
- <visible>[Substring(Control.GetLabel(4321),movie) | Substring(Control.GetLabel(4321),musicvideo)] + StringCompare(Control.GetLabel(4322),widgetfanart)</visible>
- <control type="group">
- <posx>-16</posx>
- <posy>56</posy>
- <control type="image">
- <texture background="true" diffuse="thumbs/movieposter_mask.png" fallback="DefaultVideoBigPoster.png">$INFO[Container(8000).ListItem(-1).Thumb]</texture>
- <aspectratio scalediffuse="false">stretch</aspectratio>
- <posx>19</posx>
- <posy>19</posy>
- <width>110</width>
- <height>165</height>
- </control>
- <control type="image">
- <width>148</width>
- <height>203</height>
- <texture diffuse="thumbs/movieposter_mask.png">thumbs/thumb_glass.png</texture>
- <bordertexture border="19">thumbs/poster_shadow.png</bordertexture>
- <bordersize>19</bordersize>
- </control>
- </control>
- <control type="group">
- <posx>207</posx>
- <posy>56</posy>
- <control type="image">
- <texture background="true" diffuse="thumbs/movieposter_mask.png" fallback="DefaultVideoBigPoster.png">$INFO[Container(8000).ListItem(1).Thumb]</texture>
- <aspectratio scalediffuse="false">stretch</aspectratio>
- <posx>19</posx>
- <posy>19</posy>
- <width>110</width>
- <height>165</height>
- </control>
- <control type="image">
- <width>148</width>
- <height>203</height>
- <texture diffuse="thumbs/movieposter_mask.png">thumbs/thumb_glass.png</texture>
- <bordertexture border="19">thumbs/poster_shadow.png</bordertexture>
- <bordersize>19</bordersize>
- </control>
- </control>
- <control type="group">
- <posx>82.5</posx>
- <posy>44</posy>
- <control type="image">
- <texture background="true" diffuse="thumbs/movieposter_mask.png" fallback="DefaultVideoBigPoster.png">$INFO[Container(8000).ListItem(0).Thumb]</texture>
- <aspectratio scalediffuse="false">stretch</aspectratio>
- <posx>19</posx>
- <posy>19</posy>
- <width>130</width>
- <height>195</height>
- </control>
- <control type="image">
- <width>168</width>
- <height>234</height>
- <texture diffuse="thumbs/movieposter_mask.png">thumbs/thumb_glass.png</texture>
- <bordertexture border="19">thumbs/poster_shadow.png</bordertexture>
- <bordersize>19</bordersize>
- </control>
- </control>
- </control>
<control type="image">
<texture background="true" fallback="DefaultAlbumCover.png">$INFO[Container(8000).ListItem.Icon]</texture>
<bordertexture border="7">thumbs/thumbshadow.png</bordertexture>
@@ -1057,7 +997,7 @@
<height>194</height>
<animation effect="fade" time="300">Visible</animation>
<animation effect="fade" time="50">Hidden</animation>
- <visible>[Substring(Control.GetLabel(4321),movie) | Substring(Control.GetLabel(4321),musicvideo)] + !StringCompare(Control.GetLabel(4322),widgetfanart)</visible>
+ <visible>Substring(Control.GetLabel(4321),movie) | Substring(Control.GetLabel(4321),musicvideo)</visible>
</control>
</control>
<control type="group">
View
@@ -1998,7 +1998,7 @@
<width>1670</width>
<height>786</height>
<texture background="true">$INFO[Window.Property(Current.Earth.Phase.LargeImage)]</texture>
- <colordiffuse>DD27292b</colordiffuse>
+ <colordiffuse>44FFFFFF</colordiffuse>
</control>
<control type="group">
<control type="label">
Oops, something went wrong.

0 comments on commit a8afb22

Please sign in to comment.