confluence cleanup

diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml
index 0c92121..5198420 100644 (file)
--- a/addons/skin.confluence/720p/FileManager.xml
+++ b/addons/skin.confluence/720p/FileManager.xml
@@ -421,7 +421,6 @@
                                <height>45</height>
                                <label>1036</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>back</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>
@@ -447,7 +446,6 @@
                                <height>45</height>
                                <label>31003</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>ActivateWindow(home)</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>
@@ -468,4 +466,4 @@
                </control>
                <include>Clock</include>
        </controls>
-</window>
\ No newline at end of file
+</window>

diff --git a/addons/skin.confluence/720p/Font.xml b/addons/skin.confluence/720p/Font.xml
index e092845..1a68932 100644 (file)
--- a/addons/skin.confluence/720p/Font.xml
+++ b/addons/skin.confluence/720p/Font.xml
@@ -75,11 +75,6 @@
                        <filename>Roboto-Bold.ttf</filename>
                        <size>35</size>
                </font>
-               <font>
-                       <name>font45caps_title</name>
-                       <filename>Roboto-Bold.ttf</filename>
-                       <size>45</size>
-               </font>
 
                <font>
                        <name>font_MainMenu</name>
@@ -168,11 +163,6 @@
                        <filename>Roboto-Bold.ttf</filename>
                        <size>35</size>
                </font>
-               <font>
-                       <name>font45caps_title</name>
-                       <filename>Roboto-Bold.ttf</filename>
-                       <size>45</size>
-               </font>
 
                <font>
                        <name>font_MainMenu</name>
@@ -268,12 +258,6 @@
                        <size>33</size>
                        <style>bold</style>
                </font>
-               <font>
-                       <name>font45caps_title</name>
-                       <filename>arial.ttf</filename>
-                       <size>43</size>
-                       <style>bold</style>
-               </font>
 
                <font>
                        <name>font_MainMenu</name>
@@ -288,4 +272,4 @@
                        <style>bold</style>
                </font>
        </fontset>
-</fonts>
\ No newline at end of file
+</fonts>

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 3a44c14..f12c2fd 100644 (file)
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -495,8 +495,10 @@
                                <pulseonselect>false</pulseonselect>
                                <label>137</label>
                                <onclick>RunScript(script.globalsearch)</onclick>
-                               <textureradiofocus>icon_search.png</textureradiofocus>
-                               <textureradionofocus>icon_search.png</textureradionofocus>
+                               <textureradioonfocus>icon_search.png</textureradioonfocus>
+                               <textureradioonnofocus>icon_search.png</textureradioonnofocus>
+                               <textureradioofffocus>icon_search.png</textureradioofffocus>
+                               <textureradiooffnofocus>icon_search.png</textureradiooffnofocus>
                                <onleft>607</onleft>
                                <onright>601</onright>
                                <onup>9003</onup>
@@ -708,8 +710,10 @@
                                <pulseonselect>false</pulseonselect>
                                <label>31008</label>
                                <onclick>fullscreen</onclick>
-                               <textureradiofocus>GoFullscreen.png</textureradiofocus>
-                               <textureradionofocus>GoFullscreen.png</textureradionofocus>
+                               <textureradioonfocus>GoFullscreen.png</textureradioonfocus>
+                               <textureradioonnofocus>GoFullscreen.png</textureradioonnofocus>
+                               <textureradioofffocus>GoFullscreen.png</textureradioofffocus>
+                               <textureradiooffnofocus>GoFullscreen.png</textureradiooffnofocus>
                                <onleft>606</onleft>
                                <onright>608</onright>
                                <onup>9003</onup>
@@ -1064,7 +1068,6 @@
                                <height>45</height>
                                <label>31003</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>ActivateWindow(ShutdownMenu)</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>
@@ -1090,7 +1093,6 @@
                                <height>45</height>
                                <label>1036</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>ActivateWindow(Favourites)</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>

diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml
index 3d01c47..59cdaad 100644 (file)
--- a/addons/skin.confluence/720p/LoginScreen.xml
+++ b/addons/skin.confluence/720p/LoginScreen.xml
@@ -190,7 +190,6 @@
                                        <height>45</height>
                                        <label>-</label>
                                        <font>-</font>
-                                       <aligny>-</aligny>
                                        <onclick>ActivateWindow(ShutdownMenu)</onclick>
                                        <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                        <texturenofocus border="5">floor_button.png</texturenofocus>

diff --git a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
index f2b90e4..6e45d86 100644 (file)
--- a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
+++ b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
@@ -7,7 +7,7 @@
                        <posy>0</posy>
                        <width>1280</width>
                        <height>720</height>
-                       <visibility>false</visibility>
+                       <visible>false</visible>
                </control>
                <control type="image" id="2">
                        <description>fullscreen image</description>
@@ -15,7 +15,7 @@
                        <posy>0</posy>
                        <width>1280</width>
                        <height>720</height>
-                       <visibility>false</visibility>
+                       <visible>false</visible>
                </control>
                <control type="group">
                        <visible>MusicPlayer.Offset(number).Exists + !IntegerGreaterThan(Player.TimeRemaining,20)</visible>

diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index e183647..e014948 100644 (file)
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <window>
        <defaultcontrol>-</defaultcontrol>
        <allowoverlay>no</allowoverlay>

diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml
index 49d31e0..fc847ed 100644 (file)
--- a/addons/skin.confluence/720p/SettingsProfile.xml
+++ b/addons/skin.confluence/720p/SettingsProfile.xml
@@ -158,9 +158,21 @@
                                <align>right</align> 
                                <aligny>center</aligny> 
                                <label>$INFO[System.ProfileAutoLogin]</label> 
-                               <scroll>Control.HasFocus(5)</scroll> 
+                               <visible>!Control.HasFocus(5) + !System.HasLoginScreen</visible>
+                       </control> 
+                       <control type="label"> 
+                               <posx>247</posx> 
+                               <posy>201</posy> 
+                               <width>200</width> 
+                               <height>25</height> 
+                               <font>font13caps</font> 
+                               <textcolor>grey2</textcolor> 
+                               <align>right</align> 
+                               <aligny>center</aligny> 
+                               <label>$INFO[System.ProfileAutoLogin]</label> 
+                               <scroll>true</scroll> 
                                <scrollspeed>30</scrollspeed> 
-                               <visible>!System.HasLoginScreen</visible> 
+                               <visible>Control.HasFocus(5) + !System.HasLoginScreen</visible>
                        </control> 
                        <control type="group">
                                <posx>20</posx>

diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml
index 079ef95..1cc784d 100644 (file)
--- a/addons/skin.confluence/720p/VideoFullScreen.xml
+++ b/addons/skin.confluence/720p/VideoFullScreen.xml
@@ -4,7 +4,7 @@
        <controls>
                <!-- media infos -->
                <control type="group" id="1">
-                       <visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(123) | Window.IsVisible(124) | Window.IsVisible(125) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(SliderDialog)]</visible>
+                       <visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(SliderDialog)]</visible>
                        <animation effect="fade" time="200">VisibleChange</animation>
                        <control type="image" id="1">
                                <posx>0</posx>

diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index c7c4075..969d4bc 100644 (file)
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -228,7 +228,6 @@
                                <width>55</width>
                                <height>55</height>
                                <label>31351</label>
-                               <altlabel>208</altlabel>
                                <font>-</font>
                                <texturefocus>OSDStopFO.png</texturefocus>
                                <texturenofocus>OSDStopNF.png</texturenofocus>
@@ -497,7 +496,6 @@
                        <posy>350r</posy>
                        <width>256</width>
                        <height>300</height>
-                       <align>bottom</align>
                        <itemgap>0</itemgap>
                        <onleft>400</onleft>
                        <onright>400</onright>
@@ -619,7 +617,6 @@
                        <posy>350r</posy>
                        <width>256</width>
                        <height>300</height>
-                       <align>bottom</align>
                        <itemgap>0</itemgap>
                        <onleft>500</onleft>
                        <onright>500</onright>
@@ -719,7 +716,6 @@
                        <posy>350r</posy>
                        <width>256</width>
                        <height>300</height>
-                       <align>bottom</align>
                        <itemgap>0</itemgap>
                        <onleft>550</onleft>
                        <onright>550</onright>

diff --git a/addons/skin.confluence/720p/ViewsMusicLibrary.xml b/addons/skin.confluence/720p/ViewsMusicLibrary.xml
index 4447c3e..bd9a5c7 100644 (file)
--- a/addons/skin.confluence/720p/ViewsMusicLibrary.xml
+++ b/addons/skin.confluence/720p/ViewsMusicLibrary.xml
@@ -426,7 +426,6 @@
                                        <align>left</align>
                                        <aligny>center</aligny>
                                        <label>$LOCALIZE[515]: $INFO[ListItem.Genre]</label>
-                                       <scroll>false</scroll>
                                </control>
                                <control type="label">
                                        <posx>0</posx>
@@ -440,7 +439,6 @@
                                        <align>left</align>
                                        <aligny>center</aligny>
                                        <label>$LOCALIZE[562]: $INFO[ListItem.Year]</label>
-                                       <scroll>false</scroll>
                                </control>
                                <control type="fadelabel">
                                        <posx>0</posx>

diff --git a/addons/skin.confluence/720p/defaults.xml b/addons/skin.confluence/720p/defaults.xml
index d0c5acb..b3bc87e 100644 (file)
--- a/addons/skin.confluence/720p/defaults.xml
+++ b/addons/skin.confluence/720p/defaults.xml
@@ -85,7 +85,6 @@
                <subtype>text</subtype>
                <textoffsetx>-5</textoffsetx>
                <textoffsety>0</textoffsety>
-               <aligny>-</aligny>
                <pulseonselect>no</pulseonselect>
        </default>
        <default type="spincontrolex">
@@ -116,8 +115,10 @@
                <height>42</height>
                <radiowidth>24</radiowidth>
                <radioheight>24</radioheight>
-               <textureradiofocus>radiobutton-focus.png</textureradiofocus>
-               <textureradionofocus>radiobutton-nofocus.png</textureradionofocus>
+               <textureradioonfocus>radiobutton-focus.png</textureradioonfocus>
+               <textureradioonnofocus>radiobutton-focus.png</textureradioonnofocus>
+               <textureradioofffocus>radiobutton-nofocus.png</textureradioofffocus>
+               <textureradiooffnofocus>radiobutton-nofocus.png</textureradiooffnofocus>
                <texturefocus border="5">button-focus.png</texturefocus>
                <texturenofocus border="5">button-nofocus.png</texturenofocus>
                <label>215</label>
@@ -193,4 +194,4 @@
                <aligny>center</aligny>
                <pulseonselect>no</pulseonselect>
        </default>
-</includes>
\ No newline at end of file
+</includes>

diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index c5be314..5ddd979 100644 (file)
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -175,7 +175,6 @@
                                <height>45</height>
                                <label>1036</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>back</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>
@@ -201,7 +200,6 @@
                                <height>45</height>
                                <label>31003</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>ActivateWindow(home)</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>
@@ -235,7 +233,6 @@
                                <height>45</height>
                                <label>31003</label>
                                <font>-</font>
-                               <aligny>-</aligny>
                                <onclick>ActivateWindow(PlayerControls)</onclick>
                                <texturefocus border="5">floor_buttonFO.png</texturefocus>
                                <texturenofocus border="5">floor_button.png</texturenofocus>
@@ -888,8 +885,10 @@
                        <include>ButtonCommonValues</include>
                        <label>31008</label>
                        <onclick>fullscreen</onclick>
-                       <textureradiofocus>GoFullscreen.png</textureradiofocus>
-                       <textureradionofocus>GoFullscreen.png</textureradionofocus>
+                       <textureradioonfocus>GoFullscreen.png</textureradioonfocus>
+                       <textureradioonnofocus>GoFullscreen.png</textureradioonnofocus>
+                       <textureradioofffocus>GoFullscreen.png</textureradioofffocus>
+                       <textureradiooffnofocus>GoFullscreen.png</textureradiooffnofocus>
                        <visible>Player.HasMedia</visible>
                </control>
                <control type="button" id="612">

diff --git a/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml b/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml
index 22463c8..e73326d 100644 (file)
--- a/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml
+++ b/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml
@@ -95,10 +95,6 @@
                                <font>font13</font>
                                <textcolor>white</textcolor>
                                <shadowcolor>black</shadowcolor>
-                               <onup>100</onup>
-                               <ondown>100</ondown>
-                               <onleft>101</onleft>
-                               <onright>101</onright>
                                <pagecontrol>101</pagecontrol>
                        </control>
                        <control type="spincontrol" id="101">
@@ -137,7 +133,6 @@
                                                <aligny>center</aligny>
                                                <align>center</align>
                                                <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
                                                <info>ListItem.Label</info>
                                        </control>
                                </itemlayout>
@@ -153,7 +148,6 @@
                                                <shadowcolor>black</shadowcolor>
                                                <textcolor>white</textcolor>
                                                <selectedcolor>selected</selectedcolor>
-                                               <align>left</align>
                                                <label>$INFO[ListItem.Label]</label>
                                                <visible>!Control.HasFocus(110)</visible>
                                        </control>
@@ -167,7 +161,6 @@
                                                <align>center</align>
                                                <shadowcolor>black</shadowcolor>
                                                <textcolor>selected</textcolor>
-                                               <align>left</align>
                                                <label fallback="--">$INFO[ListItem.Label]</label>
                                                <visible>Control.HasFocus(110)</visible>
                                        </control>
@@ -265,7 +258,6 @@
                        </control>
                        <control type="spincontrol" id="121">
                                <description>Next page button</description>
-                               <description>Next page button</description>
                                <posx>520</posx>
                                <posy>650</posy>
                                <subtype>page</subtype>

diff --git a/addons/skin.confluence/media/icon-video.png b/addons/skin.confluence/media/icon-video.png
deleted file mode 100644 (file)
index a59a3b5..0000000
Binary files a/addons/skin.confluence/media/icon-video.png and /dev/null differ

diff --git a/addons/skin.confluence/media/icon-weather.png b/addons/skin.confluence/media/icon-weather.png
deleted file mode 100644 (file)
index 18f61f5..0000000
Binary files a/addons/skin.confluence/media/icon-weather.png and /dev/null differ

diff --git a/addons/skin.confluence/media/icon_volume.png b/addons/skin.confluence/media/icon_volume.png
deleted file mode 100644 (file)
index 12d9001..0000000
Binary files a/addons/skin.confluence/media/icon_volume.png and /dev/null differ