diff options
Diffstat (limited to 'addons')
36 files changed, 269 insertions, 404 deletions
diff --git a/addons/skin.confluence/720p/Font.xml b/addons/skin.confluence/720p/Font.xml index f545ff3a8a..ae581cbe8e 100644 --- a/addons/skin.confluence/720p/Font.xml +++ b/addons/skin.confluence/720p/Font.xml @@ -3,140 +3,42 @@ <!-- Normal Fonts --> <font> <name>font10</name> - <filename>DejaVuSans.ttf</filename> - <size>12</size> - </font> - <font> - <name>font12</name> - <filename>DejaVuSans.ttf</filename> - <size>16</size> - </font> - <font> - <name>font12caps</name> - <filename>DefaultCaps.ttf</filename> - <size>16</size> - </font> - <font> - <name>font13</name> - <filename>DejaVuSans.ttf</filename> - <size>20</size> - </font> - <font> - <name>font13caps</name> - <filename>DefaultCaps.ttf</filename> - <size>20</size> - </font> - <font> - <name>font16caps</name> - <filename>DefaultCaps.ttf</filename> - <size>25</size> - </font> - <font> - <name>font30</name> - <filename>DejaVuSans.ttf</filename> - <size>30</size> - </font> - <font> - <name>fontContextMenu</name> - <filename>DejaVuSans.ttf</filename> - <size>18</size> - </font> - - - <!-- Title Fonts --> - <font> - <name>font10_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>12</size> - </font> - <font> - <name>font12_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>16</size> - </font> - <font> - <name>font13_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>20</size> - </font> - <font> - <name>font24_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>24</size> - </font> - <font> - <name>font28_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>28</size> - </font> - <font> - <name>font30_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>30</size> - </font> - <font> - <name>font35_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>35</size> - </font> - <font> - <name>font50caps_title</name> - <filename>DejaVuSans-Bold-Caps.ttf</filename> - <size>35</size> - </font> - <font> - <name>font45caps_title</name> - <filename>DejaVuSans-Bold-Caps.ttf</filename> - <size>45</size> - </font> - - <font> - <name>WeatherTemp</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>80</size> - </font> - </fontset> - - <fontset id="Default_NoCaps" idloc="31391" unicode="true"> - <!-- Normal Fonts --> - <font> - <name>font10</name> - <filename>DejaVuSans.ttf</filename> - <size>12</size> + <filename>Roboto-Regular.ttf</filename> + <size>14</size> </font> <font> <name>font12</name> - <filename>DejaVuSans.ttf</filename> - <size>16</size> + <filename>Roboto-Regular.ttf</filename> + <size>17</size> </font> <font> <name>font12caps</name> - <filename>DejaVuSans.ttf</filename> - <size>16</size> + <filename>Roboto-Regular.ttf</filename> + <size>17</size> </font> <font> <name>font13</name> - <filename>DejaVuSans.ttf</filename> + <filename>Roboto-Regular.ttf</filename> <size>20</size> </font> <font> <name>font13caps</name> - <filename>DejaVuSans.ttf</filename> + <filename>Roboto-Regular.ttf</filename> <size>20</size> </font> <font> <name>font16caps</name> - <filename>DejaVuSans.ttf</filename> + <filename>Roboto-Regular.ttf</filename> <size>25</size> </font> <font> <name>font30</name> - <filename>DejaVuSans.ttf</filename> + <filename>Roboto-Regular.ttf</filename> <size>30</size> </font> <font> <name>fontContextMenu</name> - <filename>DejaVuSans.ttf</filename> + <filename>Roboto-Regular.ttf</filename> <size>18</size> </font> @@ -144,151 +46,53 @@ <!-- Title Fonts --> <font> <name>font10_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>12</size> </font> <font> <name>font12_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>16</size> + <filename>Roboto-Bold.ttf</filename> + <size>17</size> </font> <font> <name>font13_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>20</size> </font> <font> <name>font24_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>24</size> </font> <font> <name>font28_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>28</size> </font> <font> <name>font30_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>30</size> </font> <font> <name>font35_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>35</size> </font> <font> - <name>font45caps_title</name> - <filename>DejaVuSans-Bold-Caps.ttf</filename> - <size>45</size> - </font> - <font> <name>font50caps_title</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>35</size> - </font> - - <font> - <name>WeatherTemp</name> - <filename>DejaVuSans-Bold.ttf</filename> - <size>80</size> - </font> - </fontset> - - <fontset id="Arial" idloc="31392" unicode="true"> - <!-- Normal Fonts --> - <font> - <name>font10</name> - <filename>Arial.ttf</filename> - <size>12</size> - </font> - <font> - <name>font12</name> - <filename>Arial.ttf</filename> - <size>16</size> - </font> - <font> - <name>font12caps</name> - <filename>Arial.ttf</filename> - <size>16</size> - </font> - <font> - <name>font13</name> - <filename>Arial.ttf</filename> - <size>20</size> - </font> - <font> - <name>font13caps</name> - <filename>Arial.ttf</filename> - <size>20</size> - </font> - <font> - <name>font16caps</name> - <filename>Arial.ttf</filename> - <size>25</size> - </font> - <font> - <name>font30</name> - <filename>Arial.ttf</filename> - <size>30</size> - </font> - <font> - <name>fontContextMenu</name> - <filename>Arial.ttf</filename> - <size>18</size> - </font> - - - <!-- Title Fonts --> - <font> - <name>font10_title</name> - <filename>Arial.ttf</filename> - <size>12</size> - </font> - <font> - <name>font12_title</name> - <filename>Arial.ttf</filename> - <size>16</size> - </font> - <font> - <name>font13_title</name> - <filename>Arial.ttf</filename> - <size>20</size> - </font> - <font> - <name>font24_title</name> - <filename>Arial.ttf</filename> - <size>24</size> - </font> - <font> - <name>font28_title</name> - <filename>Arial.ttf</filename> - <size>28</size> - </font> - <font> - <name>font30_title</name> - <filename>Arial.ttf</filename> - <size>30</size> - </font> - <font> - <name>font35_title</name> - <filename>Arial.ttf</filename> - <size>35</size> - </font> - <font> - <name>font50caps_title</name> - <filename>Arial.ttf</filename> - <size>35</size> + <filename>Roboto-Bold.ttf</filename> + <size>40</size> </font> <font> <name>font45caps_title</name> - <filename>Arial.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>45</size> </font> <font> <name>WeatherTemp</name> - <filename>Arial.ttf</filename> + <filename>Roboto-Bold.ttf</filename> <size>80</size> </font> </fontset> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index ee9f44e705..8b1348c258 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -2,28 +2,10 @@ <defaultcontrol always="true">9000</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath background="true">$INFO[Container(9000).ListItem.Icon]</imagepath> - <timeperimage>8000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - </control> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> - <posy>340r</posy> - <width>1280</width> - <height>250</height> - <colordiffuse>AAFFFFFF</colordiffuse> - <texture>HomeNowPlayingBack.png</texture> - <include>Window_OpenClose_Animation</include> - </control> - <control type="image"> - <posx>0</posx> <posy>90r</posy> <width>1280</width> <height>90</height> @@ -43,16 +25,6 @@ <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> </control> - <control type="image"> - <posx>0</posx> - <posy>125</posy> - <width>1280</width> - <height>250</height> - <colordiffuse>AAFFFFFF</colordiffuse> - <texture>HomeNowPlayingBack.png</texture> - <visible>[Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)] | [Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)] | [Container(9000).HasFocus(2) + Skin.HasSetting(homepageShowRecentlyAdded)] | [Container(9000).HasFocus(10) + Skin.HasSetting(homepageShowRecentlyAdded)] | [Container(9000).HasFocus(11) + Skin.HasSetting(homepageShowRecentlyAdded)]</visible> - <include>Window_OpenClose_Animation</include> - </control> <!-- Music Info --> <control type="group"> <posx>0</posx> @@ -552,7 +524,7 @@ <textcolor>grey3</textcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> + <label>[UPPERCASE]$INFO[ListItem.Label][/UPPERCASE]</label> </control> </itemlayout> <focusedlayout height="60" width="300"> @@ -579,7 +551,7 @@ <textcolor>white</textcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> + <label>[UPPERCASE]$INFO[ListItem.Label][/UPPERCASE]</label> <animation effect="fade" start="100" end="50" time="200" condition="!Control.HasFocus(9000)">conditional</animation> </control> </focusedlayout> @@ -587,8 +559,8 @@ <item id="7"> <label>8</label> <onclick>ActivateWindow(Weather)</onclick> - <icon>special://skin/backgrounds/weather.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>!Skin.HasSetting(HomeMenuNoWeatherButton) + !IsEmpty(Weather.Plugin)</visible> </item> <item id="4"> @@ -602,50 +574,50 @@ <label>3</label> <onclick condition="!Skin.HasSetting(HomeVideostoFiles)">ActivateWindow(Videos)</onclick> <onclick condition="Skin.HasSetting(HomeVideostoFiles)">ActivateWindow(Videos,Files,Return)</onclick> - <icon>special://skin/backgrounds/videos.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible> </item> <item id="10"> <label>20342</label> <onclick>ActivateWindow(Videos,MovieTitles,return)</onclick> - <icon>special://skin/backgrounds/videos.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Movies_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible> </item> <item id="11"> <label>20343</label> <onclick>ActivateWindow(Videos,TVShowTitles,return)</onclick> - <icon>special://skin/backgrounds/videos.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_TVShow_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</visible> </item> <item id="3"> <label>2</label> <onclick>ActivateWindow(Music)</onclick> - <icon>special://skin/backgrounds/music.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible> </item> <item id="1"> <label>0</label> <onclick>ActivateWindow(Programs,Addons,return)</onclick> - <icon>special://skin/backgrounds/programs.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible> </item> <item id="6"> <label>341</label> <onclick>XBMC.PlayDVD()</onclick> - <icon>special://skin/backgrounds/playdisc.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_PlayDisc_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> <visible>System.HasMediaDVD</visible> </item> <item id="5"> <label>13000</label> <onclick>ActivateWindow(Settings)</onclick> - <icon>special://skin/backgrounds/settings.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</thumb> + <icon>-</icon> + <thumb>-</thumb> </item> </content> </control> @@ -719,7 +691,7 @@ <height>120</height> <aspectratio aligny="bottom">keep</aspectratio> <bordertexture border="5">button-nofocus.png</bordertexture> - <bordersize>5</bordersize> + <bordersize>3</bordersize> <texture background="true">$INFO[ListItem.Icon]</texture> <visible>!Control.HasFocus(9002)</visible> </control> @@ -730,7 +702,7 @@ <height>120</height> <aspectratio aligny="bottom">keep</aspectratio> <bordertexture border="5">folder-focus.png</bordertexture> - <bordersize>5</bordersize> + <bordersize>3</bordersize> <texture background="true">$INFO[ListItem.Icon]</texture> <visible>Control.HasFocus(9002)</visible> </control> diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index a1122d07ee..f66538d039 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -24,63 +24,7 @@ <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible> </control> </include> - <include name="CommonVideoBackground"> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath fallback="special://skin/backgrounds/videos.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> - <include>Window_OpenClose_Animation</include> - </control> - </include> - <include name="CommonMusicBackground"> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath fallback="special://skin/backgrounds/music.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> - <include>Window_OpenClose_Animation</include> - </control> - </include> - <include name="CommonPictureBackground"> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath fallback="special://skin/backgrounds/pictures.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Pictures_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - </control> + <include name="CommonBackground"> <control type="image"> <posx>0</posx> <posy>0</posy> @@ -92,76 +36,13 @@ <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> <include>Window_OpenClose_Animation</include> </control> - </include> - <include name="CommonProgramsBackground"> - <control type="multiimage"> + <control type="Image"> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <imagepath fallback="special://skin/backgrounds/programs.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> - <include>Window_OpenClose_Animation</include> - </control> - </include> - <include name="CommonWeatherBackground"> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath fallback="special://skin/backgrounds/weather.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - <visible>![Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))]</visible> - </control> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath background="true">$INFO[Skin.String(WeatherFanartDir)]$INFO[Window(Weather).Property(Current.FanartCode)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible> - <animation effect="fade" time="200">WindowClose</animation> - </control> - </include> - <include name="CommonSettingsBackground"> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath fallback="special://skin/backgrounds/settings.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> - <include>Window_OpenClose_Animation</include> + <texture>special://skin/backgrounds/background.jpg</texture> + <animation effect="fade" start="100" end="80" time="200" condition="!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))">Conditional</animation> </control> </include> <include name="ContentPanelBackgrounds"> diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml index e23d889cfc..bb3c5df889 100644 --- a/addons/skin.confluence/720p/MyMusicNav.xml +++ b/addons/skin.confluence/720p/MyMusicNav.xml @@ -3,7 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51,500,550,551,509,506,511,512,513</views> <controls> - <include>CommonMusicBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml index 636b528aeb..380915eeda 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylist.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml @@ -3,7 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51,506</views> <controls> - <include>CommonMusicBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> diff --git a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml index 82e7bbf3d8..2e496fff29 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml @@ -2,7 +2,7 @@ <defaultcontrol allways="true">6</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonMusicBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="group"> <posy>10</posy> diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml index cb2bef8e4f..5df8439d02 100644 --- a/addons/skin.confluence/720p/MyMusicSongs.xml +++ b/addons/skin.confluence/720p/MyMusicSongs.xml @@ -3,7 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51,550,551,500,506</views> <controls> - <include>CommonMusicBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml index 1a7d0ad1bd..a3b6665a01 100644 --- a/addons/skin.confluence/720p/MyPics.xml +++ b/addons/skin.confluence/720p/MyPics.xml @@ -3,7 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51,550,551,500,514,510</views> <controls> - <include>CommonPictureBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml index 75626e26e2..610edf7956 100644 --- a/addons/skin.confluence/720p/MyPrograms.xml +++ b/addons/skin.confluence/720p/MyPrograms.xml @@ -3,7 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51,500,550,551</views> <controls> - <include>CommonProgramsBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index 3a20cb6f7c..ff1eb1bd39 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -4,7 +4,7 @@ <views>50,51,500,550,551,560,501,508,504,503,505,511</views> <onload condition="Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)">XBMC.RunScript(script.tvtunes,backend=True&loop=False)</onload> <controls> - <include>CommonVideoBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml index 5f93ea92e8..9b8985d72d 100644 --- a/addons/skin.confluence/720p/MyVideoPlaylist.xml +++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml @@ -3,7 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51</views> <controls> - <include>CommonVideoBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index d7757565df..8b49a6e56b 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -2,7 +2,7 @@ <defaultcontrol always="true">50</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonWeatherBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index 6c716ce217..0b9e0ad2ec 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -2,7 +2,7 @@ <defaultcontrol always="true">9000</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonSettingsBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml index a7083f6c34..4d0b2ebd2b 100644 --- a/addons/skin.confluence/720p/SettingsCategory.xml +++ b/addons/skin.confluence/720p/SettingsCategory.xml @@ -2,7 +2,7 @@ <defaultcontrol>3</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonSettingsBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index 9485cf6a55..2ddfb69802 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -2,7 +2,7 @@ <defaultcontrol always="true">2</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonSettingsBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml index a90a9f0ae2..45ee872c6a 100644 --- a/addons/skin.confluence/720p/SettingsSystemInfo.xml +++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml @@ -2,7 +2,7 @@ <defaultcontrol always="true">95</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonSettingsBackground</include> + <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/backgrounds/addons.jpg b/addons/skin.confluence/backgrounds/addons.jpg Binary files differdeleted file mode 100644 index 3e561dfbb0..0000000000 --- a/addons/skin.confluence/backgrounds/addons.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/appearance.jpg b/addons/skin.confluence/backgrounds/appearance.jpg Binary files differdeleted file mode 100644 index 0a70501e62..0000000000 --- a/addons/skin.confluence/backgrounds/appearance.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/background.jpg b/addons/skin.confluence/backgrounds/background.jpg Binary files differnew file mode 100644 index 0000000000..90caf29950 --- /dev/null +++ b/addons/skin.confluence/backgrounds/background.jpg diff --git a/addons/skin.confluence/backgrounds/music.jpg b/addons/skin.confluence/backgrounds/music.jpg Binary files differdeleted file mode 100644 index ed9e4b8fbd..0000000000 --- a/addons/skin.confluence/backgrounds/music.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/pictures.jpg b/addons/skin.confluence/backgrounds/pictures.jpg Binary files differdeleted file mode 100644 index 2abf5d27a8..0000000000 --- a/addons/skin.confluence/backgrounds/pictures.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/playdisc.jpg b/addons/skin.confluence/backgrounds/playdisc.jpg Binary files differdeleted file mode 100644 index 046e4a3c6d..0000000000 --- a/addons/skin.confluence/backgrounds/playdisc.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/programs.jpg b/addons/skin.confluence/backgrounds/programs.jpg Binary files differdeleted file mode 100644 index 3b097bbfb8..0000000000 --- a/addons/skin.confluence/backgrounds/programs.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/settings.jpg b/addons/skin.confluence/backgrounds/settings.jpg Binary files differdeleted file mode 100644 index 0c297e3177..0000000000 --- a/addons/skin.confluence/backgrounds/settings.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/skinsetting.jpg b/addons/skin.confluence/backgrounds/skinsetting.jpg Binary files differdeleted file mode 100644 index 91d00adbe5..0000000000 --- a/addons/skin.confluence/backgrounds/skinsetting.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/system.jpg b/addons/skin.confluence/backgrounds/system.jpg Binary files differdeleted file mode 100644 index bc494a0c38..0000000000 --- a/addons/skin.confluence/backgrounds/system.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/videos.jpg b/addons/skin.confluence/backgrounds/videos.jpg Binary files differdeleted file mode 100644 index b968fb8f59..0000000000 --- a/addons/skin.confluence/backgrounds/videos.jpg +++ /dev/null diff --git a/addons/skin.confluence/backgrounds/weather.jpg b/addons/skin.confluence/backgrounds/weather.jpg Binary files differdeleted file mode 100644 index 2e91ccb1c1..0000000000 --- a/addons/skin.confluence/backgrounds/weather.jpg +++ /dev/null diff --git a/addons/skin.confluence/fonts/DefaultCaps.ttf b/addons/skin.confluence/fonts/DefaultCaps.ttf Binary files differdeleted file mode 100644 index 7326cdb04c..0000000000 --- a/addons/skin.confluence/fonts/DefaultCaps.ttf +++ /dev/null diff --git a/addons/skin.confluence/fonts/DejaVuSans-Bold-Caps.ttf b/addons/skin.confluence/fonts/DejaVuSans-Bold-Caps.ttf Binary files differdeleted file mode 100644 index 5af21ea3d6..0000000000 --- a/addons/skin.confluence/fonts/DejaVuSans-Bold-Caps.ttf +++ /dev/null diff --git a/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf b/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf Binary files differdeleted file mode 100644 index 54aade078f..0000000000 --- a/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf +++ /dev/null diff --git a/addons/skin.confluence/fonts/DejaVuSans.ttf b/addons/skin.confluence/fonts/DejaVuSans.ttf Binary files differdeleted file mode 100644 index c1b19d8705..0000000000 --- a/addons/skin.confluence/fonts/DejaVuSans.ttf +++ /dev/null diff --git a/addons/skin.confluence/fonts/NOTICE.txt b/addons/skin.confluence/fonts/NOTICE.txt new file mode 100644 index 0000000000..c5b1efa7aa --- /dev/null +++ b/addons/skin.confluence/fonts/NOTICE.txt @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/addons/skin.confluence/fonts/README.txt b/addons/skin.confluence/fonts/README.txt new file mode 100644 index 0000000000..1a96dfde6c --- /dev/null +++ b/addons/skin.confluence/fonts/README.txt @@ -0,0 +1,18 @@ +Copyright (C) 2008 The Android Open Source Project + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +########## + +This directory contains the fonts for the platform. They are licensed +under the Apache 2 license. diff --git a/addons/skin.confluence/fonts/Roboto-Bold.ttf b/addons/skin.confluence/fonts/Roboto-Bold.ttf Binary files differnew file mode 100644 index 0000000000..e5d828d8b4 --- /dev/null +++ b/addons/skin.confluence/fonts/Roboto-Bold.ttf diff --git a/addons/skin.confluence/fonts/Roboto-Regular.ttf b/addons/skin.confluence/fonts/Roboto-Regular.ttf Binary files differnew file mode 100644 index 0000000000..153c60882b --- /dev/null +++ b/addons/skin.confluence/fonts/Roboto-Regular.ttf |
