diff options
Diffstat (limited to 'addons/skin.confluence')
6 files changed, 5 insertions, 44 deletions
diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml index b0a6b75557..82ec318796 100644 --- a/addons/skin.confluence/720p/DialogVideoInfo.xml +++ b/addons/skin.confluence/720p/DialogVideoInfo.xml @@ -1012,13 +1012,6 @@ <include>ButtonInfoDialogsCommonValues</include> <label>38023</label> </control> - <control type="button" id="100"> - <description>Fetch TvTunes stuff</description> - <include>ButtonInfoDialogsCommonValues</include> - <label>31127</label> - <onclick>RunScript(script.tvtunes,mode=solo)</onclick> - <visible>Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes) + [Container.Content(TVShows) | Container.Content(movies) | Container.Content(musicvideos)] + IsEmpty(Window(movieinformation).Property("TvTunes_HideVideoInfoButton"))</visible> - </control> </control> </control> </control> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index ffa16dec51..9ac8edcc8f 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -24,7 +24,7 @@ <depth>DepthMenu</depth> <left>0</left> <top>60</top> - <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo) + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> + <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)</visible> <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> <control type="image"> @@ -228,7 +228,7 @@ <depth>DepthMenu</depth> <left>0</left> <top>50</top> - <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo) + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> + <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)</visible> <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> <control type="group"> @@ -462,7 +462,6 @@ <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> <effect type="fade" start="100" end="0" time="225" /> </animation> - <visible>IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> <control type="image"> <description>Background End image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index cc996da50d..63ad350164 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -42,7 +42,6 @@ <width>1280</width> <height>720</height> <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible> - <visible>IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> </control> <control type="videowindow"> <depth>DepthBackground</depth> @@ -59,7 +58,7 @@ <width>1320</width> <height>120</height> <texture flipy="true" border="1">HomeNowPlayingBack.png</texture> - <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | !IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))]] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible> + <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible> <include>VisibleFadeEffect</include> </control> </include> diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml index 094aafae33..dd9942b95b 100644 --- a/addons/skin.confluence/720p/SkinSettings.xml +++ b/addons/skin.confluence/720p/SkinSettings.xml @@ -261,30 +261,6 @@ <onclick>Skin.ToggleSetting(HideFilenameFlagging)</onclick> <selected>Skin.HasSetting(HideFilenameFlagging)</selected> </control> - <control type="label" id="104"> - <width>750</width> - <height>45</height> - <font>font13_title</font> - <label>20343</label> - <textcolor>blue</textcolor> - <shadowcolor>black</shadowcolor> - <align>left</align> - <aligny>center</aligny> - <visible>System.HasAddon(script.tvtunes)</visible> - </control> - <control type="radiobutton" id="115"> - <width>750</width> - <height>40</height> - <font>font13</font> - <label>31126</label> - <textcolor>grey2</textcolor> - <focusedcolor>white</focusedcolor> - <texturefocus>MenuItemFO.png</texturefocus> - <texturenofocus>MenuItemNF.png</texturenofocus> - <onclick>Skin.ToggleSetting(ActivateTvTunes)</onclick> - <selected>Skin.HasSetting(ActivateTvTunes)</selected> - <visible>System.HasAddon(script.tvtunes)</visible> - </control> <control type="radiobutton" id="116"> <width>750</width> <height>40</height> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 6154de0b47..3f49db724d 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -432,7 +432,7 @@ </include> <include name="CommonNowPlaying"> <control type="group"> - <visible>Player.HasMedia + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible> + <visible>Player.HasMedia</visible> <include>VisibleFadeEffect</include> <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> diff --git a/addons/skin.confluence/language/resource.language.en_gb/strings.po b/addons/skin.confluence/language/resource.language.en_gb/strings.po index 7aaa300d1b..ee8bd48b23 100644 --- a/addons/skin.confluence/language/resource.language.en_gb/strings.po +++ b/addons/skin.confluence/language/resource.language.en_gb/strings.po @@ -275,13 +275,7 @@ msgctxt "#31125" msgid "Show background \"Now playing\" visualisation" msgstr "" -msgctxt "#31126" -msgid "Play TV theme songs in video library (TvTunes add-on)" -msgstr "" - -msgctxt "#31127" -msgid "TvTunes" -msgstr "" +#empty strings from id 31126 to 31127 msgctxt "#31128" msgid "Lyrics" |