diff options
57 files changed, 377 insertions, 288 deletions
diff --git a/addons/skin.estuary/1080i/AddonBrowser.xml b/addons/skin.estuary/1080i/AddonBrowser.xml index a464ffcbe9..3694dfd266 100644 --- a/addons/skin.estuary/1080i/AddonBrowser.xml +++ b/addons/skin.estuary/1080i/AddonBrowser.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">52</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50,52,55</views> <menucontrol>9000</menucontrol> <controls> diff --git a/addons/skin.estuary/1080i/DialogAddonInfo.xml b/addons/skin.estuary/1080i/DialogAddonInfo.xml index 46d1d6ad6c..1d46874712 100644 --- a/addons/skin.estuary/1080i/DialogAddonInfo.xml +++ b/addons/skin.estuary/1080i/DialogAddonInfo.xml @@ -97,7 +97,7 @@ </control> <control type="group"> <include>OpenClose_Left</include> - <visible>Window.IsActive(eventlog)</visible> + <visible>Window.IsActive(eventlog) | Window.IsActive(home)</visible> <include>Visible_Left</include> <include>ListThumbInfoPanel</include> </control> diff --git a/addons/skin.estuary/1080i/DialogAudioDSPManager.xml b/addons/skin.estuary/1080i/DialogAudioDSPManager.xml index 2b6151d2b2..e224105856 100644 --- a/addons/skin.estuary/1080i/DialogAudioDSPManager.xml +++ b/addons/skin.estuary/1080i/DialogAudioDSPManager.xml @@ -39,7 +39,7 @@ <top>0</top> <width>330</width> <height>130</height> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <font>font12_title</font> <aligny>center</aligny> <align>center</align> diff --git a/addons/skin.estuary/1080i/DialogFullScreenInfo.xml b/addons/skin.estuary/1080i/DialogFullScreenInfo.xml index f422769109..79c28b1a50 100644 --- a/addons/skin.estuary/1080i/DialogFullScreenInfo.xml +++ b/addons/skin.estuary/1080i/DialogFullScreenInfo.xml @@ -172,7 +172,7 @@ <height>25</height> <font>font14</font> <label>$INFO[VideoPlayer.Artist]$INFO[VideoPlayer.Album, - ]</label> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <shadowcolor>black</shadowcolor> <visible>VideoPlayer.Content(MusicVideos)</visible> </control> diff --git a/addons/skin.estuary/1080i/DialogMediaSource.xml b/addons/skin.estuary/1080i/DialogMediaSource.xml index f0c8f774e2..b66b6a4332 100644 --- a/addons/skin.estuary/1080i/DialogMediaSource.xml +++ b/addons/skin.estuary/1080i/DialogMediaSource.xml @@ -58,7 +58,7 @@ <width>820</width> <height>60</height> <aligny>center</aligny> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <label>$INFO[ListItem.Label]</label> </control> </itemlayout> diff --git a/addons/skin.estuary/1080i/DialogMusicInfo.xml b/addons/skin.estuary/1080i/DialogMusicInfo.xml index 95a1d55b82..a467fb49a4 100644 --- a/addons/skin.estuary/1080i/DialogMusicInfo.xml +++ b/addons/skin.estuary/1080i/DialogMusicInfo.xml @@ -30,7 +30,7 @@ </control> </control> <control type="group"> - <visible>StringCompare(Container(50).NumItems,0)</visible> + <visible>StringCompare(Container(50).NumItems,0) + IsEmpty(Control.GetLabel(400))</visible> <top>160</top> <control type="button" id="130"> <left>586</left> @@ -76,12 +76,13 @@ </control> </control> <control type="group"> - <visible>!StringCompare(Container(50).NumItems,0)</visible> + <visible>!StringCompare(Container(50).NumItems,0) | !IsEmpty(Control.GetLabel(400))</visible> <top>454</top> <control type="button" id="130"> <onup>50</onup> <ondown>9000</ondown> <left>586</left> + <top>-295</top> <width>1254</width> <height>320</height> <textoffsetx>40</textoffsetx> @@ -89,35 +90,51 @@ <aligny>bottom</aligny> <font>font_textbox</font> <label>-</label> + <visible>StringCompare(Container(50).NumItems,0)</visible> </control> - <control type="image"> - <left>614</left> - <top>30</top> - <width>1194</width> - <height>260</height> - <aspectratio aligny="top">scale</aspectratio> - <texture fallback="special://skin/extras/home-images/music.jpg">$INFO[ListItem.Art(fanart)]</texture> - <visible>IsEmpty(Control.GetLabel(400))</visible> + <control type="button" id="130"> + <onup>50</onup> + <ondown>9000</ondown> + <left>586</left> + <width>1254</width> + <height>320</height> + <textoffsetx>40</textoffsetx> + <textoffsety>20</textoffsety> + <aligny>bottom</aligny> + <font>font_textbox</font> + <label>-</label> </control> <control type="group"> - <visible>IsEmpty(Control.GetLabel(400)) + IsEmpty(ListItem.Art(fanart))</visible> + <animation effect="slide" start="0,0" end="0,-295" time="0" condition="StringCompare(Container(50).NumItems,0)">Conditional</animation> + <visible>[!StringCompare(Container(50).NumItems,0) + IsEmpty(Control.GetLabel(400))] | [StringCompare(Container(50).NumItems,0) + !IsEmpty(Control.GetLabel(400))]</visible> <control type="image"> <left>614</left> <top>30</top> <width>1194</width> <height>260</height> - <aspectratio>scale</aspectratio> - <texture colordiffuse="AAFFFFFF">colors/black.png</texture> + <aspectratio aligny="top">scale</aspectratio> + <texture fallback="special://skin/extras/home-images/music.jpg">$INFO[ListItem.Art(fanart)]</texture> </control> - <control type="textbox"> - <left>614</left> - <top>30</top> - <width>1194</width> - <height>260</height> - <align>center</align> - <aligny>center</aligny> - <font>font30_title</font> - <label>$LOCALIZE[19055]</label> + <control type="group"> + <visible>IsEmpty(ListItem.Art(fanart))</visible> + <control type="image"> + <left>614</left> + <top>30</top> + <width>1194</width> + <height>260</height> + <aspectratio>scale</aspectratio> + <texture colordiffuse="AAFFFFFF">colors/black.png</texture> + </control> + <control type="textbox"> + <left>614</left> + <top>30</top> + <width>1194</width> + <height>260</height> + <align>center</align> + <aligny>center</aligny> + <font>font30_title</font> + <label>$LOCALIZE[19055]</label> + </control> </control> </control> </control> @@ -278,7 +295,7 @@ <orientation>horizontal</orientation> <control type="group" id="420"> <width>262</width> - <visible>Container.Content(albums) | Container.Content(songs)</visible> + <visible>Stringcompare(ListItem.DBType,album) | Stringcompare(ListItem.DBType,song)</visible> <control type="button" id="7"> <include name="VideoInfoButtonsCommon"> <param name="icon" value="" /> @@ -316,7 +333,7 @@ <enable>!IsEmpty(ListItem.Art(fanart))</enable> <onclick>SetProperty(fanart,$ESCINFO[ListItem.Art(fanart)],home)</onclick> <onclick>ActivateWindow(1104)</onclick> - <visible>Container.Content(artists) | Container.Content(albums)</visible> + <visible>Stringcompare(ListItem.DBType,artist) | Stringcompare(ListItem.DBType,album)</visible> </control> <include name="InfoDialogButton"> <param name="id" value="6" /> @@ -340,8 +357,8 @@ </include> <onclick>Action(close)</onclick> <visible>System.hasAddon(script.extendedinfo)</visible> - <onclick condition="!Container.Content(songs)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Album])</onclick> - <onclick condition="Container.Content(songs)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Title])</onclick> + <onclick condition="!Stringcompare(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Album])</onclick> + <onclick condition="Stringcompare(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Title])</onclick> </control> </control> <include name="LeftRightArrows"> @@ -353,7 +370,7 @@ </include> </control> <control type="group"> - <visible>Container.Content(artists)</visible> + <visible>Stringcompare(ListItem.DBType,artist)</visible> <include name="InfoDialogTopBarInfo"> <param name="main_label" value="$INFO[ListItem.Artist]" /> <param name="sub_label" value="$INFO[ListItem.Genre]" /> @@ -361,7 +378,7 @@ </include> </control> <control type="group"> - <visible>Container.Content(albums)</visible> + <visible>Stringcompare(ListItem.DBType,album)</visible> <include name="InfoDialogTopBarInfo"> <param name="main_label" value="$INFO[ListItem.Album]$INFO[ListItem.Year, ([COLOR button_focus],[/COLOR])]" /> <param name="sub_label" value="$INFO[ListItem.Artist]" /> @@ -369,7 +386,7 @@ </include> </control> <control type="group"> - <visible>Container.Content(songs) + !Window.IsActive(musicinformation)</visible> + <visible>Stringcompare(ListItem.DBType,song) + !Window.IsActive(musicinformation)</visible> <include name="InfoDialogTopBarInfo"> <param name="main_label" value="[COLOR button_focus]$INFO[ListItem.TrackNumber]. [/COLOR]$INFO[ListItem.Title]" /> <param name="sub_label" value="$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]$INFO[ListItem.Year, ([COLOR button_focus],[/COLOR])]" /> diff --git a/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml b/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml index 6175b7bbdb..ed41e191c5 100644 --- a/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml +++ b/addons/skin.estuary/1080i/DialogPVRGuideOSD.xml @@ -53,7 +53,7 @@ <top>90</top> <width>580</width> <height>30</height> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <label>$INFO[Container(11).ListItem.StartDate]</label> <align>center</align> <aligny>center</aligny> diff --git a/addons/skin.estuary/1080i/DialogPVRGuideSearch.xml b/addons/skin.estuary/1080i/DialogPVRGuideSearch.xml index 89b9eb6dd9..1764744585 100644 --- a/addons/skin.estuary/1080i/DialogPVRGuideSearch.xml +++ b/addons/skin.estuary/1080i/DialogPVRGuideSearch.xml @@ -33,7 +33,7 @@ <width>1700</width> <height>68</height> <font>font12</font> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <label>$LOCALIZE[19001] $LOCALIZE[19002]</label> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/DialogVideoInfo.xml b/addons/skin.estuary/1080i/DialogVideoInfo.xml index c394fdaf9a..e3399b3e0f 100644 --- a/addons/skin.estuary/1080i/DialogVideoInfo.xml +++ b/addons/skin.estuary/1080i/DialogVideoInfo.xml @@ -7,6 +7,7 @@ <left>106</left> <animation effect="fade" start="100" end="0" time="0">WindowClose</animation> <visible>!Container.Content(files)</visible> + <include condition="Window.IsActive(home)">OpenClose_Left</include> <control type="image"> <top>-16</top> <left>-16</left> @@ -15,7 +16,7 @@ <texture>colors/black.png</texture> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> - <animation effect="fade" start="0" end="100" time="100" delay="300">WindowOpen</animation> + <animation effect="fade" start="0" end="100" time="100" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation> </control> <control type="image"> <left>4</left> @@ -24,10 +25,10 @@ <height>701</height> <aspectratio>scale</aspectratio> <texture fallback="DefaultVideo.png">$VAR[PosterVar]</texture> - <animation effect="fade" start="0" end="100" time="0" delay="300">WindowOpen</animation> + <animation effect="fade" start="0" end="100" time="0" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation> </control> <control type="group"> - <visible>Container.Content(episodes) + !IsEmpty(ListItem.Thumb)</visible> + <visible>Stringcompare(ListItem.DBType,episode) + !IsEmpty(ListItem.Thumb)</visible> <control type="image"> <left>4</left> <top>4</top> @@ -35,7 +36,7 @@ <height>701</height> <aspectratio>stretch</aspectratio> <texture colordiffuse="AAFFFFFF" fallback="DefaultVideo.png">colors/black.png</texture> - <animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation> + <animation effect="fade" start="0" end="100" time="300" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation> </control> <control type="image"> <left>14</left> @@ -44,7 +45,7 @@ <height>701</height> <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Thumb]</texture> - <animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation> + <animation effect="fade" start="0" end="100" time="300" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation> <bordertexture border="20">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> @@ -141,7 +142,8 @@ <orientation>vertical</orientation> <left>730</left> <top>488</top> - <itemgap>-5</itemgap> + <height>310</height> + <itemgap>-8</itemgap> <ondown>5000</ondown> <onup>50</onup> <onright>140</onright> @@ -277,7 +279,7 @@ <height>370</height> <onleft>50</onleft> <onright>50</onright> - <onup condition="System.hasAddon(script.extendedinfo)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[Container(50).ListItem.Label])</onup> + <onup condition="System.hasAddon(script.extendedinfo) + Control.HasFocus(50)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[Container(50).ListItem.Label])</onup> <onup condition="!System.hasAddon(script.extendedinfo)">InstallAddon(script.extendedinfo)</onup> <ondown>140</ondown> <scrolltime>200</scrolltime> @@ -427,7 +429,7 @@ <param name="label" value="$LOCALIZE[31090]" /> <param name="onclick_1" value="Action(close)" /> <param name="onclick_2" value="RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Title] $INFO[ListItem.Year])" /> - <param name="visible" value="System.hasAddon(script.extendedinfo) + Container.Content(movies) + !Control.IsVisible(11)" /> + <param name="visible" value="System.hasAddon(script.extendedinfo) + Stringcompare(ListItem.DBType,movie) + !Control.IsVisible(11)" /> </include> <control type="group" id="400"> <width>262</width> diff --git a/addons/skin.estuary/1080i/Font.xml b/addons/skin.estuary/1080i/Font.xml index 1545a19ecd..554ed11843 100644 --- a/addons/skin.estuary/1080i/Font.xml +++ b/addons/skin.estuary/1080i/Font.xml @@ -97,7 +97,7 @@ </font> <font> <name>Mono30</name> - <filename>Inconsolata-Regular.ttf</filename> + <filename>Anonymous Pro.ttf</filename> <size>30</size> </font> </fontset> diff --git a/addons/skin.estuary/1080i/Home.xml b/addons/skin.estuary/1080i/Home.xml index 886b7d1ebb..ded38bcbbe 100644 --- a/addons/skin.estuary/1080i/Home.xml +++ b/addons/skin.estuary/1080i/Home.xml @@ -3,7 +3,7 @@ <menucontrol>9000</menucontrol> <defaultcontrol>9000</defaultcontrol> <!-- <onload condition="ControlGroup(700).HasFocus">SetFocus(9000,0)</onload> - --> <backgroundcolor>FF000000</backgroundcolor> + --> <backgroundcolor>background</backgroundcolor> <controls> <control type="button" id="20000"> <include>HiddenObject</include> @@ -33,6 +33,7 @@ <visible>!Player.HasMedia</visible> </control> <control type="group" id="2000"> + <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation> <animation type="Conditional" condition="Control.IsVisible(20000)" reversible="false"> <effect type="slide" end="0,20" time="60" tween="sine" /> <effect type="slide" end="0,-20" time="180" tween="sine" delay="80" /> @@ -812,28 +813,32 @@ <param name="breadcrumbs_label" value="" /> <param name="breadcrumbs_icon" value="" /> </include> - <control type="image"> - <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> - <left>20</left> - <top>10</top> - <aspectratio>keep</aspectratio> - <width>56</width> - <height>56</height> - <texture colordiffuse="button_focus">icons/logo.png</texture> - </control> - <control type="image"> - <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> - <left>60</left> - <top>20</top> - <aspectratio>keep</aspectratio> - <width>192</width> - <height>36</height> - <texture>icons/logo-text.png</texture> + <control type="group"> + <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation> + <control type="image"> + <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <left>20</left> + <top>10</top> + <aspectratio>keep</aspectratio> + <width>56</width> + <height>56</height> + <texture colordiffuse="button_focus">icons/logo.png</texture> + </control> + <control type="image"> + <animation effect="fade" start="0" end="100" time="300">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <left>60</left> + <top>20</top> + <aspectratio>keep</aspectratio> + <width>192</width> + <height>36</height> + <texture>icons/logo-text.png</texture> + </control> </control> <include>BottomBar</include> <control type="group"> + <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation> <include>OpenClose_Left</include> <control type="radiobutton" id="900"> <left>37</left> @@ -858,7 +863,7 @@ <textureradioofffocus>icons/search.png</textureradioofffocus> <textureradiooffnofocus>icons/search.png</textureradiooffnofocus> </control> - <control type="fadelabel"> + <control type="label"> <left>77</left> <top>91</top> <width>520</width> @@ -868,9 +873,6 @@ <scrollout>false</scrollout> <pauseatend>5000</pauseatend> <label>$LOCALIZE[31001]...</label> - <label>$LOCALIZE[31002]...</label> - <label>$LOCALIZE[31003]...</label> - <label>$LOCALIZE[31004]...</label> </control> <control type="group"> <left>53</left> @@ -1124,6 +1126,7 @@ </control> </control> <control type="radiobutton" id="14200"> + <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation> <top>995</top> <left>35</left> <width>420</width> @@ -1149,6 +1152,7 @@ <visible>Player.hasMedia</visible> </control> <control type="rss"> + <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation> <left>0</left> <top>1041</top> <height>30</height> diff --git a/addons/skin.estuary/1080i/Includes.xml b/addons/skin.estuary/1080i/Includes.xml index e40f4fe849..7ec5b18f5a 100644 --- a/addons/skin.estuary/1080i/Includes.xml +++ b/addons/skin.estuary/1080i/Includes.xml @@ -210,7 +210,7 @@ <height>30</height> <font>font10</font> <aligny>center</aligny> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <label>$INFO[ListItem.Property(Name)]</label> </control> </itemlayout> @@ -255,7 +255,7 @@ <height>30</height> <font>font10</font> <aligny>center</aligny> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> <label>$INFO[ListItem.Property(Name)]</label> </control> </focusedlayout> @@ -738,11 +738,6 @@ <icon>icons/settings/weather.png</icon> </item> <item> - <label>$LOCALIZE[24001]</label> - <onclick>ActivateWindow(AddonBrowser,root)</onclick> - <icon>icons/settings/addons.png</icon> - </item> - <item> <label>$LOCALIZE[14036]</label> <onclick>ActivateWindow(ServiceSettings)</onclick> <icon>icons/settings/network.png</icon> @@ -760,13 +755,18 @@ <item> <label>$LOCALIZE[13200]</label> <onclick>ActivateWindow(Profiles)</onclick> - <icon>icons/settings/appearance.png</icon> + <icon>icons/settings/profiles.png</icon> </item> <item> <label>$LOCALIZE[138]</label> <onclick>ActivateWindow(systeminfo)</onclick> <icon>icons/settings/sysinfo.png</icon> </item> + <item> + <label>$LOCALIZE[20077]</label> + <onclick>ActivateWindow(SkinSettings)</onclick> + <icon>icons/settings/skin.png</icon> + </item> </content> </include> <include name="PlaylistWindowButtons"> diff --git a/addons/skin.estuary/1080i/Includes_MediaMenu.xml b/addons/skin.estuary/1080i/Includes_MediaMenu.xml index 9ad75fb3c8..94e4995cea 100644 --- a/addons/skin.estuary/1080i/Includes_MediaMenu.xml +++ b/addons/skin.estuary/1080i/Includes_MediaMenu.xml @@ -132,6 +132,13 @@ <onclick>SendClick(28)</onclick> <visible>Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRGuide.xml)</visible> </control> + <control type="radiobutton" id="6060"> + <include>MediaMenuItemsCommon</include> + <label>$LOCALIZE[31127]</label> + <selected>Skin.HasSetting(pvr_iconlist)</selected> + <onclick>Skin.ToggleSetting(pvr_iconlist)</onclick> + <visible>Window.IsActive(MyPVRChannels.xml)</visible> + </control> <control type="button" id="6053"> <include>MediaMenuItemsCommon</include> <label>$LOCALIZE[31022]</label> diff --git a/addons/skin.estuary/1080i/MusicVisualisation.xml b/addons/skin.estuary/1080i/MusicVisualisation.xml index f3f7aaff04..b77e317c5c 100644 --- a/addons/skin.estuary/1080i/MusicVisualisation.xml +++ b/addons/skin.estuary/1080i/MusicVisualisation.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <window> <defaultcontrol>-</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <controls> <control type="visualisation"> <include>FullScreenDimensions</include> @@ -179,47 +179,5 @@ <param name="breadcrumbs_icon" value="icons/settings/music.png" /> </include> </control> - <control type="group" id="0"> - <visible>Player.ShowCodec</visible> - <animation effect="fade" time="400" tween="cubic" reversible="true">VisibleChange</animation> - <control type="image"> - <left>30</left> - <top>10</top> - <width>1858</width> - <height>130</height> - <texture colordiffuse="B0FFFFFF">colors/black.png</texture> - <animation effect="fade" start="100" end="90" time="40" condition="true">Conditional</animation> - </control> - <control type="label"> - <left>75</left> - <top>20</top> - <label>$INFO[musicplayer.Codec,$LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate, • $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample, • $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate, • $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels, • $LOCALIZE[21444]: ]</label> - <label>-</label> - <font>font12</font> - </control> - <control type="label"> - <left>75</left> - <top>55</top> - <label>$INFO[Visualisation.Name] [I][COLOR=button_focus]($LOCALIZE[20166])[/COLOR][/I] • fps: $INFO[System.FPS]</label> - <label>-</label> - <font>font12</font> - <visible>Visualisation.Locked</visible> - </control> - <control type="label"> - <left>75</left> - <top>55</top> - <label>$INFO[Visualisation.Name] • fps: $INFO[System.FPS]</label> - <label>-</label> - <font>font12</font> - <visible>!Visualisation.Locked</visible> - </control> - <control type="label"> - <left>75</left> - <top>90</top> - <label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label> - <label>-</label> - <font>font12</font> - </control> - </control> </controls> </window> diff --git a/addons/skin.estuary/1080i/MyMusicNav.xml b/addons/skin.estuary/1080i/MyMusicNav.xml index 0a640b3c54..a8bb33d6e6 100644 --- a/addons/skin.estuary/1080i/MyMusicNav.xml +++ b/addons/skin.estuary/1080i/MyMusicNav.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">50</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <menucontrol>9000</menucontrol> <views>50,52,53,54,55,500</views> <controls> @@ -36,7 +36,7 @@ <height>746</height> <texture border="22">dialogs/dialog-bg.png</texture> </control> - <control type="textbox" id="4380"> + <control type="textbox"> <right>130</right> <top>194</top> <width>429</width> diff --git a/addons/skin.estuary/1080i/MyPVRChannels.xml b/addons/skin.estuary/1080i/MyPVRChannels.xml index 170091479a..3b658837ab 100644 --- a/addons/skin.estuary/1080i/MyPVRChannels.xml +++ b/addons/skin.estuary/1080i/MyPVRChannels.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">50</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50</views> <menucontrol>9000</menucontrol> <controls> @@ -36,7 +36,7 @@ <viewtype label="List">list</viewtype> <preloaditems>1</preloaditems> <pagecontrol>60</pagecontrol> - <focusedlayout height="58" width="1000"> + <focusedlayout height="58" width="1000" condition="!Skin.HasSetting(pvr_iconlist)"> <control type="image"> <left>0</left> <top>0</top> @@ -100,7 +100,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="58"> + <itemlayout height="58" condition="!Skin.HasSetting(pvr_iconlist)"> <control type="image"> <left>0</left> <top>0</top> @@ -155,7 +155,151 @@ <aligny>center</aligny> <font>font20_title</font> <label>$INFO[ListItem.ChannelNumberLabel]</label> - <textcolor>grey2</textcolor> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> + </control> + </itemlayout> + <focusedlayout height="77" width="1000" condition="Skin.HasSetting(pvr_iconlist)"> + <control type="image"> + <left>0</left> + <top>0</top> + <width>1000</width> + <height>77</height> + <texture border="90,3,90,3">lists/separator.png</texture> + </control> + <control type="image"> + <left>0</left> + <top>0</top> + <width>1000</width> + <height>77</height> + <texture>lists/focus.png</texture> + <visible>Control.hasFocus(50)</visible> + </control> + <control type="image"> + <left>900</left> + <top>10</top> + <width>80</width> + <height>60</height> + <aspectratio align="right">keep</aspectratio> + <texture>$INFO[listitem.icon]</texture> + </control> + <control type="progress"> + <description>Progressbar</description> + <left>105</left> + <top>48</top> + <width>50</width> + <height>12</height> + <colordiffuse>88FFFFFF</colordiffuse> + <visible>ListItem.HasEpg + !ListItem.IsRecording</visible> + <info>ListItem.Progress</info> + </control> + <control type="image"> + <left>945</left> + <top>9</top> + <width>40</width> + <height>40</height> + <texture>$VAR[PVRStatusImageVar]</texture> + </control> + <control type="label"> + <left>105</left> + <top>0</top> + <height>77</height> + <width>750</width> + <aligny>top</aligny> + <animation effect="slide" start="0,0" end="0,18" time="0" condition="IsEmpty(ListItem.Title)">Conditional</animation> + <label>$INFO[ListItem.Label]</label> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>165</left> + <top>36</top> + <height>77</height> + <width>750</width> + <aligny>top</aligny> + <align>left</align> + <font>font10</font> + <label>$INFO[ListItem.Title]</label> + <shadowcolor>text_shadow</shadowcolor> + <textcolor>button_focus</textcolor> + </control> + <control type="label"> + <left>12</left> + <top>0</top> + <height>77</height> + <width>70</width> + <align>center</align> + <aligny>center</aligny> + <font>font20_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> + <textcolor>grey</textcolor> + <shadowcolor>text_shadow</shadowcolor> + </control> + </focusedlayout> + <itemlayout height="77" condition="Skin.HasSetting(pvr_iconlist)"> + <control type="image"> + <left>0</left> + <top>0</top> + <width>1000</width> + <height>77</height> + <texture border="90,3,90,3">lists/separator.png</texture> + </control> + <control type="image"> + <left>900</left> + <top>10</top> + <width>80</width> + <height>60</height> + <aspectratio align="right">keep</aspectratio> + <texture>$INFO[listitem.icon]</texture> + </control> + <control type="progress"> + <description>Progressbar</description> + <left>105</left> + <top>48</top> + <width>50</width> + <height>12</height> + <colordiffuse>88FFFFFF</colordiffuse> + <visible>ListItem.HasEpg + !ListItem.IsRecording</visible> + <info>ListItem.Progress</info> + </control> + <control type="image"> + <left>945</left> + <top>9</top> + <width>40</width> + <height>40</height> + <texture>$VAR[PVRStatusImageVar]</texture> + </control> + <control type="label"> + <left>105</left> + <top>0</top> + <height>77</height> + <width>750</width> + <aligny>top</aligny> + <label>$INFO[ListItem.Label]</label> + <animation effect="slide" start="0,0" end="0,18" time="0" condition="IsEmpty(ListItem.Title)">Conditional</animation> + <shadowcolor>text_shadow</shadowcolor> + </control> + <control type="label"> + <left>165</left> + <top>36</top> + <height>77</height> + <width>750</width> + <aligny>top</aligny> + <align>left</align> + <font>font10</font> + <label>$INFO[ListItem.Title]</label> + <shadowcolor>text_shadow</shadowcolor> + <textcolor>button_focus</textcolor> + </control> + <control type="label"> + <left>12</left> + <top>0</top> + <height>77</height> + <width>70</width> + <align>center</align> + <aligny>center</aligny> + <font>font20_title</font> + <label>$INFO[ListItem.ChannelNumberLabel]</label> + <textcolor>grey</textcolor> <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> @@ -196,7 +340,7 @@ </control> <include name="TopBar"> <param name="breadcrumbs_label" value="TV$INFO[Control.GetLabel(29), / ]$INFO[Control.GetLabel(30), / ]" /> - <param name="breadcrumbs_icon" value="icons/settings/tvguide.png" /> + <param name="breadcrumbs_icon" value="icons/settings/tvremote.png" /> </include> <include>BottomBar</include> <control type="label" id="29"> diff --git a/addons/skin.estuary/1080i/MyPVRGuide.xml b/addons/skin.estuary/1080i/MyPVRGuide.xml index ec1f80feaa..291a008e15 100644 --- a/addons/skin.estuary/1080i/MyPVRGuide.xml +++ b/addons/skin.estuary/1080i/MyPVRGuide.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">10</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>10,11,12,13</views> <menucontrol>9000</menucontrol> <controls> @@ -29,7 +29,7 @@ <height>510</height> <pagecontrol>10</pagecontrol> <scrolltime tween="quadratic" easing="out">200</scrolltime> - <timeblocks>35</timeblocks> + <timeblocks>36</timeblocks> <rulerunit>6</rulerunit> <onleft>9000</onleft> <onup>10</onup> @@ -98,29 +98,24 @@ <height>58</height> <texture border="3" fallback="windows/pvr/epg-genres/0.png">$INFO[ListItem.Property(GenreType),windows/pvr/epg-genres/,.png]</texture> </control> - <control type="image" id="2"> - <width>58</width> - <height>58</height> - <texture border="8">buttons/thumbnail_focused.png</texture> - <visible>ListItem.HasTimer | ListItem.HasTimerSchedule</visible> - </control> - <control type="image" id="2"> - <width>58</width> - <height>58</height> - <texture border="8" colordiffuse="red">buttons/thumbnail_focused.png</texture> - <visible>ListItem.IsRecording</visible> - </control> <control type="label" id="1"> <left>6</left> <top>0</top> <width>50</width> - <height>58</height> + <height>36</height> <aligny>center</aligny> - <font>font10</font> + <font>font10_title</font> <label>$INFO[ListItem.Label]</label> </control> + <control type="image"> + <left>6</left> + <top>32</top> + <width>20</width> + <height>20</height> + <texture>$VAR[PVRTimerIcon]</texture> + </control> </itemlayout> - <focusedlayout height="58" width="58"> + <focusedlayout height="58" width="60"> <control type="image" id="2"> <top>2</top> <left>2</left> @@ -132,6 +127,11 @@ <control type="image" id="2"> <width>58</width> <height>58</height> + <texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture> + </control> + <control type="image" id="2"> + <width>58</width> + <height>58</height> <top>0</top> <texture border="3" fallback="windows/pvr/epg-genres/0.png">$INFO[ListItem.Property(GenreType),windows/pvr/epg-genres/,.png]</texture> <visible>!Control.HasFocus(10)</visible> @@ -140,22 +140,17 @@ <left>6</left> <top>0</top> <width>50</width> - <height>58</height> + <height>36</height> <aligny>center</aligny> - <font>font10</font> + <font>font10_title</font> <label>$INFO[ListItem.Label]</label> </control> - <control type="image" id="2"> - <width>58</width> - <height>58</height> - <texture border="8">buttons/thumbnail_focused.png</texture> - <visible>ListItem.HasTimer | ListItem.HasTimerSchedule</visible> - </control> - <control type="image" id="2"> - <width>58</width> - <height>58</height> - <texture border="8" colordiffuse="red">buttons/thumbnail_focused.png</texture> - <visible>ListItem.IsRecording</visible> + <control type="image"> + <left>6</left> + <top>32</top> + <width>20</width> + <height>20</height> + <texture>$VAR[PVRTimerIcon]</texture> </control> </focusedlayout> </control> @@ -343,7 +338,7 @@ </control> <include name="TopBar"> <param name="breadcrumbs_label" value="$INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]" /> - <param name="breadcrumbs_icon" value="icons/settings/livetv.png" /> + <param name="breadcrumbs_icon" value="icons/settings/tvguide.png" /> </include> <include name="BottomBar"> <param name="PageLabel" value="$INFO[Container.NumItems,$LOCALIZE[19019]: ]" /> diff --git a/addons/skin.estuary/1080i/MyPVRRecordings.xml b/addons/skin.estuary/1080i/MyPVRRecordings.xml index 606db53384..fa599f2563 100644 --- a/addons/skin.estuary/1080i/MyPVRRecordings.xml +++ b/addons/skin.estuary/1080i/MyPVRRecordings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">50</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50</views> <menucontrol>9000</menucontrol> <controls> diff --git a/addons/skin.estuary/1080i/MyPics.xml b/addons/skin.estuary/1080i/MyPics.xml index c1e08fc335..8a13f2d4e7 100644 --- a/addons/skin.estuary/1080i/MyPics.xml +++ b/addons/skin.estuary/1080i/MyPics.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">50</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50,52,53,54,55,500</views> <menucontrol>9000</menucontrol> <controls> diff --git a/addons/skin.estuary/1080i/MyPlaylist.xml b/addons/skin.estuary/1080i/MyPlaylist.xml index 3d139502ac..0954763023 100644 --- a/addons/skin.estuary/1080i/MyPlaylist.xml +++ b/addons/skin.estuary/1080i/MyPlaylist.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">50</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50</views> <controls> <include>DefaultBackground</include> diff --git a/addons/skin.estuary/1080i/MyPrograms.xml b/addons/skin.estuary/1080i/MyPrograms.xml index 9f7e255f36..f6192b6230 100644 --- a/addons/skin.estuary/1080i/MyPrograms.xml +++ b/addons/skin.estuary/1080i/MyPrograms.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">52</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50,52,55,500</views> <menucontrol>9000</menucontrol> <controls> diff --git a/addons/skin.estuary/1080i/MyVideoNav.xml b/addons/skin.estuary/1080i/MyVideoNav.xml index a8a84dd538..b76d390afd 100644 --- a/addons/skin.estuary/1080i/MyVideoNav.xml +++ b/addons/skin.estuary/1080i/MyVideoNav.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">50</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <views>50,51,52,53,54,55,500,501,502</views> <menucontrol>9000</menucontrol> <controls> @@ -28,7 +28,7 @@ <control type="group"> <include>OpenClose_Left</include> <visible>Control.IsVisible(55) | [Control.IsVisible(500) + Window.IsActive(addoninformation)]</visible> - <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(addons) | Container.Content(files) | Container.Content(mixed)</visible> + <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(addons) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos)</visible> <visible>!Window.IsActive(movieinformation)</visible> <include>Visible_Left</include> <include>ListThumbInfoPanel</include> @@ -38,7 +38,7 @@ <animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation> <visible>[Control.IsVisible(50) | Control.Isvisible(54)] + !IsEmpty(ListItem.DBID)</visible> <include>Visible_Right</include> - <visible>Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)</visible> + <visible>Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos)</visible> <control type="image"> <right>90</right> <top>162</top> @@ -55,37 +55,23 @@ <label>$INFO[ListItem.Label]</label> <visible>Control.IsVisible(54) | ListItem.IsCollection</visible> </control> - <control type="textbox" id="4380"> + <control type="textbox"> <right>130</right> - <top>194</top> + <top>245</top> <width>429</width> <height>338</height> <font>font12</font> - <animation effect="slide" start="0,0" end="0,50" time="0" reversible="false" condition="Control.IsVisible(54)">conditional</animation> - <label>$INFO[ListItem.Tagline,[B],[/B][CR]]$INFO[ListItem.Plot]</label> + <visible>Control.IsVisible(54)</visible> + <label>$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR],[CR]]$INFO[ListItem.Plot]</label> </control> - <control type="grouplist" id="4300"> + <control type="textbox"> <right>130</right> - <top>530</top> - <align>center</align> - <orientation>horizontal</orientation> - <width>430</width> - <onleft>60</onleft> - <onright>50</onright> - <control type="button" id="4301"> - <width>auto</width> - <height>95</height> - <textoffsetx>30</textoffsetx> - <label>$LOCALIZE[31047]</label> - <font>font12</font> - <texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus> - <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> - <onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick> - <onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick> - <onclick condition="!IsEmpty(ListItem.Plot)">ActivateWindow(1102)</onclick> - <onclick>SetFocus(50)</onclick> - <visible>IntegerGreaterThan(Container(4380).NumPages,1) + !Control.IsVisible(54)</visible> - </control> + <top>194</top> + <width>429</width> + <height>398</height> + <font>font12</font> + <visible>!Control.IsVisible(54)</visible> + <label>$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR],[CR]]$INFO[ListItem.Tagline,[B],[/B][CR]]$INFO[ListItem.Plot]</label> </control> <control type="textbox"> <right>130</right> @@ -133,7 +119,7 @@ <orientation>horizontal</orientation> <width>470</width> <include name="InfoFlag"> - <param name="visible" value="!IsEmpty(ListItem.Year)" /> + <param name="visible" value="!IsEmpty(ListItem.Year) + IsEmpty(ListItem.Premiered)" /> <param name="icon" value="lists/year.png" /> <param name="label" value="$INFO[ListItem.Year]" /> </include> @@ -158,7 +144,7 @@ <control type="group"> <top>180</top> <left>106</left> - <visible>!Container.Content() + !Container.Content(addons) + !Container.Content(files) + !Container.Content(mixed)</visible> + <visible>Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(sets) | Container.Content(actors) | Container.Content(directors)</visible> <visible>!Control.IsVisible(502)</visible> <visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(55) | Window.IsActive(movieinformation)</visible> <include>OpenClose_Left</include> diff --git a/addons/skin.estuary/1080i/MyWeather.xml b/addons/skin.estuary/1080i/MyWeather.xml index 331936dc14..cd1b8bb65a 100644 --- a/addons/skin.estuary/1080i/MyWeather.xml +++ b/addons/skin.estuary/1080i/MyWeather.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">300</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <menucontrol>20000</menucontrol> <controls> <control type="button" id="20000"> diff --git a/addons/skin.estuary/1080i/SettingsProfile.xml b/addons/skin.estuary/1080i/SettingsProfile.xml index 5b34a1d64d..db493d0865 100644 --- a/addons/skin.estuary/1080i/SettingsProfile.xml +++ b/addons/skin.estuary/1080i/SettingsProfile.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <window> <defaultcontrol always="true">9000</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <controls> <include>DefaultBackground</include> <control type="group"> diff --git a/addons/skin.estuary/1080i/SkinSettings.xml b/addons/skin.estuary/1080i/SkinSettings.xml index 45ca2e14ca..62b0dc8256 100644 --- a/addons/skin.estuary/1080i/SkinSettings.xml +++ b/addons/skin.estuary/1080i/SkinSettings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>9000</defaultcontrol> - <backgroundcolor>FF000000</backgroundcolor> + <backgroundcolor>background</backgroundcolor> <controls> <include>DefaultBackground</include> <control type="group"> @@ -107,19 +107,26 @@ <selected>Skin.HasSetting(show_mediaflags)</selected> </control> <control type="radiobutton" id="605"> + <label>$LOCALIZE[31002]</label> + <width>1256</width> + <include>DefaultSettingButton</include> + <onclick>Skin.ToggleSetting(no_fanart)</onclick> + <selected>Skin.HasSetting(no_fanart)</selected> + </control> + <control type="radiobutton" id="606"> <label>$LOCALIZE[31108]</label> <width>1256</width> <include>DefaultSettingButton</include> <onclick>Skin.ToggleSetting(use_custom_bg)</onclick> <selected>Skin.HasSetting(use_custom_bg)</selected> </control> - <control type="button" id="606"> + <control type="button" id="607"> <label>$LOCALIZE[31109]</label> <label2>$INFO[Skin.String(custom_background)]</label2> <width>1256</width> <include>DefaultSettingButton</include> <onclick>Skin.SetImage(custom_background)</onclick> - <enable>Skin.HasSetting(use_custom_bg)</enable> + <enable>!Skin.HasSetting(use_custom_bg)</enable> </control> </control> <control type="grouplist" id="610"> diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml index e89cecca1a..e450c5fcc6 100644 --- a/addons/skin.estuary/1080i/Variables.xml +++ b/addons/skin.estuary/1080i/Variables.xml @@ -27,8 +27,8 @@ <value>$INFO[ListItem.Duration,, $LOCALIZE[12391]]</value> </variable> <variable name="MusicInfoTextboxVar"> - <value condition="Container.Content(songs)">$INFO[ListItem.ContributorAndRole,[B]Contributors[/B][CR][COLOR=white],[/COLOR]]</value> - <value condition="Container.Content(albums)">$INFO[ListItem.Property(Album_Description),[B]Contributors[/B][CR][COLOR=white],[/COLOR]]</value> + <value condition="Container.Content(songs)">$INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]]</value> + <value condition="Container.Content(albums)">$INFO[ListItem.Property(Album_Description),[B]$LOCALIZE[183][/B][CR][COLOR=white],[/COLOR]]</value> <value>$INFO[ListItem.Property(Artist_Description),[B]$LOCALIZE[21887][/B][CR][COLOR=white],[/COLOR]]</value> </variable> <variable name="NowPlayingSublabelVar"> @@ -76,7 +76,7 @@ <value condition="Window.IsActive(pictures)">$INFO[ListItem.Property(description),,[CR]]$INFO[ListItem.PictureDatetime,[COLOR button_focus]$LOCALIZE[552]: [/COLOR],[CR]]$INFO[ListItem.PictureResolution,[COLOR button_focus]$LOCALIZE[169]: [/COLOR],[CR]]$INFO[ListItem.PictureCamMake,[COLOR button_focus]$LOCALIZE[31041]: [/COLOR],[CR]]$INFO[ListItem.PictureCamModel,[COLOR button_focus]$LOCALIZE[21823]: [/COLOR],[CR]]</value> <value condition="Container.Content(artists)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_YearsActive),[COLOR button_focus]$LOCALIZE[21898]: [/COLOR],[CR]]$INFO[ListItem.Property(Artist_Style),[COLOR button_focus]$LOCALIZE[736]: [/COLOR],[CR]]</value> <value condition="Container.Content(albums)">$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(album_label),[COLOR button_focus]$LOCALIZE[21899]: [/COLOR],[CR]]$INFO[ListItem.Property(album_style),[COLOR button_focus]$LOCALIZE[736]: [/COLOR],[CR]]</value> - <value condition="Container.Content(seasons) | Container.Content(tvshows)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(NumEpisodes),[COLOR button_focus]$LOCALIZE[20360]: [/COLOR]]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[31064]: ,)]$INFO[ListItem.Premiered,[CR][COLOR button_focus]$LOCALIZE[20416]: [/COLOR]]</value> + <value condition="Stringcompare(Listitem.DBType,season) | Stringcompare(Listitem.DBType,tvshow)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Property(NumEpisodes),[COLOR button_focus]$LOCALIZE[20360]: [/COLOR]]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[31064]: ,)]$INFO[ListItem.Premiered,[CR][COLOR button_focus]$LOCALIZE[20416]: [/COLOR]]</value> <value>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR], $LOCALIZE[31060][CR]]$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR]]</value> </variable> <variable name="ShiftRightTextBoxVar"> @@ -135,6 +135,7 @@ <value condition="!IsEmpty(ListItem.Property(addon.orphaned))">icons/infodialogs/update.png</value> --> <value condition="ListItem.IsParentFolder">-</value> <value condition="ListItem.Property(addon.downloading)">icons/infodialogs/install.png</value> + <value condition="ListItem.Property(addon.isinstalled) + !ListItem.Property(addon.isenabled) + Window.IsActive(addonbrowser)">icons/infodialogs/disable.png</value> <value condition="ListItem.Property(addon.hasupdate)">icons/infodialogs/update.png</value> <value condition="ListItem.Property(addon.isinstalled)">OverlayWatched.png</value> <value>OverlayUnwatched.png</value> @@ -162,7 +163,7 @@ <value>$INFO[ListItem.Art(poster)]</value> </variable> <variable name="BannerLabel2Var"> - <value condition="Container.Content(tvshows)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> + <value condition="Stringcompare(Listitem.DBType,tvshow)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value> <!-- <value>$INFO[ListItem.Year]</value> --> </variable> @@ -245,6 +246,7 @@ <value>$INFO[VideoPlayer.Genre]</value> </variable> <variable name="HomeFanartVar"> + <value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value> <value condition="!IsEmpty(Container(5100).ListItem.Art(fanart)) + Control.HasFocus(5100)">$INFO[Container(5100).ListItem.Art(fanart)]</value> <value condition="!IsEmpty(Container(5200).ListItem.Art(fanart)) + Control.HasFocus(5200)">$INFO[Container(5200).ListItem.Art(fanart)]</value> <value condition="!IsEmpty(Container(5300).ListItem.Art(fanart)) + Control.HasFocus(5300)">$INFO[Container(5300).ListItem.Art(fanart)]</value> @@ -261,19 +263,20 @@ <value condition="!IsEmpty(Container(8200).ListItem.Art(fanart)) + Control.HasFocus(8200)">$INFO[Container(8200).ListItem.Art(fanart)]</value> <value condition="!IsEmpty(Container(8300).ListItem.Art(fanart)) + Control.HasFocus(8300)">$INFO[Container(8300).ListItem.Art(fanart)]</value> <value condition="!IsEmpty(Container(8400).ListItem.Art(fanart)) + Control.HasFocus(8400)">$INFO[Container(8400).ListItem.Art(fanart)]</value> - <value condition="!IsEmpty(Container(15100).ListItem.Property(FanartCode)) + Control.HasFocus(15100)">resource://resource.images.weatherfanart.multi/$INFO[Container(15100).ListItem.Property(FanartCode)]</value> - <value condition="!IsEmpty(Container(15200).ListItem.Property(FanartCode)) + Control.HasFocus(15200)">resource://resource.images.weatherfanart.multi/$INFO[Container(15200).ListItem.Property(FanartCode)]</value> + <value condition="!IsEmpty(Container(15100).ListItem.Property(FanartCode)) + Control.HasFocus(15100)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15100).ListItem.Property(FanartCode)]</value> + <value condition="!IsEmpty(Container(15200).ListItem.Property(FanartCode)) + Control.HasFocus(15200)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15200).ListItem.Property(FanartCode)]</value> <value>-</value> </variable> <variable name="MediaFanartVar"> + <value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value> <value condition="!IsEmpty(Container.Art(tvshow.fanart))">$INFO[Container.Art(tvshow.fanart)]</value> <value condition="!IsEmpty(Container.Art(artist.fanart))">$INFO[Container.Art(artist.fanart)]</value> <value condition="!IsEmpty(Container.Art(fanart))">$INFO[Container.Art(fanart)]</value> <value>$INFO[ListItem.Art(fanart)]</value> </variable> <variable name="WeatherFanartVar"> - <value condition="!IsEmpty(Window(weather).Property(current.fanartcode))">$INFO[Window(weather).Property(current.fanartcode),resource://resource.images.weatherfanart.multi/]</value> - <value>$INFO[Window(weather).Property(fanartcode),resource://resource.images.weatherfanart.single/,.jpg]</value> + <value condition="!IsEmpty(Window(weather).Property(current.fanartcode)) + Skin.HasSetting(WeatherFanart.multi)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(current.fanartcode)]</value> + <value>$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(fanartcode)]$INFO[Skin.String(WeatherFanart.ext)]</value> </variable> <variable name="ListWatchedIconVar"> <value condition="ListItem.IsPlaying">overlays/watched/OverlayPlaying-List.png</value> @@ -357,4 +360,16 @@ <value condition="VideoPlayer.Content(movies) | VideoPlayer.Content(livetv)">$INFO[VideoPlayer.Genre]</value> <value condition="Player.HasAudio">$INFO[MusicPlayer.TrackNumber,,: ][COLOR=grey]$INFO[Player.Title][/COLOR]</value> </variable> + <variable name="PVRTimerIcon"> + <value condition="ListItem.IsRecording">icons/pvr/PVR-IsRecording.png</value> + <value condition="ListItem.HasTimerSchedule + ListItem.TimerHasError">icons/pvr/PVR-HasTimerScheduleError.png</value> + <value condition="ListItem.HasTimer + ListItem.TimerHasError">icons/pvr/PVR-HasTimerError.png</value> + <value condition="ListItem.HasTimerSchedule + ListItem.TimerHasConflict">icons/pvr/PVR-HasTimerScheduleConflict.png</value> + <value condition="ListItem.HasTimer + ListItem.TimerHasConflict">icons/pvr/PVR-HasTimerConflict.png</value> + <value condition="ListItem.HasRecording">icons/pvr/PVR-HasRecording.png</value> + <value condition="ListItem.HasTimerSchedule + !ListItem.TimerIsActive">icons/pvr/PVR-HasTimerScheduleDisabled.png</value> + <value condition="ListItem.HasTimer + !ListItem.TimerIsActive">icons/pvr/PVR-HasTimerDisabled.png</value> + <value condition="ListItem.HasTimerSchedule">icons/pvr/PVR-HasTimerSchedule.png</value> + <value condition="ListItem.HasTimer">icons/pvr/PVR-HasTimer.png</value> + </variable> </includes> diff --git a/addons/skin.estuary/1080i/VideoOSD.xml b/addons/skin.estuary/1080i/VideoOSD.xml index 68105ce3b7..7852b7e5a8 100644 --- a/addons/skin.estuary/1080i/VideoOSD.xml +++ b/addons/skin.estuary/1080i/VideoOSD.xml @@ -31,6 +31,7 @@ <control type="label"> <left>30</left> <top>-90</top> + <align>right</align> <textoffsetx>20</textoffsetx> <aligny>center</aligny> <width>1858</width> diff --git a/addons/skin.estuary/1080i/View_502_FanArt.xml b/addons/skin.estuary/1080i/View_502_FanArt.xml index 5de3056eb7..9b59f89d73 100644 --- a/addons/skin.estuary/1080i/View_502_FanArt.xml +++ b/addons/skin.estuary/1080i/View_502_FanArt.xml @@ -100,7 +100,7 @@ <font>font24_title</font> <align>right</align> <aligny>center</aligny> - <visible>Container.Content(movies)</visible> + <visible>Stringcompare(Listitem.dbtype,movie)</visible> <label>$INFO[ListItem.Year]</label> </control> <control type="image"> @@ -192,7 +192,7 @@ <font>font24_title</font> <align>right</align> <aligny>center</aligny> - <visible>Container.Content(movies)</visible> + <visible>Stringcompare(Listitem.dbtype,movie)</visible> <label>$INFO[ListItem.Year]</label> </control> <control type="image"> diff --git a/addons/skin.estuary/1080i/View_50_List.xml b/addons/skin.estuary/1080i/View_50_List.xml index 1a0d15acf8..06a138f6a1 100644 --- a/addons/skin.estuary/1080i/View_50_List.xml +++ b/addons/skin.estuary/1080i/View_50_List.xml @@ -61,14 +61,13 @@ <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> - <left>90</left> + <left>135</left> <top>0</top> <height>70</height> <width>555</width> <align>right</align> <aligny>center</aligny> <font>font12</font> - <animation effect="slide" end="40,0" time="0" condition="IsEmpty(ListItem.VideoResolution) + !ListItem.IsCollection">conditional</animation> <label>$VAR[ListLabel2Var]</label> <animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation> <shadowcolor>text_shadow</shadowcolor> @@ -91,14 +90,6 @@ <animation effect="fade" time="150">VisibleChange</animation> <visible>!Control.HasFocus(50)</visible> </control> - <control type="image"> - <left>657</left> - <top>22</top> - <width>40</width> - <height>26</height> - <animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation> - <texture>$VAR[MediaInfoOverlayVar]</texture> - </control> </focusedlayout> <itemlayout height="70" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)"> <control type="image"> @@ -118,14 +109,13 @@ <shadowcolor>text_shadow</shadowcolor> </control> <control type="label"> - <left>90</left> + <left>135</left> <top>0</top> <height>70</height> <width>555</width> <align>right</align> <aligny>center</aligny> <font>font12</font> - <animation effect="slide" end="40,0" time="0" condition="IsEmpty(ListItem.VideoResolution) + !ListItem.IsCollection">conditional</animation> <label>$VAR[ListLabel2Var]</label> <textcolor>grey</textcolor> <shadowcolor>text_shadow</shadowcolor> @@ -137,13 +127,6 @@ <height>32</height> <texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture> </control> - <control type="image"> - <left>657</left> - <top>22</top> - <width>40</width> - <height>26</height> - <texture colordiffuse="grey">$VAR[MediaInfoOverlayVar]</texture> - </control> </itemlayout> </control> <control type="scrollbar" id="60"> @@ -152,7 +135,7 @@ <width>12</width> <height>706</height> <onleft>50</onleft> - <onright>4301</onright> + <onright>50</onright> <orientation>vertical</orientation> </control> </control> diff --git a/addons/skin.estuary/1080i/View_51_Poster.xml b/addons/skin.estuary/1080i/View_51_Poster.xml index 2121de1795..e45b26f4da 100644 --- a/addons/skin.estuary/1080i/View_51_Poster.xml +++ b/addons/skin.estuary/1080i/View_51_Poster.xml @@ -125,7 +125,7 @@ <width>1160</width> <height>40</height> <label>$VAR[ListSubLabelVar]</label> - <animation effect="slide" start="0,0" end="70,0" time="0" condition="Container.Content(tvshows) | Container.Content(seasons)">Conditional</animation> + <animation effect="slide" start="0,0" end="70,0" time="0" condition="Stringcompare(ListItem.DBType,tvshow) | Stringcompare(ListItem.DBType,season)">Conditional</animation> <font>font30_title</font> <textcolor>button_focus</textcolor> <shadowcolor>text_shadow</shadowcolor> diff --git a/addons/skin.estuary/colors/charcoal.xml b/addons/skin.estuary/colors/charcoal.xml index 275fdbd74c..3e9562955e 100644 --- a/addons/skin.estuary/colors/charcoal.xml +++ b/addons/skin.estuary/colors/charcoal.xml @@ -1,20 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> -<!-- All others --> - <color name="black">FF000000</color> - <color name="white">FFF0F0F0</color> - <color name="total_white">FFFFFFFF</color> - <color name="brightred">FFC80000</color> - <color name="grey">FFA0A0A0</color> - <color name="grey2">FF999999</color> - <color name="blue">FFF0F0F0</color> - <color name="red">FFCE4421</color> - <color name="bluegrey">FFC6C6C8</color> - <color name="darkgrey">FF2C2C2C</color> - <color name="button_focus">FFa2a2a2</color> - <color name="text_shadow">22000000</color> - <color name="border_alpha">60FFFFFF</color> - <color name="disabled">40FFFFFF</color> - <color name="selected">FF11E7B1</color> - <color name="invalid">FFFF0000</color> + <color name="background">FF000000</color> + <color name="black">FF000000</color> + <color name="white">FFF0F0F0</color> + <color name="grey">FFA0A0A0</color> + <color name="blue">FFF0F0F0</color> + <color name="red">FFCE4421</color> + <color name="button_focus">FFa2a2a2</color> + <color name="text_shadow">22000000</color> + <color name="border_alpha">60FFFFFF</color> + <color name="disabled">40FFFFFF</color> + <color name="selected">FF11E7B1</color> + <color name="invalid">FFFF0000</color> </colors> diff --git a/addons/skin.estuary/colors/defaults.xml b/addons/skin.estuary/colors/defaults.xml index db1f93c167..05e77e587d 100644 --- a/addons/skin.estuary/colors/defaults.xml +++ b/addons/skin.estuary/colors/defaults.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> -<!-- All others --> + <color name="background">FF000000</color> <color name="black">FF000000</color> <color name="white">FFF0F0F0</color> - <color name="total_white">FFFFFFFF</color> - <color name="brightred">FFC80000</color> <color name="grey">FFA0A0A0</color> - <color name="grey2">FF999999</color> <color name="blue">FF7ACAFE</color> <color name="red">FFCE4421</color> - <color name="bluegrey">FFC6C6C8</color> - <color name="darkgrey">FF2C2C2C</color> <color name="button_focus">FF12B2E7</color> <color name="text_shadow">22000000</color> <color name="border_alpha">60FFFFFF</color> diff --git a/addons/skin.estuary/colors/green.xml b/addons/skin.estuary/colors/green.xml index 71324ce807..7be5a92c58 100644 --- a/addons/skin.estuary/colors/green.xml +++ b/addons/skin.estuary/colors/green.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> -<!-- All others --> + <color name="background">FF000000</color> <color name="black">FF000000</color> <color name="white">FFF0F0F0</color> - <color name="total_white">FFFFFFFF</color> - <color name="brightred">FFC80000</color> <color name="grey">FFA0A0A0</color> - <color name="grey2">FF999999</color> <color name="blue">FF7ACAFE</color> <color name="red">FFCE4421</color> - <color name="bluegrey">FFC6C6C8</color> - <color name="darkgrey">FF2C2C2C</color> <color name="button_focus">FF24CA7A</color> <color name="text_shadow">22000000</color> <color name="border_alpha">60FFFFFF</color> diff --git a/addons/skin.estuary/colors/maroon.xml b/addons/skin.estuary/colors/maroon.xml index 2388ae19b9..f4deb92e62 100644 --- a/addons/skin.estuary/colors/maroon.xml +++ b/addons/skin.estuary/colors/maroon.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> -<!-- All others --> + <color name="background">FF000000</color> <color name="black">FF000000</color> <color name="white">FFF0F0F0</color> - <color name="total_white">FFFFFFFF</color> - <color name="brightred">FFC80000</color> <color name="grey">FFA0A0A0</color> - <color name="grey2">FF999999</color> <color name="blue">FFb61414</color> <color name="red">FFCE4421</color> - <color name="bluegrey">FFC6C6C8</color> - <color name="darkgrey">FF2C2C2C</color> <color name="button_focus">FFD71717</color> <color name="text_shadow">22000000</color> <color name="border_alpha">60FFFFFF</color> diff --git a/addons/skin.estuary/colors/orange.xml b/addons/skin.estuary/colors/orange.xml index 7d12cd0bc1..0b68760dbf 100644 --- a/addons/skin.estuary/colors/orange.xml +++ b/addons/skin.estuary/colors/orange.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> -<!-- All others --> + <color name="background">FF000000</color> <color name="black">FF000000</color> <color name="white">FFF0F0F0</color> - <color name="total_white">FFFFFFFF</color> - <color name="brightred">FFC80000</color> <color name="grey">FFA0A0A0</color> - <color name="grey2">FF999999</color> <color name="blue">FF7ACAFE</color> <color name="red">FFCE4421</color> - <color name="bluegrey">FFC6C6C8</color> - <color name="darkgrey">FF2C2C2C</color> <color name="button_focus">FFFF7200</color> <color name="text_shadow">22000000</color> <color name="border_alpha">60FFFFFF</color> diff --git a/addons/skin.estuary/colors/pink.xml b/addons/skin.estuary/colors/pink.xml index 0a300bddd0..c828c95bfc 100644 --- a/addons/skin.estuary/colors/pink.xml +++ b/addons/skin.estuary/colors/pink.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> -<!-- All others --> + <color name="background">FF000000</color> <color name="black">FF000000</color> <color name="white">FFF0F0F0</color> - <color name="total_white">FFFFFFFF</color> - <color name="brightred">FFC80000</color> <color name="grey">FFA0A0A0</color> - <color name="grey2">FF999999</color> <color name="blue">FF7ACAFE</color> <color name="red">FFCE4421</color> - <color name="bluegrey">FFC6C6C8</color> - <color name="darkgrey">FF2C2C2C</color> <color name="button_focus">FFFF8EC4</color> <color name="text_shadow">22000000</color> <color name="border_alpha">60FFFFFF</color> diff --git a/addons/skin.estuary/fonts/Anonymous Pro.ttf b/addons/skin.estuary/fonts/Anonymous Pro.ttf Binary files differnew file mode 100644 index 0000000000..06aafc0673 --- /dev/null +++ b/addons/skin.estuary/fonts/Anonymous Pro.ttf diff --git a/addons/skin.estuary/fonts/Inconsolata-Regular.ttf b/addons/skin.estuary/fonts/Inconsolata-Regular.ttf Binary files differdeleted file mode 100644 index bbc9647556..0000000000 --- a/addons/skin.estuary/fonts/Inconsolata-Regular.ttf +++ /dev/null diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po index 7c94dc5f88..fee112f799 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -23,22 +23,12 @@ msgstr "" #: /1080i/Home.xml:775 msgctxt "#31001" -msgid "Find movies" +msgid "Search" msgstr "" -#: /1080i/Home.xml:776 +#: /1080i/SkinSettings.xml:125 msgctxt "#31002" -msgid "Find episodes" -msgstr "" - -#: /1080i/Home.xml:777 -msgctxt "#31003" -msgid "Find music" -msgstr "" - -#: /1080i/Home.xml:778 -msgctxt "#31004" -msgid "Find actors" +msgid "Show media fanart as background" msgstr "" #: /1080i/Home.xml:75 @@ -653,3 +643,13 @@ msgstr "" msgctxt "#31126" msgid "Press OK to read plot" msgstr "" + +#: /1080i/Includes_MediaMenu.xml:137 +msgctxt "#31127" +msgid "Show icons" +msgstr "" + +#: /1080i/Variables.xml:30 +msgctxt "#31128" +msgid "Contributors" +msgstr "" diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasRecording.png b/addons/skin.estuary/media/icons/pvr/PVR-HasRecording.png Binary files differnew file mode 100644 index 0000000000..4e13913bc8 --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasRecording.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimer.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimer.png Binary files differnew file mode 100644 index 0000000000..d0080f60db --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimer.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerConflict.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerConflict.png Binary files differnew file mode 100644 index 0000000000..643e7030a7 --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerConflict.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerDisabled.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerDisabled.png Binary files differnew file mode 100644 index 0000000000..6d92c0c849 --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerDisabled.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerError.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerError.png Binary files differnew file mode 100644 index 0000000000..eb3663fd9a --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerError.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerSchedule.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerSchedule.png Binary files differnew file mode 100644 index 0000000000..607728eb3d --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerSchedule.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleConflict.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleConflict.png Binary files differnew file mode 100644 index 0000000000..2b2125b168 --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleConflict.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleDisabled.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleDisabled.png Binary files differnew file mode 100644 index 0000000000..f58e03745e --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleDisabled.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleError.png b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleError.png Binary files differnew file mode 100644 index 0000000000..a2a8101d3b --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-HasTimerScheduleError.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png b/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png Binary files differnew file mode 100644 index 0000000000..cf719d34be --- /dev/null +++ b/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png diff --git a/addons/skin.estuary/media/icons/settings/tvguide.png b/addons/skin.estuary/media/icons/settings/tvguide.png Binary files differindex c3e2863eca..be5c6acc30 100644 --- a/addons/skin.estuary/media/icons/settings/tvguide.png +++ b/addons/skin.estuary/media/icons/settings/tvguide.png diff --git a/addons/skin.estuary/media/icons/settings/tvremote.png b/addons/skin.estuary/media/icons/settings/tvremote.png Binary files differnew file mode 100644 index 0000000000..9e3c43a55b --- /dev/null +++ b/addons/skin.estuary/media/icons/settings/tvremote.png diff --git a/addons/skin.estuary/media/icons/submenu/guide.png b/addons/skin.estuary/media/icons/submenu/guide.png Binary files differindex 8aca2a3f38..6e695c8f63 100644 --- a/addons/skin.estuary/media/icons/submenu/guide.png +++ b/addons/skin.estuary/media/icons/submenu/guide.png diff --git a/addons/skin.estuary/media/icons/submenu/recentlyadded.png b/addons/skin.estuary/media/icons/submenu/recentlyadded.png Binary files differindex 3b2c0a927f..509f605729 100644 --- a/addons/skin.estuary/media/icons/submenu/recentlyadded.png +++ b/addons/skin.estuary/media/icons/submenu/recentlyadded.png diff --git a/addons/skin.estuary/media/lists/panel.png b/addons/skin.estuary/media/lists/panel.png Binary files differindex 59878aad65..9a57782ba7 100644 --- a/addons/skin.estuary/media/lists/panel.png +++ b/addons/skin.estuary/media/lists/panel.png diff --git a/addons/skin.estuary/media/lists/rating.png b/addons/skin.estuary/media/lists/rating.png Binary files differindex 5855e8221b..19feaccd2d 100644 --- a/addons/skin.estuary/media/lists/rating.png +++ b/addons/skin.estuary/media/lists/rating.png diff --git a/addons/skin.estuary/media/lists/year.png b/addons/skin.estuary/media/lists/year.png Binary files differindex 6237053603..a9fa37b95f 100644 --- a/addons/skin.estuary/media/lists/year.png +++ b/addons/skin.estuary/media/lists/year.png diff --git a/addons/skin.estuary/media/windows/pvr/epg_progress.png b/addons/skin.estuary/media/windows/pvr/epg_progress.png Binary files differindex 3e633fbd37..6e9739bdf9 100644 --- a/addons/skin.estuary/media/windows/pvr/epg_progress.png +++ b/addons/skin.estuary/media/windows/pvr/epg_progress.png |
