Skip to content
Browse files

Merge pull request #1533 from JezzX/Common_Background

Changed: [Confluence] Made the PVR window use the common background code...
  • Loading branch information...
2 parents ad1a2a6 + 05ac8ba commit 021c36229d318f1686707e3fab196043b9fca4b0 @opdenkamp opdenkamp committed Oct 4, 2012
View
7 addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
@@ -41,22 +41,23 @@
<width>1280</width>
<height>720</height>
<texture>special://skin/backgrounds/media-overlay.jpg</texture>
- <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible>
+ <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + ![Window.IsVisible(PVR) + [Control.IsVisible(11) | Control.IsVisible(12)]]</visible>
+ <include>VisibleFadeEffect</include>
</control>
<control type="visualisation">
<posx>0</posx>
<posy>0</posy>
<width>1280</width>
<height>720</height>
- <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible>
+ <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis) + ![Window.IsVisible(PVR) + [Control.IsVisible(11) | Control.IsVisible(12)]]</visible>
<visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible>
</control>
<control type="videowindow">
<posx>0</posx>
<posy>0</posy>
<width>1280</width>
<height>720</height>
- <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible>
+ <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo) + ![Window.IsVisible(PVR) + [Control.IsVisible(11) | Control.IsVisible(12)]]</visible>
</control>
<control type="image">
<posx>0</posx>
View
48 addons/skin.confluence/720p/MyPVR.xml
@@ -2,53 +2,7 @@
<defaultcontrol>32</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
- <control type="image">
- <description>Normal Default Background Image</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>720</height>
- <aspectratio>scale</aspectratio>
- <texture>$INFO[Skin.CurrentTheme,special://skin/backgrounds/,.jpg]</texture>
- <visible>![Skin.HasSetting(UseCustomBackground) + !IsEmpty(Skin.String(CustomBackgroundPath))]</visible>
- <include>VisibleFadeEffect</include>
- </control>
- <control type="image">
- <description>User Set Background Image</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>720</height>
- <aspectratio>scale</aspectratio>
- <texture>$INFO[Skin.String(CustomBackgroundPath)]</texture>
- <visible>Skin.HasSetting(UseCustomBackground) + !IsEmpty(Skin.String(CustomBackgroundPath))</visible>
- <include>VisibleFadeEffect</include>
- </control>
- <control type="group">
- <visible>!Control.IsVisible(11) + !Control.IsVisible(12)</visible>
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>720</height>
- <texture>special://skin/backgrounds/media-overlay.png</texture>
- <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible>
- </control>
- <control type="visualisation">
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>720</height>
- <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible>
- </control>
- <control type="videowindow">
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>720</height>
- <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible>
- </control>
- </control>
+ <include>CommonBackground</include>
<include>ContentPanelBackgroundsPVR</include>
<include>MainWindowMouseButtons</include>
<control type="image">

0 comments on commit 021c362

Please sign in to comment.
Something went wrong with that request. Please try again.