diff options
| author | ronie <ronie@poedel.net> | 2014-05-23 22:19:52 +0200 |
|---|---|---|
| committer | ronie <ronie@poedel.net> | 2014-05-23 22:19:52 +0200 |
| commit | fccc61a5dba4204689413a0b62f0530f340b4262 (patch) | |
| tree | e02f77e58dd83a80824620f13c6024829a5312b6 /addons | |
| parent | 0d8c702fca19399369ee8a2d42d4dabb5fd4ed8a (diff) | |
| parent | 6294b18afd48ba9196f8d8aac2f31e3a3de7388c (diff) | |
Merge pull request #4772 from ronie/confluence-4613
[Confluence] adjustments needed by PR4613
Diffstat (limited to 'addons')
32 files changed, 235 insertions, 150 deletions
diff --git a/addons/skin.confluence/720p/DialogAlbumInfo.xml b/addons/skin.confluence/720p/DialogAlbumInfo.xml index 64090e2f3c..26be7fb47e 100644 --- a/addons/skin.confluence/720p/DialogAlbumInfo.xml +++ b/addons/skin.confluence/720p/DialogAlbumInfo.xml @@ -135,9 +135,9 @@ <scrolltime>200</scrolltime> <itemlayout height="30"> <control type="label"> - <left>140</left> + <left>0</left> <top>0</top> - <width>160</width> + <width>140</width> <height>30</height> <font>font13</font> <align>right</align> @@ -170,9 +170,9 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>140</left> + <left>0</left> <top>0</top> - <width>160</width> + <width>140</width> <height>30</height> <font>font13</font> <align>right</align> @@ -288,7 +288,7 @@ <scrolltime>200</scrolltime> <itemlayout height="30"> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -323,7 +323,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -524,7 +524,7 @@ <label>([COLOR=selected][B]$INFO[ListItem.TrackNumber][/B][/COLOR]) - $INFO[ListItem.Label]</label> </control> <control type="label"> - <left>420</left> + <left>220</left> <top>0</top> <width>200</width> <height>40</height> @@ -564,7 +564,7 @@ <label>([COLOR=selected][B]$INFO[ListItem.TrackNumber][/B][/COLOR]) - $INFO[ListItem.Label]</label> </control> <control type="label"> - <left>420</left> + <left>220</left> <top>0</top> <width>200</width> <height>40</height> diff --git a/addons/skin.confluence/720p/DialogPVRChannelManager.xml b/addons/skin.confluence/720p/DialogPVRChannelManager.xml index c9b27c7440..b103b5922f 100644 --- a/addons/skin.confluence/720p/DialogPVRChannelManager.xml +++ b/addons/skin.confluence/720p/DialogPVRChannelManager.xml @@ -120,6 +120,7 @@ <width>30</width> <height>30</height> <texture>$INFO[ListItem.Property(Icon)]</texture> + <aspectratio>keep</aspectratio> <visible>ListItem.Property(ActiveChannel)</visible> </control> <control type="image"> @@ -129,6 +130,7 @@ <height>30</height> <colordiffuse>77FFFFFF</colordiffuse> <texture>$INFO[ListItem.Property(Icon)]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.Property(ActiveChannel)</visible> </control> <control type="label"> @@ -181,6 +183,7 @@ <width>30</width> <height>30</height> <texture>$INFO[ListItem.Property(Icon)]</texture> + <aspectratio>keep</aspectratio> <visible>ListItem.Property(ActiveChannel)</visible> </control> <control type="image"> @@ -190,6 +193,7 @@ <height>30</height> <colordiffuse>77FFFFFF</colordiffuse> <texture>$INFO[ListItem.Property(Icon)]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.Property(ActiveChannel)</visible> </control> <control type="label"> diff --git a/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml b/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml index 3bed1aaa9a..e21eda5968 100644 --- a/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml +++ b/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml @@ -202,6 +202,7 @@ <width>40</width> <height>40</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> </itemlayout> <focusedlayout height="70" width="410"> @@ -321,6 +322,7 @@ <width>40</width> <height>40</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> </focusedlayout> </control> diff --git a/addons/skin.confluence/720p/DialogPVRGroupManager.xml b/addons/skin.confluence/720p/DialogPVRGroupManager.xml index fa7749f93f..5ff1bba3bd 100644 --- a/addons/skin.confluence/720p/DialogPVRGroupManager.xml +++ b/addons/skin.confluence/720p/DialogPVRGroupManager.xml @@ -214,6 +214,7 @@ <left>5</left> <top>4</top> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>40</left> @@ -251,6 +252,7 @@ <left>5</left> <top>4</top> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>40</left> @@ -331,6 +333,7 @@ <left>5</left> <top>4</top> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>40</left> @@ -368,6 +371,7 @@ <left>5</left> <top>4</top> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>40</left> diff --git a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml index f46126ac21..c5d6c3197a 100644 --- a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml +++ b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml @@ -117,7 +117,7 @@ <visible>ListItem.HasTimer + !ListItem.IsRecording</visible> </control> <control type="label"> - <left>400</left> + <left>100</left> <top>0</top> <width>300</width> <height>30</height> @@ -130,7 +130,7 @@ <visible>![ListItem.IsRecording | ListItem.HasTimer]</visible> </control> <control type="label"> - <left>400</left> + <left>150</left> <top>0</top> <width>250</width> <height>30</height> @@ -191,7 +191,7 @@ <visible>ListItem.HasTimer + !ListItem.IsRecording</visible> </control> <control type="label"> - <left>400</left> + <left>100</left> <top>0</top> <width>300</width> <height>30</height> @@ -204,7 +204,7 @@ <visible>![ListItem.IsRecording | ListItem.HasTimer]</visible> </control> <control type="label"> - <left>400</left> + <left>150</left> <top>0</top> <width>250</width> <height>30</height> diff --git a/addons/skin.confluence/720p/DialogPictureInfo.xml b/addons/skin.confluence/720p/DialogPictureInfo.xml index 91b7b28082..d800170675 100644 --- a/addons/skin.confluence/720p/DialogPictureInfo.xml +++ b/addons/skin.confluence/720p/DialogPictureInfo.xml @@ -114,7 +114,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>710</left> + <left>60</left> <top>0</top> <width>650</width> <height>40</height> @@ -158,7 +158,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>710</left> + <left>60</left> <top>0</top> <width>650</width> <height>40</height> diff --git a/addons/skin.confluence/720p/DialogSelect.xml b/addons/skin.confluence/720p/DialogSelect.xml index 3038aa0fde..2d6930207e 100644 --- a/addons/skin.confluence/720p/DialogSelect.xml +++ b/addons/skin.confluence/720p/DialogSelect.xml @@ -186,6 +186,7 @@ <width>80</width> <height>76</height> <texture>$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> <bordertexture border="3">black-back2.png</bordertexture> <bordersize>2</bordersize> </control> @@ -238,6 +239,7 @@ <width>80</width> <height>76</height> <texture>$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> <bordertexture border="3">black-back2.png</bordertexture> <bordersize>2</bordersize> </control> diff --git a/addons/skin.confluence/720p/DialogSubtitles.xml b/addons/skin.confluence/720p/DialogSubtitles.xml index 2124b24196..e037679cd9 100644 --- a/addons/skin.confluence/720p/DialogSubtitles.xml +++ b/addons/skin.confluence/720p/DialogSubtitles.xml @@ -138,6 +138,7 @@ <width>26</width> <height>26</height> <texture>Subtitles/flags/$INFO[ListItem.Thumb].png</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>40</left> @@ -185,6 +186,7 @@ <width>90</width> <height>17</height> <texture>LeftRating/rating$INFO[ListItem.ActualIcon].png</texture> + <aspectratio>keep</aspectratio> </control> </itemlayout> <focusedlayout width="800" height="36"> @@ -209,6 +211,7 @@ <width>26</width> <height>26</height> <texture>Subtitles/flags/$INFO[ListItem.Thumb].png</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>40</left> @@ -256,6 +259,7 @@ <width>90</width> <height>17</height> <texture>LeftRating/rating$INFO[ListItem.ActualIcon].png</texture> + <aspectratio>keep</aspectratio> </control> </focusedlayout> </control> diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml index dcae6c7b5f..12fd0f4d47 100644 --- a/addons/skin.confluence/720p/DialogVideoInfo.xml +++ b/addons/skin.confluence/720p/DialogVideoInfo.xml @@ -190,7 +190,7 @@ <scrolltime>200</scrolltime> <itemlayout height="30"> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -225,7 +225,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -370,7 +370,7 @@ <scrolltime>200</scrolltime> <itemlayout height="30"> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -405,7 +405,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -515,7 +515,7 @@ <scrolltime>200</scrolltime> <itemlayout height="30"> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -550,7 +550,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -680,7 +680,7 @@ <scrolltime>200</scrolltime> <itemlayout height="30"> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> @@ -715,7 +715,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>165</left> + <left>5</left> <top>0</top> <width>160</width> <height>30</height> diff --git a/addons/skin.confluence/720p/FileBrowser.xml b/addons/skin.confluence/720p/FileBrowser.xml index 7d6445a55d..9ff1eaac0a 100644 --- a/addons/skin.confluence/720p/FileBrowser.xml +++ b/addons/skin.confluence/720p/FileBrowser.xml @@ -174,6 +174,7 @@ <width>38</width> <height>38</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>55</left> @@ -210,6 +211,7 @@ <width>38</width> <height>38</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>55</left> @@ -249,6 +251,7 @@ <width>38</width> <height>38</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>55</left> @@ -285,6 +288,7 @@ <width>38</width> <height>38</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>55</left> diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml index d865c4b680..b9a75cc641 100644 --- a/addons/skin.confluence/720p/FileManager.xml +++ b/addons/skin.confluence/720p/FileManager.xml @@ -145,7 +145,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>530</left> + <left>330</left> <top>5</top> <width>200</width> <height>24</height> @@ -195,7 +195,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>530</left> + <left>330</left> <top>5</top> <width>200</width> <height>24</height> @@ -319,7 +319,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>530</left> + <left>330</left> <top>5</top> <width>200</width> <height>24</height> @@ -369,7 +369,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>530</left> + <left>330</left> <top>5</top> <width>200</width> <height>24</height> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index c3af1e4795..6608bf0204 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -838,7 +838,7 @@ <texture>HomeSeperator.png</texture> </control> <control type="label"> - <left>150</left> + <left>5</left> <top>0</top> <width>290</width> <height>60</height> @@ -865,7 +865,7 @@ <texture>HomeSeperator.png</texture> </control> <control type="label"> - <left>150</left> + <left>5</left> <top>0</top> <width>290</width> <height>60</height> @@ -876,7 +876,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>150</left> + <left>5</left> <top>0</top> <width>290</width> <height>60</height> diff --git a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml index 92674d3577..631afa5e9c 100644 --- a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml +++ b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml @@ -61,11 +61,12 @@ <width>160</width> <height>170</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> <bordertexture border="5">button-nofocus.png</bordertexture> <bordersize>5</bordersize> </control> <control type="label"> - <left>90</left> + <left>15</left> <top>185</top> <width>150</width> <height>20</height> @@ -93,6 +94,7 @@ <width>160</width> <height>170</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> <bordertexture border="5">folder-focus.png</bordertexture> <bordersize>5</bordersize> <visible>Control.HasFocus(8000)</visible> @@ -103,12 +105,13 @@ <width>160</width> <height>170</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> <bordertexture border="5">button-nofocus.png</bordertexture> <bordersize>5</bordersize> <visible>!Control.HasFocus(8000)</visible> </control> <control type="label"> - <left>90</left> + <left>15</left> <top>185</top> <width>150</width> <height>20</height> @@ -121,7 +124,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>90</left> + <left>15</left> <top>185</top> <width>150</width> <height>20</height> @@ -300,7 +303,7 @@ <bordersize>5</bordersize> </control> <control type="label"> - <left>120</left> + <left>20</left> <top>168</top> <width>200</width> <height>20</height> @@ -313,7 +316,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="label"> - <left>120</left> + <left>20</left> <top>185</top> <width>200</width> <height>20</height> @@ -358,7 +361,7 @@ <visible>!Control.HasFocus(8001)</visible> </control> <control type="label"> - <left>120</left> + <left>20</left> <top>168</top> <width>200</width> <height>20</height> @@ -371,7 +374,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="label"> - <left>120</left> + <left>20</left> <top>185</top> <width>200</width> <height>20</height> @@ -384,7 +387,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>120</left> + <left>20</left> <top>185</top> <width>200</width> <height>20</height> @@ -561,7 +564,7 @@ <bordersize>5</bordersize> </control> <control type="label"> - <left>100</left> + <left>10</left> <top>170</top> <width>180</width> <height>20</height> @@ -574,7 +577,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="label"> - <left>100</left> + <left>10</left> <top>190</top> <width>180</width> <height>20</height> @@ -619,7 +622,7 @@ <visible>!Control.HasFocus(8002)</visible> </control> <control type="label"> - <left>100</left> + <left>10</left> <top>170</top> <width>180</width> <height>20</height> @@ -632,7 +635,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="label"> - <left>100</left> + <left>10</left> <top>190</top> <width>180</width> <height>20</height> @@ -645,7 +648,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>100</left> + <left>10</left> <top>190</top> <width>180</width> <height>20</height> diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml index 9ced61e729..8fc3d11508 100644 --- a/addons/skin.confluence/720p/LoginScreen.xml +++ b/addons/skin.confluence/720p/LoginScreen.xml @@ -81,6 +81,7 @@ <width>80</width> <height>75</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>110</left> @@ -132,6 +133,7 @@ <width>80</width> <height>75</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>110</left> diff --git a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml index 76fd8d55dd..0118d9bc7b 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml @@ -207,7 +207,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>395</left> + <left>35</left> <top>0</top> <width>360</width> <height>30</height> @@ -242,7 +242,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>395</left> + <left>35</left> <top>0</top> <width>360</width> <height>30</height> @@ -347,7 +347,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>395</left> + <left>35</left> <top>0</top> <width>360</width> <height>30</height> @@ -382,7 +382,7 @@ <info>ListItem.Label</info> </control> <control type="label"> - <left>395</left> + <left>35</left> <top>0</top> <width>360</width> <height>30</height> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index 6016217739..663c73b63b 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -429,7 +429,7 @@ <texture border="0,5,0,5">MenuItemNF.png</texture> </control> <control type="label"> - <left>300</left> + <left>150</left> <top>5</top> <width>300</width> <height>25</height> @@ -505,7 +505,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>300</left> + <left>150</left> <top>5</top> <width>300</width> <height>25</height> diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index 58119606fa..72a5ad0c2d 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -84,9 +84,9 @@ <texture border="5">MenuItemNF.png</texture> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>0</top> - <width>380</width> + <width>240</width> <height>55</height> <font>font24_title</font> <textcolor>grey3</textcolor> @@ -104,9 +104,9 @@ <texture border="5">MenuItemFO.png</texture> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>0</top> - <width>380</width> + <width>240</width> <height>55</height> <font>font24_title</font> <textcolor>white</textcolor> diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index cfad43282f..de808783f1 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -84,9 +84,9 @@ <texture border="5">MenuItemNF.png</texture> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>0</top> - <width>380</width> + <width>240</width> <height>55</height> <font>font24_title</font> <textcolor>grey3</textcolor> @@ -105,9 +105,9 @@ <animation effect="fade" start="100" end="30" time="100" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>0</top> - <width>380</width> + <width>240</width> <height>55</height> <font>font24_title</font> <textcolor>white</textcolor> @@ -317,9 +317,10 @@ <bordertexture border="5">button-nofocus.png</bordertexture> <bordersize>5</bordersize> <texture fallback="unknown-user.png">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> - <left>94</left> + <left>6</left> <top>145</top> <width>178</width> <height>25</height> @@ -340,9 +341,10 @@ <bordertexture border="5">folder-focus.png</bordertexture> <bordersize>5</bordersize> <texture fallback="unknown-user.png">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> - <left>94</left> + <left>6</left> <top>145</top> <width>178</width> <height>25</height> diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml index 36017d2a85..fc69a5112f 100644 --- a/addons/skin.confluence/720p/SkinSettings.xml +++ b/addons/skin.confluence/720p/SkinSettings.xml @@ -109,9 +109,9 @@ <texture border="5">MenuItemNF.png</texture> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>15</top> - <width>380</width> + <width>240</width> <height>25</height> <font>font24_title</font> <textcolor>grey3</textcolor> @@ -120,9 +120,9 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>42</top> - <width>870</width> + <width>240</width> <height>25</height> <font>font13</font> <textcolor>grey2</textcolor> @@ -141,9 +141,9 @@ <animation effect="fade" start="100" end="30" time="100" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>15</top> - <width>380</width> + <width>240</width> <height>25</height> <font>font24_title</font> <textcolor>white</textcolor> @@ -152,9 +152,9 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>42</top> - <width>870</width> + <width>240</width> <height>25</height> <font>font13</font> <textcolor>grey2</textcolor> diff --git a/addons/skin.confluence/720p/VideoOSDBookmarks.xml b/addons/skin.confluence/720p/VideoOSDBookmarks.xml index bad341422e..fddb82c7d8 100644 --- a/addons/skin.confluence/720p/VideoOSDBookmarks.xml +++ b/addons/skin.confluence/720p/VideoOSDBookmarks.xml @@ -97,9 +97,9 @@ <info>ListItem.Icon</info> </control> <control type="label"> - <left>112</left> + <left>7</left> <top>185</top> - <width>225</width> + <width>226</width> <height>15</height> <font>font12</font> <selectedcolor>selected</selectedcolor> @@ -125,9 +125,9 @@ <info>ListItem.Icon</info> </control> <control type="label"> - <left>112</left> + <left>7</left> <top>185</top> - <width>225</width> + <width>226</width> <height>15</height> <font>font12</font> <selectedcolor>selected</selectedcolor> diff --git a/addons/skin.confluence/720p/ViewsAddonBrowser.xml b/addons/skin.confluence/720p/ViewsAddonBrowser.xml index 0221833c41..c38037500b 100644 --- a/addons/skin.confluence/720p/ViewsAddonBrowser.xml +++ b/addons/skin.confluence/720p/ViewsAddonBrowser.xml @@ -38,7 +38,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>555</left> + <left>55</left> <top>0</top> <width>500</width> <height>40</height> @@ -90,7 +90,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>555</left> + <left>55</left> <top>0</top> <width>500</width> <height>40</height> @@ -270,6 +270,7 @@ <bordersize>5</bordersize> <fadetime>100</fadetime> <texture background="true">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>1</left> @@ -281,12 +282,13 @@ <fadetime>100</fadetime> <colordiffuse>ff333333</colordiffuse> <texture background="true">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> <visible>!IsEmpty(ListItem.Property(Addon.broken))</visible> </control> <control type="label"> - <left>96</left> + <left>1</left> <top>70</top> - <width>190</width> + <width>191</width> <height>25</height> <font>font13_title</font> <textcolor>ffaa0000</textcolor> @@ -299,9 +301,9 @@ <visible>!IsEmpty(ListItem.Property(Addon.broken))</visible> </control> <control type="label"> - <left>96</left> + <left>1</left> <top>160</top> - <width>190</width> + <width>191</width> <height>25</height> <font>font12</font> <textcolor>grey2</textcolor> @@ -321,6 +323,7 @@ <bordersize>5</bordersize> <fadetime>100</fadetime> <texture background="true">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>1</left> @@ -332,12 +335,13 @@ <fadetime>100</fadetime> <colordiffuse>ff333333</colordiffuse> <texture background="true">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> <visible>!IsEmpty(ListItem.Property(Addon.broken))</visible> </control> <control type="label"> - <left>96</left> + <left>1</left> <top>70</top> - <width>190</width> + <width>191</width> <height>25</height> <font>font13_title</font> <textcolor>ffaa0000</textcolor> @@ -350,9 +354,9 @@ <visible>!IsEmpty(ListItem.Property(Addon.broken))</visible> </control> <control type="label"> - <left>96</left> + <left>1</left> <top>160</top> - <width>190</width> + <width>191</width> <height>25</height> <font>font12</font> <textcolor>white</textcolor> diff --git a/addons/skin.confluence/720p/ViewsFileMode.xml b/addons/skin.confluence/720p/ViewsFileMode.xml index f58dacb9c7..67fc8ed84d 100644 --- a/addons/skin.confluence/720p/ViewsFileMode.xml +++ b/addons/skin.confluence/720p/ViewsFileMode.xml @@ -37,7 +37,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>680</left> + <left>280</left> <top>0</top> <width>400</width> <height>40</height> @@ -50,7 +50,7 @@ <visible>!Window.IsVisible(Videos)</visible> </control> <control type="label"> - <left>620</left> + <left>220</left> <top>0</top> <width>400</width> <height>40</height> @@ -69,6 +69,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -87,6 +88,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible> </control> <control type="image"> @@ -138,7 +140,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>680</left> + <left>280</left> <top>0</top> <width>400</width> <height>40</height> @@ -151,7 +153,7 @@ <visible>!Window.IsVisible(Videos)</visible> </control> <control type="label"> - <left>620</left> + <left>220</left> <top>0</top> <width>400</width> <height>40</height> @@ -170,6 +172,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -188,6 +191,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible> </control> <control type="image"> @@ -269,6 +273,7 @@ <bordertexture border="5">button-nofocus.png</bordertexture> <bordersize>5</bordersize> <texture background="true">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> <visible>!Container.Content(Episodes)</visible> </control> <control type="image"> @@ -283,7 +288,7 @@ <visible>Container.Content(Episodes)</visible> </control> <control type="label"> - <left>108</left> + <left>8</left> <top>160</top> <width>200</width> <height>25</height> @@ -312,6 +317,7 @@ <bordertexture border="5">folder-focus.png</bordertexture> <bordersize>5</bordersize> <texture background="true">$INFO[Listitem.Icon]</texture> + <aspectratio>keep</aspectratio> <visible>!Container.Content(Episodes)</visible> </control> <control type="image"> @@ -326,7 +332,7 @@ <visible>Container.Content(Episodes)</visible> </control> <control type="label"> - <left>108</left> + <left>8</left> <top>160</top> <width>200</width> <height>25</height> @@ -355,9 +361,10 @@ <bordertexture border="5">button-nofocus.png</bordertexture> <bordersize>5</bordersize> <texture background="true">$VAR[PosterThumb]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> - <left>108</left> + <left>8</left> <top>240</top> <width>200</width> <height>25</height> @@ -386,9 +393,10 @@ <bordertexture border="5">folder-focus.png</bordertexture> <bordersize>5</bordersize> <texture background="true">$VAR[PosterThumb]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> - <left>108</left> + <left>8</left> <top>240</top> <width>200</width> <height>25</height> @@ -454,6 +462,7 @@ <bordertexture border="5">button-nofocus.png</bordertexture> <bordersize>5</bordersize> <texture background="true">$VAR[BannerThumb]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>500</left> @@ -473,6 +482,7 @@ <bordertexture border="5">folder-focus.png</bordertexture> <bordersize>5</bordersize> <texture background="true">$VAR[BannerThumb]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>500</left> @@ -532,6 +542,7 @@ <width>40</width> <height>32</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>60</left> @@ -546,7 +557,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>1060</left> + <left>60</left> <top>0</top> <width>1000</width> <height>40</height> @@ -559,7 +570,7 @@ <visible>!Window.IsVisible(Videos)</visible> </control> <control type="label"> - <left>1005</left> + <left>65</left> <top>0</top> <width>940</width> <height>40</height> @@ -578,6 +589,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -596,6 +608,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible> </control> <control type="image"> @@ -640,6 +653,7 @@ <width>40</width> <height>32</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>60</left> @@ -654,7 +668,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>1060</left> + <left>60</left> <top>0</top> <width>1000</width> <height>40</height> @@ -667,7 +681,7 @@ <visible>!Window.IsVisible(Videos)</visible> </control> <control type="label"> - <left>1005</left> + <left>65</left> <top>0</top> <width>940</width> <height>40</height> @@ -686,6 +700,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -704,6 +719,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + !ListItem.IsResumable</visible> </control> <control type="image"> diff --git a/addons/skin.confluence/720p/ViewsLiveTV.xml b/addons/skin.confluence/720p/ViewsLiveTV.xml index ee50edc0d6..afc35486cf 100644 --- a/addons/skin.confluence/720p/ViewsLiveTV.xml +++ b/addons/skin.confluence/720p/ViewsLiveTV.xml @@ -38,7 +38,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>750</left> + <left>50</left> <top>0</top> <width>700</width> <height>40</height> @@ -90,7 +90,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>750</left> + <left>50</left> <top>0</top> <width>700</width> <height>40</height> diff --git a/addons/skin.confluence/720p/ViewsMusicLibrary.xml b/addons/skin.confluence/720p/ViewsMusicLibrary.xml index fa42624458..1c5744a7bd 100644 --- a/addons/skin.confluence/720p/ViewsMusicLibrary.xml +++ b/addons/skin.confluence/720p/ViewsMusicLibrary.xml @@ -38,7 +38,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>760</left> + <left>60</left> <top>0</top> <width>700</width> <height>40</height> @@ -90,7 +90,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>760</left> + <left>60</left> <top>0</top> <width>700</width> <height>40</height> @@ -518,7 +518,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>730</left> + <left>30</left> <top>0</top> <width>700</width> <height>40</height> @@ -535,6 +535,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> </control> </itemlayout> <focusedlayout height="40" width="760"> @@ -577,7 +578,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>730</left> + <left>30</left> <top>0</top> <width>700</width> <height>40</height> @@ -594,6 +595,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> </control> </focusedlayout> </control> @@ -948,7 +950,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>760</left> + <left>60</left> <top>0</top> <width>700</width> <height>40</height> @@ -1000,7 +1002,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>760</left> + <left>60</left> <top>0</top> <width>700</width> <height>40</height> diff --git a/addons/skin.confluence/720p/ViewsPVR.xml b/addons/skin.confluence/720p/ViewsPVR.xml index ac84014dbb..de75379ef5 100644 --- a/addons/skin.confluence/720p/ViewsPVR.xml +++ b/addons/skin.confluence/720p/ViewsPVR.xml @@ -169,6 +169,7 @@ <width>50</width> <height>50</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>5</left> @@ -264,6 +265,7 @@ <width>50</width> <height>50</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>5</left> @@ -477,6 +479,7 @@ <width>50</width> <height>50</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>5</left> @@ -572,6 +575,7 @@ <width>50</width> <height>50</height> <texture>$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>5</left> @@ -648,6 +652,7 @@ <width>30</width> <height>30</height> <texture background="true" fallback="DefaultVideoCover.png">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>50</left> @@ -662,7 +667,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>725</left> + <left>225</left> <top>0</top> <width>500</width> <height>40</height> @@ -679,6 +684,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -723,6 +729,7 @@ <width>30</width> <height>30</height> <texture background="true" fallback="DefaultVideoCover.png">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>50</left> @@ -737,7 +744,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>725</left> + <left>225</left> <top>0</top> <width>500</width> <height>40</height> @@ -754,6 +761,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -1206,6 +1214,7 @@ <width>50</width> <height>26</height> <texture border="1">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>50</left> @@ -1287,6 +1296,7 @@ <width>50</width> <height>26</height> <texture border="1">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>50</left> @@ -1494,6 +1504,7 @@ <width>30</width> <height>30</height> <texture border="1">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>50</left> @@ -1608,6 +1619,7 @@ <width>30</width> <height>30</height> <texture border="1">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>50</left> @@ -1810,7 +1822,7 @@ <texture border="5">StackFO.png</texture> </control> <control type="label"> - <left>150</left> + <left>10</left> <top>0</top> <width>280</width> <height>40</height> @@ -1929,7 +1941,7 @@ <visible>Control.HasFocus(15)</visible> </control> <control type="label"> - <left>150</left> + <left>10</left> <top>0</top> <width>280</width> <height>40</height> @@ -2147,7 +2159,7 @@ <texture border="5">StackFO.png</texture> </control> <control type="label"> - <left>50</left> + <left>0</left> <top>0</top> <width>100</width> <height>40</height> @@ -2164,6 +2176,7 @@ <width>30</width> <height>30</height> <info>ListItem.Icon</info> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>150</left> @@ -2285,7 +2298,7 @@ <visible>Control.HasFocus(16)</visible> </control> <control type="label"> - <left>50</left> + <left>0</left> <top>0</top> <width>100</width> <height>40</height> @@ -2302,6 +2315,7 @@ <width>30</width> <height>30</height> <info>ListItem.Icon</info> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>150</left> diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index 0c8d593035..5e3c2e7c5d 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -793,7 +793,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>510</left> + <left>10</left> <top>0</top> <width>500</width> <height>40</height> @@ -812,6 +812,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -830,6 +831,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -881,7 +883,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>510</left> + <left>10</left> <top>0</top> <width>500</width> <height>40</height> @@ -900,6 +902,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -918,6 +921,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -1243,7 +1247,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>510</left> + <left>10</left> <top>0</top> <width>500</width> <height>40</height> @@ -1262,6 +1266,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -1280,6 +1285,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -1331,7 +1337,7 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>510</left> + <left>10</left> <top>0</top> <width>500</width> <height>40</height> @@ -1350,6 +1356,7 @@ <width>40</width> <height>26</height> <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture> + <aspectratio>keep</aspectratio> <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible> <visible>!ListItem.IsStereoscopic</visible> </control> @@ -1368,6 +1375,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -1666,6 +1674,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> @@ -1714,6 +1723,7 @@ <width>20</width> <height>16</height> <texture>$INFO[ListItem.Overlay]</texture> + <aspectratio>keep</aspectratio> <visible>!ListItem.IsResumable</visible> </control> <control type="image"> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 54c0ab6f91..9ee785f960 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -987,7 +987,7 @@ <texture diffuse="diffuse_mirror2.png" flipy="true" background="true">$INFO[ListItem.Icon]</texture> </control> <control type="label"> - <left>91</left> + <left>1</left> <top>125</top> <width>180</width> <height>20</height> @@ -1030,7 +1030,7 @@ <texture diffuse="diffuse_mirror2.png" flipy="true" background="true">$INFO[ListItem.Icon]</texture> </control> <control type="label"> - <left>91</left> + <left>1</left> <top>125</top> <width>180</width> <height>20</height> @@ -1042,7 +1042,7 @@ <visible>Control.HasFocus(9002)</visible> </control> <control type="label"> - <left>91</left> + <left>1</left> <top>125</top> <width>180</width> <height>20</height> @@ -1096,7 +1096,7 @@ </control> <control type="label"> <description>Episode Number</description> - <left>140</left> + <left>10</left> <top>60</top> <width>260</width> <height>15</height> @@ -1107,7 +1107,7 @@ </control> <control type="label"> <description>Episode Name</description> - <left>140</left> + <left>10</left> <top>80</top> <width>260</width> <height>15</height> @@ -1118,7 +1118,7 @@ </control> <control type="label"> <description>Next air date/time</description> - <left>140</left> + <left>10</left> <top>100</top> <width>260</width> <height>15</height> @@ -1129,7 +1129,7 @@ </control> <control type="label"> <description>Duration</description> - <left>140</left> + <left>10</left> <top>120</top> <width>260</width> <height>15</height> @@ -1179,7 +1179,7 @@ </control> <control type="label"> <description>Episode Number</description> - <left>140</left> + <left>10</left> <top>60</top> <width>260</width> <height>15</height> @@ -1190,7 +1190,7 @@ </control> <control type="label"> <description>Episode Name</description> - <left>140</left> + <left>10</left> <top>80</top> <width>260</width> <height>15</height> @@ -1201,7 +1201,7 @@ </control> <control type="label"> <description>Next air date/time</description> - <left>140</left> + <left>10</left> <top>100</top> <width>260</width> <height>15</height> @@ -1212,7 +1212,7 @@ </control> <control type="label"> <description>Duration</description> - <left>140</left> + <left>10</left> <top>120</top> <width>260</width> <height>15</height> diff --git a/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml b/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml index 42adb2c3ea..c095f28b11 100644 --- a/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml +++ b/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml @@ -93,7 +93,7 @@ <scrolltime>200</scrolltime> <itemlayout height="25"> <control type="label"> - <left>275</left> + <left>0</left> <top>0</top> <width>550</width> <height>25</height> @@ -106,7 +106,7 @@ </itemlayout> <focusedlayout height="25"> <control type="label"> - <left>275</left> + <left>0</left> <top>0</top> <width>550</width> <height>25</height> @@ -120,7 +120,7 @@ <visible>!Control.HasFocus(110)</visible> </control> <control type="label"> - <left>275</left> + <left>0</left> <top>0</top> <width>550</width> <height>25</height> diff --git a/addons/skin.confluence/720p/script-globalsearch-main.xml b/addons/skin.confluence/720p/script-globalsearch-main.xml index 5b216ffd4f..276037c802 100644 --- a/addons/skin.confluence/720p/script-globalsearch-main.xml +++ b/addons/skin.confluence/720p/script-globalsearch-main.xml @@ -186,9 +186,9 @@ <texture border="5">MenuItemNF.png</texture> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>4</top> - <width>380</width> + <width>240</width> <height>25</height> <font>font24_title</font> <textcolor>grey3</textcolor> @@ -197,9 +197,9 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>32</top> - <width>870</width> + <width>240</width> <height>20</height> <font>font13</font> <textcolor>grey2</textcolor> @@ -218,9 +218,9 @@ <animation effect="fade" start="100" end="50" time="100" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>4</top> - <width>380</width> + <width>240</width> <height>25</height> <font>font24_title</font> <textcolor>white</textcolor> @@ -229,9 +229,9 @@ <label>$INFO[ListItem.Label]</label> </control> <control type="label"> - <left>250</left> + <left>10</left> <top>32</top> - <width>870</width> + <width>240</width> <height>20</height> <font>font13</font> <textcolor>grey2</textcolor> @@ -445,6 +445,7 @@ <width>80</width> <height>115</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>50</left> @@ -530,6 +531,7 @@ <width>80</width> <height>115</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>50</left> @@ -677,6 +679,7 @@ <width>360</width> <height>65</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>330</left> @@ -687,7 +690,7 @@ <visible>IntegerGreaterThan(ListItem.Property(PlayCount),0)</visible> </control> <control type="label"> - <left>187</left> + <left>7</left> <top>75</top> <width>360</width> <height>15</height> @@ -698,7 +701,7 @@ <aligny>center</aligny> </control> <control type="label"> - <left>187</left> + <left>7</left> <top>95</top> <width>360</width> <height>15</height> @@ -733,6 +736,7 @@ <width>360</width> <height>65</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>330</left> @@ -743,7 +747,7 @@ <visible>IntegerGreaterThan(ListItem.Property(PlayCount),0)</visible> </control> <control type="label"> - <left>187</left> + <left>7</left> <top>75</top> <width>360</width> <height>15</height> @@ -754,7 +758,7 @@ <aligny>center</aligny> </control> <control type="label"> - <left>187</left> + <left>7</left> <top>95</top> <width>360</width> <height>15</height> @@ -850,6 +854,7 @@ <width>80</width> <height>115</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>100</left> @@ -885,6 +890,7 @@ <width>80</width> <height>115</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>100</left> @@ -981,6 +987,7 @@ <height>90</height> <aspectratio>scale</aspectratio> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>120</left> @@ -1035,6 +1042,7 @@ <height>90</height> <aspectratio>scale</aspectratio> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>120</left> @@ -1149,6 +1157,7 @@ <width>120</width> <height>90</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>100</left> @@ -1213,6 +1222,7 @@ <width>120</width> <height>90</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="image"> <left>100</left> @@ -1644,6 +1654,7 @@ <width>90</width> <height>90</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>110</left> @@ -1700,6 +1711,7 @@ <width>90</width> <height>90</height> <texture background="true">$INFO[ListItem.Icon]</texture> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>110</left> diff --git a/addons/skin.confluence/720p/weather/10DayForecast.xml b/addons/skin.confluence/720p/weather/10DayForecast.xml index 055c31d3c0..e0edfb2119 100644 --- a/addons/skin.confluence/720p/weather/10DayForecast.xml +++ b/addons/skin.confluence/720p/weather/10DayForecast.xml @@ -38,7 +38,7 @@ <texture border="0,5,0,5">MenuItemNF.png</texture> </control> <control type="label"> - <left>50</left> + <left>0</left> <top>0</top> <width>100</width> <height>120</height> @@ -58,7 +58,7 @@ <texture>$INFO[ListItem.Thumb]</texture> </control> <control type="label"> - <left>590</left> + <left>200</left> <top>0</top> <width>390</width> <height>70</height> @@ -70,7 +70,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="textbox"> - <left>0</left> + <left>5</left> <top>80</top> <width>590</width> <height>50</height> @@ -101,7 +101,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>50</left> + <left>0</left> <top>0</top> <width>100</width> <height>120</height> @@ -121,7 +121,7 @@ <texture>$INFO[ListItem.Thumb]</texture> </control> <control type="label"> - <left>590</left> + <left>200</left> <top>0</top> <width>390</width> <height>70</height> @@ -133,7 +133,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="textbox"> - <left>0</left> + <left>5</left> <top>80</top> <width>590</width> <height>50</height> diff --git a/addons/skin.confluence/720p/weather/HourlyForecast.xml b/addons/skin.confluence/720p/weather/HourlyForecast.xml index 86fb65378e..526648ed70 100644 --- a/addons/skin.confluence/720p/weather/HourlyForecast.xml +++ b/addons/skin.confluence/720p/weather/HourlyForecast.xml @@ -38,7 +38,7 @@ <texture border="0,5,0,5">MenuItemNF.png</texture> </control> <control type="label"> - <left>50</left> + <left>0</left> <top>0</top> <width>100</width> <height>120</height> @@ -58,7 +58,7 @@ <texture>$INFO[ListItem.Thumb]</texture> </control> <control type="label"> - <left>590</left> + <left>200</left> <top>5</top> <width>390</width> <height>70</height> @@ -70,7 +70,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="textbox"> - <left>0</left> + <left>5</left> <top>80</top> <width>590</width> <height>50</height> @@ -101,7 +101,7 @@ <include>VisibleFadeEffect</include> </control> <control type="label"> - <left>50</left> + <left>0</left> <top>0</top> <width>100</width> <height>120</height> @@ -121,7 +121,7 @@ <texture>$INFO[ListItem.Thumb]</texture> </control> <control type="label"> - <left>590</left> + <left>200</left> <top>5</top> <width>390</width> <height>70</height> @@ -133,7 +133,7 @@ <label>$INFO[ListItem.Label2]</label> </control> <control type="textbox"> - <left>0</left> + <left>5</left> <top>80</top> <width>590</width> <height>50</height> diff --git a/addons/skin.confluence/addon.xml b/addons/skin.confluence/addon.xml index f5a9debc63..ed34f532be 100644 --- a/addons/skin.confluence/addon.xml +++ b/addons/skin.confluence/addon.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <addon id="skin.confluence" - version="2.2.14" + version="2.3.0" name="Confluence" provider-name="Jezz_X, Team XBMC"> <requires> - <import addon="xbmc.gui" version="5.0.0"/> + <import addon="xbmc.gui" version="5.1.0"/> </requires> <extension point="xbmc.gui.skin" |