diff options
| author | Philipp Te <philipptemminghoff@gmx.de> | 2015-03-06 18:50:37 +0100 |
|---|---|---|
| committer | Philipp Te <philipptemminghoff@gmx.de> | 2015-03-06 19:23:46 +0100 |
| commit | da46ecfbc49762a345710b5305a55a9f131bce05 (patch) | |
| tree | 60be8d2a4530042601f3a5daa19ba959c57bdbf9 /addons | |
| parent | af23c4e8f233a1070eaabf30b5fa25ccc31dab3d (diff) | |
[CONFLUENCE] - first conversion with XML tool (just alignments, whitespace removals etc)
Diffstat (limited to 'addons')
46 files changed, 279 insertions, 289 deletions
diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml index e25334fce0..86bdbc93b4 100644 --- a/addons/skin.confluence/720p/AddonBrowser.xml +++ b/addons/skin.confluence/720p/AddonBrowser.xml @@ -8,11 +8,15 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>AddonInfoListView1</include> <!-- view id = 550 --> - <include>AddonInfoThumbView1</include> <!-- view id = 551 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>AddonInfoListView1</include> + <!-- view id = 550 --> + <include>AddonInfoThumbView1</include> + <!-- view id = 551 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/DialogAddonSettings.xml b/addons/skin.confluence/720p/DialogAddonSettings.xml index 276dcb3bd0..0b734b05b5 100644 --- a/addons/skin.confluence/720p/DialogAddonSettings.xml +++ b/addons/skin.confluence/720p/DialogAddonSettings.xml @@ -173,7 +173,6 @@ <ondown>2</ondown> </control> </control> - <control type="button" id="13"> <description>Default Category Button</description> <height>40</height> diff --git a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml index 34713784b6..b24ad8cbe3 100644 --- a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml +++ b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <defaultcontrol/> + <defaultcontrol /> <animation effect="slide" start="0,-70" end="0,0" time="100">WindowOpen</animation> <animation effect="slide" start="0,0" end="0,-70" delay="400" time="100">WindowClose</animation> <controls> diff --git a/addons/skin.confluence/720p/DialogKeyboard.xml b/addons/skin.confluence/720p/DialogKeyboard.xml index 7ac6d0d245..04e7d874e9 100644 --- a/addons/skin.confluence/720p/DialogKeyboard.xml +++ b/addons/skin.confluence/720p/DialogKeyboard.xml @@ -179,7 +179,7 @@ <include>KeyboardButton</include> </control> </control> - <!-- 2nd row --> + <!-- 2nd row --> <control type="grouplist"> <orientation>horizontal</orientation> <top>50</top> @@ -274,7 +274,7 @@ <include>KeyboardButton</include> </control> </control> - <!-- 3rd row --> + <!-- 3rd row --> <control type="grouplist"> <top>100</top> <orientation>horizontal</orientation> @@ -369,7 +369,7 @@ <include>KeyboardButton</include> </control> </control> - <!-- 4th row --> + <!-- 4th row --> <control type="grouplist"> <top>150</top> <itemgap>0</itemgap> @@ -478,7 +478,7 @@ <include>KeyboardButton</include> </control> </control> - <!-- 5th row --> + <!-- 5th row --> <control type="grouplist"> <top>200</top> <itemgap>0</itemgap> @@ -557,4 +557,4 @@ </control> </control> </controls> -</window>
\ No newline at end of file +</window> diff --git a/addons/skin.confluence/720p/DialogMediaFilter.xml b/addons/skin.confluence/720p/DialogMediaFilter.xml index 569f61b7c4..7e803bce3c 100644 --- a/addons/skin.confluence/720p/DialogMediaFilter.xml +++ b/addons/skin.confluence/720p/DialogMediaFilter.xml @@ -54,7 +54,6 @@ <ondown>10</ondown> <visible>system.getbool(input.enablemouse)</visible> </control> - <control type="grouplist" id="5"> <description>control area</description> <left>30</left> @@ -83,7 +82,6 @@ <showonepage>false</showonepage> <orientation>vertical</orientation> </control> - <control type="button" id="7"> <description>Default Button</description> <left>0</left> @@ -143,7 +141,6 @@ <texturenofocus border="5">button-nofocus.png</texturenofocus> <texturefocus border="5">button-focus2.png</texturefocus> </control> - <control type="group" id="9001"> <left>190</left> <top>435</top> diff --git a/addons/skin.confluence/720p/DialogPVRChannelManager.xml b/addons/skin.confluence/720p/DialogPVRChannelManager.xml index b3130fe46f..e9f6034f69 100644 --- a/addons/skin.confluence/720p/DialogPVRChannelManager.xml +++ b/addons/skin.confluence/720p/DialogPVRChannelManager.xml @@ -8,7 +8,6 @@ <top>65</top> </coordinates> <include>dialogeffect</include> - <controls> <control type="image"> <left>0</left> @@ -504,7 +503,7 @@ <height>200</height> <aspectratio>keep</aspectratio> <texture background="true">$INFO[Container(20).ListItem.Icon]</texture> - </control> + </control> </control> <control type="label"> <description>Page Count Label</description> diff --git a/addons/skin.confluence/720p/DialogPVRGroupManager.xml b/addons/skin.confluence/720p/DialogPVRGroupManager.xml index 818a2f2256..8f4601f6c5 100644 --- a/addons/skin.confluence/720p/DialogPVRGroupManager.xml +++ b/addons/skin.confluence/720p/DialogPVRGroupManager.xml @@ -480,7 +480,6 @@ </control> </control> <include>Clock</include> - <control type="label" id="20"> <description>Fake Label used to pass on name label</description> <visible>false</visible> diff --git a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml index a0951d5d1b..91f20b77c3 100644 --- a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml +++ b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml @@ -263,7 +263,7 @@ <align>right</align> <aligny>center</aligny> <label>([COLOR=blue]$INFO[Container(11).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(11).CurrentPage]/$INFO[Container(11).NumPages][/COLOR])</label> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> </control> </control> </controls> diff --git a/addons/skin.confluence/720p/DialogPeripheralManager.xml b/addons/skin.confluence/720p/DialogPeripheralManager.xml index 295c57dbe9..a2b7d5ac44 100644 --- a/addons/skin.confluence/720p/DialogPeripheralManager.xml +++ b/addons/skin.confluence/720p/DialogPeripheralManager.xml @@ -67,7 +67,6 @@ <ondown>10</ondown> <visible>system.getbool(input.enablemouse)</visible> </control> - <control type="list" id="20"> <left>20</left> <top>65</top> @@ -182,7 +181,6 @@ </control> </focusedlayout> </control> - <control type="scrollbar" id="61"> <left>570</left> <top>65</top> diff --git a/addons/skin.confluence/720p/DialogPeripheralSettings.xml b/addons/skin.confluence/720p/DialogPeripheralSettings.xml index ba26a08c8b..9d5c41f039 100644 --- a/addons/skin.confluence/720p/DialogPeripheralSettings.xml +++ b/addons/skin.confluence/720p/DialogPeripheralSettings.xml @@ -131,7 +131,6 @@ <height>2</height> <texture>separator2.png</texture> </control> - <control type="group" id="9000"> <left>40</left> <top>505</top> diff --git a/addons/skin.confluence/720p/DialogSeekBar.xml b/addons/skin.confluence/720p/DialogSeekBar.xml index 694f749239..357de03782 100644 --- a/addons/skin.confluence/720p/DialogSeekBar.xml +++ b/addons/skin.confluence/720p/DialogSeekBar.xml @@ -98,7 +98,6 @@ <texture>OSDPlay.png</texture> <visible>Player.Playing</visible> </control> - <control type="image"> <left>28</left> <top>4</top> @@ -139,7 +138,6 @@ <texture>OSD32x.png</texture> <visible>Player.Rewinding32x</visible> </control> - <control type="image"> <left>34</left> <top>4</top> diff --git a/addons/skin.confluence/720p/DialogSubtitles.xml b/addons/skin.confluence/720p/DialogSubtitles.xml index e037679cd9..95185a827c 100644 --- a/addons/skin.confluence/720p/DialogSubtitles.xml +++ b/addons/skin.confluence/720p/DialogSubtitles.xml @@ -7,9 +7,9 @@ </coordinates> <controls> <control type="group" id="250"> - <animation effect="slide" start="0,0" end="900,0" time="500" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="0,0" end="900,0" time="500" tween="quadratic" easing="out">WindowClose</animation> <animation type="Conditional" condition="Control.HasFocus(150) | Control.HasFocus(160)" reversible="true"> - <effect type="slide" end="-250,0" time="400"/> + <effect type="slide" end="-250,0" time="400" /> </animation> <control type="button" id="8999"> <description>Fake button for mouse control</description> @@ -326,7 +326,7 @@ <width>720</width> <height>4</height> <texture>separator.png</texture> - <animation effect="rotate" start="0" end="90" center="auto" time="0" condition="true">Conditional</animation> + <animation effect="rotate" start="0" end="90" center="auto" time="0" condition="true">Conditional</animation> </control> <control type="label"> <left>905</left> diff --git a/addons/skin.confluence/720p/FileBrowser.xml b/addons/skin.confluence/720p/FileBrowser.xml index 9ff1eaac0a..ef75cdf21d 100644 --- a/addons/skin.confluence/720p/FileBrowser.xml +++ b/addons/skin.confluence/720p/FileBrowser.xml @@ -131,23 +131,23 @@ <height>221</height> <texture border="5">button-nofocus.png</texture> </control> - <control type="image"> - <left>690</left> - <top>405</top> - <width>211</width> - <height>211</height> - <aspectratio>keep</aspectratio> - <texture background="true">$INFO[ListItem.Icon]</texture> - <visible>!SubString(Control.GetLabel(416),*)</visible> - </control> - <control type="image"> - <left>250</left> - <top>465</top> - <width>410</width> - <height>200</height> - <aspectratio>keep</aspectratio> - <texture background="true" flipx="true">$INFO[ListItem.Icon]</texture> - <visible>SubString(Control.GetLabel(416),*)</visible> + <control type="image"> + <left>690</left> + <top>405</top> + <width>211</width> + <height>211</height> + <aspectratio>keep</aspectratio> + <texture background="true">$INFO[ListItem.Icon]</texture> + <visible>!SubString(Control.GetLabel(416),*)</visible> + </control> + <control type="image"> + <left>250</left> + <top>465</top> + <width>410</width> + <height>200</height> + <aspectratio>keep</aspectratio> + <texture background="true" flipx="true">$INFO[ListItem.Icon]</texture> + <visible>SubString(Control.GetLabel(416),*)</visible> </control> <control type="panel" id="450"> <left>20</left> @@ -303,7 +303,6 @@ </control> </focusedlayout> </control> - <control type="scrollbar" id="60"> <left>640</left> <top>90</top> diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml index b9a75cc641..ebd0c89827 100644 --- a/addons/skin.confluence/720p/FileManager.xml +++ b/addons/skin.confluence/720p/FileManager.xml @@ -39,12 +39,12 @@ <left>30</left> <top>40</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>0</left> @@ -213,12 +213,12 @@ <left>650</left> <top>40</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>0</left> diff --git a/addons/skin.confluence/720p/Font.xml b/addons/skin.confluence/720p/Font.xml index e8d0e91658..0b79f1e4dc 100644 --- a/addons/skin.confluence/720p/Font.xml +++ b/addons/skin.confluence/720p/Font.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <fonts> - <fontset id="Default" idloc="31390"> + <fontset id="Default" idloc="31390"> <!-- Normal Fonts --> <font> <name>font10</name> @@ -37,8 +37,6 @@ <filename>Roboto-Regular.ttf</filename> <size>18</size> </font> - - <!-- Title Fonts --> <font> <name>font10_title</name> @@ -75,7 +73,6 @@ <filename>Roboto-Bold.ttf</filename> <size>35</size> </font> - <font> <name>font_MainMenu</name> <filename>Roboto-Bold.ttf</filename> @@ -87,7 +84,6 @@ <size>80</size> </font> </fontset> - <fontset id="Massive" idloc="15110"> <!-- Normal Fonts --> <font> @@ -125,8 +121,6 @@ <filename>Roboto-Regular.ttf</filename> <size>25</size> </font> - - <!-- Title Fonts --> <font> <name>font10_title</name> @@ -174,8 +168,7 @@ <size>80</size> </font> </fontset> - - <fontset id="DefaultNoCaps" idloc="31391"> + <fontset id="DefaultNoCaps" idloc="31391"> <!-- Normal Fonts --> <font> <name>font10</name> @@ -212,8 +205,6 @@ <filename>Roboto-Regular.ttf</filename> <size>18</size> </font> - - <!-- Title Fonts --> <font> <name>font10_title</name> @@ -250,7 +241,6 @@ <filename>Roboto-Bold.ttf</filename> <size>35</size> </font> - <font> <name>font_MainMenu</name> <filename>Roboto-Bold.ttf</filename> @@ -262,8 +252,7 @@ <size>80</size> </font> </fontset> - - <fontset id="Arial" idloc="31392"> + <fontset id="Arial" idloc="31392"> <!-- Arial Font better for non English --> <font> <name>font10</name> @@ -300,8 +289,6 @@ <filename>arial.ttf</filename> <size>16</size> </font> - - <!-- Title Fonts --> <font> <name>font10_title</name> @@ -345,7 +332,6 @@ <size>33</size> <style>bold</style> </font> - <font> <name>font_MainMenu</name> <filename>arial.ttf</filename> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 3646412526..6bc0752a17 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol always="true">9000</defaultcontrol> - <allowoverlay>no</allowoverlay> + <allowoverlay>no</allowoverlay> <onunload condition="Container(9000).Hasfocus(10) | Container(9000).Hasfocus(11) | ControlGroup(9010).HasFocus | ControlGroup(9016).HasFocus | ControlGroup(9017).HasFocus">SetProperty(VideosDirectLink,True)</onunload> <onunload condition="Control.HasFocus(9000) + Container(9000).Hasfocus(2)">ClearProperty(VideosDirectLink)</onunload> <controls> @@ -459,12 +459,12 @@ <top>370</top> <animation effect="slide" start="0,0" end="365,0" time="300" condition="!Player.HasMedia">conditional</animation> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <description>Background End image</description> @@ -724,12 +724,12 @@ <control type="group"> <top>400</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="group" id="9001"> <left>0</left> @@ -741,63 +741,72 @@ <onleft>9010</onleft> <onright>9010</onright> <visible>Container(9000).HasFocus(2)</visible> - <include>HomeSubMenuVideos</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuVideos</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9016"> <include>HomeSubMenuCommonValues</include> <onleft>9016</onleft> <onright>9016</onright> <visible>Container(9000).HasFocus(10)</visible> - <include>HomeSubMenuMovies</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuMovies</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9017"> <include>HomeSubMenuCommonValues</include> <onleft>9017</onleft> <onright>9017</onright> <visible>Container(9000).HasFocus(11)</visible> - <include>HomeSubMenuTVShows</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuTVShows</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9011"> <include>HomeSubMenuCommonValues</include> <onleft>9011</onleft> <onright>9011</onright> <visible>Container(9000).HasFocus(3)</visible> - <include>HomeSubMenuMusic</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuMusic</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9012"> <include>HomeSubMenuCommonValues</include> <onleft>9012</onleft> <onright>9012</onright> <visible>Container(9000).HasFocus(5)</visible> - <include>HomeSubMenuSystem</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuSystem</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9013"> <include>HomeSubMenuCommonValues</include> <onleft>9013</onleft> <onright>9013</onright> <visible>Container(9000).HasFocus(6)</visible> - <include>HomeSubMenuPlayDisc</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuPlayDisc</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9014"> <include>HomeSubMenuCommonValues</include> <onleft>9014</onleft> <onright>9014</onright> <visible>Container(9000).HasFocus(12)</visible> - <include>HomeSubMenuTV</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuTV</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9015"> <include>HomeSubMenuCommonValues</include> <onleft>9013</onleft> <onright>9013</onright> <visible>Container(9000).HasFocus(4)</visible> - <include>HomeSubMenuPictures</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuPictures</include> + <!-- Buttons for the grouplist --> </control> <control type="grouplist" id="9016"> <include>HomeSubMenuCommonValues</include> <onleft>9014</onleft> <onright>9014</onright> <visible>Container(9000).HasFocus(13)</visible> - <include>HomeSubMenuRadio</include> <!-- Buttons for the grouplist --> + <include>HomeSubMenuRadio</include> + <!-- Buttons for the grouplist --> </control> </control> <control type="image"> @@ -1210,5 +1219,5 @@ <include>Window_OpenClose_Animation</include> <animation effect="slide" start="0,0" end="-40,0" time="100" condition="Window.IsVisible(Mutebug)">conditional</animation> </control> - </controls> + </controls> </window> diff --git a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml index 631afa5e9c..b6d58d66c0 100644 --- a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml +++ b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml @@ -140,7 +140,7 @@ <content> <item> <label>$INFO[Window.Property(LatestMovie.1.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.1.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon> <thumb>-</thumb> @@ -148,7 +148,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.2.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.2.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon> <thumb>-</thumb> @@ -156,7 +156,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.3.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.3.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon> <thumb>-</thumb> @@ -164,7 +164,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.4.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.4.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.4.Thumb)]</icon> <thumb>-</thumb> @@ -172,7 +172,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.5.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.5.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.5.Thumb)]</icon> <thumb>-</thumb> @@ -180,7 +180,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.6.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.6.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.6.Thumb)]</icon> <thumb>-</thumb> @@ -188,7 +188,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.7.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.7.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.7.Thumb)]</icon> <thumb>-</thumb> @@ -196,7 +196,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.8.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.8.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.8.Thumb)]</icon> <thumb>-</thumb> @@ -204,7 +204,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.9.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.9.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.9.Thumb)]</icon> <thumb>-</thumb> @@ -212,7 +212,7 @@ </item> <item> <label>$INFO[Window.Property(LatestMovie.10.Title)]</label> - <label2/> + <label2 /> <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.10.Path)])</onclick> <icon>$INFO[Window.Property(LatestMovie.10.Thumb)]</icon> <thumb>-</thumb> diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml index 6cbf0af51c..b3f1a28732 100644 --- a/addons/skin.confluence/720p/LoginScreen.xml +++ b/addons/skin.confluence/720p/LoginScreen.xml @@ -10,7 +10,7 @@ <controls> <include>CommonBackground</include> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <left>0</left> <top>100r</top> diff --git a/addons/skin.confluence/720p/MusicOverlay.xml b/addons/skin.confluence/720p/MusicOverlay.xml index 2907d534ea..4577767894 100644 --- a/addons/skin.confluence/720p/MusicOverlay.xml +++ b/addons/skin.confluence/720p/MusicOverlay.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>-</defaultcontrol> - <controls> - </controls> + <controls></controls> </window> diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml index 227dfded93..5ff03b1832 100644 --- a/addons/skin.confluence/720p/MyMusicNav.xml +++ b/addons/skin.confluence/720p/MyMusicNav.xml @@ -8,17 +8,27 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>ThumbnailView</include> <!-- view id = 500 --> - <include>MusicInfoListView</include> <!-- view id = 506 --> - <include>AlbumWrapView2_Fanart</include> <!-- view id = 509 --> - <include>MusicVideoInfoListView</include> <!-- view id = 511 --> - <include>ArtistMediaListView</include> <!-- view id = 512 --> - <include>AlbumInfoListView</include> <!-- view id = 513 --> - <include>AddonInfoListView1</include> <!-- view id = 550 --> - <include>AddonInfoThumbView1</include> <!-- view id = 551 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>ThumbnailView</include> + <!-- view id = 500 --> + <include>MusicInfoListView</include> + <!-- view id = 506 --> + <include>AlbumWrapView2_Fanart</include> + <!-- view id = 509 --> + <include>MusicVideoInfoListView</include> + <!-- view id = 511 --> + <include>ArtistMediaListView</include> + <!-- view id = 512 --> + <include>AlbumInfoListView</include> + <!-- view id = 513 --> + <include>AddonInfoListView1</include> + <!-- view id = 550 --> + <include>AddonInfoThumbView1</include> + <!-- view id = 551 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml index 8ce884e29f..4527be329e 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylist.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml @@ -8,10 +8,13 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>MusicInfoListView</include> <!-- view id = 506 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>MusicInfoListView</include> + <!-- view id = 506 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml index e707949402..f1dcc3d0f0 100644 --- a/addons/skin.confluence/720p/MyMusicSongs.xml +++ b/addons/skin.confluence/720p/MyMusicSongs.xml @@ -8,13 +8,19 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>ThumbnailView</include> <!-- view id = 500 --> - <include>MusicInfoListView</include> <!-- view id = 506 --> - <include>AddonInfoListView1</include> <!-- view id = 550 --> - <include>AddonInfoThumbView1</include> <!-- view id = 551 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>ThumbnailView</include> + <!-- view id = 500 --> + <include>MusicInfoListView</include> + <!-- view id = 506 --> + <include>AddonInfoListView1</include> + <!-- view id = 550 --> + <include>AddonInfoThumbView1</include> + <!-- view id = 551 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyPVRChannels.xml b/addons/skin.confluence/720p/MyPVRChannels.xml index e6ad85312f..4693832f49 100644 --- a/addons/skin.confluence/720p/MyPVRChannels.xml +++ b/addons/skin.confluence/720p/MyPVRChannels.xml @@ -15,7 +15,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="group"> <include>VisibleFadeEffect</include> <control type="image"> @@ -56,7 +56,7 @@ <top>80</top> <visible>Control.IsVisible(50)</visible> <include>VisibleFadeEffect</include> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <left>0</left> <top>0</top> @@ -104,7 +104,6 @@ <visible>Player.HasVideo</visible> </control> </control> - <control type="group"> <include>Window_OpenClose_Animation</include> <description>TV Channels group</description> @@ -413,11 +412,9 @@ <include>Window_OpenClose_Animation</include> </control> </control> - <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> - <control type="image"> <left>0</left> <top>0</top> @@ -428,7 +425,6 @@ <animation effect="fade" time="200">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> - <include>PVRSideBlade</include> <include>Clock</include> </controls> diff --git a/addons/skin.confluence/720p/MyPVRGuide.xml b/addons/skin.confluence/720p/MyPVRGuide.xml index ca2c171f5e..58b1090a1a 100644 --- a/addons/skin.confluence/720p/MyPVRGuide.xml +++ b/addons/skin.confluence/720p/MyPVRGuide.xml @@ -15,7 +15,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <left>0</left> <top>100r</top> @@ -26,7 +26,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="group"> <include>VisibleFadeEffect</include> <control type="image"> @@ -48,7 +48,6 @@ </control> <include>MainWindowMouseButtons</include> <include>PVRHeader</include> - <control type="group" id="50"> <include>Window_OpenClose_Animation</include> <include>PVRGuideViewTimeline</include> @@ -59,7 +58,6 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> - <control type="image"> <left>0</left> <top>0</top> @@ -70,7 +68,6 @@ <animation effect="fade" time="200">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> - <include>PVRSideBlade</include> <include>Clock</include> </controls> diff --git a/addons/skin.confluence/720p/MyPVRRecordings.xml b/addons/skin.confluence/720p/MyPVRRecordings.xml index 947609ad9a..00342b0644 100644 --- a/addons/skin.confluence/720p/MyPVRRecordings.xml +++ b/addons/skin.confluence/720p/MyPVRRecordings.xml @@ -15,7 +15,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="group"> <include>VisibleFadeEffect</include> <visible>Control.IsVisible(50)</visible> @@ -51,8 +51,6 @@ </control> <include>MainWindowMouseButtons</include> <include>PVRHeader</include> - - <control type="group"> <include>Window_OpenClose_Animation</include> <description>Recordings group</description> @@ -235,7 +233,7 @@ <align>right</align> <aligny>center</aligny> <label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[19163] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> </control> <control type="group"> <left>910</left> @@ -296,17 +294,13 @@ <left>10</left> <top>548</top> <width>290</width> - <height>12</height>> - <info>PVR.backenddiskspaceprogr</info> - <visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible> - </control> + <height>12</height>> + <info>PVR.backenddiskspaceprogr</info><visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible></control> </control> </control> - <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> - <control type="image"> <left>0</left> <top>0</top> @@ -317,7 +311,6 @@ <animation effect="fade" time="200">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> - <include>PVRSideBlade</include> <include>Clock</include> </controls> diff --git a/addons/skin.confluence/720p/MyPVRSearch.xml b/addons/skin.confluence/720p/MyPVRSearch.xml index 06862eb03d..bfe88dc23a 100644 --- a/addons/skin.confluence/720p/MyPVRSearch.xml +++ b/addons/skin.confluence/720p/MyPVRSearch.xml @@ -15,7 +15,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <left>0</left> <top>100r</top> @@ -26,7 +26,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="group"> <include>VisibleFadeEffect</include> <control type="image"> @@ -48,8 +48,6 @@ </control> <include>MainWindowMouseButtons</include> <include>PVRHeader</include> - - <control type="group"> <include>Window_OpenClose_Animation</include> <description>TV Search group</description> @@ -146,7 +144,7 @@ <textcolor>grey2</textcolor> <selectedcolor>selected</selectedcolor> <info>ListItem.Label</info> - </control> + </control> </control> <control type="group"> <visible>!IsEmpty(ListItem.Date)</visible> @@ -283,7 +281,7 @@ <textcolor>grey2</textcolor> <selectedcolor>selected</selectedcolor> <info>ListItem.Label</info> - </control> + </control> </control> <control type="group"> <visible>!IsEmpty(ListItem.Date)</visible> @@ -424,11 +422,9 @@ <label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label> </control> </control> - <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> - <control type="image"> <left>0</left> <top>0</top> @@ -439,7 +435,6 @@ <animation effect="fade" time="200">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> - <include>PVRSideBlade</include> <include>Clock</include> </controls> diff --git a/addons/skin.confluence/720p/MyPVRTimers.xml b/addons/skin.confluence/720p/MyPVRTimers.xml index 8e55c95922..79a6e352ff 100644 --- a/addons/skin.confluence/720p/MyPVRTimers.xml +++ b/addons/skin.confluence/720p/MyPVRTimers.xml @@ -15,7 +15,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <left>0</left> <top>100r</top> @@ -26,7 +26,7 @@ <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="group"> <include>VisibleFadeEffect</include> <control type="image"> @@ -48,8 +48,6 @@ </control> <include>MainWindowMouseButtons</include> <include>PVRHeader</include> - - <control type="group"> <include>Window_OpenClose_Animation</include> <description>Timers group</description> @@ -334,14 +332,12 @@ <align>right</align> <aligny>center</aligny> <label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[19040] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> </control> </control> - <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> - <control type="image"> <left>0</left> <top>0</top> @@ -352,7 +348,6 @@ <animation effect="fade" time="200">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> - <include>PVRSideBlade</include> <include>Clock</include> </controls> diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml index 025ef5a090..483ab1f7d6 100644 --- a/addons/skin.confluence/720p/MyPics.xml +++ b/addons/skin.confluence/720p/MyPics.xml @@ -16,18 +16,25 @@ <aspectratio>keep</aspectratio> <include>VisibleFadeEffect</include> <visible>Control.IsVisible(510)</visible> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> </control> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>ThumbnailView</include> <!-- view id = 500 --> - <include>PictureWrapView</include> <!-- view id = 510 --> - <include>PictureThumbView</include> <!-- view id = 514 --> - <include>AddonInfoListView1</include> <!-- view id = 550 --> - <include>AddonInfoThumbView1</include> <!-- view id = 551 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>ThumbnailView</include> + <!-- view id = 500 --> + <include>PictureWrapView</include> + <!-- view id = 510 --> + <include>PictureThumbView</include> + <!-- view id = 514 --> + <include>AddonInfoListView1</include> + <!-- view id = 550 --> + <include>AddonInfoThumbView1</include> + <!-- view id = 551 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml index 43255309a3..7bccf07fb8 100644 --- a/addons/skin.confluence/720p/MyPrograms.xml +++ b/addons/skin.confluence/720p/MyPrograms.xml @@ -8,12 +8,17 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>ThumbnailView</include> <!-- view id = 500 --> - <include>AddonInfoListView1</include> <!-- view id = 550 --> - <include>AddonInfoThumbView1</include> <!-- view id = 551 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>ThumbnailView</include> + <!-- view id = 500 --> + <include>AddonInfoListView1</include> + <!-- view id = 550 --> + <include>AddonInfoThumbView1</include> + <!-- view id = 551 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index aae5fb6369..8649202bf7 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -9,20 +9,33 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> - <include>ThumbnailView</include> <!-- view id = 500 --> - <include>PosterWrapView</include> <!-- view id = 501 --> - <include>PosterWrapView2_Fanart</include> <!-- view id = 508 --> - <include>MediaListView3</include> <!-- view id = 503 --> - <include>MediaListView2</include> <!-- view id = 504 --> - <include>MediaListView4</include> <!-- view id = 515 --> - <include>WideIconView</include> <!-- view id = 505 --> - <include>MusicVideoInfoListView</include> <!-- view id = 511 --> - <include>AddonInfoListView1</include> <!-- view id = 550 --> - <include>AddonInfoThumbView1</include> <!-- view id = 551 --> - <include>LiveTVView1</include> <!-- view id = 560 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> + <include>ThumbnailView</include> + <!-- view id = 500 --> + <include>PosterWrapView</include> + <!-- view id = 501 --> + <include>PosterWrapView2_Fanart</include> + <!-- view id = 508 --> + <include>MediaListView3</include> + <!-- view id = 503 --> + <include>MediaListView2</include> + <!-- view id = 504 --> + <include>MediaListView4</include> + <!-- view id = 515 --> + <include>WideIconView</include> + <!-- view id = 505 --> + <include>MusicVideoInfoListView</include> + <!-- view id = 511 --> + <include>AddonInfoListView1</include> + <!-- view id = 550 --> + <include>AddonInfoThumbView1</include> + <!-- view id = 551 --> + <include>LiveTVView1</include> + <!-- view id = 560 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml index 3524f4e794..8e0d80558b 100644 --- a/addons/skin.confluence/720p/MyVideoPlaylist.xml +++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml @@ -8,9 +8,11 @@ <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> - <include>Window_OpenClose_Animation</include> - <include>CommonRootView</include> <!-- view id = 50 --> - <include>FullWidthList</include> <!-- view id = 51 --> + <include>Window_OpenClose_Animation</include> + <include>CommonRootView</include> + <!-- view id = 50 --> + <include>FullWidthList</include> + <!-- view id = 51 --> </control> <include>CommonPageCount</include> <include>CommonNowPlaying</include> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index 62438553c8..d4fc5c6c55 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -52,12 +52,12 @@ </control> <control type="group"> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <include>VisibleFadeEffect</include> <control type="group"> diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index ac94c99739..b376141632 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -17,12 +17,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>5</left> diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml index 210a167c90..c284e8a893 100644 --- a/addons/skin.confluence/720p/SettingsCategory.xml +++ b/addons/skin.confluence/720p/SettingsCategory.xml @@ -16,12 +16,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>5</left> @@ -103,11 +103,11 @@ <left>20</left> <top>566</top> <height>25</height> - <width>230</width> - <label>31142</label> - <font>font13_title</font> - <textcolor>white</textcolor> - <align>right</align> + <width>230</width> + <label>31142</label> + <font>font13_title</font> + <textcolor>white</textcolor> + <align>right</align> <aligny>center</aligny> </control> <control type="image"> @@ -187,7 +187,6 @@ </control> </control> <include>BehindDialogFadeOut</include> - <control type="button" id="10"> <description>Default Category Button</description> <height>60</height> diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index db0735420d..17e3a7a831 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -17,12 +17,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>5</left> diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml index 27fdb9daa9..732aa5e676 100644 --- a/addons/skin.confluence/720p/SettingsSystemInfo.xml +++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml @@ -17,12 +17,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>5</left> diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml index fc69a5112f..049e3ad417 100644 --- a/addons/skin.confluence/720p/SkinSettings.xml +++ b/addons/skin.confluence/720p/SkinSettings.xml @@ -42,12 +42,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>5</left> @@ -721,8 +721,7 @@ <texturenofocus>MenuItemNF.png</texturenofocus> <enable>!IsEmpty(Skin.String(LyricScript_Path))</enable> <onclick>Addon.OpenSettings($INFO[Skin.String(LyricScript_Path)])</onclick> - </control> - + </control> <control type="label" id="410"> <width>750</width> <height>45</height> @@ -793,7 +792,6 @@ <texturenofocus>MenuItemNF.png</texturenofocus> <onclick>Skin.SetAddon(HomeVideosButton5,xbmc.addon.video,xbmc.addon.executable)</onclick> </control> - <control type="label" id="420"> <width>750</width> <height>45</height> @@ -864,7 +862,6 @@ <texturenofocus>MenuItemNF.png</texturenofocus> <onclick>Skin.SetAddon(HomeMusicButton5,xbmc.addon.audio,xbmc.addon.executable)</onclick> </control> - <control type="label" id="430"> <width>750</width> <height>45</height> @@ -935,7 +932,6 @@ <texturenofocus>MenuItemNF.png</texturenofocus> <onclick>Skin.SetAddon(HomePictureButton5,xbmc.addon.image,xbmc.addon.executable)</onclick> </control> - <control type="label" id="440"> <width>750</width> <height>45</height> diff --git a/addons/skin.confluence/720p/SmartPlaylistEditor.xml b/addons/skin.confluence/720p/SmartPlaylistEditor.xml index a18fc17d68..b9a14d1afe 100644 --- a/addons/skin.confluence/720p/SmartPlaylistEditor.xml +++ b/addons/skin.confluence/720p/SmartPlaylistEditor.xml @@ -217,7 +217,6 @@ <ondown>16</ondown> </control> </control> - <control type="label"> <description>Name Label</description> <left>30</left> @@ -242,7 +241,6 @@ <onup>10</onup> <ondown>17</ondown> </control> - <control type="spincontrolex" id="17"> <left>30</left> <top>440</top> @@ -257,7 +255,6 @@ <onup>16</onup> <ondown>18</ondown> </control> - <control type="spincontrolex" id="18"> <left>30</left> <top>485</top> @@ -272,7 +269,6 @@ <onup>17</onup> <ondown>23</ondown> </control> - <control type="togglebutton" id="19"> <left>590</left> <top>485</top> @@ -292,7 +288,6 @@ <onup>17</onup> <ondown>24</ondown> </control> - <control type="spincontrolex" id="23"> <left>30</left> <top>530</top> @@ -307,7 +302,6 @@ <onup>18</onup> <ondown>9001</ondown> </control> - <control type="radiobutton" id="24"> <left>590</left> <top>530</top> @@ -324,7 +318,6 @@ <onup>19</onup> <ondown>9001</ondown> </control> - <control type="group" id="9001"> <control type="button" id="20"> <description>Ok Button</description> diff --git a/addons/skin.confluence/720p/VideoOverlay.xml b/addons/skin.confluence/720p/VideoOverlay.xml index 2907d534ea..4577767894 100644 --- a/addons/skin.confluence/720p/VideoOverlay.xml +++ b/addons/skin.confluence/720p/VideoOverlay.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>-</defaultcontrol> - <controls> - </controls> + <controls></controls> </window> diff --git a/addons/skin.confluence/720p/ViewsFileMode.xml b/addons/skin.confluence/720p/ViewsFileMode.xml index 3a3edf4bad..53bda87853 100644 --- a/addons/skin.confluence/720p/ViewsFileMode.xml +++ b/addons/skin.confluence/720p/ViewsFileMode.xml @@ -5,7 +5,7 @@ <visible>Control.IsVisible(50)</visible> <include>VisibleFadeEffect</include> <control type="list" id="50"> - <left>70</left> + <left>70</left> <top>78</top> <width>690</width> <height>561</height> diff --git a/addons/skin.confluence/720p/ViewsMusicLibrary.xml b/addons/skin.confluence/720p/ViewsMusicLibrary.xml index e00ee6d136..e378b6acd2 100644 --- a/addons/skin.confluence/720p/ViewsMusicLibrary.xml +++ b/addons/skin.confluence/720p/ViewsMusicLibrary.xml @@ -262,7 +262,7 @@ <top>450</top> <control type="fixedlist" id="509"> <visible>Container.Content(Albums)</visible> - <hitrect x="0" y="-10" w="1280" h="190"/> + <hitrect x="0" y="-10" w="1280" h="190" /> <left>-80</left> <top>0</top> <width>1360</width> @@ -333,12 +333,12 @@ <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Overlay]</texture> <animation type="focus"> - <effect type="fade" start="0" end="100" time="200"/> - <effect type="slide" start="0,0" end="40,40" time="200"/> + <effect type="fade" start="0" end="100" time="200" /> + <effect type="slide" start="0,0" end="40,40" time="200" /> </animation> <animation type="unfocus"> - <effect type="fade" start="100" end="0" time="200"/> - <effect type="slide" end="0,0" start="40,40" time="200"/> + <effect type="fade" start="100" end="0" time="200" /> + <effect type="slide" end="0,0" start="40,40" time="200" /> </animation> </control> </focusedlayout> diff --git a/addons/skin.confluence/720p/ViewsPVRGuide.xml b/addons/skin.confluence/720p/ViewsPVRGuide.xml index 9130e64143..2873d0dd4e 100644 --- a/addons/skin.confluence/720p/ViewsPVRGuide.xml +++ b/addons/skin.confluence/720p/ViewsPVRGuide.xml @@ -31,7 +31,7 @@ <onright>101</onright> <onup>10</onup> <ondown>10</ondown> - <onback>101</onback> + <onback>101</onback> <rulerlayout height="35" width="40"> <control type="label" id="2"> <left>0</left> @@ -280,7 +280,6 @@ </control> </control> </include> - <!-- ID: 11 --> <include name="PVRGuideViewNow"> <control type="group"> @@ -659,7 +658,6 @@ </control> </control> </include> - <!-- ID: 12 --> <include name="PVRGuideViewNext"> <control type="group"> @@ -1038,7 +1036,6 @@ </control> </control> </include> - <!-- ID: 13 --> <include name="PVRGuideViewChannel"> <control type="group"> diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index d0227c7c14..9750289ddf 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -71,12 +71,12 @@ <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Overlay]</texture> <animation type="focus"> - <effect type="fade" start="0" end="100" time="200"/> - <effect type="slide" start="0,0" end="40,40" time="200"/> + <effect type="fade" start="0" end="100" time="200" /> + <effect type="slide" start="0,0" end="40,40" time="200" /> </animation> <animation type="unfocus"> - <effect type="fade" start="100" end="0" time="200"/> - <effect type="slide" end="0,0" start="40,40" time="200"/> + <effect type="fade" start="100" end="0" time="200" /> + <effect type="slide" end="0,0" start="40,40" time="200" /> </animation> </control> </focusedlayout> @@ -310,7 +310,7 @@ <top>460</top> <control type="fixedlist" id="508"> <visible>Container.Content(Movies) | Container.Content(TVShows) | Container.Content(Sets)</visible> - <hitrect x="0" y="-10" w="1280" h="190"/> + <hitrect x="0" y="-10" w="1280" h="190" /> <left>-20</left> <top>0</top> <width>1320</width> @@ -392,12 +392,12 @@ <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Overlay]</texture> <animation type="focus"> - <effect type="fade" start="0" end="100" time="200"/> - <effect type="slide" start="0,0" end="10,5" time="200"/> + <effect type="fade" start="0" end="100" time="200" /> + <effect type="slide" start="0,0" end="10,5" time="200" /> </animation> <animation type="unfocus"> - <effect type="fade" start="100" end="0" time="200"/> - <effect type="slide" end="0,0" start="10,5" time="200"/> + <effect type="fade" start="100" end="0" time="200" /> + <effect type="slide" end="0,0" start="10,5" time="200" /> </animation> </control> </focusedlayout> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 8cc7f5aae9..3db3d44943 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -1,20 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <includes> - <include file="defaults.xml"/> - <include file="ViewsVideoLibrary.xml"/> - <include file="ViewsMusicLibrary.xml"/> - <include file="ViewsFileMode.xml"/> - <include file="ViewsPictures.xml"/> - <include file="ViewsAddonBrowser.xml"/> - <include file="ViewsLiveTV.xml"/> - <include file="ViewsPVRGuide.xml"/> - <include file="ViewsWeather.xml"/> - <include file="IncludesCodecFlagging.xml"/> - <include file="IncludesHomeRecentlyAdded.xml"/> - <include file="IncludesHomeMenuItems.xml"/> - <include file="IncludesPVR.xml"/> - <include file="IncludesBackgroundBuilding.xml"/> - + <include file="defaults.xml" /> + <include file="ViewsVideoLibrary.xml" /> + <include file="ViewsMusicLibrary.xml" /> + <include file="ViewsFileMode.xml" /> + <include file="ViewsPictures.xml" /> + <include file="ViewsAddonBrowser.xml" /> + <include file="ViewsLiveTV.xml" /> + <include file="ViewsPVRGuide.xml" /> + <include file="ViewsWeather.xml" /> + <include file="IncludesCodecFlagging.xml" /> + <include file="IncludesHomeRecentlyAdded.xml" /> + <include file="IncludesHomeMenuItems.xml" /> + <include file="IncludesPVR.xml" /> + <include file="IncludesBackgroundBuilding.xml" /> <constant name="FanartCrossfadeTime">500</constant> <constant name="IconCrossfadeTime">400</constant> <variable name="ResolutionOverlayVar"> @@ -69,7 +68,6 @@ <value condition="Player.Forwarding">$LOCALIZE[31044]</value> <value condition="Player.Rewinding">$LOCALIZE[31045]</value> </variable> - <include name="BehindDialogFadeOut"> <control type="image"> <left>0</left> @@ -981,14 +979,14 @@ <include name="HomeAddonsCommonLayout"> <include>Window_OpenClose_Animation</include> <animation type="Visible"> - <effect type="slide" start="0,30" end="0,0" delay="200" easing="out" tween="quadratic" time="200"/> - <effect type="fade" start="0" end="100" delay="200" time="200"/> + <effect type="slide" start="0,30" end="0,0" delay="200" easing="out" tween="quadratic" time="200" /> + <effect type="fade" start="0" end="100" delay="200" time="200" /> </animation> <animation type="Hidden"> - <effect type="zoom" start="100" end="70" center="auto" easing="in" tween="quadratic" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="70" center="auto" easing="in" tween="quadratic" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> - <hitrect x="0" y="530" w="1280" h="120"/> + <hitrect x="0" y="530" w="1280" h="120" /> <left>0</left> <top>190r</top> <width>1280</width> diff --git a/addons/skin.confluence/720p/script-NextAired-TVGuide.xml b/addons/skin.confluence/720p/script-NextAired-TVGuide.xml index ab1c87a759..98ae1315fc 100644 --- a/addons/skin.confluence/720p/script-NextAired-TVGuide.xml +++ b/addons/skin.confluence/720p/script-NextAired-TVGuide.xml @@ -134,7 +134,7 @@ </control> </control> <control type="grouplist" id="2000"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <left>40</left> <top>60</top> <width>1200</width> @@ -445,7 +445,7 @@ </control> </control> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <description>left Arrow</description> <left>10</left> diff --git a/addons/skin.confluence/720p/script-globalsearch-main.xml b/addons/skin.confluence/720p/script-globalsearch-main.xml index 31a0b67dcc..40449993d1 100644 --- a/addons/skin.confluence/720p/script-globalsearch-main.xml +++ b/addons/skin.confluence/720p/script-globalsearch-main.xml @@ -118,12 +118,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <control type="image"> <left>5</left> @@ -378,12 +378,12 @@ </control> <control type="group"> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300"/> - <effect type="fade" start="0" end="100" time="300"/> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> + <effect type="fade" start="0" end="100" time="300" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300"/> - <effect type="fade" start="100" end="0" time="300"/> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> + <effect type="fade" start="100" end="0" time="300" /> </animation> <left>380</left> <top>90</top> |