diff options
| author | ronie <ronie@users.noreply.github.com> | 2016-11-22 23:57:13 +0100 |
|---|---|---|
| committer | ronie <ronie@users.noreply.github.com> | 2016-11-27 22:56:45 +0100 |
| commit | 9a816b2009112ba06b89dbc766cee047e713d746 (patch) | |
| tree | f1df2fbb436df092982ab408c3403a05a925ecdf | |
| parent | 7f0bc8beb5290fe507182111f56f0a33abb00dd5 (diff) | |
[Estouchy] update to match the new look of the default skin
64 files changed, 1798 insertions, 2300 deletions
diff --git a/addons/skin.estouchy/addon.xml b/addons/skin.estouchy/addon.xml index cc99f4ec77..95ec726a74 100644 --- a/addons/skin.estouchy/addon.xml +++ b/addons/skin.estouchy/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="skin.estouchy" version="1.0.23" name="Estouchy" provider-name="Team Kodi"> +<addon id="skin.estouchy" version="1.1.0" name="Estouchy" provider-name="Team Kodi"> <requires> <import addon="xbmc.gui" version="5.12.0"/> </requires> diff --git a/addons/skin.estouchy/background/SKINDEFAULT.jpg b/addons/skin.estouchy/background/SKINDEFAULT.jpg Binary files differdeleted file mode 100755 index 0ccca464ad..0000000000 --- a/addons/skin.estouchy/background/SKINDEFAULT.jpg +++ /dev/null diff --git a/addons/skin.estouchy/background/primary.jpg b/addons/skin.estouchy/background/primary.jpg Binary files differnew file mode 100644 index 0000000000..3acb017c74 --- /dev/null +++ b/addons/skin.estouchy/background/primary.jpg diff --git a/addons/skin.estouchy/background/secondary1.png b/addons/skin.estouchy/background/secondary1.png Binary files differnew file mode 100644 index 0000000000..1548c181cc --- /dev/null +++ b/addons/skin.estouchy/background/secondary1.png diff --git a/addons/skin.estouchy/background/tv.jpg b/addons/skin.estouchy/background/tv.jpg Binary files differindex 754f82d9e5..fffb39a32e 100644 --- a/addons/skin.estouchy/background/tv.jpg +++ b/addons/skin.estouchy/background/tv.jpg diff --git a/addons/skin.estouchy/changelog.txt b/addons/skin.estouchy/changelog.txt index 05e42373f1..336b2737d3 100644 --- a/addons/skin.estouchy/changelog.txt +++ b/addons/skin.estouchy/changelog.txt @@ -1,6 +1,12 @@ +V1.1.0 +- Redesign + V1.0.22 - Updated language files from Transifex +V1.0.21 +- Updated language files from Transifex + V1.0.20 - Fix seeklabel diff --git a/addons/skin.estouchy/colors/defaults.xml b/addons/skin.estouchy/colors/defaults.xml index d87f0b67de..840cef19f4 100644 --- a/addons/skin.estouchy/colors/defaults.xml +++ b/addons/skin.estouchy/colors/defaults.xml @@ -1,10 +1,10 @@ <colors> <color name="white">FFF0F0F0</color> + <color name="lightgrey">FFD0D0D0</color> <color name="grey">FFA0A0A0</color> <color name="grey2">FF777777</color> <color name="grey3">FF2C2C2C</color> <color name="black">FF000000</color> <color name="blue">FF12B2E7</color> - <color name="darkblue">FF009FC9</color> - <color name="selected">FF12B2E7</color> + <color name="selected">FF11E7B1</color> </colors> diff --git a/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf b/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf Binary files differdeleted file mode 100644 index 54aade078f..0000000000 --- a/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf +++ /dev/null diff --git a/addons/skin.estouchy/fonts/NotoSans-Regular.ttf b/addons/skin.estouchy/fonts/NotoSans-Regular.ttf Binary files differnew file mode 100644 index 0000000000..04be6f5eee --- /dev/null +++ b/addons/skin.estouchy/fonts/NotoSans-Regular.ttf diff --git a/addons/skin.estouchy/fonts/noto_license.txt b/addons/skin.estouchy/fonts/noto_license.txt new file mode 100644 index 0000000000..f00e6a2714 --- /dev/null +++ b/addons/skin.estouchy/fonts/noto_license.txt @@ -0,0 +1,48 @@ +Copyright (c) 2010-2014, Łukasz Dziedzic (dziedzic@typoland.com), +with Reserved Font Name Lato. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file diff --git a/addons/skin.estouchy/language/resource.language.en_gb/strings.po b/addons/skin.estouchy/language/resource.language.en_gb/strings.po index b4514c2e94..d049b46c5f 100644 --- a/addons/skin.estouchy/language/resource.language.en_gb/strings.po +++ b/addons/skin.estouchy/language/resource.language.en_gb/strings.po @@ -53,7 +53,6 @@ msgid "Recent" msgstr "" #empty string with id 31012 -#Used for subtitle button in the OSD msgctxt "#31013" msgid "Movies" @@ -83,7 +82,6 @@ msgid "Info List" msgstr "" #empty strings from id 31031 to 31037 -#Extra labels msgctxt "#31038" msgid "Login" @@ -269,26 +267,19 @@ msgctxt "#31421" msgid "Select your Kodi user Profile[CR]to login and continue" msgstr "" -#empty strings from id 31422 to 31499 -#Skin Setting Headers - -msgctxt "#31500" -msgid "Home Menu Catagory Buttons" -msgstr "" +#empty strings from id 31422 to 31547 +#Skin Setting Options -msgctxt "#31501" -msgid "Home Page Add-on Quick Links" +msgctxt "#31548" +msgid "Home menu" msgstr "" -msgctxt "#31502" -msgid "Miscellaneous Options" +msgctxt "#31549" +msgid "Home Add-ons" msgstr "" -#empty strings from id 31503 to 31549 -#Skin Setting Options - msgctxt "#31550" -msgid "Home Screen Weather Info and button" +msgid "Backgrounds" msgstr "" msgctxt "#31551" diff --git a/addons/skin.estouchy/media/arrow_down.png b/addons/skin.estouchy/media/arrow_down.png Binary files differindex d91026554b..20db51f016 100644 --- a/addons/skin.estouchy/media/arrow_down.png +++ b/addons/skin.estouchy/media/arrow_down.png diff --git a/addons/skin.estouchy/media/arrow_up.png b/addons/skin.estouchy/media/arrow_up.png Binary files differindex 1db95b1d10..99fd5892f3 100644 --- a/addons/skin.estouchy/media/arrow_up.png +++ b/addons/skin.estouchy/media/arrow_up.png diff --git a/addons/skin.estouchy/media/back.png b/addons/skin.estouchy/media/back.png Binary files differnew file mode 100644 index 0000000000..f44a7b24da --- /dev/null +++ b/addons/skin.estouchy/media/back.png diff --git a/addons/skin.estouchy/media/dialogbutton-focus.png b/addons/skin.estouchy/media/dialogbutton-focus.png Binary files differnew file mode 100644 index 0000000000..3cb147851f --- /dev/null +++ b/addons/skin.estouchy/media/dialogbutton-focus.png diff --git a/addons/skin.estouchy/media/dialogbutton-nofocus.png b/addons/skin.estouchy/media/dialogbutton-nofocus.png Binary files differnew file mode 100644 index 0000000000..4c95cd7238 --- /dev/null +++ b/addons/skin.estouchy/media/dialogbutton-nofocus.png diff --git a/addons/skin.estouchy/media/header.png b/addons/skin.estouchy/media/header.png Binary files differindex d897fa4d52..6ffd6df23e 100644 --- a/addons/skin.estouchy/media/header.png +++ b/addons/skin.estouchy/media/header.png diff --git a/addons/skin.estouchy/media/icon_header_clock.png b/addons/skin.estouchy/media/icon_header_clock.png Binary files differdeleted file mode 100644 index e9ed044a13..0000000000 --- a/addons/skin.estouchy/media/icon_header_clock.png +++ /dev/null diff --git a/addons/skin.estouchy/media/icon_menu_favourites.png b/addons/skin.estouchy/media/icon_menu_favourites.png Binary files differnew file mode 100644 index 0000000000..983a774dd8 --- /dev/null +++ b/addons/skin.estouchy/media/icon_menu_favourites.png diff --git a/addons/skin.estouchy/media/icon_menu_weather.png b/addons/skin.estouchy/media/icon_menu_weather.png Binary files differnew file mode 100644 index 0000000000..15c1c155e3 --- /dev/null +++ b/addons/skin.estouchy/media/icon_menu_weather.png diff --git a/addons/skin.estouchy/media/icon_settings_addons.png b/addons/skin.estouchy/media/icon_settings_addons.png Binary files differindex ab371bc31e..59c01f7d12 100644 --- a/addons/skin.estouchy/media/icon_settings_addons.png +++ b/addons/skin.estouchy/media/icon_settings_addons.png diff --git a/addons/skin.estouchy/media/icon_settings_interface.png b/addons/skin.estouchy/media/icon_settings_interface.png Binary files differindex cb27b005b7..30eda07400 100644 --- a/addons/skin.estouchy/media/icon_settings_interface.png +++ b/addons/skin.estouchy/media/icon_settings_interface.png diff --git a/addons/skin.estouchy/media/icon_settings_library.png b/addons/skin.estouchy/media/icon_settings_library.png Binary files differdeleted file mode 100644 index df293c67fb..0000000000 --- a/addons/skin.estouchy/media/icon_settings_library.png +++ /dev/null diff --git a/addons/skin.estouchy/media/icon_settings_tv.png b/addons/skin.estouchy/media/icon_settings_livetv.png Binary files differindex 8408ea6f2a..8408ea6f2a 100644 --- a/addons/skin.estouchy/media/icon_settings_tv.png +++ b/addons/skin.estouchy/media/icon_settings_livetv.png diff --git a/addons/skin.estouchy/media/icon_settings_media.png b/addons/skin.estouchy/media/icon_settings_media.png Binary files differnew file mode 100644 index 0000000000..5ed85493da --- /dev/null +++ b/addons/skin.estouchy/media/icon_settings_media.png diff --git a/addons/skin.estouchy/media/icon_settings_profiles.png b/addons/skin.estouchy/media/icon_settings_profiles.png Binary files differindex fe6ec664a1..065441038c 100644 --- a/addons/skin.estouchy/media/icon_settings_profiles.png +++ b/addons/skin.estouchy/media/icon_settings_profiles.png diff --git a/addons/skin.estouchy/media/icon_settings_systeminfo.png b/addons/skin.estouchy/media/icon_settings_systeminfo.png Binary files differindex 16b7e02a14..992f4a0f7a 100644 --- a/addons/skin.estouchy/media/icon_settings_systeminfo.png +++ b/addons/skin.estouchy/media/icon_settings_systeminfo.png diff --git a/addons/skin.estouchy/media/list_nofocus.png b/addons/skin.estouchy/media/list_nofocus.png Binary files differdeleted file mode 100644 index 9ccfd3ee51..0000000000 --- a/addons/skin.estouchy/media/list_nofocus.png +++ /dev/null diff --git a/addons/skin.estouchy/media/panel_shadow.png b/addons/skin.estouchy/media/panel_shadow.png Binary files differnew file mode 100644 index 0000000000..65023da086 --- /dev/null +++ b/addons/skin.estouchy/media/panel_shadow.png diff --git a/addons/skin.estouchy/media/roundbutton-focus.png b/addons/skin.estouchy/media/roundbutton-focus.png Binary files differnew file mode 100644 index 0000000000..58f154c07d --- /dev/null +++ b/addons/skin.estouchy/media/roundbutton-focus.png diff --git a/addons/skin.estouchy/xml/defaults.xml b/addons/skin.estouchy/xml/Defaults.xml index 7cbf02d469..38241f9632 100644 --- a/addons/skin.estouchy/xml/defaults.xml +++ b/addons/skin.estouchy/xml/Defaults.xml @@ -6,7 +6,7 @@ <width>300</width> <height>42</height> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <font>font20</font> <textcolor>white</textcolor> <disabledcolor>grey2</disabledcolor> @@ -20,7 +20,7 @@ <width>300</width> <height>42</height> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <font>font20</font> <textcolor>white</textcolor> <disabledcolor>grey2</disabledcolor> @@ -51,7 +51,7 @@ <posx>0</posx> <posy>0</posy> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> </default> <default type="progress"> <posx>0</posx> @@ -77,7 +77,7 @@ <textureradioondisabled colordiffuse="40FFFFFF">radiobutton_on.png</textureradioondisabled> <textureradiooffdisabled colordiffuse="40FFFFFF">radiobutton_off.png</textureradiooffdisabled> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <label>215</label> <font>font20</font> <textcolor>white</textcolor> @@ -90,7 +90,7 @@ <posx>0</posx> <posy>0</posy> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> </default> <default type="slider"> <controloffsetx>75</controloffsetx> @@ -105,7 +105,7 @@ <textoffsetx>20</textoffsetx> <aligny>center</aligny> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <sliderwidth>350</sliderwidth> <sliderheight>40</sliderheight> <texturesliderbar>slider.png</texturesliderbar> @@ -146,7 +146,7 @@ <spinwidth>70</spinwidth> <spinheight>45</spinheight> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <textureup>arrow_up.png</textureup> <texturedown>arrow_down.png</texturedown> <textureupfocus colordiffuse="blue">arrow_up.png</textureupfocus> diff --git a/addons/skin.estouchy/xml/DialogAudioDSPManager.xml b/addons/skin.estouchy/xml/DialogAudioDSPManager.xml index 4d6ac24f72..cd491495ce 100644 --- a/addons/skin.estouchy/xml/DialogAudioDSPManager.xml +++ b/addons/skin.estouchy/xml/DialogAudioDSPManager.xml @@ -164,13 +164,6 @@ <scrolltime>200</scrolltime> <itemlayout height="100" width="580"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>579</width> - <height>100</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>90</width> @@ -207,14 +200,6 @@ <posy>0</posy> <width>579</width> <height>100</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!Control.HasFocus(20)</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>579</width> - <height>100</height> <texture>list_focus.png</texture> <visible>Control.HasFocus(20)</visible> </control> @@ -290,13 +275,6 @@ <scrolltime>200</scrolltime> <itemlayout height="100" width="580"> <control type="image"> - <posx>1</posx> - <posy>0</posy> - <width>579</width> - <height>100</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>90</width> @@ -333,14 +311,6 @@ <posy>0</posy> <width>579</width> <height>100</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!Control.HasFocus(21)</visible> - </control> - <control type="image"> - <posx>1</posx> - <posy>0</posy> - <width>579</width> - <height>100</height> <texture>list_focus.png</texture> <visible>Control.HasFocus(21)</visible> </control> diff --git a/addons/skin.estouchy/xml/DialogContextMenu.xml b/addons/skin.estouchy/xml/DialogContextMenu.xml index 0c6c095c78..9fa4c910c7 100644 --- a/addons/skin.estouchy/xml/DialogContextMenu.xml +++ b/addons/skin.estouchy/xml/DialogContextMenu.xml @@ -53,7 +53,7 @@ <font>font25</font> <align>center</align> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> </control> </controls> </window> diff --git a/addons/skin.estouchy/xml/DialogFavourites.xml b/addons/skin.estouchy/xml/DialogFavourites.xml index 39fdff89f9..b5b541c923 100644 --- a/addons/skin.estouchy/xml/DialogFavourites.xml +++ b/addons/skin.estouchy/xml/DialogFavourites.xml @@ -55,13 +55,6 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout width="670" height="80"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>670</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>0</posy> diff --git a/addons/skin.estouchy/xml/DialogMediaSource.xml b/addons/skin.estouchy/xml/DialogMediaSource.xml index 78398da9a8..e6153cfeb1 100644 --- a/addons/skin.estouchy/xml/DialogMediaSource.xml +++ b/addons/skin.estouchy/xml/DialogMediaSource.xml @@ -66,13 +66,6 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout height="70"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>760</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>0</posy> diff --git a/addons/skin.estouchy/xml/DialogMusicInfo.xml b/addons/skin.estouchy/xml/DialogMusicInfo.xml index c943871169..a7a2c5b6cd 100644 --- a/addons/skin.estouchy/xml/DialogMusicInfo.xml +++ b/addons/skin.estouchy/xml/DialogMusicInfo.xml @@ -563,13 +563,6 @@ <include>VisibleFadeEffect</include> <visible>[Container.Content(Artists) + !String.IsEmpty(Window.Property(ShowAlbumList))] | [Container.Content(Albums) + !String.IsEmpty(Window.Property(ShowSongList))]</visible> <itemlayout condition="Container.Content(Albums)" height="60" width="1000"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1000</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>30</posx> <posy>0</posy> diff --git a/addons/skin.estouchy/xml/DialogPVRChannelManager.xml b/addons/skin.estouchy/xml/DialogPVRChannelManager.xml index 5f0485afa1..eb7bdca26f 100644 --- a/addons/skin.estouchy/xml/DialogPVRChannelManager.xml +++ b/addons/skin.estouchy/xml/DialogPVRChannelManager.xml @@ -64,13 +64,6 @@ <scrolltime>200</scrolltime> <itemlayout height="70" width="500"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>500</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>60</width> diff --git a/addons/skin.estouchy/xml/DialogPVRChannelsOSD.xml b/addons/skin.estouchy/xml/DialogPVRChannelsOSD.xml index 9545d8eb85..d96870ff54 100644 --- a/addons/skin.estouchy/xml/DialogPVRChannelsOSD.xml +++ b/addons/skin.estouchy/xml/DialogPVRChannelsOSD.xml @@ -57,13 +57,6 @@ <scrolltime>200</scrolltime> <itemlayout height="90" width="750"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>750</width> - <height>90</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>80</width> diff --git a/addons/skin.estouchy/xml/DialogPVRGroupManager.xml b/addons/skin.estouchy/xml/DialogPVRGroupManager.xml index 74d28a09e8..3acb11a112 100644 --- a/addons/skin.estouchy/xml/DialogPVRGroupManager.xml +++ b/addons/skin.estouchy/xml/DialogPVRGroupManager.xml @@ -73,13 +73,6 @@ <scrolltime>200</scrolltime> <itemlayout height="70" width="500"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>500</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>60</width> @@ -176,13 +169,6 @@ <scrolltime>200</scrolltime> <itemlayout height="70" width="500"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>500</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>60</width> @@ -287,13 +273,6 @@ <scrolltime>200</scrolltime> <itemlayout height="70" width="1030"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1030</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>60</width> diff --git a/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml b/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml index 5944b7a171..5457d355a3 100644 --- a/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml +++ b/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml @@ -57,13 +57,6 @@ <scrolltime>200</scrolltime> <itemlayout height="90" width="750"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>750</width> - <height>90</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>2</posx> <posy>2</posy> <width>86</width> diff --git a/addons/skin.estouchy/xml/DialogPictureInfo.xml b/addons/skin.estouchy/xml/DialogPictureInfo.xml index c6cb36eab2..058a67c336 100644 --- a/addons/skin.estouchy/xml/DialogPictureInfo.xml +++ b/addons/skin.estouchy/xml/DialogPictureInfo.xml @@ -55,13 +55,6 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout height="60"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1000</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>0</posy> diff --git a/addons/skin.estouchy/xml/DialogSelect.xml b/addons/skin.estouchy/xml/DialogSelect.xml index 13367e491c..07742a2518 100644 --- a/addons/skin.estouchy/xml/DialogSelect.xml +++ b/addons/skin.estouchy/xml/DialogSelect.xml @@ -55,19 +55,12 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout height="60" width="680"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>680</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>0</posy> <width>640</width> <height>60</height> - <font>font20</font> + <font>font20_title</font> <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> @@ -87,7 +80,7 @@ <posy>0</posy> <width>640</width> <height>60</height> - <font>font20</font> + <font>font20_title</font> <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> @@ -118,7 +111,7 @@ <control type="list" id="6"> <posx>0</posx> <posy>60</posy> - <width>670</width> + <width>680</width> <height>600</height> <onup>6</onup> <ondown>6</ondown> @@ -126,20 +119,13 @@ <onright>61</onright> <pagecontrol>61</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="120" width="670"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>680</width> - <height>120</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> + <itemlayout height="120" width="680"> <control type="label"> <posx>20</posx> <posy>15</posy> - <width>540</width> + <width>550</width> <height>30</height> - <font>font20_title</font> + <font>font24_title</font> <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> @@ -149,34 +135,35 @@ <posx>30</posx> <posy>50</posy> <width>530</width> - <height>60</height> + <height>70</height> + <textcolor>grey</textcolor> <font>font22</font> <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> </control> <control type="image"> - <posx>555</posx> + <posx>565</posx> <posy>5</posy> <width>110</width> <height>110</height> <texture>$INFO[Listitem.Icon]</texture> </control> </itemlayout> - <focusedlayout height="120" width="670"> + <focusedlayout height="120" width="680"> <control type="image"> <posx>0</posx> <posy>0</posy> - <width>670</width> + <width>680</width> <height>120</height> <texture>list_focus.png</texture> </control> <control type="label"> <posx>20</posx> <posy>15</posy> - <width>540</width> + <width>550</width> <height>30</height> - <font>font20_title</font> + <font>font24_title</font> <selectedcolor>selected</selectedcolor> <align>left</align> <aligny>center</aligny> @@ -186,14 +173,14 @@ <posx>30</posx> <posy>50</posy> <width>530</width> - <height>60</height> + <height>70</height> <font>font22</font> <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> </control> <control type="image"> - <posx>555</posx> + <posx>565</posx> <posy>5</posy> <width>110</width> <height>110</height> @@ -202,7 +189,7 @@ </focusedlayout> </control> <control type="scrollbar" id="61"> - <posx>682</posx> + <posx>686</posx> <posy>90</posy> <width>26</width> <height>540</height> diff --git a/addons/skin.estouchy/xml/DialogSubtitles.xml b/addons/skin.estouchy/xml/DialogSubtitles.xml index 30893fd413..555d15fe1b 100644 --- a/addons/skin.estouchy/xml/DialogSubtitles.xml +++ b/addons/skin.estouchy/xml/DialogSubtitles.xml @@ -67,13 +67,6 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout width="940" height="80"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>940</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>10</posy> @@ -138,14 +131,6 @@ <posy>0</posy> <width>940</width> <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!Control.HasFocus(120)</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>940</width> - <height>80</height> <texture>list_focus.png</texture> <visible>Control.HasFocus(120)</visible> </control> @@ -324,13 +309,6 @@ <viewtype label="535">list</viewtype> <scrolltime>200</scrolltime> <itemlayout width="320" height="70"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>320</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>10</posx> <posy>0</posy> diff --git a/addons/skin.estouchy/xml/DialogVideoInfo.xml b/addons/skin.estouchy/xml/DialogVideoInfo.xml index 8afe39ed5e..b1f326be4e 100644 --- a/addons/skin.estouchy/xml/DialogVideoInfo.xml +++ b/addons/skin.estouchy/xml/DialogVideoInfo.xml @@ -617,13 +617,6 @@ <include>VisibleFadeEffect</include> <itemlayout height="100" width="500"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>500</width> - <height>100</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>10</posx> <posy>4</posy> <width>100</width> diff --git a/addons/skin.estouchy/xml/EventLog.xml b/addons/skin.estouchy/xml/EventLog.xml index c71569c8a0..b1758d79cb 100644 --- a/addons/skin.estouchy/xml/EventLog.xml +++ b/addons/skin.estouchy/xml/EventLog.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <defaultcontrol always="true">50</defaultcontrol> - <views>50</views> + <defaultcontrol always="true">500</defaultcontrol> + <views>500</views> <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> diff --git a/addons/skin.estouchy/xml/FileBrowser.xml b/addons/skin.estouchy/xml/FileBrowser.xml index f2688f6aae..47a4bbd332 100644 --- a/addons/skin.estouchy/xml/FileBrowser.xml +++ b/addons/skin.estouchy/xml/FileBrowser.xml @@ -55,13 +55,6 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout width="670" height="80"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>670</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>0</posy> diff --git a/addons/skin.estouchy/xml/FileManager.xml b/addons/skin.estouchy/xml/FileManager.xml index 97a8d04567..815e747b4e 100644 --- a/addons/skin.estouchy/xml/FileManager.xml +++ b/addons/skin.estouchy/xml/FileManager.xml @@ -29,11 +29,13 @@ <aligny>center</aligny> </control> <control type="image"> - <posx>0</posx> - <posy>40</posy> - <width>570</width> - <height>720</height> - <texture>panel.png</texture> + <posx>-5</posx> + <posy>35</posy> + <width>580</width> + <height>730</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="panel" id="20"> <posx>0</posx> @@ -49,13 +51,6 @@ <scrolltime>200</scrolltime> <itemlayout height="80" width="570"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>570</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>70</width> @@ -163,11 +158,13 @@ <aligny>center</aligny> </control> <control type="image"> - <posx>0</posx> - <posy>40</posy> - <width>570</width> - <height>720</height> - <texture>panel.png</texture> + <posx>-5</posx> + <posy>35</posy> + <width>580</width> + <height>730</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="panel" id="21"> <posx>0</posx> @@ -183,13 +180,6 @@ <scrolltime>200</scrolltime> <itemlayout height="80" width="570"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>570</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>70</width> diff --git a/addons/skin.estouchy/xml/Font.xml b/addons/skin.estouchy/xml/Font.xml index 641ad7e57e..8f4d787a35 100644 --- a/addons/skin.estouchy/xml/Font.xml +++ b/addons/skin.estouchy/xml/Font.xml @@ -4,90 +4,110 @@ <!-- Normal Fonts --> <font> <name>font13</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>24</size> </font> <font> <name>font16</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>16</size> </font> <font> <name>font20</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>20</size> </font> <font> <name>font22</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>22</size> </font> <font> <name>font24</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>24</size> </font> <font> <name>font25</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>25</size> </font> <font> <name>font30</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>30</size> </font> + <font> + <name>font40</name> + <filename>NotoSans-Regular.ttf</filename> + <size>40</size> + </font> <!-- Title Fonts --> <font> <name>font11_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>11</size> + <style>bold</style> </font> <font> <name>font14_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>14</size> + <style>bold</style> </font> <font> <name>font18_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>18</size> + <style>bold</style> </font> <font> <name>font20_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>20</size> + <style>bold</style> </font> <font> <name>font24_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>24</size> + <style>bold</style> </font> <font> <name>font28_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>28</size> + <style>bold</style> </font> <font> <name>font30_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>30</size> + <style>bold</style> </font> <font> <name>font35_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>35</size> + <style>bold</style> + </font> + <font> + <name>font70_title</name> + <filename>NotoSans-Regular.ttf</filename> + <size>70</size> + <style>lighten</style> </font> <font> <name>font80_title</name> - <filename>DejaVuSans-Bold.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>80</size> + <style>bold</style> </font> <font> <name>font20_narrow</name> - <filename>Arial.ttf</filename> + <filename>NotoSans-Regular.ttf</filename> <size>20</size> - <linespacing>0.91</linespacing> + <linespacing>0.80</linespacing> </font> </fontset> <fontset id="Arial" idloc="31391"> @@ -127,6 +147,11 @@ <filename>Arial.ttf</filename> <size>30</size> </font> + <font> + <name>font40</name> + <filename>Arial.ttf</filename> + <size>40</size> + </font> <!-- Title Fonts --> <font> <name>font11_title</name> @@ -177,6 +202,12 @@ <style>bold</style> </font> <font> + <name>font70_title</name> + <filename>Arial.ttf</filename> + <size>70</size> + <style>lighten</style> + </font> + <font> <name>font80_title</name> <filename>Arial.ttf</filename> <size>80</size> diff --git a/addons/skin.estouchy/xml/Home.xml b/addons/skin.estouchy/xml/Home.xml index 09beb7988c..dd859733e1 100644 --- a/addons/skin.estouchy/xml/Home.xml +++ b/addons/skin.estouchy/xml/Home.xml @@ -11,15 +11,14 @@ <label>$INFO[Weather.FanartCode]</label> <!-- trigger weather retrieval --> </control> <include>CommonBackground</include> - <include>Header</include> - <include>CommonNowPlaying</include> - <include>Footer</include> <control type="group"> + <posx>778r</posx> + <posy>10</posy> <include>Window_OpenClose_Animation</include> - <animation effect="slide" start="0,0" end="106,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> + <animation effect="slide" start="0,0" end="250,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> <visible>Library.HasContent(Movies) | Library.HasContent(TVShows) | Library.HasContent(Music) | Integer.IsGreater(Container(2400).NumItems,0)</visible> <control type="button"> - <posx>509r</posx> + <posx>0</posx> <posy>120</posy> <width>33</width> <height>55</height> @@ -28,7 +27,7 @@ <onclick>Control.Move(9010,-1)</onclick> </control> <control type="button"> - <posx>176r</posx> + <posx>333</posx> <posy>120</posy> <width>33</width> <height>55</height> @@ -38,7 +37,7 @@ </control> <control type="wraplist" id="9010"> <include>VisibleFadeEffect</include> - <posx>426r</posx> + <posx>83</posx> <posy>78</posy> <width>200</width> <height>140</height> @@ -48,11 +47,13 @@ <orientation>Horizontal</orientation> <itemlayout width="200" height="140"> <control type="image"> - <posx>20</posx> - <posy>20</posy> - <height>100</height> - <width>160</width> + <posx>15</posx> + <posy>15</posy> + <height>110</height> + <width>170</width> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="label"> <posx>5</posx> @@ -68,19 +69,23 @@ </itemlayout> <focusedlayout width="200" height="140"> <control type="image"> - <posx>20</posx> - <posy>20</posy> - <height>100</height> - <width>160</width> + <posx>15</posx> + <posy>15</posy> + <height>110</height> + <width>170</width> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <visible>!Control.HasFocus(9010)</visible> </control> <control type="image"> - <posx>20</posx> - <posy>20</posy> - <height>100</height> - <width>160</width> + <posx>15</posx> + <posy>15</posy> + <height>110</height> + <width>170</width> <texture>list_focus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <visible>Control.HasFocus(9010)</visible> </control> <control type="label"> @@ -128,42 +133,16 @@ </control> </control> <control type="group"> - <animation effect="slide" start="0,0" end="212,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !Integer.IsGreater(Container(2400).NumItems,0)">Conditional</animation> - <animation effect="slide" start="0,0" end="323,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !Integer.IsGreater(Container(2400).NumItems,0)">Conditional</animation> - <include content="HomeMenu" condition="String.IsEqual(Skin.AspectRatio,16:9)"> - <param name="panel-width">1000</param> - <param name="layout-width">500</param> - <param name="list-width">480</param> - <param name="label-posx-left">110</param> - <param name="label-posx-right">0</param> - <param name="label-width">370</param> - <param name="icon-posx-left">6</param> - <param name="icon-posx-right">386</param> - <param name="iconback-posx">383</param> - <param name="iconback-width">98</param> - </include> - <include content="HomeMenu" condition="String.IsEqual(Skin.AspectRatio,4:3)"> - <param name="panel-width">832</param> - <param name="layout-width">416</param> - <param name="list-width">400</param> - <param name="label-posx-left">90</param> - <param name="label-posx-right">-20</param> - <param name="label-width">330</param> - <param name="icon-posx-left">-6</param> - <param name="icon-posx-right">318</param> - <param name="iconback-posx">326</param> - <param name="iconback-width">75</param> - </include> + <animation effect="slide" start="0,0" end="-1040,0" time="400" tween="quadratic" easing="in">WindowClose</animation> + <animation effect="slide" end="0,0" start="-1040,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> + <include>HomeMenu</include> <control type="panel" id="9002"> - <include>Window_OpenClose_Animation</include> - <posx>240</posx> - <posy>185r</posy> + <posx>5</posx> + <posy>70</posy> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(Home)">WindowClose</animation> <animation effect="fade" end="100" start="0" time="300" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="60,0" time="0" condition="String.IsEqual(Container(9002).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="120,0" time="0" condition="String.IsEqual(Container(9002).NumItems,3)">conditional</animation> - <animation effect="slide" start="0,0" end="-100,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - <width>802</width> + <animation effect="slide" start="0,0" end="60,0" time="0" condition="String.IsEqual(Container(9002).NumItems,3)">conditional</animation> + <width>900</width> <height>120</height> <onleft>9002</onleft> <onright>9002</onright> @@ -172,17 +151,10 @@ <pagecontrol></pagecontrol> <scrolltime>300</scrolltime> <orientation>Horizontal</orientation> - <itemlayout height="100" width="120"> - <control type="image"> - <posx>5</posx> - <posy>0</posy> - <width>90</width> - <height>90</height> - <texture>button_nofocus.png</texture> - </control> + <itemlayout height="120" width="120"> <control type="image"> - <posx>10</posx> - <posy>5</posy> + <posx>20</posx> + <posy>20</posy> <width>80</width> <height>80</height> <bordersize>12</bordersize> @@ -190,17 +162,17 @@ <aspectratio>keep</aspectratio> </control> </itemlayout> - <focusedlayout height="100" width="120"> + <focusedlayout height="120" width="120"> <control type="image"> - <posx>5</posx> + <posx>0</posx> <posy>0</posy> - <width>90</width> - <height>90</height> - <texture>list_focus.png</texture> + <width>120</width> + <height>120</height> + <texture colordiffuse="blue">roundbutton-focus.png</texture> </control> <control type="image"> - <posx>10</posx> - <posy>5</posy> + <posx>20</posx> + <posy>20</posy> <width>80</width> <height>80</height> <bordersize>12</bordersize> @@ -230,27 +202,19 @@ <onclick>ActivateWindow(FileManager)</onclick> <icon>icon_button_filemanager.png</icon> </item> - <item> - <label>1036</label> - <onclick>ActivateWindow(Favourites)</onclick> - <icon>icon_button_favourites.png</icon> - </item> - <item> - <label>20183</label> - <onclick>ReloadSkin</onclick> - <icon>icon_button_refresh.png</icon> - <visible>false</visible> - </item> </content> </control> </control> + <include>Header</include> + <include>CommonNowPlaying</include> + <include>Footer</include> <include content="HomeRecentlyAddedInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)"> - <param name="group-posx">640r</param> - <param name="panel-width">630</param> + <param name="group-posx">1120r</param> + <param name="panel-width">1120</param> </include> <include content="HomeRecentlyAddedInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)"> - <param name="group-posx">430r</param> - <param name="panel-width">420</param> + <param name="group-posx">640r</param> + <param name="panel-width">630</param> </include> </controls> </window> diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml index 470bb5111d..45649b4eeb 100644 --- a/addons/skin.estouchy/xml/Includes.xml +++ b/addons/skin.estouchy/xml/Includes.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <includes> - <include file="defaults.xml" /> + <include file="Defaults.xml" /> <include file="IncludesCodecFlagging.xml" /> <include file="IncludesPlayerControls.xml" /> <include file="IncludesHomeRecentlyAdded.xml" /> <include file="IncludesKeypad.xml" /> - <include file="ViewsList.xml" /> <include file="ViewsThumbnail.xml" /> <include file="ViewsWide.xml" /> <include file="ViewsPVR.xml" /> - <constant name="FanartCrossfadeTime">500</constant> <constant name="IconCrossfadeTime">400</constant> - <variable name="PlaylistHeader"> <value condition="Window.IsVisible(musicplaylist)">$LOCALIZE[10517]</value> <value condition="Window.IsVisible(videoplaylist)">$LOCALIZE[10522]</value> @@ -92,14 +89,12 @@ <include condition="String.IsEqual(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include> <include condition="String.IsEqual(Skin.AspectRatio,4:3)">ScreenWidth-4x3</include> </include> - <include name="ScreenWidth-16x9"> <width>1706</width> </include> <include name="ScreenWidth-4x3"> <width>1280</width> </include> - <include name="CommonBackground"> <control type="image"> <posx>0</posx> @@ -107,7 +102,7 @@ <aspectratio>scale</aspectratio> <include>ScreenWidth</include> <height>960</height> - <texture fallback="special://skin/background/SKINDEFAULT.jpg">special://skin/background/$INFO[Skin.CurrentTheme].jpg</texture> + <texture colordiffuse="FF006699">special://skin/background/primary.jpg</texture> <visible>!Skin.HasSetting(UseCustomBackground)</visible> </control> <control type="image"> @@ -116,7 +111,7 @@ <aspectratio>scale</aspectratio> <include>ScreenWidth</include> <height>960</height> - <texture>$INFO[Skin.String(CustomBackground)]</texture> + <texture colordiffuse="60FFFFFF">$INFO[Skin.String(CustomBackground)]</texture> <visible>Skin.HasSetting(UseCustomBackground)</visible> </control> <control type="image"> @@ -160,29 +155,38 @@ <fadetime>FanartCrossfadeTime</fadetime> <visible>Player.HasMedia</visible> </control> - <control type="videowindow"> + <control type="image"> <posx>0</posx> <posy>0</posy> <include>ScreenWidth</include> <height>960</height> - <visible>!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings) + !SlideShow.IsActive</visible> + <texture>black.png</texture> + <colordiffuse>90000000</colordiffuse> + <include>VisibleFadeEffect</include> + <visible>[!String.IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible> </control> - <control type="visualisation"> + <control type="image"> <posx>0</posx> <posy>0</posy> + <aspectratio>scale</aspectratio> <include>ScreenWidth</include> <height>960</height> - <visible>!Skin.HasSetting(HideVizBackground) + Player.HasAudio + !SlideShow.IsActive</visible> + <texture colordiffuse="4D24CCA2">special://skin/background/secondary1.png</texture> + <visible>!Skin.HasSetting(UseCustomBackground)</visible> </control> - <control type="image"> + <control type="videowindow"> <posx>0</posx> <posy>0</posy> <include>ScreenWidth</include> <height>960</height> - <texture>black.png</texture> - <colordiffuse>70000000</colordiffuse> - <include>VisibleFadeEffect</include> - <visible>[!String.IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible> + <visible>!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings) + !SlideShow.IsActive</visible> + </control> + <control type="visualisation"> + <posx>0</posx> + <posy>0</posy> + <include>ScreenWidth</include> + <height>960</height> + <visible>!Skin.HasSetting(HideVizBackground) + Player.HasAudio + !SlideShow.IsActive</visible> </control> </include> <include name="Header"> @@ -192,8 +196,8 @@ <posx>0</posx> <posy>0</posy> <include>ScreenWidth</include> - <height>80</height> - <texture border="0,0,0,2">header.png</texture> + <height>120</height> + <texture>header.png</texture> </control> <control type="button"> <description>Home Button</description> @@ -216,57 +220,38 @@ <include>VisibleFadeEffect</include> </control> </control> - <control type="button"> - <posx>370r</posx> - <posy>16</posy> - <height>45</height> - <width>145</width> - <font></font> - <texturefocus></texturefocus> - <texturenofocus></texturenofocus> - <onclick>ActivateWindow(weather)</onclick> - <visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> - </control> <control type="grouplist"> <include>VisibleFadeEffect</include> <posx>415r</posx> <posy>16</posy> <width>400</width> - <height>45</height> + <height>70</height> <align>right</align> <itemgap>10</itemgap> <orientation>horizontal</orientation> - <include condition="!Window.IsVisible(LoginScreen)">WeatherIcon</include> <control type="label"> <description>System Time</description> - <height>45</height> - <width>145</width> - <font>font30</font> + <height>70</height> + <width>400</width> + <font>font70_title</font> <textcolor>white</textcolor> <align>right</align> <aligny>center</aligny> <label>$INFO[System.Time]</label> </control> - <control type="image"> - <description>System Time Clock</description> - <height>45</height> - <width>45</width> - <texture colordiffuse="blue">icon_header_clock.png</texture> - <aspectratio>keep</aspectratio> - </control> </control> </include> <include name="Footer"> <control type="image"> <posx>0</posx> - <posy>80r</posy> + <posy>120r</posy> <include>ScreenWidth</include> - <height>80</height> + <height>120</height> <texture flipy="true">header.png</texture> </control> <control type="rss"> <posx>0</posx> - <posy>58r</posy> + <posy>40r</posy> <height>30</height> <include>ScreenWidth</include> <font>font24_title</font> @@ -291,31 +276,6 @@ <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> </include> - <include name="WeatherIcon"> - <control type="label"> - <description>Weather label</description> - <height>45</height> - <width>100</width> - <font>font30</font> - <textcolor>white</textcolor> - <align>right</align> - <animation effect="fade" time="300">VisibleChange</animation> - <aligny>center</aligny> - <textoffsetx>0</textoffsetx> - <label>$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label> - <visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> - </control> - <control type="image"> - <description>Weather</description> - <width>45</width> - <height>45</height> - <fadetime>300</fadetime> - <aspectratio align="left">keep</aspectratio> - <texture colordiffuse="blue">weather/$INFO[Window(Weather).Property(Current.FanartCode)].png</texture> - <animation effect="fade" time="300">VisibleChange</animation> - <visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible> - </control> - </include> <include name="BehindDialogFadeOut"> <control type="image"> <posx>-1706</posx> @@ -472,19 +432,10 @@ <onright>9002</onright> <onup>9001</onup> <ondown>20</ondown> - <pagecontrol></pagecontrol> <scrolltime>300</scrolltime> <orientation>Horizontal</orientation> <itemlayout height="78" width="120"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>A0464646</colordiffuse> - </control> - <control type="image"> <posx>21</posx> <posy>0</posy> <width>78</width> @@ -493,27 +444,11 @@ <texture>$INFO[ListItem.Icon]</texture> <aspectratio>keep</aspectratio> </control> - <control type="image"> - <posx>120</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>A0464646</colordiffuse> - </control> </itemlayout> <focusedlayout height="78" width="120"> <control type="image"> <posx>0</posx> <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>A0464646</colordiffuse> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> <width>122</width> <height>78</height> <texture>list_focus.png</texture> @@ -527,14 +462,6 @@ <texture>$INFO[ListItem.Icon]</texture> <aspectratio>keep</aspectratio> </control> - <control type="image"> - <posx>120</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>A0464646</colordiffuse> - </control> </focusedlayout> </include> <include name="MenuButtonCommonValues"> @@ -547,7 +474,7 @@ <aligny>center</aligny> <font>font22</font> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> </include> <include name="ButtonInfoDialogsCommonValues"> @@ -556,8 +483,8 @@ <align>center</align> <aligny>center</aligny> <font>font18_title</font> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus>button_nofocus.png</texturenofocus> + <texturefocus colordiffuse="blue" border="15">dialogbutton-focus.png</texturefocus> + <texturenofocus border="15">dialogbutton-nofocus.png</texturenofocus> <pulseonselect>false</pulseonselect> </include> <include name="CommonNowPlaying"> @@ -567,14 +494,6 @@ <include>VisibleFadeEffect</include> <include>16x9_xPos_Relocation</include> <visible>Player.HasMedia + ![Window.IsVisible(busydialog) | Window.IsVisible(Notification) | Window.IsVisible(volumebar)]</visible> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>FF464646</colordiffuse> - </control> <control type="button"> <description>Volume Button</description> <posx>13</posx> @@ -586,14 +505,6 @@ <texturefocus colordiffuse="blue">osd_volume.png</texturefocus> <onclick>ActivateWindow(1112)</onclick> </control> - <control type="image"> - <posx>64</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>FF464646</colordiffuse> - </control> <control type="togglebutton"> <description>Play Button</description> <posx>77</posx> @@ -608,14 +519,6 @@ <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> <onclick>PlayerControl(Play)</onclick> </control> - <control type="image"> - <posx>128</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>FF464646</colordiffuse> - </control> <control type="group"> <visible>!Window.IsVisible(1112)</visible> <control type="progress"> @@ -708,14 +611,6 @@ <visible>Player.HasVideo + VideoPlayer.Content(MusicVideos)</visible> </control> </control> - <control type="image"> - <posx>550</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>FF464646</colordiffuse> - </control> <control type="button"> <description>Next Button</description> <posx>563</posx> @@ -727,14 +622,6 @@ <texturefocus colordiffuse="blue">osd_next.png</texturefocus> <onclick>PlayerControl(Next)</onclick> </control> - <control type="image"> - <posx>614</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>FF464646</colordiffuse> - </control> <control type="button"> <description>Stop Button</description> <posx>627</posx> @@ -746,14 +633,6 @@ <texturefocus colordiffuse="blue">osd_stop.png</texturefocus> <onclick>PlayerControl(Stop)</onclick> </control> - <control type="image"> - <posx>678</posx> - <posy>0</posy> - <width>2</width> - <height>78</height> - <texture border="2">separator.png</texture> - <colordiffuse>FF464646</colordiffuse> - </control> </control> </include> <include name="ScrollOffsetLabel"> @@ -788,20 +667,21 @@ <include name="SideMenu"> <control type="group"> <posx>0</posx> - <posy>80</posy> + <posy>0</posy> <animation effect="slide" start="0,0" end="-100,0" time="400" tween="quadratic" easing="in">WindowClose</animation> <animation effect="slide" end="0,0" start="-100,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> <control type="image"> <description>Menu Panel</description> - <posx>0</posx> + <posx>-960</posx> <posy>0</posy> - <width>100</width> - <height>800</height> - <texture>side_panel.png</texture> + <width>960</width> + <height>120</height> + <texture>header.png</texture> + <animation effect="rotate" end="90" time="0" center="0,0" condition="true">Conditional</animation> </control> <control type="list" id="9000"> <posx>0</posx> - <posy>0</posy> + <posy>80</posy> <width>100</width> <height>800</height> <itemlayout width="100" height="100"> @@ -887,70 +767,32 @@ </include> <include name="HomeMenu"> <control type="group"> - <animation effect="slide" start="0,0" end="-1040,0" time="400" tween="quadratic" easing="in">WindowClose</animation> - <animation effect="slide" end="0,0" start="-1040,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <posx>0</posx> <control type="image"> <description>Menu Panel</description> - <posx>40</posx> - <posy>100</posy> - <width>$PARAM[list-width]</width> - <height>620</height> + <posx>-5</posx> + <posy>-5</posy> + <width>510</width> + <height>970</height> <texture>panel.png</texture> - <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - </control> - <control type="image"> - <description>Menu Panel</description> - <posx>540</posx> - <posy>100</posy> - <width>$PARAM[list-width]</width> - <height>620</height> - <texture>panel.png</texture> - <animation effect="slide" start="0,0" end="-104,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - </control> - <control type="image"> - <posx>40</posx> - <posy>-55</posy> - <width>$PARAM[list-width]</width> - <height>155</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation> - <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - <visible>!Integer.IsGreater(Container(9000).NumItems,6)</visible> - </control> - <control type="image"> - <posx>540</posx> - <posy>-55</posy> - <width>$PARAM[list-width]</width> - <height>155</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation> - <animation effect="slide" start="0,0" end="-104,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - <visible>!Integer.IsGreater(Container(9000).NumItems,6)</visible> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> - <control type="panel" id="9000"> - <posx>40</posx> - <posy>100</posy> - <width>$PARAM[panel-width]</width> - <height>620</height> + <control type="fixedlist" id="9000"> + <posx>0</posx> + <posy>200</posy> + <width>500</width> + <height>760</height> <onleft>9000</onleft> <onright>9003</onright> <onup>10</onup> <ondown>10</ondown> - <pagecontrol></pagecontrol> <scrolltime>300</scrolltime> <orientation>vertical</orientation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation> - <animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation> - <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - <itemlayout height="155" width="$PARAM[layout-width]"> + <focusposition>1</focusposition> + <movement>2</movement> + <itemlayout height="155" width="500"> <control type="image"> - <posx>$PARAM[icon-posx-left]</posx> + <posx>-6</posx> <posy>18</posy> <width>90</width> <height>120</height> @@ -958,28 +800,21 @@ <aspectratio>keep</aspectratio> </control> <control type="label"> - <posx>$PARAM[label-posx-left]</posx> + <posx>90</posx> <posy>0</posy> - <width>$PARAM[label-width]</width> + <width>430</width> <height>155</height> - <font>font35_title</font> + <font>font40</font> <textcolor>white</textcolor> <aligny>center</aligny> <label>[UPPERCASE]$INFO[ListItem.Label][/UPPERCASE]</label> </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[list-width]</width> - <height>155</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> </itemlayout> - <focusedlayout height="155" width="$PARAM[layout-width]"> + <focusedlayout height="155" width="500"> <control type="image"> <posx>0</posx> <posy>0</posy> - <width>$PARAM[list-width]</width> + <width>500</width> <height>155</height> <texture>list_focus.png</texture> <visible>Control.HasFocus(9000)</visible> @@ -987,14 +822,14 @@ <control type="image"> <posx>0</posx> <posy>0</posy> - <width>$PARAM[iconback-width]</width> + <width>75</width> <height>155</height> <texture>black.png</texture> <colordiffuse>50000000</colordiffuse> <visible>Control.HasFocus(9000)</visible> </control> <control type="image"> - <posx>$PARAM[icon-posx-left]</posx> + <posx>-6</posx> <posy>18</posy> <width>90</width> <height>120</height> @@ -1002,11 +837,11 @@ <aspectratio>keep</aspectratio> </control> <control type="label"> - <posx>$PARAM[label-posx-left]</posx> + <posx>90</posx> <posy>0</posy> - <width>$PARAM[label-width]</width> + <width>430</width> <height>155</height> - <font>font35_title</font> + <font>font40</font> <textcolor>white</textcolor> <aligny>center</aligny> <label>[UPPERCASE]$INFO[ListItem.Label][/UPPERCASE]</label> @@ -1019,21 +854,21 @@ </control> </include> <include name="HomeMainMenuItems"> - <item id="1"> + <item> <label>31556</label> <onclick>ActivateWindow(TVChannels)</onclick> <icon>icon_menu_livetv.png</icon> <thumb></thumb> <visible>System.HasPVRAddon + !Skin.HasSetting(HideHomeButtonLiveTV)</visible> </item> - <item id="2"> + <item> <label>19021</label> <onclick>ActivateWindow(RadioChannels)</onclick> <icon>icon_menu_radio.png</icon> <thumb></thumb> <visible>System.HasPVRAddon + !Skin.HasSetting(HideHomeButtonRadio)</visible> </item> - <item id="3"> + <item> <label>20342</label> <onclick>ActivateWindow(Videos,MovieTitles,Return)</onclick> <icon>icon_menu_movies.png</icon> @@ -1041,7 +876,7 @@ <visible>Library.HasContent(Movies)</visible> <visible>!Skin.HasSetting(HideHomeButtonMovies)</visible> </item> - <item id="4"> + <item> <label>20343</label> <onclick>ActivateWindow(Videos,TVShowTitles,Return)</onclick> <icon>icon_menu_tvshows.png</icon> @@ -1049,34 +884,48 @@ <visible>Library.HasContent(TVShows)</visible> <visible>!Skin.HasSetting(HideHomeButtonTVShows)</visible> </item> - <item id="5"> + <item> <label>3</label> <onclick>ActivateWindow(Videos,Root,Return)</onclick> <icon>icon_menu_videos.png</icon> <thumb></thumb> <visible>!Skin.HasSetting(HideHomeButtonVideo)</visible> </item> - <item id="6"> + <item> <label>2</label> <onclick>ActivateWindow(Music)</onclick> <icon>icon_menu_music.png</icon> <thumb></thumb> <visible>!Skin.HasSetting(HideHomeButtonMusic)</visible> </item> - <item id="7"> + <item> <label>1</label> <onclick>ActivateWindow(Pictures)</onclick> <icon>icon_menu_pictures.png</icon> <thumb></thumb> <visible>!Skin.HasSetting(HideHomeButtonPictures)</visible> </item> - <item id="8"> + <item> <label>24001</label> <onclick>ActivateWindow(Programs,Addons,return)</onclick> <icon>icon_menu_addons.png</icon> <thumb></thumb> <visible>!Skin.HasSetting(HideHomeButtonPrograms)</visible> </item> + <item> + <label>8</label> + <onclick>ActivateWindow(Weather)</onclick> + <icon>icon_menu_weather.png</icon> + <thumb></thumb> + <visible>!Skin.HasSetting(HideHomeButtonWeather)</visible> + </item> + <item> + <label>1036</label> + <onclick>ActivateWindow(Favourites)</onclick> + <icon>icon_menu_favourites.png</icon> + <thumb></thumb> + <visible>!Skin.HasSetting(HideHomeButtonFavourites)</visible> + </item> </include> <include name="KeyboardButton"> <width>84</width> @@ -1158,7 +1007,7 @@ <description>Sort asc</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>31051</label> <altlabel>31050</altlabel> <usealttexture>Container.SortDirection(Ascending)</usealttexture> @@ -1191,7 +1040,7 @@ <description>Sort asc</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>31051</label> <altlabel>31050</altlabel> <usealttexture>Container.SortDirection(Ascending)</usealttexture> @@ -1223,7 +1072,7 @@ <description>Sort asc</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>31051</label> <altlabel>31050</altlabel> <usealttexture>Container.SortDirection(Ascending)</usealttexture> @@ -1237,7 +1086,7 @@ <description>Update Library</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>653</label> <altlabel>13353</altlabel> <usealttexture>library.isscanningmusic</usealttexture> @@ -1351,7 +1200,7 @@ <description>Sort asc</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>31051</label> <altlabel>31050</altlabel> <usealttexture>Container.SortDirection(Ascending)</usealttexture> @@ -1385,12 +1234,183 @@ <description>Sort asc</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>31051</label> <altlabel>31050</altlabel> <usealttexture>Container.SortDirection(Ascending)</usealttexture> </control> </include> + <include name="ProfilesContent"> + <control type="image"> + <posx>390</posx> + <posy>130</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + <control type="panel" id="2"> + <posx>390</posx> + <posy>133</posy> + <width>$PARAM[panel-width]</width> + <height>720</height> + <onleft>9</onleft> + <onright>60</onright> + <onup>2</onup> + <ondown>2</ondown> + <viewtype label="21371">list</viewtype> + <scrolltime>200</scrolltime> + <visible>Skin.String(ProfileSettings,1)</visible> + <itemlayout width="293" height="360"> + <control type="image"> + <posx>20</posx> + <posy>10</posy> + <width>253</width> + <height>253</height> + <texture fallback="DefaultActor.png">$INFO[Listitem.Icon]</texture> + </control> + <control type="label"> + <posx>10</posx> + <posy>270</posy> + <width>273</width> + <height>25</height> + <font>font24_title</font> + <textcolor>white</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="label"> + <posx>10</posx> + <posy>304</posy> + <width>273</width> + <height>20</height> + <font>font20</font> + <textcolor>blue</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <aligny>center</aligny> + <label>$LOCALIZE[31320]</label> + <visible>!String.IsEmpty(ListItem.Label2)</visible> + </control> + <control type="label"> + <posx>10</posx> + <posy>330</posy> + <width>273</width> + <height>20</height> + <font>font20</font> + <textcolor>grey</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label2]</label> + </control> + </itemlayout> + <focusedlayout width="293" height="360"> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>293</width> + <height>360</height> + <texture>list_focus.png</texture> + </control> + <control type="image"> + <posx>20</posx> + <posy>10</posy> + <width>253</width> + <height>253</height> + <texture fallback="DefaultActor.png">$INFO[Listitem.Icon]</texture> + </control> + <control type="label"> + <posx>10</posx> + <posy>270</posy> + <width>273</width> + <height>25</height> + <font>font24_title</font> + <textcolor>white</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label]</label> + </control> + <control type="label"> + <posx>10</posx> + <posy>304</posy> + <width>273</width> + <height>20</height> + <font>font20</font> + <textcolor>white</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <aligny>center</aligny> + <label>$LOCALIZE[31320]</label> + <visible>!String.IsEmpty(ListItem.Label2)</visible> + </control> + <control type="label"> + <posx>10</posx> + <posy>330</posy> + <width>273</width> + <height>20</height> + <font>font20</font> + <textcolor>white</textcolor> + <selectedcolor>selected</selectedcolor> + <align>center</align> + <aligny>center</aligny> + <label>$INFO[ListItem.Label2]</label> + </control> + </focusedlayout> + </control> + <control type="grouplist" id="200"> + <description>control area</description> + <posx>390</posx> + <posy>140</posy> + <width>$PARAM[panel-width]</width> + <height>720</height> + <itemgap>-1</itemgap> + <onleft>9</onleft> + <onright>60</onright> + <onup>200</onup> + <ondown>200</ondown> + <visible>Skin.String(ProfileSettings,2)</visible> + <control type="radiobutton" id ="4"> + <description>Enable Login screen</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>20096</label> + <enable>!Window.IsVisible(ProfileSettings)</enable> + <textoffsetx>20</textoffsetx> + </control> + <control type="button" id ="5"> + <description>Auto Login</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[33084]: $INFO[System.ProfileAutoLogin]</label> + <enable>!Window.IsVisible(ProfileSettings)</enable> + <textoffsetx>20</textoffsetx> + </control> + </control> + <control type="image"> + <posx>390</posx> + <posy>854</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + </include> <include name="PVRMenu"> <control type="button" id="201"> <include>MenuButtonCommonValues</include> @@ -1449,6 +1469,46 @@ <visible>Window.IsVisible(TVRecordings) | Window.IsVisible(RadioRecordings)</visible> </control> </include> + <include name="SettingsContent"> + <control type="image"> + <posx>390</posx> + <posy>130</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + <control type="grouplist" id="5"> + <description>control area</description> + <posx>390</posx> + <posy>140</posy> + <width>$PARAM[panel-width]</width> + <height>640</height> + <itemgap>-1</itemgap> + <onleft>3</onleft> + <onright>3</onright> + <onup>5</onup> + <ondown>5</ondown> + </control> + <control type="image"> + <posx>390</posx> + <posy>774</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + <control type="textbox" id="6"> + <description>Settings Description</description> + <posx>410</posx> + <posy>790</posy> + <width>$PARAM[textbox-width]</width> + <height>90</height> + <font>font22</font> + <textcolor>blue</textcolor> + <align>left</align> + </control> + </include> <include name="SettingsMenu"> <control type="button" id="20"> <description>Settings level button</description> @@ -1463,6 +1523,816 @@ <onclick>settingsreset</onclick> </control> </include> + <include name="SettingsPanel"> + <control type="panel" id="9000"> + <include>Window_OpenClose_Animation_Zoom</include> + <posx>$PARAM[panel-posx]</posx> + <posy>100</posy> + <width>$PARAM[panel-width]</width> + <height>750</height> + <onleft>9000</onleft> + <onright>9001</onright> + <onup>9000</onup> + <ondown>9000</ondown> + <scrolltime>300</scrolltime> + <itemlayout height="250" width="$PARAM[layout-width]"> + <control type="image"> + <posx>20</posx> + <posy>20</posy> + <width>360</width> + <height>210</height> + <texture>button_nofocus.png</texture> + </control> + <control type="image"> + <posx>15</posx> + <posy>175</posy> + <width>370</width> + <height>60</height> + <texture colordiffuse="40000000">black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + </control> + <control type="image"> + <posx>80</posx> + <posy>10</posy> + <width>240</width> + <height>240</height> + <texture>$INFO[ListItem.Icon]</texture> + <align>center</align> + </control> + <control type="label"> + <posx>0</posx> + <posy>190</posy> + <width>400</width> + <height>400</height> + <label>$INFO[ListItem.Label]</label> + <font>font20_title</font> + <align>center</align> + <textcolor>white</textcolor> + </control> + </itemlayout> + <focusedlayout height="250" width="$PARAM[layout-width]"> + <control type="group"> + <animation type="Focus" reversible="false"> + <effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" /> + </animation> + <animation type="UnFocus" reversible="false"> + <effect type="zoom" center="auto" start="108" end="100" time="250" tween="sine" /> + </animation> + <control type="image"> + <posx>20</posx> + <posy>20</posy> + <width>360</width> + <height>210</height> + <texture>button_nofocus.png</texture> + </control> + <control type="image"> + <posx>20</posx> + <posy>20</posy> + <width>360</width> + <height>210</height> + <texture>list_focus.png</texture> + <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> + </control> + <control type="image"> + <posx>20</posx> + <posy>180</posy> + <width>360</width> + <height>50</height> + <texture colordiffuse="40000000">black.png</texture> + </control> + <control type="image"> + <posx>80</posx> + <posy>10</posy> + <width>240</width> + <height>240</height> + <texture>$INFO[ListItem.Icon]</texture> + <align>center</align> + </control> + <control type="label"> + <posx>0</posx> + <posy>190</posy> + <width>400</width> + <height>400</height> + <label>$INFO[ListItem.Label]</label> + <font>font20_title</font> + <align>center</align> + </control> + </control> + </focusedlayout> + <content> + <item id="1"> + <label>14200</label> + <label2>31408</label2> + <onclick>ActivateWindow(PlayerSettings)</onclick> + <icon>icon_settings_player.png</icon> + </item> + <item id="2"> + <label>14211</label> + <label2>31409</label2> + <onclick>ActivateWindow(MediaSettings)</onclick> + <icon>icon_settings_media.png</icon> + </item> + <item id="3"> + <label>31556</label> + <label2>31555</label2> + <onclick>ActivateWindow(PVRSettings)</onclick> + <icon>icon_settings_livetv.png</icon> + </item> + <item id="4"> + <label>14036</label> + <label2>31405</label2> + <onclick>ActivateWindow(ServiceSettings)</onclick> + <icon>icon_settings_services.png</icon> + </item> + <item id="5"> + <label>14206</label> + <label2>31410</label2> + <onclick>ActivateWindow(InterfaceSettings)</onclick> + <icon>icon_settings_interface.png</icon> + </item> + <item id="6"> + <label>13000</label> + <label2>31406</label2> + <onclick>ActivateWindow(SystemSettings)</onclick> + <icon>icon_settings_system.png</icon> + </item> + <item id="7"> + <label>24001</label> + <label2>31407</label2> + <onclick>ActivateWindow(AddonBrowser)</onclick> + <icon>icon_settings_addons.png</icon> + </item> + <item id="8"> + <label>13200</label> + <label2>31411</label2> + <onclick>ActivateWindow(Profiles)</onclick> + <icon>icon_settings_profiles.png</icon> + </item> + <item id="9"> + <label>130</label> + <label2>31412</label2> + <onclick>ActivateWindow(SystemInfo)</onclick> + <icon>icon_settings_systeminfo.png</icon> + </item> + </content> + </control> + </include> + <include name="SkinSettingsContent"> + <control type="image"> + <posx>390</posx> + <posy>130</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + <control type="grouplist" id="100"> + <description>control area</description> + <posx>390</posx> + <posy>140</posy> + <width>$PARAM[panel-width]</width> + <height>640</height> + <itemgap>-1</itemgap> + <onup>100</onup> + <ondown>9002</ondown> + <onleft>9</onleft> + <onright>60</onright> + <visible>Skin.String(SkinSettings,1)</visible> + <control type="radiobutton" id="102"> + <description>Show LiveTV</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31556]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonLiveTV)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonLiveTV)</selected> + <enable>System.HasPVRAddon</enable> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="103"> + <description>Show Radio</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[19021]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonRadio)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonRadio)</selected> + <enable>System.HasPVRAddon</enable> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="104"> + <description>Hide Videos</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[3]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonVideo)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonVideo)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="105"> + <description>Hide Movies</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[20342]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonMovies)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonMovies)</selected> + <textoffsetx>20</textoffsetx> + <enable>Library.HasContent(Movies)</enable> + </control> + <control type="radiobutton" id="106"> + <description>Hide TVShows</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[20343]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonTVShows)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonTVShows)</selected> + <textoffsetx>20</textoffsetx> + <enable>Library.HasContent(TVShows)</enable> + </control> + <control type="radiobutton" id="107"> + <description>Hide Music</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[2]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonMusic)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonMusic)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="108"> + <description>Hide Pictures</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[1]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonPictures)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonPictures)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="109"> + <description>Hide Programs</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[0]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonPrograms)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonPrograms)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="110"> + <description>Hide Weather</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[8]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonWeather)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonWeather)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="111"> + <description>Hide Favourites</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[1036]</label> + <onclick>Skin.ToggleSetting(HideHomeButtonFavourites)</onclick> + <selected>!Skin.HasSetting(HideHomeButtonFavourites)</selected> + <textoffsetx>20</textoffsetx> + </control> + </control> + <control type="grouplist" id="200"> + <description>control area</description> + <posx>390</posx> + <posy>140</posy> + <width>$PARAM[panel-width]</width> + <height>640</height> + <itemgap>-1</itemgap> + <onup>200</onup> + <ondown>9002</ondown> + <onleft>9</onleft> + <onright>60</onright> + <visible>Skin.String(SkinSettings,2)</visible> + <control type="button" id="202"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 1</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton1))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton1,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="203"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 2</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton2,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="204"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 3</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton3,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="205"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 4</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton4,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="206"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 5</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton5))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton5,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="207"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 6</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton6))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton6,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="208"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 7</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton7))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton7,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="209"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 8</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton8))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton8,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="210"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 9</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton9))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton9,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="211"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 10</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton10))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton10,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="212"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 11</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton11))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton11,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="213"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 12</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton12))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton12,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="214"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 13</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton13))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton13,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="215"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 14</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton14))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton14,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + <control type="button" id="216"> + <description>Home Addon Button</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31551] 15</label> + <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton15))]</label2> + <textoffsetx>20</textoffsetx> + <onclick>Skin.SetAddon(HomeAddonButton15,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + </control> + </control> + <control type="grouplist" id="300"> + <description>control area</description> + <posx>390</posx> + <posy>140</posy> + <width>$PARAM[panel-width]</width> + <height>640</height> + <itemgap>-1</itemgap> + <onup>200</onup> + <ondown>9002</ondown> + <onleft>9</onleft> + <onright>60</onright> + <visible>Skin.String(SkinSettings,3)</visible> + <control type="radiobutton" id="115"> + <description>Use custom background</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31553]</label> + <onclick>Skin.ToggleSetting(UseCustomBackground)</onclick> + <selected>Skin.HasSetting(UseCustomBackground)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="button" id="116"> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>- $LOCALIZE[31554]</label> + <label2>$INFO[Skin.String(CustomBackground)]</label2> + <onclick>Skin.SetImage(CustomBackground)</onclick> + <enable>Skin.HasSetting(UseCustomBackground)</enable> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="117"> + <description>Hide video background</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31557]</label> + <onclick>Skin.ToggleSetting(HideVideoBackground)</onclick> + <selected>Skin.HasSetting(HideVideoBackground)</selected> + <textoffsetx>20</textoffsetx> + </control> + <control type="radiobutton" id="118"> + <description>Hide viz background</description> + <width>$PARAM[panel-width]</width> + <height>80</height> + <aligny>center</aligny> + <font>font24_title</font> + <textcolor>white</textcolor> + <texturefocus>list_focus.png</texturefocus> + <texturenofocus></texturenofocus> + <pulseonselect>false</pulseonselect> + <label>$LOCALIZE[31558]</label> + <onclick>Skin.ToggleSetting(HideVizBackground)</onclick> + <selected>Skin.HasSetting(HideVizBackground)</selected> + <textoffsetx>20</textoffsetx> + </control> + </control> + <control type="image"> + <posx>390</posx> + <posy>774</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + </include> + <include name="SysInfoContent"> + <control type="image"> + <posx>390</posx> + <posy>130</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + <control type="group"> + <posx>390</posx> + <posy>133</posy> + <width>$PARAM[panel-width]</width> + <height>720</height> + <control type="label" id="2"> + <description>Label 2</description> + <posx>20</posx> + <posy>0</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="3"> + <description>Label 3</description> + <posx>20</posx> + <posy>60</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="4"> + <description>Label 4</description> + <posx>20</posx> + <posy>120</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="5"> + <description>Label 5</description> + <posx>20</posx> + <posy>180</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="6"> + <description>Label 6</description> + <posx>20</posx> + <posy>240</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="7"> + <description>Label 7</description> + <posx>20</posx> + <posy>300</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="8"> + <description>Label 8</description> + <posx>20</posx> + <posy>360</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="9"> + <description>Label 9</description> + <posx>20</posx> + <posy>420</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="10"> + <description>Label 10</description> + <posx>20</posx> + <posy>480</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + <control type="label" id="11"> + <description>Label 11</description> + <posx>20</posx> + <posy>540</posy> + <width>$PARAM[panel-width]</width> + <height>60</height> + <align>left</align> + <aligny>center</aligny> + <label></label> + <font>font22</font> + </control> + </control> + <control type="textbox" id="30"> + <posx>410</posx> + <posy>150</posy> + <width>$PARAM[textbox-width]</width> + <height>620</height> + <pagecontrol>60</pagecontrol> + <autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll> + </control> + <control type="scrollbar" id="60"> + <posx>50r</posx> + <posy>150</posy> + <width>26</width> + <height>610</height> + <texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground> + <texturesliderbar colordiffuse="grey">white.png</texturesliderbar> + <texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus> + <textureslidernib>blank.png</textureslidernib> + <textureslidernibfocus>blank.png</textureslidernibfocus> + <onleft>9000</onleft> + <showonepage>false</showonepage> + <orientation>vertical</orientation> + <animation effect="fade" time="150">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> + <visible>Control.IsVisible(30)</visible> + </control> + <control type="image"> + <posx>390</posx> + <posy>774</posy> + <width>$PARAM[panel-width]</width> + <height>2</height> + <texture border="2">separator.png</texture> + <colordiffuse>blue</colordiffuse> + </control> + </include> <include name="VideosMenu"> <control type="button" id="3"> <description>Sort by button</description> @@ -1473,7 +2343,7 @@ <description>Sort asc</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>31051</label> <altlabel>31050</altlabel> <usealttexture>Container.SortDirection(Ascending)</usealttexture> @@ -1493,7 +2363,7 @@ <description>Update Library</description> <include>MenuButtonCommonValues</include> <alttexturefocus>list_focus.png</alttexturefocus> - <alttexturenofocus border="40,0,40,5">list_nofocus.png</alttexturenofocus> + <alttexturenofocus></alttexturenofocus> <label>653</label> <altlabel>13353</altlabel> <usealttexture>library.isscanningvideo</usealttexture> diff --git a/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml b/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml index 90de8c8190..2818c81649 100644 --- a/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml +++ b/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml @@ -3,7 +3,7 @@ <include name="HomeRecentlyAddedInfo"> <control type="group"> <posx>0</posx> - <posy>210</posy> + <posy>230</posy> <animation type="WindowClose" reversible="false"> <effect type="fade" start="100" end="0" time="400" /> </animation> @@ -11,6 +11,7 @@ <effect type="slide" start="400,0" end="0,0" delay="200" easing="out" tween="quadratic" time="400" /> <effect type="fade" start="0" end="100" delay="200" time="400" /> </animation> + <animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> <control type="group" id="2010"> <posx>$PARAM[group-posx]</posx> <posy>0</posy> @@ -39,11 +40,13 @@ <scrolltime>200</scrolltime> <itemlayout height="330" width="210"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>200</width> - <height>320</height> + <posx>0</posx> + <posy>0</posy> + <width>210</width> + <height>330</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -68,11 +71,13 @@ </itemlayout> <focusedlayout height="330" width="210"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>200</width> - <height>320</height> + <posx>0</posx> + <posy>0</posy> + <width>210</width> + <height>330</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -102,104 +107,7 @@ <texture border="5">thumb_focus.png</texture> </control> </focusedlayout> - <content> - <item id="1"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.1.Title))</visible> - </item> - <item id="2"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.2.Title))</visible> - </item> - <item id="3"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.3.Title))</visible> - </item> - <item id="4"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.4.Title))</visible> - </item> - <item id="5"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.5.Title))</visible> - </item> - <item id="6"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.6.Title))</visible> - </item> - <item id="7"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.7.Title))</visible> - </item> - <item id="8"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.8.Title))</visible> - </item> - <item id="9"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.9.Title))</visible> - </item> - <item id="10"> - <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> - <visible>!String.IsEmpty(Window.Property(LatestMovie.10.Title))</visible> - </item> - <item id="11"> - <label>$INFO[Window.Property(LatestMovie.11.Title)]</label> - <label2></label2> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.11.Path)])</onclick> - <icon>$INFO[Window.Property(LatestMovie.11.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestMovie.11.Title))</visible> - </item> - <item id="12"> - <label>$INFO[Window.Property(LatestMovie.12.Title)]</label> - <label2></label2> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.12.Path)])</onclick> - <icon>$INFO[Window.Property(LatestMovie.12.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestMovie.12.Title))</visible> - </item> - </content> + <content target="movies" sortby="date" limit="10">videodb://recentlyaddedmovies/</content> </control> <control type="panel" id="2200"> <visible>Library.HasContent(TVShows) + Container(9010).HasFocus(2)</visible> @@ -211,8 +119,8 @@ <effect type="zoom" start="100" end="50" center="auto" easing="in" tween="quadratic" time="400" /> <effect type="fade" start="100" end="0" time="400" /> </animation> - <animation effect="slide" start="0,0" end="30,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> - <posx>40</posx> + <animation effect="slide" start="0,0" end="71,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation> + <posx>-36</posx> <posy>0</posy> <width>$PARAM[panel-width]</width> <height>660</height> @@ -225,11 +133,13 @@ <scrolltime>200</scrolltime> <itemlayout height="220" width="280"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>270</width> - <height>210</height> + <posx>0</posx> + <posy>0</posy> + <width>280</width> + <height>220</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -250,7 +160,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> + <label>$INFO[ListItem.Label]</label> </control> <control type="label"> <posx>15</posx> @@ -262,16 +172,18 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[UPPERCASE]$INFO[ListItem.Property(EpNumber)][/UPPERCASE]</label> + <label>[UPPERCASE]$INFO[ListItem.TVShowTitle][/UPPERCASE]</label> </control> </itemlayout> <focusedlayout height="250" width="213"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>270</width> - <height>210</height> + <posx>0</posx> + <posy>0</posy> + <width>280</width> + <height>220</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -292,7 +204,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> + <label>$INFO[ListItem.Label]</label> </control> <control type="label"> <posx>15</posx> @@ -304,7 +216,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[UPPERCASE]$INFO[ListItem.Property(EpNumber)][/UPPERCASE]</label> + <label>[UPPERCASE]$INFO[ListItem.TVShowTitle][/UPPERCASE]</label> </control> <control type="image"> <posx>5</posx> @@ -314,98 +226,7 @@ <texture border="5">thumb_focus.png</texture> </control> </focusedlayout> - <content> - <item id="1"> - <label>$INFO[Window.Property(LatestEpisode.1.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.1.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.1.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.1.EpisodeTitle))</visible> - </item> - <item id="2"> - <label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.2.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.2.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.2.EpisodeTitle))</visible> - </item> - <item id="3"> - <label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.3.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.3.EpisodeTitle))</visible> - </item> - <item id="4"> - <label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.4.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.4.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.4.EpisodeTitle))</visible> - </item> - <item id="5"> - <label>$INFO[Window.Property(LatestEpisode.5.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.5.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.5.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.5.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.5.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.5.EpisodeTitle))</visible> - </item> - <item id="6"> - <label>$INFO[Window.Property(LatestEpisode.6.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.6.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.6.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.6.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.6.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.6.EpisodeTitle))</visible> - </item> - <item id="7"> - <label>$INFO[Window.Property(LatestEpisode.7.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.7.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.7.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.7.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.7.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.7.EpisodeTitle))</visible> - </item> - <item id="8"> - <label>$INFO[Window.Property(LatestEpisode.8.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.8.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.8.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.8.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.8.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.8.EpisodeTitle))</visible> - </item> - <item id="9"> - <label>$INFO[Window.Property(LatestEpisode.9.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.9.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.9.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.9.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.9.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.9.EpisodeTitle))</visible> - </item> - <item id="10"> - <label>$INFO[Window.Property(LatestEpisode.10.EpisodeTitle)]</label> - <label2>$INFO[Window.Property(LatestEpisode.10.ShowTitle)]</label2> - <property name="EpNumber">$INFO[Window.Property(LatestEpisode.10.EpisodeNo)]</property> - <onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.10.Path)])</onclick> - <icon></icon> - <thumb>$INFO[Window.Property(LatestEpisode.10.Thumb)]</thumb> - <visible>!String.IsEmpty(Window.Property(LatestEpisode.10.EpisodeTitle))</visible> - </item> - </content> + <content target="video" limit="12">videodb://recentlyaddedepisodes/</content> </control> <control type="panel" id="2300"> <visible>Library.HasContent(Music) + Container(9010).HasFocus(3)</visible> @@ -430,11 +251,13 @@ <scrolltime>200</scrolltime> <itemlayout height="220" width="210"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>200</width> - <height>210</height> + <posx>0</posx> + <posy>0</posy> + <width>210</width> + <height>220</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -459,11 +282,13 @@ </itemlayout> <focusedlayout height="170" width="160"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>200</width> - <height>210</height> + <posx>0</posx> + <posy>0</posy> + <width>210</width> + <height>220</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -493,104 +318,7 @@ <texture border="5">thumb_focus.png</texture> </control> </focusedlayout> - <content> - <item id="1"> - <label>$INFO[Window.Property(LatestAlbum.1.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.1.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.1.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.1.Title))</visible> - </item> - <item id="2"> - <label>$INFO[Window.Property(LatestAlbum.2.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.2.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.2.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.2.Title))</visible> - </item> - <item id="3"> - <label>$INFO[Window.Property(LatestAlbum.3.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.3.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.3.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.3.Title))</visible> - </item> - <item id="4"> - <label>$INFO[Window.Property(LatestAlbum.4.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.4.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.4.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.4.Title))</visible> - </item> - <item id="5"> - <label>$INFO[Window.Property(LatestAlbum.5.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.5.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.5.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.5.Title))</visible> - </item> - <item id="6"> - <label>$INFO[Window.Property(LatestAlbum.6.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.6.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.6.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.6.Title))</visible> - </item> - <item id="7"> - <label>$INFO[Window.Property(LatestAlbum.7.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.7.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.7.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.7.Title))</visible> - </item> - <item id="8"> - <label>$INFO[Window.Property(LatestAlbum.8.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.8.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.8.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.8.Title))</visible> - </item> - <item id="9"> - <label>$INFO[Window.Property(LatestAlbum.9.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.9.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.9.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.9.Title))</visible> - </item> - <item id="10"> - <label>$INFO[Window.Property(LatestAlbum.10.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.10.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.10.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.10.Title))</visible> - </item> - <item id="11"> - <label>$INFO[Window.Property(LatestAlbum.11.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.11.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.11.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.11.Title))</visible> - </item> - <item id="12"> - <label>$INFO[Window.Property(LatestAlbum.12.Title)]</label> - <label2></label2> - <onclick>ActivateWindow(Music,$INFO[Window.Property(LatestAlbum.12.Path)])</onclick> - <icon>$INFO[Window.Property(LatestAlbum.12.Thumb)]</icon> - <thumb></thumb> - <visible>!String.IsEmpty(Window.Property(LatestAlbum.12.Title))</visible> - </item> - </content> + <content target="music" limit="15">musicdb://recentlyaddedalbums/</content> </control> <control type="panel" id="2400"> <visible>Container(9010).HasFocus(4)</visible> @@ -615,11 +343,13 @@ <scrolltime>200</scrolltime> <itemlayout height="220" width="210"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>200</width> - <height>210</height> + <posx>0</posx> + <posy>0</posy> + <width>210</width> + <height>220</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -644,11 +374,13 @@ </itemlayout> <focusedlayout height="170" width="160"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>200</width> - <height>210</height> + <posx>0</posx> + <posy>0</posy> + <width>210</width> + <height>220</height> <texture>black.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> <colordiffuse>99000000</colordiffuse> </control> <control type="image"> @@ -775,6 +507,22 @@ <thumb></thumb> <visible>!String.IsEmpty(Skin.String(HomeAddonButton12))</visible> </item> + <item> + <label>$INFO[system.addontitle(Skin.String(HomeAddonButton13))]</label> + <label2></label2> + <onclick>RunAddon($INFO[Skin.String(HomeAddonButton13)])</onclick> + <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton13))]</icon> + <thumb></thumb> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton13))</visible> + </item> + <item> + <label>$INFO[system.addontitle(Skin.String(HomeAddonButton14))]</label> + <label2></label2> + <onclick>RunAddon($INFO[Skin.String(HomeAddonButton14)])</onclick> + <icon>$INFO[system.addonicon(Skin.String(HomeAddonButton14))]</icon> + <thumb></thumb> + <visible>!String.IsEmpty(Skin.String(HomeAddonButton14))</visible> + </item> </content> </control> </control> diff --git a/addons/skin.estouchy/xml/LoginScreen.xml b/addons/skin.estouchy/xml/LoginScreen.xml index e5c64219eb..97237b2a67 100644 --- a/addons/skin.estouchy/xml/LoginScreen.xml +++ b/addons/skin.estouchy/xml/LoginScreen.xml @@ -46,13 +46,6 @@ <scrolltime>200</scrolltime> <itemlayout height="110" width="690"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>690</width> - <height>110</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>2</posx> <posy>2</posy> <width>106</width> diff --git a/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml b/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml index 54482a14f7..f8a467b2dc 100644 --- a/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml +++ b/addons/skin.estouchy/xml/MyMusicPlaylistEditor.xml @@ -29,11 +29,13 @@ <label>31058</label> </control> <control type="image"> - <posx>0</posx> - <posy>40</posy> - <width>570</width> - <height>720</height> - <texture>panel.png</texture> + <posx>-5</posx> + <posy>35</posy> + <width>580</width> + <height>730</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="panel" id="50"> <posx>0</posx> @@ -49,13 +51,6 @@ <scrolltime>200</scrolltime> <itemlayout height="80" width="570"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>570</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>70</width> @@ -162,11 +157,13 @@ <label>31059</label> </control> <control type="image"> - <posx>0</posx> - <posy>40</posy> - <width>570</width> - <height>720</height> - <texture>panel.png</texture> + <posx>-5</posx> + <posy>35</posy> + <width>580</width> + <height>730</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="panel" id="100"> <posx>0</posx> @@ -182,13 +179,6 @@ <scrolltime>200</scrolltime> <itemlayout height="60" width="570"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>570</width> - <height>80</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>70</width> diff --git a/addons/skin.estouchy/xml/MyWeather.xml b/addons/skin.estouchy/xml/MyWeather.xml index bb4bd0a05b..8e9ef6abdb 100644 --- a/addons/skin.estouchy/xml/MyWeather.xml +++ b/addons/skin.estouchy/xml/MyWeather.xml @@ -18,11 +18,13 @@ <posx>50</posx> <posy>130</posy> <control type="image"> - <posx>20</posx> - <posy>20</posy> - <width>510</width> - <height>680</height> - <texture>panel.png</texture> + <posx>15</posx> + <posy>15</posy> + <width>520</width> + <height>690</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="label"> <description>header label</description> @@ -249,11 +251,13 @@ <posy>130</posy> <visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day0.Title))</visible> <control type="image"> - <posx>20</posx> - <posy>20</posy> - <width>560</width> - <height>680</height> - <texture>panel.png</texture> + <posx>15</posx> + <posy>15</posy> + <width>570</width> + <height>690</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="panel" id="50"> <posx>20</posx> @@ -269,13 +273,6 @@ <scrolltime>200</scrolltime> <itemlayout height="170" width="560"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>560</width> - <height>170</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>380</posx> <posy>3</posy> <width>164</width> diff --git a/addons/skin.estouchy/xml/Settings.xml b/addons/skin.estouchy/xml/Settings.xml index e8543957f7..91b2f45821 100644 --- a/addons/skin.estouchy/xml/Settings.xml +++ b/addons/skin.estouchy/xml/Settings.xml @@ -3,9 +3,31 @@ <defaultcontrol always="true">9000</defaultcontrol> <controls> <include>CommonBackground</include> + <include content="SettingsPanel" condition="String.IsEqual(Skin.AspectRatio,16:9)"> + <param name="panel-posx">160</param> + <param name="panel-width">1500</param> + <param name="layout-width">500</param> + </include> + <include content="SettingsPanel" condition="String.IsEqual(Skin.AspectRatio,4:3)"> + <param name="panel-posx">40</param> + <param name="panel-width">1200</param> + <param name="layout-width">400</param> + </include> <include>Header</include> <include>CommonNowPlaying</include> <include>Footer</include> + <control type="textbox"> + <description>Settings Description</description> + <posx>250</posx> + <posy>70r</posy> + <width>780</width> + <height>60</height> + <label>$INFO[Container(9000).ListItem.Label2]</label> + <font>font22</font> + <textcolor>blue</textcolor> + <align>center</align> + <include>16x9_xPos_Relocation</include> + </control> <control type="label"> <description>Window label</description> <include>MediaWindowTitleCommons</include> @@ -27,170 +49,5 @@ </item> </content> </control> - <control type="panel" id="9000"> - <include>16x9_xPos_Relocation</include> - <include>Window_OpenClose_Animation_Zoom</include> - <posx>40</posx> - <posy>100</posy> - <width>1200</width> - <height>750</height> - <onleft>9000</onleft> - <onright>9001</onright> - <onup>9000</onup> - <ondown>9000</ondown> - <pagecontrol></pagecontrol> - <scrolltime>300</scrolltime> - <itemlayout height="250" width="400"> - <control type="image"> - <posx>20</posx> - <posy>20</posy> - <width>360</width> - <height>210</height> - <texture>button_nofocus.png</texture> - </control> - <control type="image"> - <posx>20</posx> - <posy>180</posy> - <width>360</width> - <height>50</height> - <texture colordiffuse="40000000">black.png</texture> - </control> - <control type="image"> - <posx>80</posx> - <posy>10</posy> - <width>240</width> - <height>240</height> - <texture>$INFO[ListItem.Icon]</texture> - <align>center</align> - </control> - <control type="label"> - <posx>0</posx> - <posy>190</posy> - <width>400</width> - <height>400</height> - <label>$INFO[ListItem.Label]</label> - <font>font20_title</font> - <align>center</align> - <textcolor>white</textcolor> - </control> - </itemlayout> - <focusedlayout height="250" width="400"> - <control type="group"> - <animation type="Focus" reversible="false"> - <effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" /> - </animation> - <animation type="UnFocus" reversible="false"> - <effect type="zoom" center="auto" start="108" end="100" time="250" tween="sine" /> - </animation> - <control type="image"> - <posx>20</posx> - <posy>20</posy> - <width>360</width> - <height>210</height> - <texture>button_nofocus.png</texture> - </control> - <control type="image"> - <posx>20</posx> - <posy>20</posy> - <width>360</width> - <height>210</height> - <texture>list_focus.png</texture> - <animation effect="fade" start="100" end="0" time="0">Unfocus</animation> - </control> - <control type="image"> - <posx>20</posx> - <posy>180</posy> - <width>360</width> - <height>50</height> - <texture colordiffuse="40000000">black.png</texture> - </control> - <control type="image"> - <posx>80</posx> - <posy>10</posy> - <width>240</width> - <height>240</height> - <texture>$INFO[ListItem.Icon]</texture> - <align>center</align> - </control> - <control type="label"> - <posx>0</posx> - <posy>190</posy> - <width>400</width> - <height>400</height> - <label>$INFO[ListItem.Label]</label> - <font>font20_title</font> - <align>center</align> - </control> - </control> - </focusedlayout> - <content> - <item id="1"> - <label>14200</label> - <label2>31408</label2> - <onclick>ActivateWindow(PlayerSettings)</onclick> - <icon>icon_settings_player.png</icon> - </item> - <item id="2"> - <label>14211</label> - <label2>31409</label2> - <onclick>ActivateWindow(MediaSettings)</onclick> - <icon>icon_settings_library.png</icon> - </item> - <item id="3"> - <label>31556</label> - <label2>31555</label2> - <onclick>ActivateWindow(PVRSettings)</onclick> - <icon>icon_settings_tv.png</icon> - </item> - <item id="4"> - <label>14036</label> - <label2>31405</label2> - <onclick>ActivateWindow(ServiceSettings)</onclick> - <icon>icon_settings_services.png</icon> - </item> - <item id="5"> - <label>14206</label> - <label2>31410</label2> - <onclick>ActivateWindow(InterfaceSettings)</onclick> - <icon>icon_settings_interface.png</icon> - </item> - <item id="6"> - <label>13000</label> - <label2>31406</label2> - <onclick>ActivateWindow(SystemSettings)</onclick> - <icon>icon_settings_system.png</icon> - </item> - <item id="7"> - <label>24001</label> - <label2>31407</label2> - <onclick>ActivateWindow(AddonBrowser)</onclick> - <icon>icon_settings_addons.png</icon> - </item> - <item id="8"> - <label>13200</label> - <label2>31411</label2> - <onclick>ActivateWindow(Profiles)</onclick> - <icon>icon_settings_profiles.png</icon> - </item> - <item id="9"> - <label>130</label> - <label2>31412</label2> - <onclick>ActivateWindow(SystemInfo)</onclick> - <icon>icon_settings_systeminfo.png</icon> - </item> - </content> - </control> - <control type="textbox"> - <description>Settings Description</description> - <posx>250</posx> - <posy>70r</posy> - <width>780</width> - <height>60</height> - <label>$INFO[Container(9000).ListItem.Label2]</label> - <font>font22</font> - <textcolor>blue</textcolor> - <align>center</align> - <include>16x9_xPos_Relocation</include> - </control> </controls> </window> diff --git a/addons/skin.estouchy/xml/SettingsCategory.xml b/addons/skin.estouchy/xml/SettingsCategory.xml index 6c065a377e..249ecf1072 100644 --- a/addons/skin.estouchy/xml/SettingsCategory.xml +++ b/addons/skin.estouchy/xml/SettingsCategory.xml @@ -4,54 +4,25 @@ <onunload>ClearProperty(PopupMenuVisible,Home)</onunload> <controls> <include>CommonBackground</include> - <include>Header</include> - <include>CommonNowPlaying</include> - <include>ScrollBarCommons</include> - <include>Footer</include> - <control type="label"> - <description>Window label</description> - <include>MediaWindowTitleCommons</include> - <label>$LOCALIZE[5]$INFO[Control.GetLabel(2), - ]</label> - </control> - <control type="panel" id="9002"> - <include>VisibleFadeEffect</include> - <include>BottomMenuLayout</include> - <content> - <item> - <label>31200</label> - <onclick>Back</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> - <label>1036</label> - <onclick>ActivateWindow(Favourites)</onclick> - <icon>icon_button_favourites.png</icon> - </item> - <item> - <label>5</label> - <onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> - <onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> - <icon>icon_button_settings.png</icon> - </item> - </content> - </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include>16x9_xPos_Relocation</include> - <posx>30</posx> - <posy>140</posy> + <posx>0</posx> + <posy>0</posy> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>290</width> - <height>720</height> + <description>Menu Panel</description> + <posx>-5</posx> + <posy>-5</posy> + <width>400</width> + <height>970</height> <texture>panel.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="grouplist" id="3"> <description>button area</description> <posx>0</posx> - <posy>0</posy> - <width>290</width> + <posy>130</posy> + <width>390</width> <height>720</height> <itemgap>-1</itemgap> <onleft>5</onleft> @@ -59,54 +30,24 @@ <onup>3</onup> <ondown>3</ondown> </control> - <control type="image"> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>720</height> - <texture>panel.png</texture> - </control> - <control type="grouplist" id="5"> - <description>control area</description> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>580</height> - <pagecontrol>60</pagecontrol> - <itemgap>-1</itemgap> - <onleft>3</onleft> - <onright>3</onright> - <onup>5</onup> - <ondown>5</ondown> - </control> - <control type="image"> - <posx>310</posx> - <posy>600</posy> - <width>880</width> - <height>2</height> - <texture border="2">separator.png</texture> - <colordiffuse>blue</colordiffuse> - </control> - <control type="textbox" id="6"> - <description>Settings Description</description> - <posx>320</posx> - <posy>620</posy> - <width>840</width> - <height>80</height> - <font>font22</font> - <textcolor>blue</textcolor> - <align>left</align> - </control> + <include content="SettingsContent" condition="String.IsEqual(Skin.AspectRatio,16:9)"> + <param name="panel-width">1316</param> + <param name="textbox-width">1286</param> + </include> + <include content="SettingsContent" condition="String.IsEqual(Skin.AspectRatio,4:3)"> + <param name="panel-width">890</param> + <param name="textbox-width">860</param> + </include> </control> <control type="button" id="10"> <description>Default Category Button</description> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <textoffsetx>20</textoffsetx> </control> @@ -118,7 +59,7 @@ <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <textoffsetx>20</textoffsetx> </control> <control type="label" id="14"> @@ -139,7 +80,7 @@ <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <textoffsetx>20</textoffsetx> </control> <control type="spincontrolex" id="9"> @@ -150,7 +91,7 @@ <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <aligny>center</aligny> <reverse>yes</reverse> <textoffsetx>20</textoffsetx> @@ -163,7 +104,7 @@ <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <aligny>center</aligny> <textoffsetx>20</textoffsetx> </control> @@ -182,6 +123,36 @@ <font></font> <visible>false</visible> </control> + <include>Header</include> + <include>CommonNowPlaying</include> + <include>Footer</include> + <control type="label"> + <description>Window label</description> + <include>MediaWindowTitleCommons</include> + <label>$LOCALIZE[5]$INFO[Control.GetLabel(2), - ]</label> + </control> + <control type="panel" id="9002"> + <include>VisibleFadeEffect</include> + <include>BottomMenuLayout</include> + <content> + <item> + <label>31200</label> + <onclick>Back</onclick> + <icon>icon_button_back.png</icon> + </item> + <item> + <label>1036</label> + <onclick>ActivateWindow(Favourites)</onclick> + <icon>icon_button_favourites.png</icon> + </item> + <item> + <label>5</label> + <onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick> + <onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick> + <icon>icon_button_settings.png</icon> + </item> + </content> + </control> <include content="PopupMenu"> <param name="panel-posy">400</param> <param name="panel-height">160</param> diff --git a/addons/skin.estouchy/xml/SettingsProfile.xml b/addons/skin.estouchy/xml/SettingsProfile.xml index 4735f8df81..70a461b210 100644 --- a/addons/skin.estouchy/xml/SettingsProfile.xml +++ b/addons/skin.estouchy/xml/SettingsProfile.xml @@ -3,47 +3,25 @@ <defaultcontrol always="true">2</defaultcontrol> <controls> <include>CommonBackground</include> - <include>Header</include> - <include>CommonNowPlaying</include> - <include>Footer</include> - <control type="label"> - <description>Window label</description> - <include>MediaWindowTitleCommons</include> - <label>$LOCALIZE[10034]</label> - </control> - <control type="panel" id="9002"> - <include>VisibleFadeEffect</include> - <include>BottomMenuLayout</include> - <content> - <item> - <label>31200</label> - <onclick>Back</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> - <label>1036</label> - <onclick>ActivateWindow(Favourites)</onclick> - <icon>icon_button_favourites.png</icon> - </item> - </content> - </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include>16x9_xPos_Relocation</include> - <posx>30</posx> - <posy>140</posy> + <posx>0</posx> + <posy>0</posy> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>290</width> - <height>720</height> + <description>Menu Panel</description> + <posx>-5</posx> + <posy>-5</posy> + <width>400</width> + <height>970</height> <texture>panel.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="grouplist" id="9"> <description>button area</description> <posx>0</posx> - <posy>0</posy> - <width>290</width> + <posy>130</posy> + <width>390</width> <height>720</height> <itemgap>-1</itemgap> <onleft>9</onleft> @@ -52,13 +30,13 @@ <ondown>2</ondown> <control type="button" id="91"> <description>Profiles Button</description> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>13200</label> <textoffsetx>20</textoffsetx> @@ -66,182 +44,51 @@ </control> <control type="button" id="92"> <description>Login Button</description> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>31038</label> <textoffsetx>20</textoffsetx> <onfocus>Skin.SetString(ProfileSettings,2)</onfocus> </control> </control> - <control type="image"> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>720</height> - <texture>panel.png</texture> - </control> - <control type="panel" id="2"> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>720</height> - <onleft>9</onleft> - <onright>60</onright> - <onup>2</onup> - <ondown>2</ondown> - <viewtype label="21371">list</viewtype> - <pagecontrol>60</pagecontrol> - <scrolltime>200</scrolltime> - <visible>Skin.String(ProfileSettings,1)</visible> - <itemlayout width="293" height="360"> - <control type="image"> - <posx>20</posx> - <posy>10</posy> - <width>253</width> - <height>253</height> - <texture fallback="DefaultActor.png">$INFO[Listitem.Icon]</texture> - </control> - <control type="label"> - <posx>10</posx> - <posy>270</posy> - <width>273</width> - <height>25</height> - <font>font24_title</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="label"> - <posx>10</posx> - <posy>304</posy> - <width>273</width> - <height>20</height> - <font>font20</font> - <textcolor>blue</textcolor> - <selectedcolor>selected</selectedcolor> - <align>center</align> - <aligny>center</aligny> - <label>$LOCALIZE[31320]</label> - <visible>!String.IsEmpty(ListItem.Label2)</visible> - </control> - <control type="label"> - <posx>10</posx> - <posy>330</posy> - <width>273</width> - <height>20</height> - <font>font20</font> - <textcolor>grey</textcolor> - <selectedcolor>selected</selectedcolor> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> - </control> - </itemlayout> - <focusedlayout width="293" height="360"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>293</width> - <height>360</height> - <texture>list_focus.png</texture> - </control> - <control type="image"> - <posx>20</posx> - <posy>10</posy> - <width>253</width> - <height>253</height> - <texture fallback="DefaultActor.png">$INFO[Listitem.Icon]</texture> - </control> - <control type="label"> - <posx>10</posx> - <posy>270</posy> - <width>273</width> - <height>25</height> - <font>font24_title</font> - <textcolor>white</textcolor> - <selectedcolor>selected</selectedcolor> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> - </control> - <control type="label"> - <posx>10</posx> - <posy>304</posy> - <width>273</width> - <height>20</height> - <font>font20</font> - <textcolor>blue</textcolor> - <selectedcolor>selected</selectedcolor> - <align>center</align> - <aligny>center</aligny> - <label>$LOCALIZE[31320]</label> - <visible>!String.IsEmpty(ListItem.Label2)</visible> - </control> - <control type="label"> - <posx>10</posx> - <posy>330</posy> - <width>273</width> - <height>20</height> - <font>font20</font> - <textcolor>grey</textcolor> - <selectedcolor>selected</selectedcolor> - <align>center</align> - <aligny>center</aligny> - <label>$INFO[ListItem.Label2]</label> - </control> - </focusedlayout> - </control> - <control type="grouplist" id="200"> - <description>control area</description> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>680</height> - <pagecontrol>60</pagecontrol> - <itemgap>-1</itemgap> - <onleft>9</onleft> - <onright>60</onright> - <onup>200</onup> - <ondown>200</ondown> - <visible>Skin.String(ProfileSettings,2)</visible> - <control type="radiobutton" id ="4"> - <description>Enable Login screen</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>20096</label> - <enable>!Window.IsVisible(ProfileSettings)</enable> - <textoffsetx>20</textoffsetx> - </control> - <control type="button" id ="5"> - <description>Auto Login</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[33084]: $INFO[System.ProfileAutoLogin]</label> - <enable>!Window.IsVisible(ProfileSettings)</enable> - <textoffsetx>20</textoffsetx> - </control> - </control> + <include content="ProfilesContent" condition="String.IsEqual(Skin.AspectRatio,16:9)"> + <param name="panel-width">1316</param> + <param name="textbox-width">1286</param> + </include> + <include content="ProfilesContent" condition="String.IsEqual(Skin.AspectRatio,4:3)"> + <param name="panel-width">890</param> + <param name="textbox-width">860</param> + </include> + </control> + <include>Header</include> + <include>CommonNowPlaying</include> + <include>Footer</include> + <control type="label"> + <description>Window label</description> + <include>MediaWindowTitleCommons</include> + <label>$LOCALIZE[10034]</label> + </control> + <control type="panel" id="9002"> + <include>VisibleFadeEffect</include> + <include>BottomMenuLayout</include> + <content> + <item> + <label>31200</label> + <onclick>Back</onclick> + <icon>icon_button_back.png</icon> + </item> + <item> + <label>1036</label> + <onclick>ActivateWindow(Favourites)</onclick> + <icon>icon_button_favourites.png</icon> + </item> + </content> </control> - <include>ScrollBarCommons</include> </controls> </window> diff --git a/addons/skin.estouchy/xml/SettingsSystemInfo.xml b/addons/skin.estouchy/xml/SettingsSystemInfo.xml index 4495490898..6ebad1751f 100644 --- a/addons/skin.estouchy/xml/SettingsSystemInfo.xml +++ b/addons/skin.estouchy/xml/SettingsSystemInfo.xml @@ -3,47 +3,28 @@ <defaultcontrol always="true">95</defaultcontrol> <controls> <include>CommonBackground</include> - <include>Header</include> - <include>CommonNowPlaying</include> - <include>Footer</include> - <control type="label"> - <description>Window label</description> - <include>MediaWindowTitleCommons</include> - <label>$LOCALIZE[130]</label> - </control> - <control type="panel" id="9002"> - <include>VisibleFadeEffect</include> - <include>BottomMenuLayout</include> - <content> - <item> - <label>31200</label> - <onclick>Back</onclick> - <icon>icon_button_back.png</icon> - </item> - </content> - </control> <control type="label" id="40"> <description>Hiddenlabel to pass to above</description> <visible>false</visible> </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include>16x9_xPos_Relocation</include> - <posx>30</posx> - <posy>140</posy> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>290</width> - <height>600</height> + <description>Menu Panel</description> + <posx>-5</posx> + <posy>-5</posy> + <width>400</width> + <height>970</height> <texture>panel.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="grouplist" id="9000"> <description>button area</description> <posx>0</posx> - <posy>0</posy> - <width>290</width> - <height>598</height> + <posy>130</posy> + <width>390</width> + <height>720</height> <itemgap>-1</itemgap> <onleft>5</onleft> <onright>60</onright> @@ -51,326 +32,106 @@ <ondown>9000</ondown> <control type="button" id="95"> <description>Button Summary Values</description> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>20037</label> <textoffsetx>20</textoffsetx> </control> <control type="button" id="94"> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>13277</label> <textoffsetx>20</textoffsetx> </control> <control type="button" id="96"> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>13279</label> <textoffsetx>20</textoffsetx> </control> <control type="button" id="97"> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>13280</label> <textoffsetx>20</textoffsetx> </control> <control type="button" id="98"> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>13281</label> <textoffsetx>20</textoffsetx> </control> <control type="button" id="99"> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>31556</label> <textoffsetx>20</textoffsetx> </control> <control type="button" id="100"> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> <label>12389</label> <textoffsetx>20</textoffsetx> </control> </control> - <control type="image"> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>602</height> - <texture>panel.png</texture> - </control> - <control type="group"> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>598</height> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(2))</visible> - </control> - <control type="label" id="2"> - <description>Label 2</description> - <posx>20</posx> - <posy>0</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>60</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(3))</visible> - </control> - <control type="label" id="3"> - <description>Label 3</description> - <posx>20</posx> - <posy>60</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>120</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(4))</visible> - </control> - <control type="label" id="4"> - <description>Label 4</description> - <posx>20</posx> - <posy>120</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>180</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(5))</visible> - </control> - <control type="label" id="5"> - <description>Label 5</description> - <posx>20</posx> - <posy>180</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>240</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(6))</visible> - </control> - <control type="label" id="6"> - <description>Label 6</description> - <posx>20</posx> - <posy>240</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>300</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(7))</visible> - </control> - <control type="label" id="7"> - <description>Label 7</description> - <posx>20</posx> - <posy>300</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>360</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(8))</visible> - </control> - <control type="label" id="8"> - <description>Label 8</description> - <posx>20</posx> - <posy>360</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>420</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(9))</visible> - </control> - <control type="label" id="9"> - <description>Label 9</description> - <posx>20</posx> - <posy>420</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>480</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(10))</visible> - </control> - <control type="label" id="10"> - <description>Label 10</description> - <posx>20</posx> - <posy>480</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - <control type="image"> - <posx>0</posx> - <posy>540</posy> - <width>880</width> - <height>60</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!String.IsEmpty(Control.GetLabel(11))</visible> - </control> - <control type="label" id="11"> - <description>Label 11</description> - <posx>20</posx> - <posy>540</posy> - <width>850</width> - <height>60</height> - <align>left</align> - <aligny>center</aligny> - <label></label> - <font>font22</font> - </control> - </control> - <control type="textbox" id="30"> - <posx>340</posx> - <posy>25</posy> - <width>800</width> - <height>550</height> - <pagecontrol>60</pagecontrol> - <autoscroll delay="5000" repeat="7500" time="5000">true</autoscroll> - </control> - <control type="scrollbar" id="60"> - <posx>1200</posx> - <posy>0</posy> - <width>26</width> - <height>602</height> - <texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground> - <texturesliderbar colordiffuse="grey">white.png</texturesliderbar> - <texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus> - <textureslidernib>blank.png</textureslidernib> - <textureslidernibfocus>blank.png</textureslidernibfocus> - <onleft>9000</onleft> - <showonepage>false</showonepage> - <orientation>vertical</orientation> - <animation effect="fade" time="150">Visible</animation> - <animation effect="fade" time="150">Hidden</animation> - <visible>Control.IsVisible(30)</visible> - </control> + <include content="SysInfoContent" condition="String.IsEqual(Skin.AspectRatio,16:9)"> + <param name="panel-width">1316</param> + <param name="textbox-width">1236</param> + </include> + <include content="SysInfoContent" condition="String.IsEqual(Skin.AspectRatio,4:3)"> + <param name="panel-width">890</param> + <param name="textbox-width">810</param> + </include> <control type="group"> - <posx>60</posx> - <posy>220r</posy> + <posx>470r</posx> + <posy>190r</posy> <control type="label" id="52"> <description>Kodi Build Version</description> - <posx>1130</posx> + <posx>330</posx> <posy>10</posy> - <width>1130</width> + <width>740</width> <label>144</label> <align>right</align> <textcolor>blue</textcolor> @@ -379,9 +140,9 @@ </control> <control type="label"> <description>Memory Text</description> - <posx>800</posx> + <posx>0</posx> <posy>50</posy> - <width>850</width> + <width>410</width> <height>25</height> <label>$LOCALIZE[31309] $INFO[system.memory(used.percent)]</label> <align>right</align> @@ -392,7 +153,7 @@ </control> <control type="progress"> <description>Memory BAR</description> - <posx>810</posx> + <posx>10</posx> <posy>50</posy> <width>320</width> <height>25</height> @@ -400,10 +161,10 @@ </control> <control type="label"> <description>CPU Text</description> - <posx>800</posx> + <posx>0</posx> <posy>90</posy> - <width>850</width> - <height>25</height> + <width>410</width> + <height>60</height> <label>$LOCALIZE[13271] $INFO[System.CPUUsage]</label> <align>right</align> <aligny>center</aligny> @@ -414,7 +175,7 @@ </control> <control type="progress"> <description>CPU BAR</description> - <posx>810</posx> + <posx>10</posx> <posy>90</posy> <width>320</width> <height>25</height> @@ -422,5 +183,24 @@ </control> </control> </control> + <include>Header</include> + <include>CommonNowPlaying</include> + <include>Footer</include> + <control type="label"> + <description>Window label</description> + <include>MediaWindowTitleCommons</include> + <label>$LOCALIZE[130]</label> + </control> + <control type="panel" id="9002"> + <include>VisibleFadeEffect</include> + <include>BottomMenuLayout</include> + <content> + <item> + <label>31200</label> + <onclick>Back</onclick> + <icon>icon_button_back.png</icon> + </item> + </content> + </control> </controls> </window> diff --git a/addons/skin.estouchy/xml/SkinSettings.xml b/addons/skin.estouchy/xml/SkinSettings.xml index fd5309daf8..446a892a71 100644 --- a/addons/skin.estouchy/xml/SkinSettings.xml +++ b/addons/skin.estouchy/xml/SkinSettings.xml @@ -3,47 +3,25 @@ <defaultcontrol>91</defaultcontrol> <controls> <include>CommonBackground</include> - <include>Header</include> - <include>CommonNowPlaying</include> - <include>Header</include> - <control type="label"> - <description>Window label</description> - <include>MediaWindowTitleCommons</include> - <label>$LOCALIZE[20077]</label> - </control> - <control type="panel" id="9002"> - <include>VisibleFadeEffect</include> - <include>BottomMenuLayout</include> - <content> - <item> - <label>31200</label> - <onclick>Back</onclick> - <icon>icon_button_back.png</icon> - </item> - <item> - <label>1036</label> - <onclick>ActivateWindow(Favourites)</onclick> - <icon>icon_button_favourites.png</icon> - </item> - </content> - </control> <control type="group"> <include>Window_OpenClose_Animation_Zoom</include> - <include>16x9_xPos_Relocation</include> - <posx>30</posx> - <posy>140</posy> + <posx>0</posx> + <posy>0</posy> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>290</width> - <height>720</height> + <description>Menu Panel</description> + <posx>-5</posx> + <posy>-5</posy> + <width>400</width> + <height>970</height> <texture>panel.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="grouplist" id="9"> <description>button area</description> <posx>0</posx> - <posy>0</posy> - <width>290</width> + <posy>130</posy> + <width>390</width> <height>720</height> <itemgap>-1</itemgap> <onleft>9</onleft> @@ -52,498 +30,79 @@ <ondown>2</ondown> <control type="button" id="91"> <description>Home Button</description> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> - <label>10000</label> + <label>31548</label> <textoffsetx>20</textoffsetx> <onfocus>Skin.SetString(SkinSettings,1)</onfocus> </control> <control type="button" id="92"> <description>Addon Button</description> - <width>290</width> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> - <label>24001</label> + <label>31549</label> <textoffsetx>20</textoffsetx> <onfocus>Skin.SetString(SkinSettings,2)</onfocus> </control> - </control> - <control type="image"> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>720</height> - <texture border="20">panel.png</texture> - </control> - <control type="grouplist" id="100"> - <description>control area</description> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>720</height> - <pagecontrol>60</pagecontrol> - <itemgap>-1</itemgap> - <onup>100</onup> - <ondown>9002</ondown> - <onleft>9</onleft> - <onright>60</onright> - <visible>Skin.String(SkinSettings,1)</visible> - <control type="label" id="101"> - <width>880</width> - <height>80</height> - <align>center</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <label>31500</label> - <textoffsetx>20</textoffsetx> - </control> - <control type="image"> - <posx>0</posx> - <posy>60</posy> - <width>880</width> - <height>2</height> - <texture border="2">separator.png</texture> - </control> - <control type="radiobutton" id="102"> - <description>Show LiveTV</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31556]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonLiveTV)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonLiveTV)</selected> - <enable>System.HasPVRAddon</enable> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="103"> - <description>Show Radio</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[19021]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonRadio)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonRadio)</selected> - <enable>System.HasPVRAddon</enable> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="104"> - <description>Hide Videos</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[3]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonVideo)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonVideo)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="105"> - <description>Hide Movies</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[20342]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonMovies)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonMovies)</selected> - <textoffsetx>20</textoffsetx> - <enable>Library.HasContent(Movies)</enable> - </control> - <control type="radiobutton" id="106"> - <description>Hide TVShows</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[20343]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonTVShows)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonTVShows)</selected> - <textoffsetx>20</textoffsetx> - <enable>Library.HasContent(TVShows)</enable> - </control> - <control type="radiobutton" id="107"> - <description>Hide Music</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[2]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonMusic)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonMusic)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="108"> - <description>Hide Pictures</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[1]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonPictures)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonPictures)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="109"> - <description>Hide Programs</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[0]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonPrograms)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonPrograms)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="label" id="110"> - <width>880</width> - <height>80</height> - <align>center</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <label>31502</label> - <textoffsetx>20</textoffsetx> - </control> - <control type="image"> - <posx>0</posx> - <posy>60</posy> - <width>880</width> - <height>2</height> - <texture border="2">separator.png</texture> - </control> - <control type="radiobutton" id="111"> - <description>Show Weather info and button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31550]</label> - <onclick>Skin.ToggleSetting(HideHomeButtonWeather)</onclick> - <selected>!Skin.HasSetting(HideHomeButtonWeather)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="112"> - <description>Use custom background</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31553]</label> - <onclick>Skin.ToggleSetting(UseCustomBackground)</onclick> - <selected>Skin.HasSetting(UseCustomBackground)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="button" id="113"> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>- $LOCALIZE[31554]</label> - <label2>$INFO[Skin.String(CustomBackground)]</label2> - <onclick>Skin.SetImage(CustomBackground)</onclick> - <enable>Skin.HasSetting(UseCustomBackground)</enable> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="114"> - <description>Hide video background</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31557]</label> - <onclick>Skin.ToggleSetting(HideVideoBackground)</onclick> - <selected>Skin.HasSetting(HideVideoBackground)</selected> - <textoffsetx>20</textoffsetx> - </control> - <control type="radiobutton" id="115"> - <description>Hide viz background</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31558]</label> - <onclick>Skin.ToggleSetting(HideVizBackground)</onclick> - <selected>Skin.HasSetting(HideVizBackground)</selected> - <textoffsetx>20</textoffsetx> - </control> - </control> - <control type="grouplist" id="200"> - <description>control area</description> - <posx>310</posx> - <posy>0</posy> - <width>880</width> - <height>720</height> - <pagecontrol>60</pagecontrol> - <itemgap>-1</itemgap> - <onup>200</onup> - <ondown>9002</ondown> - <onleft>9</onleft> - <onright>60</onright> - <visible>Skin.String(SkinSettings,2)</visible> - <control type="label" id="201"> - <width>880</width> - <height>80</height> - <align>center</align> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <label>31501</label> - </control> - <control type="image"> - <posx>0</posx> - <posy>60</posy> - <width>880</width> - <height>2</height> - <texture border="2">separator.png</texture> - </control> - <control type="button" id="202"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 1</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton1))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton1,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="203"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 2</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton2,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="204"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 3</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton3,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="205"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 4</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton4,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="206"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 5</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton5))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton5,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="207"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 6</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton6))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton6,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="208"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 7</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton7))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton7,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="209"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 8</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton8))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton8,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="210"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 9</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton9))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton9,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="211"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 10</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton10))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton10,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="212"> - <description>Home Addon Button</description> - <width>880</width> + <control type="button" id="93"> + <description>Background Button</description> + <width>390</width> <height>80</height> <aligny>center</aligny> <font>font24_title</font> <textcolor>white</textcolor> <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> + <texturenofocus></texturenofocus> <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 11</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton11))]</label2> + <label>31550</label> <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton11,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> - </control> - <control type="button" id="213"> - <description>Home Addon Button</description> - <width>880</width> - <height>80</height> - <aligny>center</aligny> - <font>font24_title</font> - <textcolor>white</textcolor> - <texturefocus>list_focus.png</texturefocus> - <texturenofocus border="40,0,40,5">list_nofocus.png</texturenofocus> - <pulseonselect>false</pulseonselect> - <label>$LOCALIZE[31551] 12</label> - <label2>$INFO[system.addontitle(Skin.String(HomeAddonButton12))]</label2> - <textoffsetx>20</textoffsetx> - <onclick>Skin.SetAddon(HomeAddonButton12,xbmc.addon.video,xbmc.addon.audio,xbmc.addon.image,xbmc.python.script)</onclick> + <onfocus>Skin.SetString(SkinSettings,3)</onfocus> </control> </control> + <include content="SkinSettingsContent" condition="String.IsEqual(Skin.AspectRatio,16:9)"> + <param name="panel-width">1316</param> + <param name="textbox-width">1286</param> + </include> + <include content="SkinSettingsContent" condition="String.IsEqual(Skin.AspectRatio,4:3)"> + <param name="panel-width">890</param> + <param name="textbox-width">860</param> + </include> + </control> + <include>Header</include> + <include>CommonNowPlaying</include> + <include>Footer</include> + <control type="label"> + <description>Window label</description> + <include>MediaWindowTitleCommons</include> + <label>$LOCALIZE[20077]</label> + </control> + <control type="panel" id="9002"> + <include>VisibleFadeEffect</include> + <include>BottomMenuLayout</include> + <content> + <item> + <label>31200</label> + <onclick>Back</onclick> + <icon>icon_button_back.png</icon> + </item> + <item> + <label>1036</label> + <onclick>ActivateWindow(Favourites)</onclick> + <icon>icon_button_favourites.png</icon> + </item> + </content> </control> - <include>ScrollBarCommons</include> </controls> </window> diff --git a/addons/skin.estouchy/xml/SmartPlaylistEditor.xml b/addons/skin.estouchy/xml/SmartPlaylistEditor.xml index 52b4dbde62..44416126f9 100644 --- a/addons/skin.estouchy/xml/SmartPlaylistEditor.xml +++ b/addons/skin.estouchy/xml/SmartPlaylistEditor.xml @@ -114,13 +114,6 @@ <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> <itemlayout height="65"> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>760</width> - <height>65</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> <control type="label"> <posx>20</posx> <posy>0</posy> @@ -139,14 +132,6 @@ <posy>0</posy> <width>760</width> <height>65</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - <visible>!Control.HasFocus(10)</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>760</width> - <height>65</height> <texture>list_focus.png</texture> <visible>Control.HasFocus(10)</visible> </control> diff --git a/addons/skin.estouchy/xml/ViewsList.xml b/addons/skin.estouchy/xml/ViewsList.xml index 9bce772739..19058b6832 100644 --- a/addons/skin.estouchy/xml/ViewsList.xml +++ b/addons/skin.estouchy/xml/ViewsList.xml @@ -2,12 +2,24 @@ <includes> <include name="List"> <control type="image"> - <posx>120</posx> - <posy>130</posy> - <width>$PARAM[panel-width]</width> - <height>700</height> - <texture>panel.png</texture> - <visible>Control.IsVisible(500)</visible> + <posx>115</posx> + <posy>125</posy> + <width>1540</width> + <height>710</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + <visible>String.IsEqual(Skin.AspectRatio,16:9) + Control.IsVisible(500)</visible> + </control> + <control type="image"> + <posx>115</posx> + <posy>125</posy> + <width>1100</width> + <height>710</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + <visible>String.IsEqual(Skin.AspectRatio,4:3) + Control.IsVisible(500)</visible> </control> <control type="panel" id="500"> <posx>120</posx> @@ -24,13 +36,6 @@ <preloaditems>2</preloaditems> <itemlayout height="70" width="$PARAM[panel-width]" condition="!Window.IsVisible(EventLog)"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[layout-width]</width> - <height>70</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>4</posx> <posy>4</posy> <width>62</width> @@ -307,13 +312,6 @@ </focusedlayout> <itemlayout height="90" width="$PARAM[panel-width]" condition="Window.IsVisible(EventLog)"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[layout-width]</width> - <height>90</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>4</posx> <posy>4</posy> <width>82</width> diff --git a/addons/skin.estouchy/xml/ViewsPVR.xml b/addons/skin.estouchy/xml/ViewsPVR.xml index 6a3bb3f1a9..7a89c279a9 100644 --- a/addons/skin.estouchy/xml/ViewsPVR.xml +++ b/addons/skin.estouchy/xml/ViewsPVR.xml @@ -2,12 +2,24 @@ <includes> <include name="PVRBack"> <control type="image"> - <posx>120</posx> - <posy>120</posy> - <width>$PARAM[panel-width]</width> - <height>750</height> - <texture>panel.png</texture> - <visible>!Control.IsVisible(10)</visible> + <posx>115</posx> + <posy>115</posy> + <width>1540</width> + <height>760</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + <visible>String.IsEqual(Skin.AspectRatio,16:9) + Control.IsVisible(10)</visible> + </control> + <control type="image"> + <posx>115</posx> + <posy>115</posy> + <width>1100</width> + <height>760</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + <visible>String.IsEqual(Skin.AspectRatio,4:3) + Control.IsVisible(10)</visible> </control> </include> <include name="PVRList"> @@ -24,13 +36,6 @@ <preloaditems>2</preloaditems> <itemlayout height="90" width="$PARAM[panel-width]"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[panel-width]</width> - <height>90</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>10</posx> <posy>10</posy> <width>70</width> diff --git a/addons/skin.estouchy/xml/ViewsThumbnail.xml b/addons/skin.estouchy/xml/ViewsThumbnail.xml index 501c458db1..c5af6558e6 100644 --- a/addons/skin.estouchy/xml/ViewsThumbnail.xml +++ b/addons/skin.estouchy/xml/ViewsThumbnail.xml @@ -19,11 +19,13 @@ <animation effect="slide" start="0,0" end="28,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3) + Container.Content(Episodes)">Conditional</animation> <itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(TVShows) + !Container.Content(MusicVideos)" height="250" width="218"> <control type="image"> - <posx>10</posx> - <posy>5</posy> - <width>200</width> - <height>245</height> + <posx>5</posx> + <posy>0</posy> + <width>210</width> + <height>255</height> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="image"> <posx>10</posx> @@ -52,9 +54,9 @@ </control> <control type="textbox"> <posx>10</posx> - <posy>200</posy> + <posy>199</posy> <width>200</width> - <height>49</height> + <height>52</height> <font>font20_narrow</font> <selectedcolor>selected</selectedcolor> <align>center</align> @@ -73,11 +75,13 @@ </itemlayout> <focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(TVShows) + !Container.Content(MusicVideos)" height="250" width="218"> <control type="image"> - <posx>10</posx> - <posy>5</posy> - <width>200</width> - <height>245</height> + <posx>5</posx> + <posy>0</posy> + <width>210</width> + <height>255</height> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="image"> <posx>10</posx> @@ -102,13 +106,13 @@ <posy>205</posy> <width>200</width> <height>45</height> - <texture colordiffuse="darkblue">white.png</texture> + <texture colordiffuse="blue">white.png</texture> </control> <control type="textbox"> <posx>10</posx> - <posy>200</posy> + <posy>199</posy> <width>200</width> - <height>49</height> + <height>52</height> <font>font20_narrow</font> <selectedcolor>selected</selectedcolor> <align>center</align> @@ -127,11 +131,13 @@ </focusedlayout> <itemlayout condition="Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)" height="375" width="218"> <control type="image"> - <posx>10</posx> - <posy>5</posy> - <width>200</width> - <height>345</height> + <posx>5</posx> + <posy>0</posy> + <width>210</width> + <height>355</height> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="image"> <posx>10</posx> @@ -150,9 +156,9 @@ </control> <control type="textbox"> <posx>10</posx> - <posy>300</posy> + <posy>299</posy> <width>200</width> - <height>49</height> + <height>52</height> <font>font20_narrow</font> <selectedcolor>selected</selectedcolor> <align>center</align> @@ -184,11 +190,13 @@ </itemlayout> <focusedlayout condition="Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)" height="375" width="218"> <control type="image"> - <posx>10</posx> - <posy>5</posy> - <width>200</width> - <height>345</height> + <posx>5</posx> + <posy>0</posy> + <width>210</width> + <height>355</height> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="image"> <posx>10</posx> @@ -203,13 +211,13 @@ <posy>305</posy> <width>200</width> <height>45</height> - <texture colordiffuse="darkblue">white.png</texture> + <texture colordiffuse="blue">white.png</texture> </control> <control type="textbox"> <posx>10</posx> - <posy>300</posy> + <posy>299</posy> <width>200</width> - <height>49</height> + <height>52</height> <font>font20_narrow</font> <selectedcolor>selected</selectedcolor> <align>center</align> @@ -241,11 +249,13 @@ </focusedlayout> <itemlayout condition="Container.Content(Episodes) | Container.Content(MusicVideos)" height="250" width="$PARAM[layout-width]"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>298</width> - <height>213</height> + <posx>0</posx> + <posy>0</posy> + <width>308</width> + <height>223</height> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="image"> <posx>5</posx> @@ -264,9 +274,9 @@ </control> <control type="textbox"> <posx>5</posx> - <posy>168</posy> + <posy>167</posy> <width>298</width> - <height>49</height> + <height>52</height> <font>font20_narrow</font> <selectedcolor>selected</selectedcolor> <align>center</align> @@ -290,11 +300,13 @@ </itemlayout> <focusedlayout condition="Container.Content(Episodes) | Container.Content(MusicVideos)" height="250" width="$PARAM[layout-width]"> <control type="image"> - <posx>5</posx> - <posy>5</posy> - <width>298</width> - <height>213</height> + <posx>0</posx> + <posy>0</posy> + <width>308</width> + <height>223</height> <texture>button_nofocus.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> </control> <control type="image"> <posx>5</posx> @@ -309,13 +321,13 @@ <posy>173</posy> <width>298</width> <height>45</height> - <texture colordiffuse="darkblue">white.png</texture> + <texture colordiffuse="blue">white.png</texture> </control> <control type="textbox"> <posx>5</posx> - <posy>168</posy> + <posy>167</posy> <width>298</width> - <height>49</height> + <height>52</height> <font>font20_narrow</font> <selectedcolor>selected</selectedcolor> <align>center</align> diff --git a/addons/skin.estouchy/xml/ViewsWide.xml b/addons/skin.estouchy/xml/ViewsWide.xml index b5f105827c..32c31118dd 100644 --- a/addons/skin.estouchy/xml/ViewsWide.xml +++ b/addons/skin.estouchy/xml/ViewsWide.xml @@ -2,12 +2,24 @@ <includes> <include name="Wide"> <control type="image"> - <posx>120</posx> - <posy>120</posy> - <width>$PARAM[panel-width]</width> - <height>720</height> - <texture>panel.png</texture> - <visible>Control.IsVisible(550)</visible> + <posx>115</posx> + <posy>115</posy> + <width>1540</width> + <height>730</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + <visible>String.IsEqual(Skin.AspectRatio,16:9) + Control.IsVisible(550)</visible> + </control> + <control type="image"> + <posx>115</posx> + <posy>115</posy> + <width>1100</width> + <height>730</height> + <texture>back.png</texture> + <bordertexture border="6">panel_shadow.png</bordertexture> + <bordersize>5</bordersize> + <visible>String.IsEqual(Skin.AspectRatio,4:3) + Control.IsVisible(550)</visible> </control> <control type="panel" id="550"> <visible>Container.Content(Movies) | Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons)</visible> @@ -25,13 +37,6 @@ <preloaditems>2</preloaditems> <itemlayout condition="!Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(Artists) + !Container.Content(Albums) + !Container.Content(Songs) + !Container.Content(Addons)" height="240" width="$PARAM[panel-width]"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[panel-width]</width> - <height>240</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>10</posy> <width>150</width> @@ -60,6 +65,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Genre]</label> + <textcolor>blue</textcolor> </control> <control type="label"> <posx>510r</posx> @@ -71,6 +77,7 @@ <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> + <textcolor>blue</textcolor> <animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation> </control> <control type="image"> @@ -120,10 +127,11 @@ <posx>170</posx> <posy>70</posy> <width>$PARAM[textbox-width-movies]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Plot]</label> + <textcolor>lightgrey</textcolor> </control> </itemlayout> <focusedlayout condition="!Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(Artists) + !Container.Content(Albums) + !Container.Content(Songs) + !Container.Content(Addons)" height="240" width="$PARAM[panel-width]"> @@ -163,6 +171,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Genre]</label> + <textcolor>blue</textcolor> </control> <control type="label"> <posx>510r</posx> @@ -174,6 +183,7 @@ <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> + <textcolor>blue</textcolor> <animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation> </control> <control type="image"> @@ -223,7 +233,7 @@ <posx>170</posx> <posy>70</posy> <width>$PARAM[textbox-width-movies]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Plot]</label> @@ -232,13 +242,6 @@ </focusedlayout> <itemlayout condition="Container.Content(Episodes) | Container.Content(MusicVideos)" height="240" width="$PARAM[panel-width]"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[panel-width]</width> - <height>240</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>75</posy> <width>250</width> @@ -267,6 +270,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Premiered,$LOCALIZE[20416] : ]</label> + <textcolor>blue</textcolor> <visible>Container.Content(Episodes)</visible> </control> <control type="label"> @@ -279,6 +283,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Artist]</label> + <textcolor>blue</textcolor> <visible>Container.Content(MusicVideos)</visible> </control> <control type="label"> @@ -291,6 +296,7 @@ <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> + <textcolor>blue</textcolor> </control> <control type="image"> <description>Rating value</description> @@ -330,10 +336,11 @@ <posx>270</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Plot]</label> + <textcolor>lightgrey</textcolor> </control> </itemlayout> <focusedlayout condition="Container.Content(Episodes) | Container.Content(MusicVideos)" height="240" width="$PARAM[panel-width]"> @@ -373,6 +380,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Premiered,$LOCALIZE[20416] : ]</label> + <textcolor>blue</textcolor> <visible>Container.Content(Episodes)</visible> </control> <control type="label"> @@ -385,6 +393,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Artist]</label> + <textcolor>blue</textcolor> <visible>Container.Content(MusicVideos)</visible> </control> <control type="label"> @@ -397,6 +406,7 @@ <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label2]</label> + <textcolor>blue</textcolor> </control> <control type="image"> <description>Rating value</description> @@ -436,7 +446,7 @@ <posx>270</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Plot]</label> @@ -445,13 +455,6 @@ </focusedlayout> <itemlayout condition="Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs)" height="240" width="$PARAM[panel-width]"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[panel-width]</width> - <height>240</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>230</width> @@ -480,6 +483,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Genre]</label> + <textcolor>blue</textcolor> <visible>Container.Content(Artists)</visible> </control> <control type="label"> @@ -492,6 +496,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Year,, - ]$INFO[ListItem.Genre]</label> + <textcolor>blue</textcolor> <visible>!Container.Content(Artists)</visible> </control> <control type="label"> @@ -503,6 +508,7 @@ <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> + <textcolor>blue</textcolor> <label>$INFO[ListItem.Label2]</label> </control> <control type="image"> @@ -529,20 +535,22 @@ <posx>250</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Property(Artist_Description)]</label> + <textcolor>lightgrey</textcolor> <visible>Container.Content(Artists)</visible> </control> <control type="textbox"> <posx>250</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Property(Album_Description)]</label> + <textcolor>lightgrey</textcolor> <visible>Container.Content(Albums)</visible> </control> <control type="textbox"> @@ -553,6 +561,7 @@ <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Comment]</label> + <textcolor>lightgrey</textcolor> <visible>Container.Content(Songs) + !String.IsEmpty(ListItem.Comment)</visible> </control> <control type="textbox"> @@ -563,6 +572,7 @@ <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Album,$LOCALIZE[558]: ][CR]$INFO[ListItem.Tracknumber,$LOCALIZE[554]: ][CR]$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label> + <textcolor>lightgrey</textcolor> <visible>Container.Content(Songs) + String.IsEmpty(ListItem.Comment)</visible> </control> </itemlayout> @@ -603,6 +613,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Genre]</label> + <textcolor>blue</textcolor> <visible>Container.Content(Artists)</visible> </control> <control type="label"> @@ -615,6 +626,7 @@ <align>left</align> <aligny>center</aligny> <label>$INFO[ListItem.Year,, - ]$INFO[ListItem.Genre]</label> + <textcolor>blue</textcolor> <visible>!Container.Content(Artists)</visible> </control> <control type="label"> @@ -626,6 +638,7 @@ <selectedcolor>selected</selectedcolor> <align>right</align> <aligny>center</aligny> + <textcolor>blue</textcolor> <label>$INFO[ListItem.Label2]</label> </control> <control type="image"> @@ -652,7 +665,7 @@ <posx>250</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Property(Artist_Description)]</label> @@ -662,7 +675,7 @@ <posx>250</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.Property(Album_Description)]</label> @@ -694,13 +707,6 @@ </focusedlayout> <itemlayout condition="Container.Content(Addons)" height="240" width="$PARAM[panel-width]"> <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>$PARAM[panel-width]</width> - <height>240</height> - <texture border="40,0,40,5">list_nofocus.png</texture> - </control> - <control type="image"> <posx>5</posx> <posy>5</posy> <width>230</width> @@ -752,7 +758,7 @@ <posx>250</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.AddonBroken,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDisclaimer,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDescription]</label> @@ -818,7 +824,7 @@ <posx>250</posx> <posy>75</posy> <width>$PARAM[textbox-width-episodes]</width> - <height>154</height> + <height>145</height> <font>font25</font> <align>justify</align> <label>$INFO[ListItem.AddonBroken,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDisclaimer,[COLOR=blue][B],[/B][/COLOR][CR]]$INFO[ListItem.AddonDescription]</label> @@ -828,4 +834,3 @@ </control> </include> </includes> - |
