diff options
| author | pieh <misiek.piechowiak@gmail.com> | 2011-08-18 11:45:10 -0700 |
|---|---|---|
| committer | pieh <misiek.piechowiak@gmail.com> | 2011-08-18 11:45:10 -0700 |
| commit | 55941ded3b0d68c45fd006d98075a93626742137 (patch) | |
| tree | c2af525ad235c2b5618d16c8d45ee6652cd8b241 /addons | |
| parent | 125cb1e7e5e1ac3328b0da283d0f86e332668db1 (diff) | |
| parent | c29b990d4c3db4915ee5f2fc0096ee95465b96d7 (diff) | |
Merge pull request #352 from pieh/conditional_onX
Add optional condition attribute to <onfoo condition="bar">blah</onfoo>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/Home.xml | 11 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/MyVideoNav.xml | 26 |
2 files changed, 4 insertions, 33 deletions
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 7d4a52be3a..8313540223 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -600,18 +600,11 @@ </item> <item id="2"> <label>3</label> - <onclick>ActivateWindow(Videos)</onclick> + <onclick condition="!Skin.HasSetting(HomeVideostoFiles)">ActivateWindow(Videos)</onclick> + <onclick condition="Skin.HasSetting(HomeVideostoFiles)">ActivateWindow(Videos,Files,Return)</onclick> <icon>special://skin/backgrounds/videos.jpg</icon> <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb> <visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible> - <visible>!Skin.HasSetting(HomeVideostoFiles)</visible> - </item> - <item id="2"> - <label>3</label> - <onclick>ActivateWindow(Videos,Files,Return)</onclick> - <icon>special://skin/backgrounds/videos.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb> - <visible>Skin.HasSetting(HomeVideostoFiles)</visible> </item> <item id="10"> <label>20342</label> diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index de024eb0a9..3a20cb6f7c 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -1,31 +1,9 @@ <window id="25"> - <defaultcontrol always="true">9999</defaultcontrol> + <defaultcontrol always="true">50</defaultcontrol> <allowoverlay>no</allowoverlay> <views>50,51,500,550,551,560,501,508,504,503,505,511</views> + <onload condition="Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)">XBMC.RunScript(script.tvtunes,backend=True&loop=False)</onload> <controls> - <control type="button" id="9999"> - <description>TvTunes trigger</description> - <posx>-10</posx> - <posy>-10</posy> - <width>1</width> - <height>1</height> - <onfocus>XBMC.RunScript(script.tvtunes,backend=True&loop=False)</onfocus> - <onfocus>SetFocus(50)</onfocus> - <texturenofocus>-</texturenofocus> - <texturefocus>-</texturefocus> - <visible>Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)</visible> - </control> - <control type="button" id="9999"> - <description>Don't trigger TvTunes if its not installed or active (Saves log errors)</description> - <posx>-10</posx> - <posy>-10</posy> - <width>1</width> - <height>1</height> - <onfocus>SetFocus(50)</onfocus> - <texturenofocus>-</texturenofocus> - <texturefocus>-</texturefocus> - <visible>!Skin.HasSetting(ActivateTvTunes) | !System.HasAddon(script.tvtunes)</visible> - </control> <include>CommonVideoBackground</include> <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> |