diff options
| author | ronie <ronie@users.noreply.github.com> | 2016-03-18 00:08:18 +0100 |
|---|---|---|
| committer | ronie <ronie@users.noreply.github.com> | 2016-03-18 00:15:13 +0100 |
| commit | e81b359ae2fa16a733121a7edaf1f6c155bda508 (patch) | |
| tree | ef93e8ac17fa413ce2f53858ec844424fafe3fa5 | |
| parent | d9b129fcc37e57897a5a499490a8bef933bbe794 (diff) | |
[Estouchy] update
41 files changed, 580 insertions, 442 deletions
diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml index 2fcf7fd155..ec1af1bda5 100644 --- a/addons/skin.estouchy/addon.xml +++ b/addons/skin.estouchy/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="skin.estouchy" version="1.0.4" name="Estouchy" provider-name="Team Kodi"> +<addon id="skin.estouchy" version="1.0.5" name="Estouchy" provider-name="Team Kodi"> <requires> <import addon="xbmc.gui" version="5.11.0"/> </requires> diff --git a/addons/skin.estouchy/changelog.txt b/addons/skin.estouchy/changelog.txt index 1012fc72d1..a514614e8c 100644 --- a/addons/skin.estouchy/changelog.txt +++ b/addons/skin.estouchy/changelog.txt @@ -1,21 +1,24 @@ +V1.0.5 +- Add gamecontrollers support + V1.0.4 - Updated language files from Transifex V1.0.3 - Updated language files from Transifex -v1.0.2 +V1.0.2 - Cosmetics -v1.0.1 +V1.0.1 - Fixes -v1.0.0 +V1.0.0 - Initial release -v0.0.1 +V0.0.1 - Initial beta -v0.0.0 +V0.0.0 - XML from re-touched - Graphics from Estuary diff --git a/addons/skin.estouchy/media/DefaultUser.png b/addons/skin.estouchy/media/DefaultUser.png Binary files differnew file mode 100644 index 0000000000..2ccda2e3b4 --- /dev/null +++ b/addons/skin.estouchy/media/DefaultUser.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonGame.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonGame.png Binary files differnew file mode 100644 index 0000000000..6be31822cb --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonGame.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultAddonPeripheral.png b/addons/skin.estouchy/media/defaulticons/DefaultAddonPeripheral.png Binary files differnew file mode 100644 index 0000000000..d14e7b94e8 --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultAddonPeripheral.png diff --git a/addons/skin.estouchy/media/defaulticons/DefaultGameAddons.png b/addons/skin.estouchy/media/defaulticons/DefaultGameAddons.png Binary files differnew file mode 100644 index 0000000000..c08c56e577 --- /dev/null +++ b/addons/skin.estouchy/media/defaulticons/DefaultGameAddons.png diff --git a/addons/skin.estouchy/xml/AddonBrowser.xml b/addons/skin.estouchy/xml/AddonBrowser.xml index bd2b21ed35..ac0fb16c2a 100644 --- a/addons/skin.estouchy/xml/AddonBrowser.xml +++ b/addons/skin.estouchy/xml/AddonBrowser.xml @@ -13,40 +13,40 @@ <description>Window label</description> <include>MediaWindowTitleCommons</include> <label>$LOCALIZE[24001]$INFO[Container.FolderName, - ]</label> - <visible>!StringCompare(ListItem.Path,addons://)</visible> + <visible>!String.IsEqual(ListItem.Path,addons://)</visible> </control> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> <label>$LOCALIZE[24001] - $LOCALIZE[31039] $INFO[Window(AddonBrowser).Property(Updated)]</label> - <visible>StringCompare(ListItem.Path,addons://)</visible> + <visible>String.IsEqual(ListItem.Path,addons://)</visible> </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="layout-width" value="306"/> </include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="layout-width" value="363"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1230"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> <param name="panel-width" value="1090"/> <param name="label-width" value="790"/> <param name="label2-posx" value="920r"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> <param name="panel-width" value="1530"/> <param name="textbox-width-movies" value="1350"/> <param name="textbox-width-episodes" value="1250"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> <param name="panel-width" value="1090"/> <param name="textbox-width-movies" value="910"/> <param name="textbox-width-episodes" value="810"/> diff --git a/addons/skin.estouchy/xml/CustomFirstRun.xml b/addons/skin.estouchy/xml/CustomFirstRun.xml index 09001d8520..f781bf9b86 100644 --- a/addons/skin.estouchy/xml/CustomFirstRun.xml +++ b/addons/skin.estouchy/xml/CustomFirstRun.xml @@ -121,7 +121,7 @@ <height>85</height> <texture>defaulticons/DefaultFolderBack.png</texture> <animation effect="rotate" start="0" end="-45" center="auto" condition="true">Conditional</animation> - <animation effect="slide" start="0,0" end="-170,160" time="0" condition="StringCompare(Skin.AspectRatio,16:9)">conditional</animation> + <animation effect="slide" start="0,0" end="-170,160" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9)">conditional</animation> </control> <control type="label"> <posx>-85</posx> @@ -132,7 +132,7 @@ <label>$NUMBER[1]</label> <align>center</align> <aligny>center</aligny> - <animation effect="slide" start="0,0" end="-213,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9)">conditional</animation> + <animation effect="slide" start="0,0" end="-213,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9)">conditional</animation> </control> <control type="image"> <posx>317</posx> diff --git a/addons/skin.estouchy/xml/DialogAddonInfo.xml b/addons/skin.estouchy/xml/DialogAddonInfo.xml index 0e41b6eaae..1123bc7e4e 100644 --- a/addons/skin.estouchy/xml/DialogAddonInfo.xml +++ b/addons/skin.estouchy/xml/DialogAddonInfo.xml @@ -194,7 +194,7 @@ <aligny>center</aligny> <font>font20_title</font> <textcolor>selected</textcolor> - <visible>IsEmpty(ListItem.AddonBroken)</visible> + <visible>String.IsEmpty(ListItem.AddonBroken)</visible> </control> <control type="textbox"> <description>Disclaimer</description> @@ -206,7 +206,7 @@ <label fallback="231">$INFO[ListItem.AddonDisclaimer]</label> <textcolor>selected</textcolor> <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll> - <visible>IsEmpty(ListItem.AddonBroken)</visible> + <visible>String.IsEmpty(ListItem.AddonBroken)</visible> </control> <control type="label"> <description>Broken label</description> @@ -220,7 +220,7 @@ <aligny>center</aligny> <font>font20_title</font> <textcolor>selected</textcolor> - <visible>!IsEmpty(ListItem.AddonBroken)</visible> + <visible>!String.IsEmpty(ListItem.AddonBroken)</visible> </control> <control type="textbox"> <description>Reason label</description> @@ -234,7 +234,7 @@ <aligny>center</aligny> <textcolor>selected</textcolor> <autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll> - <visible>!IsEmpty(ListItem.AddonBroken)</visible> + <visible>!String.IsEmpty(ListItem.AddonBroken)</visible> </control> </control> </control> diff --git a/addons/skin.estouchy/xml/DialogConfirm.xml b/addons/skin.estouchy/xml/DialogConfirm.xml index 49f791e159..826b67b956 100644 --- a/addons/skin.estouchy/xml/DialogConfirm.xml +++ b/addons/skin.estouchy/xml/DialogConfirm.xml @@ -38,9 +38,9 @@ </control> <control type="textbox" id="9"> <posx>20</posx> - <posy>82</posy> + <posy>72</posy> <width>660</width> - <height>110</height> + <height>138</height> <label>-</label> <font>font22</font> </control> diff --git a/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml b/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml index a53b5c507a..886b8d6353 100644 --- a/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml +++ b/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml @@ -8,7 +8,7 @@ <width>500</width> <height>78</height> <include>16x9_xPos_Relocation</include> - <visible>![Window.IsVisible(Notification) | Window.IsVisible(BusyDialog) | Window.IsVisible(VolumeBar) | Window.IsVisible(1112) | Window.IsVisible(Visualisation)] | Window.IsVisible(FullscreenVideo)</visible> + <visible>![Window.IsVisible(Notification) | Window.IsVisible(BusyDialog) | Window.IsVisible(VolumeBar) | Window.IsVisible(1112) | Window.IsVisible(Visualisation) | Window.IsVisible(FullscreenVideo)]</visible> <control type="fadelabel" id="30"> <posx>0</posx> <posy>10</posy> diff --git a/addons/skin.estouchy/xml/DialogGameControllers.xml b/addons/skin.estouchy/xml/DialogGameControllers.xml new file mode 100644 index 0000000000..613b266fea --- /dev/null +++ b/addons/skin.estouchy/xml/DialogGameControllers.xml @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8"?> +<window> + <defaultcontrol always="true">3</defaultcontrol> + <include>16x9_xPos_Relocation</include> + <include>Window_OpenClose_Animation_Zoom</include> + <coordinates> + <posx>75</posx> + <posy>90</posy> + </coordinates> + <controls> + <include>BehindDialogFadeOut</include> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>1130</width> + <height>60</height> + <texture border="5">dialog_header.png</texture> + </control> + <control type="label"> + <posx>20</posx> + <posy>0</posy> + <include>WindowTitleCommons</include> + <width>1130</width> + <label>$LOCALIZE[35058]</label> + </control> + <control type="group"> + <posx>1060</posx> + <posy>0</posy> + <include>DialogCloseButtonCommons</include> + </control> + <control type="image"> + <posx>0</posx> + <posy>60</posy> + <width>1130</width> + <height>720</height> + <texture>dialog_back.png</texture> + </control> + <control type="label"> + <posx>0</posx> + <posy>60</posy> + <width>300</width> + <height>50</height> + <label>35050</label> + <font>font25</font> + <align>center</align> + <aligny>center</aligny> + </control> + <control type="image"> + <posx>0</posx> + <posy>110</posy> + <width>300</width> + <height>552</height> + <texture colordiffuse="40000000">panel.png</texture> + </control> + <control type="grouplist" id="3"> + <posx>0</posx> + <posy>110</posy> + <width>300</width> + <height>553</height> + <pagecontrol>60</pagecontrol> + <itemgap>-1</itemgap> + <onleft>5</onleft> + <onright>60</onright> + <onup>9000</onup> + <ondown>9000</ondown> + </control> + <control type="button" id="10"> + <posx>0</posx> + <posy>0</posy> + <height>70</height> + <font>font25</font> + </control> + <control type="scrollbar" id="60"> + <posx>310</posx> + <posy>140</posy> + <width>10</width> + <height>493</height> + <texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground> + <texturesliderbar colordiffuse="grey">white.png</texturesliderbar> + <texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus> + <textureslidernib>blank.png</textureslidernib> + <textureslidernibfocus>blank.png</textureslidernibfocus> + <onleft>3</onleft> + <onright>5</onright> + <ondown>60</ondown> + <onup>60</onup> + <showonepage>false</showonepage> + <orientation>vertical</orientation> + <animation effect="fade" time="150">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> + </control> + <control type="gamecontroller" id="31"> + <left>340</left> + <top>150</top> + <width>450</width> + <height>286</height> + <include>VisibleFadeEffect</include> + </control> + <control type="label"> + <posx>800</posx> + <posy>60</posy> + <width>300</width> + <height>50</height> + <label>35059</label> + <font>font25</font> + <align>center</align> + <aligny>center</aligny> + </control> + <control type="image"> + <posx>800</posx> + <posy>110</posy> + <width>300</width> + <height>552</height> + <texture colordiffuse="40000000">panel.png</texture> + </control> + <control type="grouplist" id="5"> + <posx>800</posx> + <posy>110</posy> + <width>300</width> + <height>553</height> + <pagecontrol>61</pagecontrol> + <itemgap>-1</itemgap> + <onleft>3</onleft> + <onright>61</onright> + <onup>9000</onup> + <ondown>9000</ondown> + </control> + <control type="button" id="7"> + <posx>0</posx> + <posy>0</posy> + <height>70</height> + <font>font25</font> + </control> + <control type="scrollbar" id="61"> + <posx>1110</posx> + <posy>140</posy> + <width>10</width> + <height>493</height> + <texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground> + <texturesliderbar colordiffuse="grey">white.png</texturesliderbar> + <texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus> + <textureslidernib>blank.png</textureslidernib> + <textureslidernibfocus>blank.png</textureslidernibfocus> + <onleft>5</onleft> + <onright>3</onright> + <ondown>60</ondown> + <onup>60</onup> + <showonepage>false</showonepage> + <orientation>vertical</orientation> + <animation effect="fade" time="150">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> + </control> + <control type="grouplist" id="9000"> + <posx>0</posx> + <posy>710</posy> + <width>1130</width> + <height>60</height> + <itemgap>5</itemgap> + <align>center</align> + <orientation>horizontal</orientation> + <onup>3</onup> + <ondown>3</ondown> + <control type="button" id="18"> + <description>OK button</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + <label>186</label> + </control> + <control type="button" id="19"> + <description>Reset button</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + <label>10035</label> + </control> + <control type="button" id="20"> + <description>More</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + <label>21452</label> + </control> + <control type="button" id="17"> + <description>Help button</description> + <width>200</width> + <include>ButtonInfoDialogsCommonValues</include> + <label>10043</label> + </control> + </control> + </controls> +</window> diff --git a/addons/skin.estouchy/xml/DialogMusicInfo.xml b/addons/skin.estouchy/xml/DialogMusicInfo.xml index 3f7624f795..5c5d7833b3 100644 --- a/addons/skin.estouchy/xml/DialogMusicInfo.xml +++ b/addons/skin.estouchy/xml/DialogMusicInfo.xml @@ -122,109 +122,109 @@ <label>$LOCALIZE[557]:</label> <label2>$INFO[ListItem.Artist]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Artist)</visible> + <visible>!String.IsEmpty(ListItem.Artist)</visible> </item> <item> <label>$LOCALIZE[558]:</label> <label2>$INFO[ListItem.Album]$INFO[listitem.discnumber, - $LOCALIZE[427] ]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Album)</visible> + <visible>!String.IsEmpty(ListItem.Album)</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[175]:</label> <label2>$INFO[ListItem.Mood]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Mood)</visible> + <visible>!String.IsEmpty(ListItem.Mood)</visible> </item> <item> <label>$LOCALIZE[562]:</label> <label2>$INFO[ListItem.Year]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Year)</visible> + <visible>!String.IsEmpty(ListItem.Year)</visible> </item> <item> <label>$LOCALIZE[554]:</label> <label2>$INFO[ListItem.TrackNumber]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.TrackNumber)</visible> + <visible>!String.IsEmpty(ListItem.TrackNumber)</visible> </item> <item> <label>$LOCALIZE[563]:</label> <label2>$INFO[ListItem.RatingAndVotes]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.RatingAndVotes)</visible> + <visible>!String.IsEmpty(ListItem.RatingAndVotes)</visible> </item> <item> <label>$LOCALIZE[38018]:</label> <label2>$INFO[ListItem.Userrating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Userrating)</visible> + <visible>!String.IsEmpty(ListItem.Userrating)</visible> </item> <item> <label>$LOCALIZE[29903]:</label> <label2>$INFO[ListItem.Property(Role.Composer)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Composer))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Composer))</visible> </item> <item> <label>$LOCALIZE[29905]:</label> <label2>$INFO[ListItem.Property(Role.Conductor)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Conductor))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Conductor))</visible> </item> <item> <label>$LOCALIZE[38034]:</label> <label2>$INFO[ListItem.Property(Role.Orchestra)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Orchestra))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Orchestra))</visible> </item> <item> <label>$LOCALIZE[38035]:</label> <label2>$INFO[ListItem.Property(Role.Lyricist)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Lyricist))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Lyricist))</visible> </item> <item> <label>$LOCALIZE[38036]:</label> <label2>$INFO[ListItem.Property(Role.Remixer)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Remixer))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Remixer))</visible> </item> <item> <label>$LOCALIZE[38037]:</label> <label2>$INFO[ListItem.Property(Role.Arranger)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Arranger))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Arranger))</visible> </item> <item> <label>$LOCALIZE[38038]:</label> <label2>$INFO[ListItem.Property(Role.Engineer)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Engineer))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Engineer))</visible> </item> <item> <label>$LOCALIZE[38039]:</label> <label2>$INFO[ListItem.Property(Role.Producer)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Producer))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Producer))</visible> </item> <item> <label>$LOCALIZE[38040]:</label> <label2>$INFO[ListItem.Property(Role.DJMixer)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.DJMixer))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.DJMixer))</visible> </item> <item> <label>$LOCALIZE[38041]:</label> <label2>$INFO[ListItem.Property(Role.Mixer)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Role.Mixer))</visible> + <visible>!String.IsEmpty(ListItem.Property(Role.Mixer))</visible> </item> </content> </control> @@ -342,49 +342,49 @@ <label>$LOCALIZE[557]:</label> <label2>$INFO[ListItem.Artist]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Artist)</visible> + <visible>!String.IsEmpty(ListItem.Artist)</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[563]:</label> <label2>$INFO[ListItem.Rating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Rating)</visible> + <visible>!String.IsEmpty(ListItem.Rating)</visible> </item> <item> <label>$LOCALIZE[175]:</label> <label2>$INFO[ListItem.Property(Album_Mood)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Album_Mood))</visible> + <visible>!String.IsEmpty(ListItem.Property(Album_Mood))</visible> </item> <item> <label>$LOCALIZE[176]:</label> <label2>$INFO[ListItem.Property(Album_Style)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Album_Style))</visible> + <visible>!String.IsEmpty(ListItem.Property(Album_Style))</visible> </item> <item> <label>$LOCALIZE[21895]:</label> <label2>$INFO[ListItem.Property(Album_Theme)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Album_Theme))</visible> + <visible>!String.IsEmpty(ListItem.Property(Album_Theme))</visible> </item> <item> <label>$LOCALIZE[21899]:</label> <label2>$INFO[ListItem.Property(Album_Label)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Album_Label))</visible> + <visible>!String.IsEmpty(ListItem.Property(Album_Label))</visible> </item> <item> <label>$LOCALIZE[562]:</label> <label2>$INFO[ListItem.Year]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Year)</visible> + <visible>!String.IsEmpty(ListItem.Year)</visible> </item> </content> </control> @@ -502,49 +502,49 @@ <label>$LOCALIZE[21893]:</label> <label2>$INFO[ListItem.Property(Artist_Born)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_Born))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_Born))</visible> </item> <item> <label>$LOCALIZE[21894]:</label> <label2>$INFO[ListItem.Property(Artist_Formed)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_Formed))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_Formed))</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[175]:</label> <label2>$INFO[ListItem.Property(Artist_Mood)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_Mood))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_Mood))</visible> </item> <item> <label>$LOCALIZE[176]:</label> <label2>$INFO[ListItem.Property(Artist_Style)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_Style))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_Style))</visible> </item> <item> <label>$LOCALIZE[21897]:</label> <label2>$INFO[ListItem.Property(Artist_Died)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_Died))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_Died))</visible> </item> <item> <label>$LOCALIZE[21896]:</label> <label2>$INFO[ListItem.Property(Artist_Disbanded)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_Disbanded))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_Disbanded))</visible> </item> <item> <label>$LOCALIZE[21898]:</label> <label2>$INFO[ListItem.Property(Artist_YearsActive)]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Property(Artist_YearsActive))</visible> + <visible>!String.IsEmpty(ListItem.Property(Artist_YearsActive))</visible> </item> </content> </control> @@ -561,7 +561,7 @@ <pagecontrol>-</pagecontrol> <scrolltime>200</scrolltime> <include>VisibleFadeEffect</include> - <visible>[Container.Content(Artists) + !IsEmpty(Window.Property(ShowAlbumList))] | [Container.Content(Albums) + !IsEmpty(Window.Property(ShowSongList))]</visible> + <visible>[Container.Content(Artists) + !String.IsEmpty(Window.Property(ShowAlbumList))] | [Container.Content(Albums) + !String.IsEmpty(Window.Property(ShowSongList))]</visible> <itemlayout condition="Container.Content(Albums)" height="60" width="1000"> <control type="image"> <posx>0</posx> @@ -712,9 +712,9 @@ <alttexturenofocus>button_nofocus.png</alttexturenofocus> <label>21888</label> <altlabel>19033</altlabel> - <usealttexture>!IsEmpty(Window.Property(ShowAlbumList))</usealttexture> - <onclick condition="IsEmpty(Window.Property(ShowAlbumList))">SetProperty(ShowAlbumList, show)</onclick> - <onclick condition="!IsEmpty(Window.Property(ShowAlbumList))">ClearProperty(ShowAlbumList)</onclick> + <usealttexture>!String.IsEmpty(Window.Property(ShowAlbumList))</usealttexture> + <onclick condition="String.IsEmpty(Window.Property(ShowAlbumList))">SetProperty(ShowAlbumList, show)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(ShowAlbumList))">ClearProperty(ShowAlbumList)</onclick> <visible>Container.Content(Artists)</visible> </control> <control type="togglebutton" id="900"> @@ -725,9 +725,9 @@ <alttexturenofocus>button_nofocus.png</alttexturenofocus> <label>182</label> <altlabel>19033</altlabel> - <usealttexture>!IsEmpty(Window.Property(ShowSongList))</usealttexture> - <onclick condition="IsEmpty(Window.Property(ShowSongList))">SetProperty(ShowSongList, show)</onclick> - <onclick condition="!IsEmpty(Window.Property(ShowSongList))">ClearProperty(ShowSongList)</onclick> + <usealttexture>!String.IsEmpty(Window.Property(ShowSongList))</usealttexture> + <onclick condition="String.IsEmpty(Window.Property(ShowSongList))">SetProperty(ShowSongList, show)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(ShowSongList))">ClearProperty(ShowSongList)</onclick> <visible>Container.Content(Albums)</visible> </control> </control> diff --git a/addons/skin.estouchy/xml/DialogNotification.xml b/addons/skin.estouchy/xml/DialogNotification.xml index 894dd4e64f..b62c243ea1 100644 --- a/addons/skin.estouchy/xml/DialogNotification.xml +++ b/addons/skin.estouchy/xml/DialogNotification.xml @@ -18,9 +18,9 @@ </control> <control type="fadelabel" id="401"> <description>Line 1 Label</description> - <posx>0</posx> + <posx>78</posx> <posy>20</posy> - <width>500</width> + <width>422</width> <height>15</height> <font>font18_title</font> <align>center</align> @@ -30,9 +30,9 @@ </control> <control type="fadelabel" id="402"> <description>Line 2 Label</description> - <posx>0</posx> + <posx>78</posx> <posy>42</posy> - <width>500</width> + <width>422</width> <height>20</height> <font>font20</font> <align>center</align> diff --git a/addons/skin.estouchy/xml/DialogPVRChannelManager.xml b/addons/skin.estouchy/xml/DialogPVRChannelManager.xml index 595342093e..fcc3b73f99 100644 --- a/addons/skin.estouchy/xml/DialogPVRChannelManager.xml +++ b/addons/skin.estouchy/xml/DialogPVRChannelManager.xml @@ -22,7 +22,7 @@ <include>WindowTitleCommons</include> <width>1130</width> <label>$LOCALIZE[19199] - $LOCALIZE[19023]</label> - <visible>IsEmpty(Window.Property(IsRadio))</visible> + <visible>String.IsEmpty(Window.Property(IsRadio))</visible> </control> <control type="label"> <posx>20</posx> @@ -30,7 +30,7 @@ <include>WindowTitleCommons</include> <width>1130</width> <label>$LOCALIZE[19199] - $LOCALIZE[19024]</label> - <visible>!IsEmpty(Window.Property(IsRadio))</visible> + <visible>!String.IsEmpty(Window.Property(IsRadio))</visible> </control> <control type="group"> <posx>1060</posx> @@ -269,7 +269,7 @@ <description>TV/Radio Button</description> <width>250</width> <include>ButtonInfoDialogsCommonValues</include> - <usealttexture>!IsEmpty(Window.Property(IsRadio))</usealttexture> + <usealttexture>!String.IsEmpty(Window.Property(IsRadio))</usealttexture> <alttexturefocus>list_focus.png</alttexturefocus> <alttexturenofocus>button_nofocus.png</alttexturenofocus> <label>19024</label> diff --git a/addons/skin.estouchy/xml/DialogPVRGroupManager.xml b/addons/skin.estouchy/xml/DialogPVRGroupManager.xml index 750691e02e..74d28a09e8 100644 --- a/addons/skin.estouchy/xml/DialogPVRGroupManager.xml +++ b/addons/skin.estouchy/xml/DialogPVRGroupManager.xml @@ -22,7 +22,7 @@ <include>WindowTitleCommons</include> <width>1040</width> <label>$LOCALIZE[19143] - $LOCALIZE[19023]</label> - <visible>IsEmpty(Window.Property(IsRadio))</visible> + <visible>String.IsEmpty(Window.Property(IsRadio))</visible> </control> <control type="label"> <posx>20</posx> @@ -30,7 +30,7 @@ <include>WindowTitleCommons</include> <width>1040</width> <label>$LOCALIZE[19143] - $LOCALIZE[19024]</label> - <visible>!IsEmpty(Window.Property(IsRadio))</visible> + <visible>!String.IsEmpty(Window.Property(IsRadio))</visible> </control> <control type="group"> <posx>1010</posx> diff --git a/addons/skin.estouchy/xml/DialogPVRRadioRDSInfo.xml b/addons/skin.estouchy/xml/DialogPVRRadioRDSInfo.xml index 09a5c7fe48..c0525ef256 100644 --- a/addons/skin.estouchy/xml/DialogPVRRadioRDSInfo.xml +++ b/addons/skin.estouchy/xml/DialogPVRRadioRDSInfo.xml @@ -107,115 +107,115 @@ <label>$LOCALIZE[557]:</label> <label2>$INFO[RDS.Artist]</label2> <onclick>noop</onclick> - <visible>IsEmpty(RDS.Band)</visible> + <visible>String.IsEmpty(RDS.Band)</visible> </item> <item> <label>$LOCALIZE[29901]:</label> <label2>$INFO[RDS.Band]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.Band)</visible> + <visible>!String.IsEmpty(RDS.Band)</visible> </item> <item> <label>$LOCALIZE[556]:</label> <label2>$INFO[RDS.Title]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.Title)</visible> + <visible>!String.IsEmpty(RDS.Title)</visible> </item> <item> <label>$LOCALIZE[558]:</label> <label2>$INFO[RDS.Album]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.Album)</visible> + <visible>!String.IsEmpty(RDS.Album)</visible> </item> <item> <label>$LOCALIZE[569]:</label> <label2>$INFO[RDS.Comment]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.Comment)</visible> + <visible>!String.IsEmpty(RDS.Comment)</visible> </item> <item> <label>$LOCALIZE[29903]:</label> <label2>$INFO[RDS.Composer]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.Composer)</visible> + <visible>!String.IsEmpty(RDS.Composer)</visible> </item> <item> <label>$LOCALIZE[29905]:</label> <label2>$INFO[RDS.Conductor]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.Conductor)</visible> + <visible>!String.IsEmpty(RDS.Conductor)</visible> </item> <item> <label>$LOCALIZE[29902]:</label> <label2>$INFO[RDS.ProgStyle]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgStyle)</visible> + <visible>!String.IsEmpty(RDS.ProgStyle)</visible> </item> <item> <label>$LOCALIZE[29906]:</label> <label2>$INFO[RDS.ProgHost]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgHost)</visible> + <visible>!String.IsEmpty(RDS.ProgHost)</visible> </item> <item> <label>$LOCALIZE[19148]:</label> <label2>$INFO[RDS.ProgStation]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgStation)</visible> + <visible>!String.IsEmpty(RDS.ProgStation)</visible> </item> <item> <label>$LOCALIZE[29907]:</label> <label2>$INFO[RDS.ProgEditStaff]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgEditStaff)</visible> + <visible>!String.IsEmpty(RDS.ProgEditStaff)</visible> </item> <item> <label>$LOCALIZE[19030]:</label> <label2>$INFO[RDS.ProgNow]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgNow)</visible> + <visible>!String.IsEmpty(RDS.ProgNow)</visible> </item> <item> <label>$LOCALIZE[19031]:</label> <label2>$INFO[RDS.ProgNext]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgNext)</visible> + <visible>!String.IsEmpty(RDS.ProgNext)</visible> </item> <item> <label>$LOCALIZE[29910]:</label> <label2>$INFO[RDS.PhoneStudio]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.PhoneStudio)</visible> + <visible>!String.IsEmpty(RDS.PhoneStudio)</visible> </item> <item> <label>$LOCALIZE[29911]:</label> <label2>$INFO[RDS.EmailStudio]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.EmailStudio)</visible> + <visible>!String.IsEmpty(RDS.EmailStudio)</visible> </item> <item> <label>$LOCALIZE[29912]:</label> <label2>$INFO[RDS.SMSStudio]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.SMSStudio)</visible> + <visible>!String.IsEmpty(RDS.SMSStudio)</visible> </item> <item> <label>$LOCALIZE[29914]:</label> <label2>$INFO[RDS.ProgHomepage]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.ProgHomepage)</visible> + <visible>!String.IsEmpty(RDS.ProgHomepage)</visible> </item> <item> <label>$LOCALIZE[29910]:</label> <label2>$INFO[RDS.PhoneHotline]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.PhoneHotline)</visible> + <visible>!String.IsEmpty(RDS.PhoneHotline)</visible> </item> <item> <label>$LOCALIZE[29911]:</label> <label2>$INFO[RDS.EmailHotline]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(RDS.EmailHotline)</visible> + <visible>!String.IsEmpty(RDS.EmailHotline)</visible> </item> </content> </control> diff --git a/addons/skin.estouchy/xml/DialogVideoInfo.xml b/addons/skin.estouchy/xml/DialogVideoInfo.xml index daf8b46b44..1e095cb17a 100644 --- a/addons/skin.estouchy/xml/DialogVideoInfo.xml +++ b/addons/skin.estouchy/xml/DialogVideoInfo.xml @@ -173,67 +173,67 @@ <label>$LOCALIZE[20339]:</label> <label2>$INFO[ListItem.Director]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Director)</visible> + <visible>!String.IsEmpty(ListItem.Director)</visible> </item> <item> <label>$LOCALIZE[20417]:</label> <label2>$INFO[ListItem.Writer]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Writer)</visible> + <visible>!String.IsEmpty(ListItem.Writer)</visible> </item> <item> <label>$LOCALIZE[572]:</label> <label2>$INFO[ListItem.Studio]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Studio)</visible> + <visible>!String.IsEmpty(ListItem.Studio)</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[562]:</label> <label2>$INFO[ListItem.Year]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Year)</visible> + <visible>!String.IsEmpty(ListItem.Year)</visible> </item> <item> <label>$LOCALIZE[2050]:</label> <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Duration)</visible> + <visible>!String.IsEmpty(ListItem.Duration)</visible> </item> <item> <label>$LOCALIZE[563]:</label> <label2>$INFO[ListItem.RatingAndVotes]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.RatingAndVotes)</visible> + <visible>!String.IsEmpty(ListItem.RatingAndVotes)</visible> </item> <item> <label>$LOCALIZE[38018]:</label> <label2>$INFO[ListItem.UserRating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.UserRating)</visible> + <visible>!String.IsEmpty(ListItem.UserRating)</visible> </item> <item> <label>$LOCALIZE[202]:</label> <label2>$INFO[ListItem.TagLine]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.TagLine)</visible> + <visible>!String.IsEmpty(ListItem.TagLine)</visible> </item> <item> <label>$LOCALIZE[20074]:</label> <label2>$INFO[ListItem.mpaa]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.mpaa)</visible> + <visible>!String.IsEmpty(ListItem.mpaa)</visible> </item> <item> <label>$LOCALIZE[15311]</label> <label2>$INFO[ListItem.FilenameAndPath]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.FilenameAndPath)</visible> + <visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible> </item> </content> </control> @@ -302,43 +302,43 @@ <label>$LOCALIZE[20360]:</label> <label2>$INFO[listitem.episode] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Episode)</visible> + <visible>!String.IsEmpty(ListItem.Episode)</visible> </item> <item> <label>$LOCALIZE[31322]:</label> <label2>$INFO[ListItem.Premiered]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Premiered)</visible> + <visible>!String.IsEmpty(ListItem.Premiered)</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[562]:</label> <label2>$INFO[ListItem.Year]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Year)</visible> + <visible>!String.IsEmpty(ListItem.Year)</visible> </item> <item> <label>$LOCALIZE[563]:</label> <label2>$INFO[ListItem.Rating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Rating)</visible> + <visible>!String.IsEmpty(ListItem.Rating)</visible> </item> <item> <label>$LOCALIZE[38018]:</label> <label2>$INFO[ListItem.UserRating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.UserRating)</visible> + <visible>!String.IsEmpty(ListItem.UserRating)</visible> </item> <item> <label>$LOCALIZE[15311]</label> <label2>$INFO[ListItem.FilenameAndPath]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.FilenameAndPath)</visible> + <visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible> </item> </content> </control> @@ -407,67 +407,67 @@ <label>$LOCALIZE[20364]:</label> <label2>$INFO[ListItem.TVShowTitle]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.TVShowTitle)</visible> + <visible>!String.IsEmpty(ListItem.TVShowTitle)</visible> </item> <item> <label>$LOCALIZE[20373]:</label> <label2>$INFO[ListItem.Season]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Season)</visible> + <visible>!String.IsEmpty(ListItem.Season)</visible> </item> <item> <label>$LOCALIZE[20359]:</label> <label2>$INFO[ListItem.Episode]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Episode)</visible> + <visible>!String.IsEmpty(ListItem.Episode)</visible> </item> <item> <label>$LOCALIZE[31322]:</label> <label2>$INFO[ListItem.Premiered]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Premiered)</visible> + <visible>!String.IsEmpty(ListItem.Premiered)</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[20339]:</label> <label2>$INFO[ListItem.Director]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Director)</visible> + <visible>!String.IsEmpty(ListItem.Director)</visible> </item> <item> <label>$LOCALIZE[20417]:</label> <label2>$INFO[ListItem.Writer]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Writer)</visible> + <visible>!String.IsEmpty(ListItem.Writer)</visible> </item> <item> <label>$LOCALIZE[2050]:</label> <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Duration)</visible> + <visible>!String.IsEmpty(ListItem.Duration)</visible> </item> <item> <label>$LOCALIZE[563]:</label> <label2>$INFO[ListItem.Rating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Rating)</visible> + <visible>!String.IsEmpty(ListItem.Rating)</visible> </item> <item> <label>$LOCALIZE[38018]:</label> <label2>$INFO[ListItem.UserRating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.UserRating)</visible> + <visible>!String.IsEmpty(ListItem.UserRating)</visible> </item> <item> <label>$LOCALIZE[15311]</label> <label2>$INFO[ListItem.FilenameAndPath]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.FilenameAndPath)</visible> + <visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible> </item> </content> </control> @@ -536,61 +536,61 @@ <label>$LOCALIZE[557]:</label> <label2>$INFO[ListItem.Artist]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Artist)</visible> + <visible>!String.IsEmpty(ListItem.Artist)</visible> </item> <item> <label>$LOCALIZE[558]:</label> <label2>$INFO[ListItem.Album]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Album)</visible> + <visible>!String.IsEmpty(ListItem.Album)</visible> </item> <item> <label>$LOCALIZE[515]:</label> <label2>$INFO[ListItem.Genre]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Genre)</visible> + <visible>!String.IsEmpty(ListItem.Genre)</visible> </item> <item> <label>$LOCALIZE[572]:</label> <label2>$INFO[ListItem.Studio]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Studio)</visible> + <visible>!String.IsEmpty(ListItem.Studio)</visible> </item> <item> <label>$LOCALIZE[20417]:</label> <label2>$INFO[ListItem.Writer]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Writer)</visible> + <visible>!String.IsEmpty(ListItem.Writer)</visible> </item> <item> <label>$LOCALIZE[20339]:</label> <label2>$INFO[ListItem.Director]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Director)</visible> + <visible>!String.IsEmpty(ListItem.Director)</visible> </item> <item> <label>$LOCALIZE[562]:</label> <label2>$INFO[ListItem.Year]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Year)</visible> + <visible>!String.IsEmpty(ListItem.Year)</visible> </item> <item> <label>$LOCALIZE[2050]:</label> <label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.Duration)</visible> + <visible>!String.IsEmpty(ListItem.Duration)</visible> </item> <item> <label>$LOCALIZE[38018]:</label> <label2>$INFO[ListItem.UserRating]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.UserRating)</visible> + <visible>!String.IsEmpty(ListItem.UserRating)</visible> </item> <item> <label>$LOCALIZE[15311]</label> <label2>$INFO[ListItem.FilenameAndPath]</label2> <onclick>noop</onclick> - <visible>!IsEmpty(ListItem.FilenameAndPath)</visible> + <visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible> </item> </content> </control> @@ -713,7 +713,7 @@ <width>195</width> <include>ButtonInfoDialogsCommonValues</include> <label>20410</label> - <visible>!IsEmpty(ListItem.Trailer)</visible> + <visible>!String.IsEmpty(ListItem.Trailer)</visible> </control> <control type="button" id="7"> <description>Rating button</description> diff --git a/addons/skin.estouchy/xml/EventLog.xml b/addons/skin.estouchy/xml/EventLog.xml index 4758602654..de55f2302d 100644 --- a/addons/skin.estouchy/xml/EventLog.xml +++ b/addons/skin.estouchy/xml/EventLog.xml @@ -16,12 +16,12 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1240"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="label-width" value="800"/> <param name="label2-posx" value="920r"/> diff --git a/addons/skin.estouchy/xml/Home.xml b/addons/skin.estouchy/xml/Home.xml index 473870824c..5766c1cc0e 100644 --- a/addons/skin.estouchy/xml/Home.xml +++ b/addons/skin.estouchy/xml/Home.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">9000</defaultcontrol> - <onload condition="IsEmpty(Skin.String(FirstRun))">ActivateWindow(1111)</onload> + <onload condition="String.IsEmpty(Skin.String(FirstRun))">ActivateWindow(1111)</onload> <controls> <control type="label"> <posx>-10</posx> @@ -16,8 +16,8 @@ <include>Footer</include> <control type="group"> <include>Window_OpenClose_Animation</include> - <animation effect="slide" start="0,0" end="106,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> - <visible>Library.HasContent(Movies) | Library.HasContent(TVShows) | Library.HasContent(Music) | IntegerGreaterThan(Container(2400).NumItems,0)</visible> + <animation effect="slide" start="0,0" end="106,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> + <visible>Library.HasContent(Movies) | Library.HasContent(TVShows) | Library.HasContent(Music) | Integer.IsGreater(Container(2400).NumItems,0)</visible> <control type="button"> <posx>509r</posx> <posy>120</posy> @@ -122,15 +122,15 @@ <onclick>Control.Move(9010,1)</onclick> <icon>-</icon> <thumb>-</thumb> - <visible>IntegerGreaterThan(Container(2400).NumItems,0)</visible> + <visible>Integer.IsGreater(Container(2400).NumItems,0)</visible> </item> </content> </control> </control> <control type="group"> - <animation effect="slide" start="0,0" end="212,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !IntegerGreaterThan(Container(2400).NumItems,0)">Conditional</animation> - <animation effect="slide" start="0,0" end="323,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !IntegerGreaterThan(Container(2400).NumItems,0)">Conditional</animation> - <include condition="StringCompare(Skin.AspectRatio,16:9)" name="HomeMenu"> + <animation effect="slide" start="0,0" end="212,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !Integer.IsGreater(Container(2400).NumItems,0)">Conditional</animation> + <animation effect="slide" start="0,0" end="323,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !Integer.IsGreater(Container(2400).NumItems,0)">Conditional</animation> + <include condition="String.IsEqual(Skin.AspectRatio,16:9)" name="HomeMenu"> <param name="panel-width">1000</param> <param name="layout-width">500</param> <param name="list-width">480</param> @@ -142,7 +142,7 @@ <param name="iconback-posx">383</param> <param name="iconback-width">98</param> </include> - <include condition="StringCompare(Skin.AspectRatio,4:3)" name="HomeMenu"> + <include condition="String.IsEqual(Skin.AspectRatio,4:3)" name="HomeMenu"> <param name="panel-width">832</param> <param name="layout-width">416</param> <param name="list-width">400</param> @@ -160,9 +160,9 @@ <posy>185r</posy> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(Home)">WindowClose</animation> <animation effect="fade" end="100" start="0" time="300" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="60,0" time="0" condition="StringCompare(Container(9002).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="120,0" time="0" condition="StringCompare(Container(9002).NumItems,3)">conditional</animation> - <animation effect="slide" start="0,0" end="-100,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="60,0" time="0" condition="String.IsEqual(Container(9002).NumItems,4)">conditional</animation> + <animation effect="slide" start="0,0" end="120,0" time="0" condition="String.IsEqual(Container(9002).NumItems,3)">conditional</animation> + <animation effect="slide" start="0,0" end="-100,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> <width>802</width> <height>120</height> <onleft>9002</onleft> @@ -218,7 +218,7 @@ <label>20126</label> <onclick>System.LogOff</onclick> <icon>icon_button_logoff.png</icon> - <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible> + <visible>System.HasLoginScreen | Integer.IsGreater(System.ProfileCount,1)</visible> </item> <item> <label>5</label> @@ -244,11 +244,11 @@ </content> </control> </control> - <include condition="StringCompare(Skin.AspectRatio,16:9)" name="HomeRecentlyAddedInfo"> + <include condition="String.IsEqual(Skin.AspectRatio,16:9)" name="HomeRecentlyAddedInfo"> <param name="group-posx">640r</param> <param name="panel-width">630</param> </include> - <include condition="StringCompare(Skin.AspectRatio,4:3)" name="HomeRecentlyAddedInfo"> + <include condition="String.IsEqual(Skin.AspectRatio,4:3)" name="HomeRecentlyAddedInfo"> <param name="group-posx">430r</param> <param name="panel-width">420</param> </include> diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml index dadc3186a4..27b19a4327 100644 --- a/addons/skin.estouchy/xml/Includes.xml +++ b/addons/skin.estouchy/xml/Includes.xml @@ -45,8 +45,8 @@ <value condition="Window.IsVisible(VideoOSD)">$LOCALIZE[31049] $INFO[Player.FinishTime]</value> </variable> <variable name="PosterThumb"> - <value condition="!IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value> - <value condition="IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Icon]</value> + <value condition="!String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value> + <value condition="String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Icon]</value> </variable> <variable name="PVRListLabel"> <value condition="![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels)]">$INFO[ListItem.Label]</value> @@ -75,7 +75,7 @@ <value condition="Player.Seeking + !Player.DisplayAfterSeek">[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</value> <value condition="Player.Seeking">$INFO[Player.SeekTime]</value> <value condition="Player.DisplayAfterSeek + ![Player.Forwarding | Player.Rewinding]">[UPPERCASE]$LOCALIZE[773][/UPPERCASE] $INFO[Player.SeekOffset]</value> - <value condition="!IsEmpty(Player.SeekStepSize) + ![Player.Forwarding | Player.Rewinding]">[UPPERCASE]$LOCALIZE[773][/UPPERCASE] $INFO[Player.SeekStepSize]</value> + <value condition="!String.IsEmpty(Player.SeekStepSize) + ![Player.Forwarding | Player.Rewinding]">[UPPERCASE]$LOCALIZE[773][/UPPERCASE] $INFO[Player.SeekStepSize]</value> </variable> <variable name="Speed"> <value condition="Player.Forwarding2x | Player.Rewinding2x">2x</value> @@ -90,8 +90,8 @@ </variable> <include name="ScreenWidth"> - <include condition="StringCompare(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include> - <include condition="StringCompare(Skin.AspectRatio,4:3)">ScreenWidth-4x3</include> + <include condition="String.IsEqual(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include> + <include condition="String.IsEqual(Skin.AspectRatio,4:3)">ScreenWidth-4x3</include> </include> <include name="ScreenWidth-16x9"> @@ -183,7 +183,7 @@ <texture>black.png</texture> <colordiffuse>70000000</colordiffuse> <include>VisibleFadeEffect</include> - <visible>[!IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible> + <visible>[!String.IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible> </control> </include> <include name="Header"> @@ -226,7 +226,7 @@ <texturefocus>-</texturefocus> <texturenofocus>-</texturenofocus> <onclick>ActivateWindow(weather)</onclick> - <visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> + <visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> </control> <control type="grouplist"> <include>VisibleFadeEffect</include> @@ -304,7 +304,7 @@ <aligny>center</aligny> <textoffsetx>0</textoffsetx> <label>$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label> - <visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> + <visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> </control> <control type="image"> <description>Weather</description> @@ -314,7 +314,7 @@ <aspectratio align="left">keep</aspectratio> <texture colordiffuse="blue">weather/$INFO[Window(Weather).Property(Current.FanartCode)].png</texture> <animation effect="fade" time="300">VisibleChange</animation> - <visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> + <visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> </control> </include> <include name="BehindDialogFadeOut"> @@ -355,7 +355,7 @@ <visible>Control.IsVisible(60) + ![[Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide)] + Control.IsVisible(10)]</visible> <animation effect="slide" start="40,0" end="0,0" time="400">Visible</animation> <animation effect="slide" start="0,0" end="40,0" time="400">Hidden</animation> - <animation effect="slide" start="0,0" end="-7,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="-7,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> <control type="scrollbar" id="60"> <posx>8</posx> <posy>40</posy> @@ -450,8 +450,8 @@ </item> <item> <label>5</label> - <onclick condition="IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> - <onclick condition="!IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> + <onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> + <onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> <icon>icon_button_settings.png</icon> <visible>![Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist)]</visible> </item> @@ -461,11 +461,11 @@ <include name="BottomMenuLayout"> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(Home)">WindowClose</animation> <animation effect="fade" end="100" start="0" time="300" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="120,0" time="0" condition="StringCompare(Container(9002).NumItems,5)">conditional</animation> - <animation effect="slide" start="0,0" end="240,0" time="0" condition="StringCompare(Container(9002).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="360,0" time="0" condition="StringCompare(Container(9002).NumItems,3)">conditional</animation> - <animation effect="slide" start="0,0" end="480,0" time="0" condition="StringCompare(Container(9002).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="600,0" time="0" condition="StringCompare(Container(9002).NumItems,1)">conditional</animation> + <animation effect="slide" start="0,0" end="120,0" time="0" condition="String.IsEqual(Container(9002).NumItems,5)">conditional</animation> + <animation effect="slide" start="0,0" end="240,0" time="0" condition="String.IsEqual(Container(9002).NumItems,4)">conditional</animation> + <animation effect="slide" start="0,0" end="360,0" time="0" condition="String.IsEqual(Container(9002).NumItems,3)">conditional</animation> + <animation effect="slide" start="0,0" end="480,0" time="0" condition="String.IsEqual(Container(9002).NumItems,2)">conditional</animation> + <animation effect="slide" start="0,0" end="600,0" time="0" condition="String.IsEqual(Container(9002).NumItems,1)">conditional</animation> <posx>730r</posx> <posy>78r</posy> <width>802</width> @@ -761,7 +761,7 @@ <include name="ScrollOffsetLabel"> <control type="group"> <include>16x9_xPos_Relocation</include> - <visible>Container.Scrolling + [StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556])]</visible> + <visible>Container.Scrolling + [String.IsEqual(Container.SortMethod,$LOCALIZE[551]) | String.IsEqual(Container.SortMethod,$LOCALIZE[561]) | String.IsEqual(Container.SortMethod,$LOCALIZE[558]) | String.IsEqual(Container.SortMethod,$LOCALIZE[557]) | String.IsEqual(Container.SortMethod,$LOCALIZE[556])]</visible> <animation effect="fade" time="100">Visible</animation> <animation effect="fade" time="300">Hidden</animation> <posx>600</posx> @@ -861,7 +861,7 @@ </item> <item> <label>-</label> - <onclick>ActivateWindow(Videos)</onclick> + <onclick>ActivateWindow(Video,Root,Return)</onclick> <icon>icon_menu_videos.png</icon> <visible>!Skin.HasSetting(HideHomeButtonVideo)</visible> </item> @@ -899,7 +899,7 @@ <width>$PARAM[list-width]</width> <height>620</height> <texture>panel.png</texture> - <animation effect="slide" start="0,0" end="-20,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> </control> <control type="image"> <description>Menu Panel</description> @@ -908,7 +908,7 @@ <width>$PARAM[list-width]</width> <height>620</height> <texture>panel.png</texture> - <animation effect="slide" start="0,0" end="-104,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="-104,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> </control> <control type="image"> <posx>40</posx> @@ -916,11 +916,11 @@ <width>$PARAM[list-width]</width> <height>155</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,6)">conditional</animation> - <animation effect="slide" start="0,0" end="-20,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> - <visible>!IntegerGreaterThan(Container(9000).NumItems,6)</visible> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation> + <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> + <visible>!Integer.IsGreater(Container(9000).NumItems,6)</visible> </control> <control type="image"> <posx>540</posx> @@ -928,11 +928,11 @@ <width>$PARAM[list-width]</width> <height>155</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,6)">conditional</animation> - <animation effect="slide" start="0,0" end="-104,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> - <visible>!IntegerGreaterThan(Container(9000).NumItems,6)</visible> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation> + <animation effect="slide" start="0,0" end="-104,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> + <visible>!Integer.IsGreater(Container(9000).NumItems,6)</visible> </control> <control type="panel" id="9000"> <posx>40</posx> @@ -946,10 +946,10 @@ <pagecontrol>-</pagecontrol> <scrolltime>300</scrolltime> <orientation>vertical</orientation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,6)">conditional</animation> - <animation effect="slide" start="0,0" end="-20,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation> + <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation> + <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> <itemlayout height="155" width="$PARAM[layout-width]"> <control type="image"> <posx>$PARAM[icon-posx-left]</posx> @@ -1037,7 +1037,7 @@ </item> <item id="3"> <label>20342</label> - <onclick>ActivateWindow(Videos,MovieTitles,Return)</onclick> + <onclick>ActivateWindow(Video,MovieTitles,Return)</onclick> <icon>icon_menu_movies.png</icon> <thumb>-</thumb> <visible>Library.HasContent(Movies)</visible> @@ -1045,7 +1045,7 @@ </item> <item id="4"> <label>20343</label> - <onclick>ActivateWindow(Videos,TVShowTitles,Return)</onclick> + <onclick>ActivateWindow(Video,TVShowTitles,Return)</onclick> <icon>icon_menu_tvshows.png</icon> <thumb>-</thumb> <visible>Library.HasContent(TVShows)</visible> @@ -1053,7 +1053,7 @@ </item> <item id="5"> <label>3</label> - <onclick>ActivateWindow(Videos)</onclick> + <onclick>ActivateWindow(Video,Root,Return)</onclick> <icon>icon_menu_videos.png</icon> <thumb>-</thumb> <visible>!Skin.HasSetting(HideHomeButtonVideo)</visible> @@ -1091,7 +1091,7 @@ </include> <include name="PopupMenu"> <control type="group"> - <visible>!IsEmpty(Window(Home).Property(PopupMenuVisible))</visible> + <visible>!String.IsEmpty(Window(Home).Property(PopupMenuVisible))</visible> <include>VisibleFadeEffect</include> <animation effect="fade" time="250">WindowClose</animation> <control type="button"> @@ -1256,7 +1256,7 @@ <include>MenuButtonCommonValues</include> <label>13350</label> <onclick>ActivateWindow(musicplaylist)</onclick> - <visible>!StringCompare(Playlist.Length(music),0)</visible> + <visible>!String.IsEqual(Playlist.Length(music),0)</visible> </control> </include> <include name="MusicOSDMenu"> @@ -1398,45 +1398,45 @@ <include>MenuButtonCommonValues</include> <label>19019</label> <onclick condition="Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels)">NextChannelGroup</onclick> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick> </control> <control type="button" id="202"> <include>MenuButtonCommonValues</include> <label>22020</label> <onclick condition="Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide)">NextChannelGroup</onclick> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVGuide)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioGuide)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVGuide)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioGuide)</onclick> </control> <control type="button" id="203"> <include>MenuButtonCommonValues</include> <label>19163</label> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVRecordings)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioRecordings)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVRecordings)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioRecordings)</onclick> </control> <control type="button" id="204"> <include>MenuButtonCommonValues</include> <label>19040</label> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimers)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimers)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimers)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimers)</onclick> </control> <control type="button" id="205"> <include>MenuButtonCommonValues</include> <label>19138</label> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimerRules)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimerRules)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimerRules)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimerRules)</onclick> </control> <control type="button" id="206"> <include>MenuButtonCommonValues</include> <label>137</label> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVSearch)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioSearch)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVSearch)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioSearch)</onclick> </control> <control type="button" id="207"> <include>MenuButtonCommonValues</include> <label>$VAR[PVRSwitch]</label> - <onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick> - <onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick> + <onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick> + <onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick> </control> <control type="radiobutton" id="6"> <textwidth>240</textwidth> @@ -1512,7 +1512,7 @@ <include>MenuButtonCommonValues</include> <label>13350</label> <onclick>ActivateWindow(videoplaylist)</onclick> - <visible>!StringCompare(Playlist.Length(video),0)</visible> + <visible>!String.IsEqual(Playlist.Length(video),0)</visible> </control> </include> <include name="VideoOSDMenu"> @@ -1604,7 +1604,7 @@ </control> </include> <include name="16x9_xPos_Relocation"> - <animation effect="slide" start="0,0" end="213,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9)">conditional</animation> + <animation effect="slide" start="0,0" end="213,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9)">conditional</animation> </include> <include name="Window_OpenClose_Animation"> <animation effect="fade" time="250">WindowOpen</animation> diff --git a/addons/skin.estouchy/xml/IncludesCodecFlagging.xml b/addons/skin.estouchy/xml/IncludesCodecFlagging.xml index ce2f708cc2..ed572fa7ca 100644 --- a/addons/skin.estouchy/xml/IncludesCodecFlagging.xml +++ b/addons/skin.estouchy/xml/IncludesCodecFlagging.xml @@ -15,7 +15,7 @@ <aspectratio align="left">keep</aspectratio> <texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture> <!-- Don't show if its one of the 500 divx codecs --> - <visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible> + <visible>![String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]</visible> </control> <control type="image"> <description>Divx Codec Image</description> @@ -23,7 +23,7 @@ <height>44</height> <aspectratio align="left">keep</aspectratio> <texture>flagging/video/divx.png</texture> - <visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible> + <visible>[String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]</visible> </control> </include> <include name="VideoTypeHackFlaggingConditions"> @@ -33,7 +33,7 @@ <height>44</height> <aspectratio align="left">keep</aspectratio> <texture>flagging/video/bluray.png</texture> - <visible>[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible> + <visible>[String.Contains(ListItem.FilenameAndPath,bluray) | String.Contains(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible> </control> <control type="image"> <description>HDDVD Image</description> @@ -41,7 +41,7 @@ <height>44</height> <aspectratio align="left">keep</aspectratio> <texture>flagging/video/hddvd.png</texture> - <visible>substring(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible> + <visible>String.Contains(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible> </control> <control type="image"> <description>DVD Image</description> @@ -49,7 +49,7 @@ <height>44</height> <aspectratio align="left">keep</aspectratio> <texture>flagging/video/dvd.png</texture> - <visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible> + <visible>[String.Contains(ListItem.FilenameAndPath,dvd) + ![String.Contains(ListItem.FilenameAndPath,hddvd) | String.Contains(ListItem.FilenameAndPath,bluray) | String.Contains(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible> </control> <control type="image"> <description>TV Types Image</description> @@ -57,7 +57,7 @@ <height>44</height> <aspectratio align="left">keep</aspectratio> <texture>flagging/video/TV.png</texture> - <visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible> + <visible>[String.Contains(ListItem.FilenameAndPath,pdtv) | String.Contains(ListItem.FilenameAndPath,hdtv) | String.Contains(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible> </control> <control type="image"> <description>VHS Image</description> @@ -65,7 +65,7 @@ <height>44</height> <aspectratio align="left">keep</aspectratio> <texture>flagging/video/vhs.png</texture> - <visible>substring(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible> + <visible>String.Contains(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible> </control> </include> <include name="AudioCodecFlaggingConditions"> diff --git a/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml b/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml index e38bb19c17..1d1baf7e8e 100644 --- a/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml +++ b/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml @@ -109,7 +109,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.1.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.1.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.1.Title))</visible> </item> <item id="2"> <label>$INFO[Window.Property(LatestMovie.2.Title)]</label> @@ -117,7 +117,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.2.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.2.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.2.Title))</visible> </item> <item id="3"> <label>$INFO[Window.Property(LatestMovie.3.Title)]</label> @@ -125,7 +125,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.3.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.3.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.3.Title))</visible> </item> <item id="4"> <label>$INFO[Window.Property(LatestMovie.4.Title)]</label> @@ -133,7 +133,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.4.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.4.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.4.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.4.Title))</visible> </item> <item id="5"> <label>$INFO[Window.Property(LatestMovie.5.Title)]</label> @@ -141,7 +141,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.5.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.5.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.5.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.5.Title))</visible> </item> <item id="6"> <label>$INFO[Window.Property(LatestMovie.6.Title)]</label> @@ -149,7 +149,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.6.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.6.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.6.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.6.Title))</visible> </item> <item id="7"> <label>$INFO[Window.Property(LatestMovie.7.Title)]</label> @@ -157,7 +157,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.7.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.7.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.7.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.7.Title))</visible> </item> <item id="8"> <label>$INFO[Window.Property(LatestMovie.8.Title)]</label> @@ -165,7 +165,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.8.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.8.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.8.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.8.Title))</visible> </item> <item id="9"> <label>$INFO[Window.Property(LatestMovie.9.Title)]</label> @@ -173,7 +173,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.9.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.9.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.9.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.9.Title))</visible> </item> <item id="10"> <label>$INFO[Window.Property(LatestMovie.10.Title)]</label> @@ -181,7 +181,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.10.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.10.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.10.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.10.Title))</visible> </item> <item id="11"> <label>$INFO[Window.Property(LatestMovie.11.Title)]</label> @@ -189,7 +189,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.11.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.11.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.11.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.11.Title))</visible> </item> <item id="12"> <label>$INFO[Window.Property(LatestMovie.12.Title)]</label> @@ -197,7 +197,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.12.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.12.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestMovie.12.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestMovie.12.Title))</visible> </item> </content> </control> @@ -211,7 +211,7 @@ <effect type="zoom" start="100" end="50" center="auto" easing="in" tween="quadratic" time="400" /> <effect type="fade" start="100" end="0" time="400" /> </animation> - <animation effect="slide" start="0,0" end="30,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="30,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> <posx>40</posx> <posy>0</posy> <width>$PARAM[panel-width]</width> @@ -322,7 +322,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.1.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.1.EpisodeTitle))</visible> </item> <item id="2"> <label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label> @@ -331,7 +331,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.2.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.2.EpisodeTitle))</visible> </item> <item id="3"> <label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label> @@ -340,7 +340,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.3.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.3.EpisodeTitle))</visible> </item> <item id="4"> <label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label> @@ -349,7 +349,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.4.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.4.EpisodeTitle))</visible> </item> <item id="5"> <label>$INFO[Window.Property(LatestEpisode.5.EpisodeTitle)]</label> @@ -358,7 +358,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.5.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.5.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.5.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.5.EpisodeTitle))</visible> </item> <item id="6"> <label>$INFO[Window.Property(LatestEpisode.6.EpisodeTitle)]</label> @@ -367,7 +367,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.6.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.6.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.6.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.6.EpisodeTitle))</visible> </item> <item id="7"> <label>$INFO[Window.Property(LatestEpisode.7.EpisodeTitle)]</label> @@ -376,7 +376,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.7.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.7.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.7.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.7.EpisodeTitle))</visible> </item> <item id="8"> <label>$INFO[Window.Property(LatestEpisode.8.EpisodeTitle)]</label> @@ -385,7 +385,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.8.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.8.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.8.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.8.EpisodeTitle))</visible> </item> <item id="9"> <label>$INFO[Window.Property(LatestEpisode.9.EpisodeTitle)]</label> @@ -394,7 +394,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.9.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.9.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.9.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.9.EpisodeTitle))</visible> </item> <item id="10"> <label>$INFO[Window.Property(LatestEpisode.10.EpisodeTitle)]</label> @@ -403,7 +403,7 @@ <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.10.Path)])</onclick> <icon>-</icon> <thumb>$INFO[Window.Property(LatestEpisode.10.Thumb)]</thumb> - <visible>!IsEmpty(Window.Property(LatestEpisode.10.EpisodeTitle))</visible> + <visible>!String.IsEmpty(Window.Property(LatestEpisode.10.EpisodeTitle))</visible> </item> </content> </control> @@ -500,7 +500,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.1.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.1.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.1.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.1.Title))</visible> </item> <item id="2"> <label>$INFO[Window.Property(LatestAlbum.2.Title)]</label> @@ -508,7 +508,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.2.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.2.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.2.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.2.Title))</visible> </item> <item id="3"> <label>$INFO[Window.Property(LatestAlbum.3.Title)]</label> @@ -516,7 +516,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.3.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.3.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.3.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.3.Title))</visible> </item> <item id="4"> <label>$INFO[Window.Property(LatestAlbum.4.Title)]</label> @@ -524,7 +524,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.4.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.4.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.4.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.4.Title))</visible> </item> <item id="5"> <label>$INFO[Window.Property(LatestAlbum.5.Title)]</label> @@ -532,7 +532,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.5.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.5.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.5.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.5.Title))</visible> </item> <item id="6"> <label>$INFO[Window.Property(LatestAlbum.6.Title)]</label> @@ -540,7 +540,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.6.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.6.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.6.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.6.Title))</visible> </item> <item id="7"> <label>$INFO[Window.Property(LatestAlbum.7.Title)]</label> @@ -548,7 +548,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.7.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.7.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.7.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.7.Title))</visible> </item> <item id="8"> <label>$INFO[Window.Property(LatestAlbum.8.Title)]</label> @@ -556,7 +556,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.8.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.8.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.8.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.8.Title))</visible> </item> <item id="9"> <label>$INFO[Window.Property(LatestAlbum.9.Title)]</label> @@ -564,7 +564,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.9.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.9.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.9.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.9.Title))</visible> </item> <item id="10"> <label>$INFO[Window.Property(LatestAlbum.10.Title)]</label> @@ -572,7 +572,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.10.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.10.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.10.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.10.Title))</visible> </item> <item id="11"> <label>$INFO[Window.Property(LatestAlbum.11.Title)]</label> @@ -580,7 +580,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.11.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.11.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.11.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.11.Title))</visible> </item> <item id="12"> <label>$INFO[Window.Property(LatestAlbum.12.Title)]</label> @@ -588,7 +588,7 @@ <onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.12.Path)])</onclick> <icon>$INFO[Window.Property(LatestAlbum.12.Thumb)]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Window.Property(LatestAlbum.12.Title))</visible> + <visible>!String.IsEmpty(Window.Property(LatestAlbum.12.Title))</visible> </item> </content> </control> @@ -685,7 +685,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton1)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton1))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton1))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton1))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label> @@ -693,7 +693,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton2)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton2))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton2))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton2))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label> @@ -701,7 +701,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton3)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton3))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton3))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton3))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label> @@ -709,7 +709,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton4)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton4))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton4))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton4))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton5))]</label> @@ -717,7 +717,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton5)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton5))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton5))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton5))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton6))]</label> @@ -725,7 +725,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton6)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton6))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton6))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton6))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton7))]</label> @@ -733,7 +733,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton7)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton7))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton7))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton7))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton8))]</label> @@ -741,7 +741,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton8)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton8))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton8))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton8))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton9))]</label> @@ -749,7 +749,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton9)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton9))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton9))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton9))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton10))]</label> @@ -757,7 +757,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton10)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton10))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton10))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton10))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton11))]</label> @@ -765,7 +765,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton11)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton11))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton11))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton11))</visible> </item> <item> <label>$INFO[system.addontitle(Skin.String(HomeAddonButton12))]</label> @@ -773,7 +773,7 @@ <onclick>RunAddon($INFO[Skin.String(HomeAddonButton12)])</onclick> <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton12))]</icon> <thumb>-</thumb> - <visible>!IsEmpty(Skin.String(HomeAddonButton12))</visible> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton12))</visible> </item> </content> </control> diff --git a/addons/skin.estouchy/xml/MusicVisualisation.xml b/addons/skin.estouchy/xml/MusicVisualisation.xml index 895111c095..2c6bdafc37 100644 --- a/addons/skin.estouchy/xml/MusicVisualisation.xml +++ b/addons/skin.estouchy/xml/MusicVisualisation.xml @@ -21,59 +21,5 @@ <include>ScreenWidth</include> <height>960</height> </control> - <!-- codec & viz infos --> - <control type="group" id="0"> - <posx>0</posx> - <posy>50</posy> - <visible>Player.ShowCodec + ![Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible> - <animation effect="fade" time="200">VisibleChange</animation> - <control type="image"> - <description>media info background image</description> - <posx>0</posx> - <posy>0</posy> - <include>ScreenWidth</include> - <height>105</height> - <colordiffuse>AAFFFFFF</colordiffuse> - <texture>grey.png</texture> - </control> - <control type="label"> - <description>row 1 label</description> - <posx>50</posx> - <posy>10</posy> - <label>-</label> - <align>left</align> - <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> - <font>font16</font> - </control> - <control type="label"> - <description>row 2 label</description> - <posx>50</posx> - <posy>40</posy> - <label>-</label> - <align>left</align> - <label>$INFO[Visualisation.Name] [I][COLOR=blue]($LOCALIZE[20166])[/COLOR][/I] · fps: $INFO[System.FPS]</label> - <font>font16</font> - <visible>Visualisation.Locked</visible> - </control> - <control type="label"> - <description>Unlocked row 2 label</description> - <posx>50</posx> - <posy>40</posy> - <label>-</label> - <align>left</align> - <label>$INFO[Visualisation.Name] · fps: $INFO[System.FPS]</label> - <font>font16</font> - <visible>!Visualisation.Locked</visible> - </control> - <control type="label"> - <description>row 3 label</description> - <posx>50</posx> - <posy>70</posy> - <label>-</label> - <align>left</align> - <label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label> - <font>font16</font> - </control> - </control> </controls> </window> diff --git a/addons/skin.estouchy/xml/MyMusicNav.xml b/addons/skin.estouchy/xml/MyMusicNav.xml index 1b53a1cd0c..0214150a2b 100644 --- a/addons/skin.estouchy/xml/MyMusicNav.xml +++ b/addons/skin.estouchy/xml/MyMusicNav.xml @@ -16,30 +16,30 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="layout-width" value="306"/> </include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="layout-width" value="363"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1230"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> <param name="panel-width" value="1090"/> <param name="label-width" value="790"/> <param name="label2-posx" value="920r"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> <param name="panel-width" value="1530"/> <param name="textbox-width-movies" value="1350"/> <param name="textbox-width-episodes" value="1250"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> <param name="panel-width" value="1090"/> <param name="textbox-width-movies" value="910"/> <param name="textbox-width-episodes" value="810"/> diff --git a/addons/skin.estouchy/xml/MyPVRChannels.xml b/addons/skin.estouchy/xml/MyPVRChannels.xml index 2f74bd587f..8de142e9be 100644 --- a/addons/skin.estouchy/xml/MyPVRChannels.xml +++ b/addons/skin.estouchy/xml/MyPVRChannels.xml @@ -19,27 +19,27 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> </include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> <param name="textbox-width" value="1160"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> <param name="textbox-width" value="720"/> </include> diff --git a/addons/skin.estouchy/xml/MyPVRGuide.xml b/addons/skin.estouchy/xml/MyPVRGuide.xml index eaaea84002..b2d773ddb1 100644 --- a/addons/skin.estouchy/xml/MyPVRGuide.xml +++ b/addons/skin.estouchy/xml/MyPVRGuide.xml @@ -22,53 +22,53 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="PVREPG" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 10 --> + <include name="PVREPG" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 10 --> <param name="panel-width" value="1530"/> </include> - <include name="PVREPG" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 10 --> + <include name="PVREPG" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 10 --> <param name="panel-width" value="1090"/> </include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> </include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 11 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 11 --> <param name="panel-id" value="11"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 11 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 11 --> <param name="panel-id" value="11"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 12 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 12 --> <param name="panel-id" value="12"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 12 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 12 --> <param name="panel-id" value="12"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 13 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 13 --> <param name="panel-id" value="13"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 13 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 13 --> <param name="panel-id" value="13"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> <param name="textbox-width" value="1160"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> <param name="textbox-width" value="720"/> </include> diff --git a/addons/skin.estouchy/xml/MyPVRRecordings.xml b/addons/skin.estouchy/xml/MyPVRRecordings.xml index e8777ccecc..56d1f3ba73 100644 --- a/addons/skin.estouchy/xml/MyPVRRecordings.xml +++ b/addons/skin.estouchy/xml/MyPVRRecordings.xml @@ -16,27 +16,27 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> </include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> <param name="textbox-width" value="1160"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> <param name="textbox-width" value="720"/> </include> diff --git a/addons/skin.estouchy/xml/MyPVRSearch.xml b/addons/skin.estouchy/xml/MyPVRSearch.xml index 8b9440ef5f..0099964dcc 100644 --- a/addons/skin.estouchy/xml/MyPVRSearch.xml +++ b/addons/skin.estouchy/xml/MyPVRSearch.xml @@ -16,27 +16,27 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> </include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> <param name="textbox-width" value="1160"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> <param name="textbox-width" value="720"/> </include> diff --git a/addons/skin.estouchy/xml/MyPVRTimers.xml b/addons/skin.estouchy/xml/MyPVRTimers.xml index 0a7835373c..8f26622c7b 100644 --- a/addons/skin.estouchy/xml/MyPVRTimers.xml +++ b/addons/skin.estouchy/xml/MyPVRTimers.xml @@ -16,27 +16,27 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> </include> - <include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1530"/> <param name="label-width" value="1400"/> </include> - <include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-id" value="50"/> <param name="panel-width" value="1090"/> <param name="label-width" value="960"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <param name="panel-width" value="1530"/> <param name="textbox-width" value="1160"/> </include> - <include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)"> + <include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <param name="panel-width" value="1090"/> <param name="textbox-width" value="720"/> </include> diff --git a/addons/skin.estouchy/xml/MyPics.xml b/addons/skin.estouchy/xml/MyPics.xml index c83ef0181f..05d2cadf0a 100644 --- a/addons/skin.estouchy/xml/MyPics.xml +++ b/addons/skin.estouchy/xml/MyPics.xml @@ -16,20 +16,20 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="layout-width" value="306"/> </include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="layout-width" value="363"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1230"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> <param name="panel-width" value="1090"/> <param name="label-width" value="790"/> <param name="label2-posx" value="920r"/> diff --git a/addons/skin.estouchy/xml/MyPlaylist.xml b/addons/skin.estouchy/xml/MyPlaylist.xml index f6037b8449..ad8df987a7 100644 --- a/addons/skin.estouchy/xml/MyPlaylist.xml +++ b/addons/skin.estouchy/xml/MyPlaylist.xml @@ -15,30 +15,30 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="layout-width" value="306"/> </include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="layout-width" value="363"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1230"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> <param name="panel-width" value="1090"/> <param name="label-width" value="790"/> <param name="label2-posx" value="920r"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> <param name="panel-width" value="1530"/> <param name="textbox-width-movies" value="1350"/> <param name="textbox-width-episodes" value="1250"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> <param name="panel-width" value="1090"/> <param name="textbox-width-movies" value="910"/> <param name="textbox-width-episodes" value="810"/> diff --git a/addons/skin.estouchy/xml/MyPrograms.xml b/addons/skin.estouchy/xml/MyPrograms.xml index ec74d750ac..5861b11d28 100644 --- a/addons/skin.estouchy/xml/MyPrograms.xml +++ b/addons/skin.estouchy/xml/MyPrograms.xml @@ -16,30 +16,30 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="layout-width" value="306"/> </include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="layout-width" value="363"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1230"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> <param name="panel-width" value="1090"/> <param name="label-width" value="790"/> <param name="label2-posx" value="920r"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> <param name="panel-width" value="1530"/> <param name="textbox-width-movies" value="1350"/> <param name="textbox-width-episodes" value="1250"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> <param name="panel-width" value="1090"/> <param name="textbox-width-movies" value="910"/> <param name="textbox-width-episodes" value="810"/> diff --git a/addons/skin.estouchy/xml/MyVideoNav.xml b/addons/skin.estouchy/xml/MyVideoNav.xml index 23b8ef26cc..d1719869fc 100644 --- a/addons/skin.estouchy/xml/MyVideoNav.xml +++ b/addons/skin.estouchy/xml/MyVideoNav.xml @@ -16,30 +16,30 @@ </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 50 --> <param name="panel-width" value="1530"/> <param name="layout-width" value="306"/> </include> - <include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> + <include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 50 --> <param name="panel-width" value="1090"/> <param name="layout-width" value="363"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 500 --> <param name="panel-width" value="1530"/> <param name="label-width" value="1230"/> <param name="label2-posx" value="1360r"/> </include> - <include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> + <include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 500 --> <param name="panel-width" value="1090"/> <param name="label-width" value="790"/> <param name="label2-posx" value="920r"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> <!-- view id = 550 --> <param name="panel-width" value="1530"/> <param name="textbox-width-movies" value="1350"/> <param name="textbox-width-episodes" value="1250"/> </include> - <include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> + <include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> <!-- view id = 550 --> <param name="panel-width" value="1090"/> <param name="textbox-width-movies" value="910"/> <param name="textbox-width-episodes" value="810"/> diff --git a/addons/skin.estouchy/xml/MyWeather.xml b/addons/skin.estouchy/xml/MyWeather.xml index 98a3d3c4f2..473e8af5e8 100644 --- a/addons/skin.estouchy/xml/MyWeather.xml +++ b/addons/skin.estouchy/xml/MyWeather.xml @@ -247,7 +247,7 @@ <control type="group"> <posx>600</posx> <posy>130</posy> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day0.Title))</visible> <control type="image"> <posx>20</posx> <posy>20</posy> @@ -303,7 +303,7 @@ <align>center</align> <aligny>center</aligny> <label>[COLOR=grey]$LOCALIZE[419][/COLOR][CR][B]$INFO[ListItem.Property(HighTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label> - <visible>!IsEmpty(ListItem.Property(HighTemp))</visible> + <visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible> </control> <control type="label"> <posx>210</posx> @@ -315,7 +315,7 @@ <align>center</align> <aligny>center</aligny> <label>[COLOR=grey]$LOCALIZE[418][/COLOR][CR][B]$INFO[ListItem.Property(LowTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label> - <visible>!IsEmpty(ListItem.Property(HighTemp))</visible> + <visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible> </control> <control type="textbox"> <posx>20</posx> @@ -364,7 +364,7 @@ <align>center</align> <aligny>center</aligny> <label>[COLOR=grey]$LOCALIZE[419][/COLOR][CR][B]$INFO[ListItem.Property(HighTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label> - <visible>!IsEmpty(ListItem.Property(HighTemp))</visible> + <visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible> </control> <control type="label"> <posx>210</posx> @@ -376,7 +376,7 @@ <align>center</align> <aligny>center</aligny> <label>[COLOR=grey]$LOCALIZE[418][/COLOR][CR][B]$INFO[ListItem.Property(LowTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label> - <visible>!IsEmpty(ListItem.Property(HighTemp))</visible> + <visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible> </control> <control type="textbox"> <posx>20</posx> @@ -404,7 +404,7 @@ <property name="Outlook">$INFO[Window.Property(Day0.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day0.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day1.Title)]</label> @@ -414,7 +414,7 @@ <property name="Outlook">$INFO[Window.Property(Day1.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day1.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day1.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day2.Title)]</label> @@ -424,7 +424,7 @@ <property name="Outlook">$INFO[Window.Property(Day2.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day2.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day2.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day3.Title)]</label> @@ -434,7 +434,7 @@ <property name="Outlook">$INFO[Window.Property(Day3.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day3.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day3.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day4.Title)]</label> @@ -444,7 +444,7 @@ <property name="Outlook">$INFO[Window.Property(Day4.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day4.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day4.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day5.Title)]</label> @@ -454,7 +454,7 @@ <property name="Outlook">$INFO[Window.Property(Day5.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day5.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day5.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day6.Title)]</label> @@ -464,7 +464,7 @@ <property name="Outlook">$INFO[Window.Property(Day6.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day6.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day6.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day7.Title)]</label> @@ -474,7 +474,7 @@ <property name="Outlook">$INFO[Window.Property(Day7.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day7.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day7.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day8.Title)]</label> @@ -484,7 +484,7 @@ <property name="Outlook">$INFO[Window.Property(Day8.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day8.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day8.Title))</visible> </item> <item> <label>$INFO[Window.Property(Day9.Title)]</label> @@ -494,7 +494,7 @@ <property name="Outlook">$INFO[Window.Property(Day9.Outlook)]</property> <property name="TempUnits">$INFO[System.TemperatureUnits]</property> <onclick>noop</onclick> - <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day9.Title))</visible> + <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day9.Title))</visible> </item> </content> </control> diff --git a/addons/skin.estouchy/xml/SettingsCategory.xml b/addons/skin.estouchy/xml/SettingsCategory.xml index 86643e5224..96b19c9ecf 100644 --- a/addons/skin.estouchy/xml/SettingsCategory.xml +++ b/addons/skin.estouchy/xml/SettingsCategory.xml @@ -29,8 +29,8 @@ </item> <item> <label>5</label> - <onclick condition="IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> - <onclick condition="!IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> + <onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> + <onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> <icon>icon_button_settings.png</icon> </item> </content> diff --git a/addons/skin.estouchy/xml/SettingsProfile.xml b/addons/skin.estouchy/xml/SettingsProfile.xml index 61b8defd27..4735f8df81 100644 --- a/addons/skin.estouchy/xml/SettingsProfile.xml +++ b/addons/skin.estouchy/xml/SettingsProfile.xml @@ -130,7 +130,7 @@ <align>center</align> <aligny>center</aligny> <label>$LOCALIZE[31320]</label> - <visible>!IsEmpty(ListItem.Label2)</visible> + <visible>!String.IsEmpty(ListItem.Label2)</visible> </control> <control type="label"> <posx>10</posx> @@ -183,7 +183,7 @@ <align>center</align> <aligny>center</aligny> <label>$LOCALIZE[31320]</label> - <visible>!IsEmpty(ListItem.Label2)</visible> + <visible>!String.IsEmpty(ListItem.Label2)</visible> </control> <control type="label"> <posx>10</posx> diff --git a/addons/skin.estouchy/xml/SettingsSystemInfo.xml b/addons/skin.estouchy/xml/SettingsSystemInfo.xml index 8cfc4328e3..25f89ce794 100644 --- a/addons/skin.estouchy/xml/SettingsSystemInfo.xml +++ b/addons/skin.estouchy/xml/SettingsSystemInfo.xml @@ -140,7 +140,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(2))</visible> + <visible>!String.IsEmpty(Control.GetLabel(2))</visible> </control> <control type="label" id="2"> <description>Label 2</description> @@ -159,7 +159,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(3))</visible> + <visible>!String.IsEmpty(Control.GetLabel(3))</visible> </control> <control type="label" id="3"> <description>Label 3</description> @@ -178,7 +178,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(4))</visible> + <visible>!String.IsEmpty(Control.GetLabel(4))</visible> </control> <control type="label" id="4"> <description>Label 4</description> @@ -197,7 +197,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(5))</visible> + <visible>!String.IsEmpty(Control.GetLabel(5))</visible> </control> <control type="label" id="5"> <description>Label 5</description> @@ -216,7 +216,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(6))</visible> + <visible>!String.IsEmpty(Control.GetLabel(6))</visible> </control> <control type="label" id="6"> <description>Label 6</description> @@ -235,7 +235,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(7))</visible> + <visible>!String.IsEmpty(Control.GetLabel(7))</visible> </control> <control type="label" id="7"> <description>Label 7</description> @@ -254,7 +254,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(8))</visible> + <visible>!String.IsEmpty(Control.GetLabel(8))</visible> </control> <control type="label" id="8"> <description>Label 8</description> @@ -273,7 +273,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(9))</visible> + <visible>!String.IsEmpty(Control.GetLabel(9))</visible> </control> <control type="label" id="9"> <description>Label 9</description> @@ -292,7 +292,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(10))</visible> + <visible>!String.IsEmpty(Control.GetLabel(10))</visible> </control> <control type="label" id="10"> <description>Label 10</description> @@ -311,7 +311,7 @@ <width>880</width> <height>60</height> <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!IsEmpty(Control.GetLabel(11))</visible> + <visible>!String.IsEmpty(Control.GetLabel(11))</visible> </control> <control type="label" id="11"> <description>Label 11</description> diff --git a/addons/skin.estouchy/xml/ViewsList.xml b/addons/skin.estouchy/xml/ViewsList.xml index 1cda62fed6..7041609694 100644 --- a/addons/skin.estouchy/xml/ViewsList.xml +++ b/addons/skin.estouchy/xml/ViewsList.xml @@ -37,7 +37,7 @@ <height>62</height> <texture background="true">$VAR[PosterThumb]</texture> <aspectratio>keep</aspectratio> - <visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>4</posx> @@ -46,7 +46,7 @@ <height>62</height> <texture background="true">defaulticons/$INFO[Listitem.Icon]</texture> <aspectratio>keep</aspectratio> - <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> + <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="label"> <posx>75</posx> @@ -82,7 +82,7 @@ <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> <animation effect="slide" start="0" end ="100,0" time="0" condition="Container.Content(Albums)">Conditional</animation> - <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !SubString(ListItem.Label,..)</visible> + <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !String.Contains(ListItem.Label,..)</visible> </control> <control type="image"> <description>Rating value</description> @@ -92,7 +92,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture> - <visible>Container.Content(Songs) + !SubString(ListItem.Label,..)</visible> + <visible>Container.Content(Songs) + !String.Contains(ListItem.Label,..)</visible> </control> <control type="image"> <posx>110r</posx> @@ -138,7 +138,7 @@ <aligny>center</aligny> <label>$INFO[ListItem.AddonStatus,, - ]$INFO[ListItem.AddonVersion]</label> <animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation> - <visible>Window.IsVisible(AddonBrowser) + !stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + !String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible> </control> <control type="label"> <posx>$PARAM[label2-posx]</posx> @@ -151,7 +151,7 @@ <aligny>center</aligny> <label>$INFO[ListItem.AddonVersion]</label> <animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation> - <visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible> </control> <control type="image"> <posx>50r</posx> @@ -160,7 +160,7 @@ <height>30</height> <aspectratio>keep</aspectratio> <texture>OverlayWatched.png</texture> - <visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible> </control> </itemlayout> <focusedlayout height="70" width="$PARAM[panel-width]" condition="!Window.IsVisible(EventLog)"> @@ -179,7 +179,7 @@ <height>62</height> <texture background="true">$VAR[PosterThumb]</texture> <aspectratio>keep</aspectratio> - <visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>4</posx> @@ -188,7 +188,7 @@ <height>62</height> <texture background="true">defaulticons/$INFO[Listitem.Icon]</texture> <aspectratio>keep</aspectratio> - <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> + <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="label"> <posx>75</posx> @@ -224,7 +224,7 @@ <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/]</texture> <animation effect="slide" start="0" end ="100,0" time="0" condition="Container.Content(Albums)">Conditional</animation> - <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !SubString(ListItem.Label,..)</visible> + <visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !String.Contains(ListItem.Label,..)</visible> </control> <control type="image"> <description>Rating value</description> @@ -234,7 +234,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/]</texture> - <visible>Container.Content(Songs) + !SubString(ListItem.Label,..)</visible> + <visible>Container.Content(Songs) + !String.Contains(ListItem.Label,..)</visible> </control> <control type="image"> <posx>110r</posx> @@ -280,7 +280,7 @@ <aligny>center</aligny> <label>$INFO[ListItem.AddonStatus,, - ]$INFO[ListItem.AddonVersion]</label> <animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation> - <visible>Window.IsVisible(AddonBrowser) + !stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + !String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible> </control> <control type="label"> <posx>$PARAM[label2-posx]</posx> @@ -293,7 +293,7 @@ <aligny>center</aligny> <label>$INFO[ListItem.AddonVersion]</label> <animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation> - <visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible> </control> <control type="image"> <posx>50r</posx> @@ -302,7 +302,7 @@ <height>30</height> <aspectratio>keep</aspectratio> <texture>OverlayWatched.png</texture> - <visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible> </control> </focusedlayout> <itemlayout height="90" width="$PARAM[panel-width]" condition="Window.IsVisible(EventLog)"> diff --git a/addons/skin.estouchy/xml/ViewsThumbnail.xml b/addons/skin.estouchy/xml/ViewsThumbnail.xml index 12e86219ee..54429521fb 100644 --- a/addons/skin.estouchy/xml/ViewsThumbnail.xml +++ b/addons/skin.estouchy/xml/ViewsThumbnail.xml @@ -14,9 +14,9 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <preloaditems>4</preloaditems> - <animation effect="slide" start="0,0" end="-1,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation> - <animation effect="slide" start="0,0" end="-1,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9) + Container.Content(Episodes)">Conditional</animation> - <animation effect="slide" start="0,0" end="28,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3) + Container.Content(Episodes)">Conditional</animation> + <animation effect="slide" start="0,0" end="-1,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="-1,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9) + Container.Content(Episodes)">Conditional</animation> + <animation effect="slide" start="0,0" end="28,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3) + Container.Content(Episodes)">Conditional</animation> <itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(TVShows) + !Container.Content(MusicVideos)" height="250" width="218"> <control type="image"> <posx>10</posx> @@ -32,7 +32,7 @@ <height>200</height> <texture background="true">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> - <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>67</posx> @@ -41,7 +41,7 @@ <height>86</height> <texture background="true">defaulticons/$INFO[Listitem.Icon]</texture> <aspectratio>keep</aspectratio> - <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> + <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>10</posx> @@ -68,7 +68,7 @@ <height>30</height> <aspectratio>keep</aspectratio> <texture>OverlayWatched.png</texture> - <visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible> </control> </itemlayout> <focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(TVShows) + !Container.Content(MusicVideos)" height="250" width="218"> @@ -86,7 +86,7 @@ <height>200</height> <texture background="true">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> - <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible> + <visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>67</posx> @@ -95,7 +95,7 @@ <height>86</height> <texture background="true">defaulticons/$INFO[Listitem.Icon]</texture> <aspectratio>keep</aspectratio> - <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible> + <visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible> </control> <control type="image"> <posx>10</posx> @@ -122,7 +122,7 @@ <height>30</height> <aspectratio>keep</aspectratio> <texture>OverlayWatched.png</texture> - <visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible> + <visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible> </control> </focusedlayout> <itemlayout condition="Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)" height="375" width="218"> diff --git a/addons/skin.estouchy/xml/ViewsWide.xml b/addons/skin.estouchy/xml/ViewsWide.xml index 8bc7c6f70d..b5f105827c 100644 --- a/addons/skin.estouchy/xml/ViewsWide.xml +++ b/addons/skin.estouchy/xml/ViewsWide.xml @@ -80,9 +80,9 @@ <width>200</width> <height>25</height> <aspectratio align="left">keep</aspectratio> - <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> + <texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture> <animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation> - <visible>!StringCompare(ListItem.Label,..)</visible> + <visible>!String.IsEqual(ListItem.Label,..)</visible> </control> <control type="image"> <posx>100r</posx> @@ -183,9 +183,9 @@ <width>200</width> <height>25</height> <aspectratio align="left">keep</aspectratio> - <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> + <texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture> <animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation> - <visible>!StringCompare(ListItem.Label,..)</visible> + <visible>!String.IsEqual(ListItem.Label,..)</visible> </control> <control type="image"> <posx>100r</posx> @@ -300,7 +300,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> - <visible>!StringCompare(ListItem.Label,..)</visible> + <visible>!String.IsEqual(ListItem.Label,..)</visible> </control> <control type="image"> <posx>100r</posx> @@ -406,7 +406,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> - <visible>!StringCompare(ListItem.Label,..)</visible> + <visible>!String.IsEqual(ListItem.Label,..)</visible> </control> <control type="image"> <posx>100r</posx> @@ -513,7 +513,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> - <visible>!StringCompare(ListItem.Label,..) + Container.Content(Albums)</visible> + <visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Albums)</visible> </control> <control type="image"> <description>Rating value</description> @@ -523,7 +523,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture> - <visible>!StringCompare(ListItem.Label,..) + Container.Content(Songs)</visible> + <visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Songs)</visible> </control> <control type="textbox"> <posx>250</posx> @@ -553,7 +553,7 @@ <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Comment]</label> - <visible>Container.Content(Songs) + !IsEmpty(ListItem.Comment)</visible> + <visible>Container.Content(Songs) + !String.IsEmpty(ListItem.Comment)</visible> </control> <control type="textbox"> <posx>250</posx> @@ -563,7 +563,7 @@ <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Album,$LOCALIZE[558]: ][CR]$INFO[ListItem.Tracknumber,$LOCALIZE[554]: ][CR]$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label> - <visible>Container.Content(Songs) + IsEmpty(ListItem.Comment)</visible> + <visible>Container.Content(Songs) + String.IsEmpty(ListItem.Comment)</visible> </control> </itemlayout> <focusedlayout condition="Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs)" height="240" width="$PARAM[panel-width]"> @@ -636,7 +636,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture> - <visible>!StringCompare(ListItem.Label,..) + Container.Content(Albums)</visible> + <visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Albums)</visible> </control> <control type="image"> <description>Rating value</description> @@ -646,7 +646,7 @@ <height>25</height> <aspectratio align="left">keep</aspectratio> <texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture> - <visible>!StringCompare(ListItem.Label,..) + Container.Content(Songs)</visible> + <visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Songs)</visible> </control> <control type="textbox"> <posx>250</posx> @@ -678,7 +678,7 @@ <align>justify</align> <label>$INFO[ListItem.Comment]</label> <autoscroll delay="2000" time="2000" repeat="2000">True</autoscroll> - <visible>Container.Content(Songs) + !IsEmpty(ListItem.Comment)</visible> + <visible>Container.Content(Songs) + !String.IsEmpty(ListItem.Comment)</visible> </control> <control type="textbox"> <posx>250</posx> @@ -689,7 +689,7 @@ <align>justify</align> <label>$INFO[ListItem.Album,$LOCALIZE[558]: ][CR]$INFO[ListItem.Tracknumber,$LOCALIZE[554]: ][CR]$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label> <autoscroll delay="2000" time="2000" repeat="2000">True</autoscroll> - <visible>Container.Content(Songs) + IsEmpty(ListItem.Comment)</visible> + <visible>Container.Content(Songs) + String.IsEmpty(ListItem.Comment)</visible> </control> </focusedlayout> <itemlayout condition="Container.Content(Addons)" height="240" width="$PARAM[panel-width]"> |
