Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Confluence] drop tvtunes support #8243

Merged
merged 1 commit into from Oct 18, 2015
Merged

[Confluence] drop tvtunes support #8243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions addons/skin.confluence/720p/DialogVideoInfo.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions addons/skin.confluence/720p/Home.xml
View file
Open in desktop
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
View file
Open in desktop
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
24 changes: 0 additions & 24 deletions addons/skin.confluence/720p/SkinSettings.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion addons/skin.confluence/720p/includes.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
8 changes: 1 addition & 7 deletions addons/skin.confluence/language/resource.language.en_gb/strings.po
View file
Open in desktop
Expand Up @@ -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"
Expand Down