diff options
| author | phil65 <philipptemminghoff@gmx.de> | 2016-12-23 04:57:15 +0100 |
|---|---|---|
| committer | phil65 <philipptemminghoff@gmx.de> | 2016-12-23 04:57:15 +0100 |
| commit | a3fcadbe5c7f3d17b4890c9774a3670e5103df64 (patch) | |
| tree | 37f2b87c6559862a15fd83ce8975795db4d7c13f /addons/skin.estuary | |
| parent | 5c99fb05b9f12ac318d9d503c305378565a92836 (diff) | |
[estuary] sync
Diffstat (limited to 'addons/skin.estuary')
63 files changed, 302 insertions, 280 deletions
diff --git a/addons/skin.estuary/addon.xml b/addons/skin.estuary/addon.xml index 82318b2b29..f4b10f5d09 100644 --- a/addons/skin.estuary/addon.xml +++ b/addons/skin.estuary/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="skin.estuary" version="1.9.2" name="Estuary" provider-name="phil65, Piers"> +<addon id="skin.estuary" version="1.9.5" name="Estuary" provider-name="phil65, Piers"> <requires> <import addon="xbmc.gui" version="5.12.0"/> </requires> diff --git a/addons/skin.estuary/colors/brown.xml b/addons/skin.estuary/colors/brown.xml index 61cba54dc8..845d5685b0 100644 --- a/addons/skin.estuary/colors/brown.xml +++ b/addons/skin.estuary/colors/brown.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF674032</color> - <color name="secondary_background">80738627</color> + <color name="primary_background">FF563529</color> + <color name="secondary_background">33738627</color> <color name="dialog_tint">FF282524</color> <color name="button_focus">FF83513F</color> <color name="selected">FFFF4400</color> diff --git a/addons/skin.estuary/colors/charcoal.xml b/addons/skin.estuary/colors/charcoal.xml index b7ddb3c362..a77ccc7a22 100644 --- a/addons/skin.estuary/colors/charcoal.xml +++ b/addons/skin.estuary/colors/charcoal.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF404040</color> - <color name="secondary_background">CCA2A2A2</color> + <color name="primary_background">FF666666</color> + <color name="secondary_background">4D808080</color> <color name="dialog_tint">FF262626</color> <color name="button_focus">FFA2A2A2</color> <color name="selected">FF11E7B1</color> diff --git a/addons/skin.estuary/colors/chartreuse.xml b/addons/skin.estuary/colors/chartreuse.xml index 4f2b5e9c4c..b05615cc12 100644 --- a/addons/skin.estuary/colors/chartreuse.xml +++ b/addons/skin.estuary/colors/chartreuse.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF67A61E</color> - <color name="secondary_background">90AF3F37</color> - <color name="dialog_tint">FF222A22</color> + <color name="primary_background">FF3B5E12</color> + <color name="secondary_background">3398FF05</color> + <color name="dialog_tint">FF202920</color> <color name="button_focus">FF4FAF00</color> <color name="selected">FF24C6C9</color> </colors> diff --git a/addons/skin.estuary/colors/concrete.xml b/addons/skin.estuary/colors/concrete.xml index 2b025fc0b3..81bf41a3c5 100644 --- a/addons/skin.estuary/colors/concrete.xml +++ b/addons/skin.estuary/colors/concrete.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF607D8B</color> - <color name="secondary_background">33FF8750</color> + <color name="primary_background">FF4B5F69</color> + <color name="secondary_background">33DA845C</color> <color name="dialog_tint">FF242728</color> <color name="button_focus">FF607D8B</color> <color name="selected">FFFF8C00</color> diff --git a/addons/skin.estuary/colors/defaults.xml b/addons/skin.estuary/colors/defaults.xml index 2b10155f67..bf5d7b166d 100644 --- a/addons/skin.estuary/colors/defaults.xml +++ b/addons/skin.estuary/colors/defaults.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF006699</color> - <color name="secondary_background">80A6111F</color> - <color name="dialog_tint">FF22282A</color> + <color name="primary_background">FF0E597E</color> + <color name="secondary_background">330BAA8E</color> + <color name="dialog_tint">FF1A2123</color> <color name="background">FF000000</color> <color name="bg_image">FF909090</color> <color name="bg_overlay">30FFFFFF</color> diff --git a/addons/skin.estuary/colors/gold.xml b/addons/skin.estuary/colors/gold.xml index 4aa46f443b..84d50ee7ee 100644 --- a/addons/skin.estuary/colors/gold.xml +++ b/addons/skin.estuary/colors/gold.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF974D02</color> - <color name="secondary_background">99CCCC00</color> + <color name="primary_background">FF966300</color> + <color name="secondary_background">33FFFF00</color> <color name="dialog_tint">FF2B2B22</color> <color name="button_focus">FFCFA700</color> - <color name="selected">FF11E7B1</color> + <color name="selected">FFFFF000</color> </colors> diff --git a/addons/skin.estuary/colors/green.xml b/addons/skin.estuary/colors/green.xml index b85fc17a7d..073f128e11 100644 --- a/addons/skin.estuary/colors/green.xml +++ b/addons/skin.estuary/colors/green.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF24CA7A</color> - <color name="secondary_background">FF004466</color> - <color name="dialog_tint">FF222A26</color> + <color name="primary_background">FF1C6E45</color> + <color name="secondary_background">3300A3CC</color> + <color name="dialog_tint">FF1F2722</color> <color name="button_focus">FF24CA7A</color> - <color name="selected">FF24C6C9</color> + <color name="selected">FF14D519</color> </colors> diff --git a/addons/skin.estuary/colors/maroon.xml b/addons/skin.estuary/colors/maroon.xml index f0079b16a0..e4dbcc5e87 100644 --- a/addons/skin.estuary/colors/maroon.xml +++ b/addons/skin.estuary/colors/maroon.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF7B0100</color> - <color name="secondary_background">4D1442CC</color> - <color name="dialog_tint">FF2C2121</color> + <color name="primary_background">FF6B1414</color> + <color name="secondary_background">33DB2C83</color> + <color name="dialog_tint">FF262020</color> <color name="button_focus">FFC40300</color> <color name="selected">FF24C6C9</color> </colors> diff --git a/addons/skin.estuary/colors/midnight.xml b/addons/skin.estuary/colors/midnight.xml new file mode 100644 index 0000000000..7aba048bd9 --- /dev/null +++ b/addons/skin.estuary/colors/midnight.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<colors> + <color name="primary_background">FF11375C</color> + <color name="secondary_background">334F4F9E</color> + <color name="dialog_tint">FF181B1E</color> + <color name="button_focus">FF2866A4</color> + <color name="selected">FF5BE5EE</color> +</colors> diff --git a/addons/skin.estuary/colors/orange.xml b/addons/skin.estuary/colors/orange.xml index 287b7ef79d..501a1facce 100644 --- a/addons/skin.estuary/colors/orange.xml +++ b/addons/skin.estuary/colors/orange.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FFFF7200</color> - <color name="secondary_background">60B300B3</color> - <color name="dialog_tint">FF2A2622</color> + <color name="primary_background">FFA74012</color> + <color name="secondary_background">33BDAE12</color> + <color name="dialog_tint">FF2B2621</color> <color name="button_focus">FFFF9800</color> <color name="selected">FFFFF100</color> </colors> diff --git a/addons/skin.estuary/colors/pink.xml b/addons/skin.estuary/colors/pink.xml index 9552a7d244..2dfd136b32 100644 --- a/addons/skin.estuary/colors/pink.xml +++ b/addons/skin.estuary/colors/pink.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FFF23F94</color> - <color name="secondary_background">6F00ADCC</color> + <color name="primary_background">FFA61558</color> + <color name="secondary_background">3363BCE9</color> <color name="dialog_tint">FF2B2225</color> <color name="button_focus">FFE91E63</color> <color name="selected">FF94D800</color> diff --git a/addons/skin.estuary/colors/rose.xml b/addons/skin.estuary/colors/rose.xml index 60e13b552c..62b8672f89 100644 --- a/addons/skin.estuary/colors/rose.xml +++ b/addons/skin.estuary/colors/rose.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FFFF8EC4</color> - <color name="secondary_background">80B30000</color> - <color name="dialog_tint">FF282427</color> + <color name="primary_background">FFA22A66</color> + <color name="secondary_background">33FFB3D7</color> + <color name="dialog_tint">FF251F24</color> <color name="button_focus">FFFF8EC4</color> - <color name="selected">FF24C6C9</color> + <color name="selected">FFFF0261</color> </colors> diff --git a/addons/skin.estuary/colors/teal.xml b/addons/skin.estuary/colors/teal.xml index 88ea88f1b1..a7d408c287 100644 --- a/addons/skin.estuary/colors/teal.xml +++ b/addons/skin.estuary/colors/teal.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FF00897B</color> - <color name="secondary_background">93FF8750</color> + <color name="primary_background">FF00665C</color> + <color name="secondary_background">33F07942</color> <color name="dialog_tint">FF222A2A</color> <color name="button_focus">FF009688</color> <color name="selected">FFC67F03</color> diff --git a/addons/skin.estuary/colors/violet.xml b/addons/skin.estuary/colors/violet.xml index 7214edae4e..e9ec02a79e 100644 --- a/addons/skin.estuary/colors/violet.xml +++ b/addons/skin.estuary/colors/violet.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> - <color name="primary_background">FFA200FF</color> - <color name="secondary_background">4DF6FF02</color> + <color name="primary_background">FF5B1C80</color> + <color name="secondary_background">33FFB3D7</color> <color name="dialog_tint">FF27222A</color> <color name="button_focus">FFC050FF</color> - <color name="selected">FF11E7B1</color> + <color name="selected">FFFF0054</color> </colors> diff --git a/addons/skin.estuary/extras/backgrounds/pattern0.jpg b/addons/skin.estuary/extras/backgrounds/pattern0.jpg Binary files differnew file mode 100644 index 0000000000..e5ae3ffe4c --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern0.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern1.jpg b/addons/skin.estuary/extras/backgrounds/pattern1.jpg Binary files differnew file mode 100644 index 0000000000..4494d61cbc --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern1.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern2.jpg b/addons/skin.estuary/extras/backgrounds/pattern2.jpg Binary files differnew file mode 100644 index 0000000000..93f0451dc0 --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern2.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern3.jpg b/addons/skin.estuary/extras/backgrounds/pattern3.jpg Binary files differnew file mode 100644 index 0000000000..7c4fc2374a --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern3.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern4.jpg b/addons/skin.estuary/extras/backgrounds/pattern4.jpg Binary files differnew file mode 100644 index 0000000000..db93147380 --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern4.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern5.jpg b/addons/skin.estuary/extras/backgrounds/pattern5.jpg Binary files differnew file mode 100644 index 0000000000..b63b2d6a33 --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern5.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern6.jpg b/addons/skin.estuary/extras/backgrounds/pattern6.jpg Binary files differnew file mode 100644 index 0000000000..2beb9170ef --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern6.jpg diff --git a/addons/skin.estuary/extras/backgrounds/pattern7.jpg b/addons/skin.estuary/extras/backgrounds/pattern7.jpg Binary files differnew file mode 100644 index 0000000000..66c2b59331 --- /dev/null +++ b/addons/skin.estuary/extras/backgrounds/pattern7.jpg diff --git a/addons/skin.estuary/extras/backgrounds/primary.jpg b/addons/skin.estuary/extras/backgrounds/primary.jpg Binary files differindex 13c69ff3c2..ca82ba1027 100644 --- a/addons/skin.estuary/extras/backgrounds/primary.jpg +++ b/addons/skin.estuary/extras/backgrounds/primary.jpg diff --git a/addons/skin.estuary/extras/backgrounds/secondary1.png b/addons/skin.estuary/extras/backgrounds/secondary1.png Binary files differdeleted file mode 100644 index f7bf45e6d6..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary1.png +++ /dev/null diff --git a/addons/skin.estuary/extras/backgrounds/secondary2.png b/addons/skin.estuary/extras/backgrounds/secondary2.png Binary files differdeleted file mode 100644 index 795e6900b9..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary2.png +++ /dev/null diff --git a/addons/skin.estuary/extras/backgrounds/secondary3.png b/addons/skin.estuary/extras/backgrounds/secondary3.png Binary files differdeleted file mode 100644 index ea1cf60bb7..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary3.png +++ /dev/null diff --git a/addons/skin.estuary/extras/backgrounds/secondary4.png b/addons/skin.estuary/extras/backgrounds/secondary4.png Binary files differdeleted file mode 100644 index 9f6b637af3..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary4.png +++ /dev/null diff --git a/addons/skin.estuary/extras/backgrounds/secondary5.png b/addons/skin.estuary/extras/backgrounds/secondary5.png Binary files differdeleted file mode 100644 index e7a3c0ac40..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary5.png +++ /dev/null diff --git a/addons/skin.estuary/extras/backgrounds/secondary6.png b/addons/skin.estuary/extras/backgrounds/secondary6.png Binary files differdeleted file mode 100644 index 54aa4e8cc5..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary6.png +++ /dev/null diff --git a/addons/skin.estuary/extras/backgrounds/secondary7.png b/addons/skin.estuary/extras/backgrounds/secondary7.png Binary files differdeleted file mode 100644 index 0a1d984cda..0000000000 --- a/addons/skin.estuary/extras/backgrounds/secondary7.png +++ /dev/null diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po index 7851fcb616..4da4685cf7 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -56,7 +56,10 @@ msgctxt "#31007" msgid "Unwatched movies" msgstr "" -#empty string with id 31008 +#: /xml/SkinSettings.xml +msgctxt "#31008" +msgid "Enable category widgets" +msgstr "" #: /1080i/MyVideoNav.xml msgctxt "#31009" @@ -585,12 +588,7 @@ msgctxt "#31131" msgid "Choose skin fanart pack" msgstr "" -#: /1080i/MyVideoNav.xml /1080i/View_502_FanArt.xml -msgctxt "#31132" -msgid "min" -msgstr "" - -#empty string with id 31133 +#empty strings from id 31132 to 31133 #: /1080i/DialogSeekBar.xml msgctxt "#31134" diff --git a/addons/skin.estuary/media/icons/sidemenu/disc.png b/addons/skin.estuary/media/icons/sidemenu/disc.png Binary files differnew file mode 100644 index 0000000000..4ae4a49a5b --- /dev/null +++ b/addons/skin.estuary/media/icons/sidemenu/disc.png diff --git a/addons/skin.estuary/media/lists/panel.png b/addons/skin.estuary/media/lists/panel.png Binary files differindex 908b4670e8..47964e0888 100644 --- a/addons/skin.estuary/media/lists/panel.png +++ b/addons/skin.estuary/media/lists/panel.png diff --git a/addons/skin.estuary/themes/curial/lists/panel.png b/addons/skin.estuary/themes/curial/lists/panel.png Binary files differindex 0ea409f521..93d0176561 100644 --- a/addons/skin.estuary/themes/curial/lists/panel.png +++ b/addons/skin.estuary/themes/curial/lists/panel.png diff --git a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml index 552f500063..6b5e4bc7d8 100644 --- a/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml +++ b/addons/skin.estuary/xml/Custom_1100_AddonLauncher.xml @@ -89,54 +89,51 @@ <ondown>700</ondown> <onright>SetFocus($INFO[Container(9000).ListItem.Property(menu_id)])</onright> <scrolltime tween="cubic" easing="out">500</scrolltime> - <focusedlayout height="95"> - <control type="group"> - <animation effect="fade" start="100" end="0" time="0">UnFocus</animation> - <control type="image"> - <left>0</left> - <width>462</width> - <height>95</height> - <texture colordiffuse="button_focus">lists/focus.png</texture> - <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !ControlGroup(700).HasFocus">Conditional</animation> - </control> - <control type="image"> - <left>-3</left> - <top>1</top> - <width>95</width> - <height>95</height> - <texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture> - <animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation> - </control> - <control type="image"> - <left>0</left> - <width>95</width> - <height>95</height> - <texture colordiffuse="51FFFFFF">colors/black.png</texture> - <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !ControlGroup(700).HasFocus">Conditional</animation> - </control> + <focusedlayout height="95" width="462"> + <control type="image"> + <left>0</left> + <right>0</right> + <bottom>0</bottom> + <texture colordiffuse="button_focus">lists/focus.png</texture> + <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000)">Conditional</animation> + </control> + <control type="image"> + <left>-3</left> + <top>0</top> + <width>95</width> + <bottom>0</bottom> + <texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture> + <animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation> + </control> + <control type="image"> + <left>0</left> + <width>95</width> + <bottom>0</bottom> + <texture colordiffuse="51FFFFFF">colors/black.png</texture> + <animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="image"> <left>-3</left> - <top>1</top> + <top>0</top> <width>95</width> - <height>95</height> + <bottom>0</bottom> <texture>$INFO[ListItem.Art(thumb)]</texture> </control> <control type="label"> <left>104</left> - <height>95</height> - <width>560</width> + <bottom>0</bottom> + <right>10</right> <aligny>center</aligny> <font>font14</font> <label>$INFO[ListItem.Label]</label> <shadowcolor>text_shadow</shadowcolor> </control> </focusedlayout> - <itemlayout height="95"> + <itemlayout height="95" width="462"> <control type="label"> <left>104</left> - <height>95</height> - <width>560</width> + <bottom>0</bottom> + <right>10</right> <aligny>center</aligny> <font>font14</font> <label>$INFO[ListItem.Label]</label> @@ -144,9 +141,9 @@ </control> <control type="image"> <left>-3</left> - <top>1</top> + <top>0</top> <width>95</width> - <height>95</height> + <bottom>0</bottom> <texture colordiffuse="44FFFFFF">$INFO[ListItem.Art(thumb)]</texture> </control> </itemlayout> diff --git a/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml index 01ff0f8b1f..04c55bd42c 100644 --- a/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml +++ b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml @@ -38,7 +38,6 @@ <info>Player.Volume</info> </control> <control type="slider"> - <description>Slider</description> <left>40</left> <top>55</top> <width>400</width> diff --git a/addons/skin.estuary/xml/DialogAddonSettings.xml b/addons/skin.estuary/xml/DialogAddonSettings.xml index 37bbf6a40f..007ec7013c 100644 --- a/addons/skin.estuary/xml/DialogAddonSettings.xml +++ b/addons/skin.estuary/xml/DialogAddonSettings.xml @@ -87,16 +87,13 @@ <texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus> </control> <control type="button" id="3"> - <description>Default Button</description> <include>DefaultSettingButton</include> </control> <control type="radiobutton" id="4"> - <description>Default RadioButton</description> <include>DefaultSettingButton</include> <textwidth>900</textwidth> </control> <control type="spincontrolex" id="5"> - <description>Default spincontrolex</description> <include>DefaultSettingButton</include> <textwidth>900</textwidth> </control> @@ -116,7 +113,6 @@ <texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture> </control> <control type="sliderex" id="8"> - <description>Default Slider</description> <include>DefaultSettingButton</include> </control> </control> diff --git a/addons/skin.estuary/xml/DialogAudioDSPManager.xml b/addons/skin.estuary/xml/DialogAudioDSPManager.xml index eaeeeaf2c1..878e24ee65 100644 --- a/addons/skin.estuary/xml/DialogAudioDSPManager.xml +++ b/addons/skin.estuary/xml/DialogAudioDSPManager.xml @@ -30,14 +30,14 @@ <control type="image"> <left>0</left> <top>0</top> - <width>330</width> + <right>0</right> <height>130</height> <texture border="40">buttons/dialogbutton-nofo.png</texture> </control> <control type="label"> <left>0</left> <top>0</top> - <width>330</width> + <right>0</right> <height>130</height> <textcolor>grey</textcolor> <font>font25_title</font> @@ -50,7 +50,7 @@ <control type="image"> <left>0</left> <top>0</top> - <width>330</width> + <right>0</right> <height>130</height> <animation effect="fade" start="100" end="20" time="200" condition="!Control.HasFocus(9000)">Conditional</animation> <texture border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texture> @@ -58,7 +58,7 @@ <control type="label"> <left>0</left> <top>0</top> - <width>330</width> + <right>0</right> <height>130</height> <font>font25_title</font> <aligny>center</aligny> @@ -68,7 +68,6 @@ </focusedlayout> </control> <control type="group" id="200"> - <description>available- and active mode lists</description> <top>90</top> <control type="group"> <left>320</left> diff --git a/addons/skin.estuary/xml/DialogContextMenu.xml b/addons/skin.estuary/xml/DialogContextMenu.xml index 5db627ddec..ab08b67f04 100644 --- a/addons/skin.estuary/xml/DialogContextMenu.xml +++ b/addons/skin.estuary/xml/DialogContextMenu.xml @@ -5,7 +5,8 @@ <coordinates> <left>0</left> <top>0</top> - <origin x="735" y="400">Window.IsActive(Home)</origin> + <origin x="1055" y="400">Window.IsActive(Home) + String.IsEqual(Skin.AspectRatio,21:9)</origin> + <origin x="735" y="400">Window.IsActive(Home) + !String.IsEqual(Skin.AspectRatio,21:9)</origin> </coordinates> <controls> <control type="image"> diff --git a/addons/skin.estuary/xml/DialogExtendedProgressBar.xml b/addons/skin.estuary/xml/DialogExtendedProgressBar.xml index 65532c6691..e0f09a6f44 100644 --- a/addons/skin.estuary/xml/DialogExtendedProgressBar.xml +++ b/addons/skin.estuary/xml/DialogExtendedProgressBar.xml @@ -46,13 +46,11 @@ <align>right</align> <orientation>horizontal</orientation> <control type="label" id="30"> - <description>Header label</description> <width min="0" max="680">auto</width> <height>120</height> <font>font12</font> </control> <control type="label"> - <description>Header label</description> <width min="0" max="120">auto</width> <height>120</height> <font>font12</font> @@ -71,7 +69,6 @@ </control> <control type="progress" id="32"> <left>3000</left> - <description>progress control</description> <height>15</height> </control> </control> diff --git a/addons/skin.estuary/xml/DialogKeyboard.xml b/addons/skin.estuary/xml/DialogKeyboard.xml index 2d3a7f7183..9c4bbe71f3 100644 --- a/addons/skin.estuary/xml/DialogKeyboard.xml +++ b/addons/skin.estuary/xml/DialogKeyboard.xml @@ -11,7 +11,6 @@ <visible>!Window.IsVisible(numericinput)</visible> <include>Animation_DialogPopupVisible</include> <control type="image"> - <description>background image</description> <left>0</left> <bottom>0</bottom> <width>100%</width> @@ -19,7 +18,6 @@ <texture flipy="true">frame/osdfade.png</texture> </control> <control type="image"> - <description>background image</description> <left>0</left> <bottom>0</bottom> <width>100%</width> @@ -38,7 +36,6 @@ <shadowcolor>black</shadowcolor> </control> <control type="image"> - <description>background image</description> <centerleft>50%</centerleft> <top>184</top> <width>1542</width> @@ -46,7 +43,6 @@ <texture colordiffuse="dialog_tint">colors/white.png</texture> </control> <control type="image"> - <description>background image</description> <centerleft>50%</centerleft> <top>184</top> <width>1542</width> @@ -54,7 +50,6 @@ <texture border="40">buttons/button-alt-nofo.png</texture> </control> <control type="edit" id="312"> - <description>Edit Text</description> <centerleft>50%</centerleft> <top>183</top> <width>1510</width> diff --git a/addons/skin.estuary/xml/DialogMediaSource.xml b/addons/skin.estuary/xml/DialogMediaSource.xml index 50ab3fc473..4a37a28825 100644 --- a/addons/skin.estuary/xml/DialogMediaSource.xml +++ b/addons/skin.estuary/xml/DialogMediaSource.xml @@ -43,31 +43,31 @@ <ondown>12</ondown> <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="70"> + <itemlayout height="70" width="820"> <control type="label"> <left>10</left> + <right>10</right> <top>0</top> - <width>820</width> - <height>60</height> + <bottom>0</bottom> <aligny>center</aligny> <textcolor>grey</textcolor> <label>$INFO[ListItem.Label]</label> </control> </itemlayout> - <focusedlayout height="70"> + <focusedlayout height="70" width="820"> <control type="image"> <left>0</left> <top>0</top> - <width>820</width> - <height>61</height> + <bottom>0</bottom> + <right>0</right> <visible>Control.HasFocus(10)</visible> <texture colordiffuse="button_focus">lists/focus.png</texture> </control> <control type="label"> <left>10</left> <top>0</top> - <width>820</width> - <height>60</height> + <bottom>0</bottom> + <right>10</right> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> </control> diff --git a/addons/skin.estuary/xml/DialogPVRChannelManager.xml b/addons/skin.estuary/xml/DialogPVRChannelManager.xml index c0aa0ff456..9d477c461a 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelManager.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelManager.xml @@ -7,9 +7,9 @@ <centertop>50%</centertop> <height>830</height> <centerleft>50%</centerleft> - <width>1720</width> + <width>1820</width> <include content="DialogBackgroundCommons"> - <param name="width" value="1720" /> + <param name="width" value="1820" /> <param name="height" value="830" /> <param name="header_label" value="$VAR[PVRChannelMgrHeader]" /> <param name="header_id" value="2" /> @@ -18,7 +18,7 @@ <left>10</left> <top>70</top> <control type="scrollbar" id="60"> - <left>630</left> + <left>660</left> <top>30</top> <width>12</width> <height>710</height> @@ -29,14 +29,14 @@ <control type="image"> <left>0</left> <top>10</top> - <width>642</width> + <width>672</width> <height>750</height> <texture border="40">buttons/dialogbutton-nofo.png</texture> </control> <control type="list" id="20"> <left>20</left> <top>30</top> - <width>600</width> + <width>630</width> <height>710</height> <onup>20</onup> <ondown>20</ondown> @@ -44,47 +44,53 @@ <onright>60</onright> <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="70" width="600"> + <itemlayout height="70" width="630"> <control type="image"> <left>0</left> - <width>600</width> - <height>68</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="selected">colors/white.png</texture> <animation effect="fade" end="20" time="0" condition="true">Conditional</animation> - <visible>!String.IsEmpty(ListItem.Property(Changed))</visible> + <visible>ListItem.Property(Changed)</visible> </control> <control type="image"> <left>15</left> <top>10</top> <width>50</width> <height>50</height> - <texture>$INFO[ListItem.Property(Icon)]</texture> + <texture>$INFO[ListItem.Property(icon)]</texture> <aspectratio>keep</aspectratio> - <!-- <visible>!ListItem.Property(ActiveChannel)</visible> - --> + </control> + <control type="image"> + <right>0</right> + <top>10</top> + <width>50</width> + <height>50</height> + <texture>OverlayLocked.png</texture> + <aspectratio>keep</aspectratio> + <visible>ListItem.Property(ParentalLocked)</visible> </control> <control type="label"> - <left>45</left> - <width>600</width> - <height>70</height> - <textoffsetx>40</textoffsetx> + <left>85</left> + <right>40</right> + <bottom>0</bottom> <aligny>center</aligny> <label>$INFO[ListItem.Property(Number),[B],[/B] - ]$INFO[ListItem.Property(Name)]</label> </control> </itemlayout> - <focusedlayout height="70" width="600"> + <focusedlayout height="70" width="630"> <control type="image"> <left>0</left> - <width>600</width> - <height>68</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="selected">colors/white.png</texture> <animation effect="fade" end="20" time="0" condition="true">Conditional</animation> - <visible>!String.IsEmpty(ListItem.Property(Changed))</visible> + <visible>ListItem.Property(Changed)</visible> </control> <control type="image"> <left>0</left> - <width>600</width> - <height>70</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="30" time="0" condition="!Control.HasFocus(20)">conditional</animation> </control> @@ -93,23 +99,31 @@ <top>10</top> <width>50</width> <height>50</height> - <texture>$INFO[ListItem.Property(Icon)]</texture> + <texture>$INFO[ListItem.Property(icon)]</texture> <aspectratio>keep</aspectratio> </control> + <control type="image"> + <right>0</right> + <top>10</top> + <width>50</width> + <height>50</height> + <texture>OverlayLocked.png</texture> + <aspectratio>keep</aspectratio> + <visible>ListItem.Property(ParentalLocked)</visible> + </control> <control type="label"> <left>45</left> <top>-15</top> - <width>600</width> + <right>40</right> <height>70</height> <textoffsetx>40</textoffsetx> <aligny>center</aligny> <label>$INFO[ListItem.Property(Number),[B],[/B] - ]$INFO[ListItem.Property(Name)]</label> </control> <control type="label"> - <left>45</left> - <textoffsetx>40</textoffsetx> + <left>85</left> <top>35</top> - <width>600</width> + <right>40</right> <height>30</height> <font>font12</font> <aligny>center</aligny> @@ -119,7 +133,7 @@ </control> </control> <control type="group"> - <left>665</left> + <left>700</left> <control type="grouplist" id="9002"> <top>80</top> <onleft>60</onleft> @@ -181,7 +195,7 @@ <width>70</width> <height>50</height> <aspectratio>keep</aspectratio> - <texture background="true">$INFO[Container(20).ListItem.Icon]</texture> + <texture background="true">$INFO[Container(20).ListItem.Property(icon)]</texture> </control> <control type="grouplist"> <top>565</top> @@ -232,29 +246,30 @@ </control> </control> <control type="grouplist" id="9000"> - <left>1360</left> + <right>20</right> <top>90</top> <onleft>9002</onleft> <onright>20</onright> <itemgap>dialogbuttons_itemgap</itemgap> + <width>400</width> <include content="DefaultDialogButton"> - <param name="width" value="350" /> + <param name="width" value="400" /> <param name="id" value="4" /> <param name="label" value="$LOCALIZE[186]" /> </include> <include content="DefaultDialogButton"> - <param name="width" value="350" /> + <param name="width" value="400" /> <param name="id" value="5" /> <param name="label" value="$LOCALIZE[14070]" /> </include> <include content="DefaultDialogButton"> - <param name="width" value="350" /> + <param name="width" value="400" /> <param name="id" value="6" /> <param name="label" value="$LOCALIZE[222]" /> </include> </control> <control type="label"> - <left>1355</left> + <right>40</right> <top>780</top> <width>330</width> <height>35</height> diff --git a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml index ee338ad485..0750f42b6e 100644 --- a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml @@ -21,12 +21,12 @@ <pagecontrol>60</pagecontrol> <movement>4</movement> <focusposition>5</focusposition> - <scrolltime>200</scrolltime> + <scrolltime tween="cubic" easing="out">500</scrolltime> <focusedlayout height="90" width="1000"> <control type="image"> <left>0</left> - <width>1000</width> - <height>90</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(11)</visible> </control> @@ -34,7 +34,7 @@ <left>770</left> <top>10</top> <width>90</width> - <height>70</height> + <bottom>10</bottom> <aspectratio align="right">keep</aspectratio> <texture>$INFO[listitem.icon]</texture> </control> @@ -48,7 +48,7 @@ <info>ListItem.Progress</info> </control> <control type="image"> - <left>945</left> + <right>15</right> <top>9</top> <width>40</width> <height>40</height> @@ -91,7 +91,7 @@ <left>770</left> <top>10</top> <width>90</width> - <height>70</height> + <bottom>10</bottom> <aspectratio align="right">keep</aspectratio> <texture>$INFO[listitem.icon]</texture> </control> @@ -105,7 +105,7 @@ <info>ListItem.Progress</info> </control> <control type="image"> - <left>945</left> + <right>15</right> <top>9</top> <width>40</width> <height>40</height> diff --git a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml index 31fbc1cd0a..a7762e3544 100644 --- a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml @@ -19,14 +19,14 @@ <onup>11</onup> <ondown>11</ondown> <pagecontrol>60</pagecontrol> - <scrolltime>200</scrolltime> + <scrolltime tween="cubic" easing="out">500</scrolltime> <movement>4</movement> <focusposition>5</focusposition> <itemlayout height="90" width="1600"> <control type="label"> <left>20</left> <width>150</width> - <height>90</height> + <bottom>0</bottom> <aligny>center</aligny> <textcolor>grey</textcolor> <label>$INFO[ListItem.StartTime]</label> @@ -34,7 +34,7 @@ <control type="label"> <left>150</left> <width>610</width> - <height>90</height> + <bottom>0</bottom> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> @@ -44,7 +44,7 @@ <control type="image"> <left>0</left> <width>780</width> - <height>90</height> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(11)</visible> <animation effect="fade" start="100" end="0" time="0">UnFocus</animation> @@ -52,14 +52,14 @@ <control type="label"> <left>20</left> <width>150</width> - <height>90</height> + <bottom>0</bottom> <aligny>center</aligny> <label>$INFO[ListItem.StartTime]</label> </control> <control type="label"> <left>150</left> <width>610</width> - <height>90</height> + <bottom>0</bottom> <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> diff --git a/addons/skin.estuary/xml/DialogSelect.xml b/addons/skin.estuary/xml/DialogSelect.xml index 326f4f74b2..5307ee5e6d 100644 --- a/addons/skin.estuary/xml/DialogSelect.xml +++ b/addons/skin.estuary/xml/DialogSelect.xml @@ -62,7 +62,7 @@ <control type="label"> <left>135</left> <top>0</top> - <width>730</width> + <right>20</right> <height>60</height> <font>font14</font> <aligny>center</aligny> @@ -71,7 +71,7 @@ <control type="textbox"> <left>135</left> <top>52</top> - <width>730</width> + <right>20</right> <height>65</height> <font>font12</font> <textcolor>grey</textcolor> @@ -82,8 +82,8 @@ <control type="image"> <left>0</left> <top>0</top> - <width>880</width> - <height>125</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(6)</visible> </control> @@ -98,7 +98,7 @@ <control type="label"> <left>135</left> <top>0</top> - <width>730</width> + <right>20</right> <height>60</height> <aligny>center</aligny> <scroll>true</scroll> @@ -108,7 +108,7 @@ <control type="textbox"> <left>135</left> <top>52</top> - <width>730</width> + <right>20</right> <height>65</height> <font>font12</font> <label>$INFO[ListItem.Label2]</label> diff --git a/addons/skin.estuary/xml/DialogSubtitles.xml b/addons/skin.estuary/xml/DialogSubtitles.xml index ba9a12e458..38256bf8c9 100644 --- a/addons/skin.estuary/xml/DialogSubtitles.xml +++ b/addons/skin.estuary/xml/DialogSubtitles.xml @@ -150,8 +150,8 @@ <focusedlayout width="920" height="100"> <control type="image"> <left>0</left> - <width>920</width> - <height>100</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(120)</visible> </control> diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml index 41c78b5e2f..055b7a264d 100644 --- a/addons/skin.estuary/xml/EventLog.xml +++ b/addons/skin.estuary/xml/EventLog.xml @@ -30,7 +30,7 @@ <top>10</top> <width>120</width> <height>120</height> - <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> + <texture fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> <bordersize>4</bordersize> @@ -68,7 +68,7 @@ <left>0</left> <top>0</top> <right>0</right> - <height>141</height> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(50)</visible> </control> @@ -77,7 +77,7 @@ <top>10</top> <width>120</width> <height>120</height> - <texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> + <texture fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture> <aspectratio>scale</aspectratio> <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> <bordersize>4</bordersize> @@ -171,7 +171,7 @@ <height>300</height> <fadetime>300</fadetime> <aspectratio aligny="bottom">keep</aspectratio> - <texture fallback="DefaultVideo.png">$INFO[ListItem.Icon]</texture> + <texture fallback="DefaultAddon.png">$INFO[ListItem.Icon]</texture> <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> diff --git a/addons/skin.estuary/xml/FileBrowser.xml b/addons/skin.estuary/xml/FileBrowser.xml index 489919620f..553d364917 100644 --- a/addons/skin.estuary/xml/FileBrowser.xml +++ b/addons/skin.estuary/xml/FileBrowser.xml @@ -84,7 +84,7 @@ <control type="label"> <left>75</left> <top>0</top> - <width>560</width> + <right>20</right> <height>70</height> <aligny>center</aligny> <selectedcolor>green</selectedcolor> @@ -95,7 +95,7 @@ <control type="image"> <left>0</left> <top>0</top> - <width>940</width> + <right>0</right> <height>71</height> <visible>Control.HasFocus(450)</visible> <texture colordiffuse="button_focus">lists/focus.png</texture> @@ -111,7 +111,7 @@ <control type="label"> <left>75</left> <top>0</top> - <width>560</width> + <right>20</right> <height>70</height> <aligny>center</aligny> <selectedcolor>green</selectedcolor> @@ -142,7 +142,7 @@ <control type="label"> <left>75</left> <top>0</top> - <width>800</width> + <right>20</right> <height>70</height> <aligny>center</aligny> <selectedcolor>green</selectedcolor> @@ -153,7 +153,7 @@ <control type="image"> <left>0</left> <top>0</top> - <width>940</width> + <right>0</right> <height>71</height> <visible>Control.HasFocus(451)</visible> <texture colordiffuse="button_focus">lists/focus.png</texture> @@ -169,7 +169,7 @@ <control type="label"> <left>75</left> <top>0</top> - <width>800</width> + <right>20</right> <height>70</height> <aligny>center</aligny> <selectedcolor>green</selectedcolor> diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml index d797316266..d20502fa14 100644 --- a/addons/skin.estuary/xml/Home.xml +++ b/addons/skin.estuary/xml/Home.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <!-- <menucontrol>9000</menucontrol> - --> <defaultcontrol>9000</defaultcontrol> - <!-- <onload condition="ControlGroup(700).HasFocus">SetFocus(9000,0)</onload> - --> <backgroundcolor>background</backgroundcolor> <controls> <control type="button" id="20000"> @@ -54,7 +50,7 @@ </include> <control type="grouplist" id="5001"> <include>WidgetGroupListCommon</include> - <include content="WidgetListCategories" condition="Library.HasContent(movies)"> + <include content="WidgetListCategories" condition="Library.HasContent(movies) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://video/movies/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="videos"/> @@ -115,7 +111,7 @@ </include> <control type="grouplist" id="6001"> <include>WidgetGroupListCommon</include> - <include content="WidgetListCategories" condition="Library.HasContent(tvshows)"> + <include content="WidgetListCategories" condition="Library.HasContent(tvshows) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://video/tvshows/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="videos"/> @@ -173,7 +169,7 @@ </include> <control type="grouplist" id="7001"> <include>WidgetGroupListCommon</include> - <include content="WidgetListCategories" condition="Library.HasContent(music)"> + <include content="WidgetListCategories" condition="Library.HasContent(music) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://music/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="music"/> @@ -239,7 +235,7 @@ </include> <control type="grouplist" id="8001"> <include>WidgetGroupListCommon</include> - <include content="WidgetListCategories"> + <include content="WidgetListCategories" condition="!Skin.HasSetting(home_no_categories_widget)" > <param name="content_path" value="addons://"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="addonbrowser"/> @@ -637,7 +633,7 @@ </include> <control type="grouplist" id="16001"> <include>WidgetGroupListCommon</include> - <include content="WidgetListCategories" condition="Library.HasContent(musicvideos)"> + <include content="WidgetListCategories" condition="Library.HasContent(musicvideos) + !Skin.HasSetting(home_no_categories_widget)"> <param name="content_path" value="library://music/musicvideos/"/> <param name="widget_header" value="$LOCALIZE[31148]"/> <param name="widget_target" value="videos"/> @@ -739,6 +735,21 @@ </control> --> </control> + <control type="group" id="21000"> + <visible>String.IsEqual(Container(9000).ListItem.Property(id),disc)</visible> + <include content="Visible_Right_Delayed"> + <param name="id" value="disc"/> + </include> + <include content="ImageWidget"> + <param name="text_label" value="$INFO[System.DVDLabel]" /> + <param name="button_label" value="$LOCALIZE[341]" /> + <param name="button_onclick" value="PlayDVD"/> + <param name="button_id" value="21100"/> + <param name="visible" value="true"/> + <param name="button2_label" value="$LOCALIZE[13391]"/> + <param name="button2_onclick" value="EjectTray()"/> + </include> + </control> </control> <control type="group"> <depth>DepthContentPanel</depth> @@ -826,7 +837,8 @@ <content> <item> <label>$LOCALIZE[342]</label> - <onclick condition="Library.HasContent(movies)">ActivateWindow(Videos,videodb://movies/titles/,return)</onclick> + <onclick condition="Library.HasContent(movies) + Skin.HasSetting(home_no_categories_widget)">ActivateWindow(Videos,videodb://movies/,return)</onclick> + <onclick condition="Library.HasContent(movies) + !Skin.HasSetting(home_no_categories_widget)">ActivateWindow(Videos,videodb://movies/titles/,return)</onclick> <onclick condition="!Library.HasContent(movies)">ActivateWindow(Videos,sources://video/,return)</onclick> <property name="menu_id">$NUMBER[5000]</property> <thumb>icons/sidemenu/movies.png</thumb> @@ -835,7 +847,8 @@ </item> <item> <label>$LOCALIZE[20343]</label> - <onclick condition="Library.HasContent(tvshows)">ActivateWindow(Videos,videodb://tvshows/titles/,return)</onclick> + <onclick condition="Library.HasContent(tvshows) + Skin.HasSetting(home_no_categories_widget)">ActivateWindow(Videos,videodb://tvshows/,return)</onclick> + <onclick condition="Library.HasContent(tvshows) + !Skin.HasSetting(home_no_categories_widget)">ActivateWindow(Videos,videodb://tvshows/titles/,return)</onclick> <onclick condition="!Library.HasContent(tvshows)">ActivateWindow(Videos,sources://video/,return)</onclick> <property name="menu_id">$NUMBER[6000]</property> <thumb>icons/sidemenu/tv.png</thumb> @@ -851,6 +864,14 @@ <visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible> </item> <item> + <label>$LOCALIZE[427]</label> + <onclick>PlayDVD</onclick> + <property name="menu_id">$NUMBER[21000]</property> + <thumb>icons/sidemenu/disc.png</thumb> + <property name="id">disc</property> + <visible>System.HasMediaDVD</visible> + </item> + <item> <label>$LOCALIZE[20389]</label> <property name="menu_id">$NUMBER[16000]</property> <onclick>ActivateWindow(Videos,musicvideos,return)</onclick> @@ -932,12 +953,8 @@ <width>480</width> <height>110</height> <top>100</top> - <onup>SetFocus(9000)</onup> - <onup>PageDown</onup> - <onup>PageDown</onup> - <ondown>SetFocus(9000)</ondown> - <ondown>PageUp</ondown> - <ondown>PageUp</ondown> + <onup>SetFocus(9000,99,absolute)</onup> + <ondown>SetFocus(9000,0,absolute)</ondown> <onright>2000</onright> <align>justify</align> <include content="IconButton"> diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml index 65914065fe..b3f7993305 100644 --- a/addons/skin.estuary/xml/Includes.xml +++ b/addons/skin.estuary/xml/Includes.xml @@ -204,7 +204,7 @@ <control type="label"> <left>82</left> <top>3</top> - <width>388</width> + <right>20</right> <height>40</height> <font>font12</font> <aligny>center</aligny> @@ -213,7 +213,7 @@ <control type="label"> <left>82</left> <top>37</top> - <width>388</width> + <right>20</right> <height>30</height> <font>font12</font> <aligny>center</aligny> @@ -225,8 +225,8 @@ <control type="image"> <left>0</left> <top>0</top> - <width>470</width> - <height>80</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> @@ -241,7 +241,7 @@ <control type="label"> <left>82</left> <top>3</top> - <width>388</width> + <right>20</right> <height>40</height> <font>font12</font> <aligny>center</aligny> @@ -250,7 +250,7 @@ <control type="label"> <left>82</left> <top>37</top> - <width>388</width> + <right>20</right> <height>30</height> <font>font12</font> <aligny>center</aligny> @@ -289,13 +289,12 @@ <param name="font">font13</param> <param name="fontcolor">grey</param> <definition> - <itemlayout height="$PARAM[height]"> + <itemlayout width="$PARAM[width]" height="$PARAM[height]"> <control type="label"> - <left>0</left> - <textoffsetx>20</textoffsetx> + <left>20</left> <top>0</top> - <width>$PARAM[width]</width> - <height>$PARAM[height]</height> + <right>20</right> + <bottom>0</bottom> <align>$PARAM[align]</align> <font>$PARAM[font]</font> <aligny>center</aligny> @@ -303,21 +302,20 @@ <label>$INFO[ListItem.Label]</label> </control> </itemlayout> - <focusedlayout height="$PARAM[height]" width="600"> + <focusedlayout width="$PARAM[width]" height="$PARAM[height]"> <control type="image"> <left>0</left> <top>0</top> - <width>$PARAM[width]</width> - <height>$PARAM[height]</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> <control type="label"> - <left>0</left> - <textoffsetx>20</textoffsetx> + <left>20</left> <top>0</top> - <width>$PARAM[width]</width> - <height>$PARAM[height]</height> + <right>20</right> + <bottom>0</bottom> <align>$PARAM[align]</align> <font>$PARAM[font]</font> <aligny>center</aligny> @@ -397,7 +395,7 @@ <height>60</height> <align>center</align> <aligny>center</aligny> - <label>$INFO[ListItem.Duration,, $LOCALIZE[31132]]</label> + <label>$INFO[ListItem.Duration]</label> <font>font_flag</font> </control> <include content="MediaFlag"> @@ -821,7 +819,7 @@ <param name="sublabel">$INFO[Container.SortMethod,$LOCALIZE[31022]: , ∙ ]$INFO[Container.CurrentItem,, / ]$INFO[Container.NumItems]</param> <definition> <control type="group"> - <animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> + <animation effect="slide" end="0,-112" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> <depth>DepthBars</depth> <animation effect="fade" start="0" end="100" time="300" condition="[Window.Previous(fullscreenvideo) | Window.Previous(startup)] + !Window.IsVisible(1109)">WindowOpen</animation> <control type="image"> @@ -1042,7 +1040,7 @@ <depth>DepthBackground</depth> <include>FullScreenDimensions</include> <aspectratio>scale</aspectratio> - <texture colordiffuse="secondary_background" fallback="special://skin/extras/backgrounds/secondary1.png">$INFO[Skin.String(background_overlay),special://skin/extras/backgrounds/secondary,.png]</texture> + <texture colordiffuse="secondary_background" fallback="special://skin/extras/backgrounds/pattern1.jpg">$INFO[Skin.String(background_overlay),special://skin/extras/backgrounds/pattern,.jpg]</texture> </control> </include> <include name="DefaultBackground"> @@ -1100,7 +1098,7 @@ <param name="info_visible">False</param> <definition> <control type="group"> - <animation effect="slide" end="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> + <animation effect="slide" end="0,112" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> <depth>DepthBars</depth> <animation effect="fade" start="100" end="0" time="300" condition="Window.Next(visualisation) | Window.Next(screencalibration)">WindowClose</animation> <animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup) | Window.Previous(visualisation)">WindowOpen</animation> @@ -1283,7 +1281,7 @@ <param name="flipx">false</param> <definition> <control type="image"> - <texture flipx="$PARAM[flipx]">lists/panel.png</texture> + <texture flipx="$PARAM[flipx]" colordiffuse="EDFFFFFF">lists/panel.png</texture> <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <width>$PARAM[width]</width> diff --git a/addons/skin.estuary/xml/Includes_Home.xml b/addons/skin.estuary/xml/Includes_Home.xml index 22703a9f76..6fab18e247 100644 --- a/addons/skin.estuary/xml/Includes_Home.xml +++ b/addons/skin.estuary/xml/Includes_Home.xml @@ -75,7 +75,7 @@ <top>115</top> <visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible> <right>0</right> - <height>500</height> + <height>503</height> <include content="WidgetListCommon"> <param name="list_id" value="$PARAM[list_id]"/> </include> @@ -112,6 +112,7 @@ <param name="visible">true</param> <param name="visible_1">true</param> <param name="visible_2">true</param> + <param name="button2_label">$LOCALIZE[31116]</param> <param name="button2_onclick">true</param> <definition> <control type="group" id="$PARAM[button_id]889"> @@ -151,7 +152,7 @@ <control type="button" id="$PARAM[button_id]568"> <width>auto</width> <height>110</height> - <label>$LOCALIZE[31116]</label> + <label>$PARAM[button2_label]</label> <textoffsetx>40</textoffsetx> <onclick>$PARAM[button2_onclick]</onclick> <onclick>SetFocus(9000)</onclick> @@ -326,14 +327,14 @@ </control> <control type="image"> <centertop>74</centertop> - <left>62</left> + <left>58</left> <width>200</width> <height>$PARAM[icon_height]</height> <texture fallback="DefaultFolder.png">$PARAM[icon]</texture> <aspectratio>keep</aspectratio> </control> <control type="textbox"> - <left>42</left> + <left>38</left> <top>106</top> <width>240</width> <height>70</height> @@ -371,14 +372,14 @@ </control> <control type="image"> <centertop>74</centertop> - <left>62</left> + <left>58</left> <width>200</width> <height>$PARAM[icon_height]</height> <texture fallback="DefaultFolder.png">$PARAM[icon]</texture> <aspectratio>keep</aspectratio> </control> <control type="textbox"> - <left>42</left> + <left>38</left> <top>106</top> <width>240</width> <height>70</height> @@ -889,10 +890,7 @@ <onunfocus>SetProperty(listposition,$INFO[Container($PARAM[list_id]).Position],home)</onunfocus> <onfocus>Control.Move($PARAM[list_id],-$INFO[Container($PARAM[list_id]).Position])</onfocus> <onfocus>Control.Move($PARAM[list_id],$INFO[Window(home).Property(listposition)])</onfocus> - <onback>PageUp</onback> - <onback>PageUp</onback> - <onback>PageUp</onback> - <onback>PageUp</onback> + <onback>SetFocus($PARAM[list_id],0,absolute)</onback> <preloaditems>2</preloaditems> </include> <include name="BusyListSpinner"> diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml index ecaacd6633..675396f96c 100644 --- a/addons/skin.estuary/xml/Includes_PVR.xml +++ b/addons/skin.estuary/xml/Includes_PVR.xml @@ -40,20 +40,20 @@ <onright>$PARAM[scrollbar_id]</onright> <pagecontrol>$PARAM[scrollbar_id]</pagecontrol> <scrolltime>200</scrolltime> - <itemlayout height="70"> + <itemlayout height="70" width="470"> <control type="image"> <width>60</width> <height>60</height> - <left>405</left> - <top>4</top> - <texture border="2">$INFO[ListItem.ActualIcon]</texture> + <right>5</right> + <top>5</top> + <texture>$INFO[ListItem.ActualIcon]</texture> <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> <bordersize>2</bordersize> <aspectratio>keep</aspectratio> </control> <control type="label"> <left>20</left> - <width>390</width> + <right>70</right> <height>70</height> <aligny>center</aligny> <font>font27</font> @@ -61,27 +61,27 @@ <label>$INFO[ListItem.ChannelNumberLabel,[B],[/B] - ]$INFO[ListItem.ChannelName]</label> </control> </itemlayout> - <focusedlayout height="70"> + <focusedlayout height="70" width="470"> <control type="image"> <left>0</left> - <width>470</width> - <height>70</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus($PARAM[list_id])</visible> </control> <control type="image"> <width>60</width> <height>60</height> - <left>405</left> - <top>4</top> - <texture border="2">$INFO[ListItem.ActualIcon]</texture> + <right>5</right> + <top>5</top> + <texture>$INFO[ListItem.ActualIcon]</texture> <bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture> <bordersize>2</bordersize> <aspectratio>keep</aspectratio> </control> <control type="label"> <left>20</left> - <width>390</width> + <right>70</right> <height>70</height> <font>font27</font> <aligny>center</aligny> diff --git a/addons/skin.estuary/xml/LoginScreen.xml b/addons/skin.estuary/xml/LoginScreen.xml index e9c3622321..f92e539c73 100644 --- a/addons/skin.estuary/xml/LoginScreen.xml +++ b/addons/skin.estuary/xml/LoginScreen.xml @@ -74,12 +74,12 @@ <width>110</width> <height>110</height> <texture fallback="DefaultUser.png">$INFO[ListItem.Icon]</texture> - <aspectratio>scale</aspectratio> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>130</left> <top>14</top> - <width>610</width> + <right>20</right> <height>60</height> <font>font37</font> <aligny>center</aligny> @@ -88,7 +88,7 @@ <control type="label"> <left>130</left> <top>58</top> - <width>610</width> + <right>20</right> <height>50</height> <font>font12</font> <textcolor>grey</textcolor> @@ -100,9 +100,9 @@ <control type="image"> <left>0</left> <top>0</top> - <width>775</width> - <height>130</height> - <texture border="40" colordiffuse="button_focus">lists/focus.png</texture> + <right>0</right> + <bottom>0</bottom> + <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.HasFocus(52)</visible> </control> <control type="image"> @@ -111,12 +111,12 @@ <width>110</width> <height>110</height> <texture fallback="DefaultUser.png">$INFO[ListItem.Icon]</texture> - <aspectratio>scale</aspectratio> + <aspectratio>keep</aspectratio> </control> <control type="label"> <left>130</left> <top>14</top> - <width>610</width> + <right>20</right> <height>60</height> <font>font37</font> <aligny>center</aligny> @@ -125,7 +125,7 @@ <control type="label"> <left>130</left> <top>58</top> - <width>610</width> + <right>20</right> <height>50</height> <font>font12</font> <aligny>center</aligny> diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml index 716f3a53c4..1d441b0fb7 100644 --- a/addons/skin.estuary/xml/MyPVRChannels.xml +++ b/addons/skin.estuary/xml/MyPVRChannels.xml @@ -31,7 +31,7 @@ <left>0</left> <top>0</top> <right>0</right> - <height>90</height> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(50)</visible> </control> @@ -174,7 +174,7 @@ <left>0</left> <top>0</top> <right>0</right> - <height>70</height> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <visible>Control.hasFocus(51)</visible> </control> @@ -198,7 +198,7 @@ <control type="label"> <left>105</left> <top>0</top> - <height>70</height> + <bottom>0</bottom> <right>90</right> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> @@ -206,7 +206,7 @@ <control type="label"> <left>320</left> <top>0</top> - <height>70</height> + <bottom>0</bottom> <right>90</right> <aligny>center</aligny> <align>right</align> @@ -215,7 +215,7 @@ <control type="label"> <left>12</left> <top>0</top> - <height>70</height> + <bottom>0</bottom> <width>75</width> <align>center</align> <aligny>center</aligny> @@ -244,7 +244,7 @@ <control type="label"> <left>105</left> <top>0</top> - <height>70</height> + <bottom>0</bottom> <right>90</right> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> @@ -253,7 +253,7 @@ <control type="label"> <left>320</left> <top>0</top> - <height>70</height> + <bottom>0</bottom> <right>90</right> <aligny>center</aligny> <align>right</align> @@ -264,7 +264,7 @@ <control type="label"> <left>12</left> <top>0</top> - <height>70</height> + <bottom>0</bottom> <width>75</width> <align>center</align> <aligny>center</aligny> @@ -312,7 +312,6 @@ <top>82</top> <width>560</width> <height>262</height> - <visible>!String.IsEqual(ListItem.StartTime,ListItem.EndTime)</visible> <label>$INFO[ListItem.StartTime]</label> </control> <control type="label"> @@ -320,7 +319,6 @@ <width>520</width> <height>262</height> <align>right</align> - <visible>!String.IsEqual(ListItem.StartTime,ListItem.EndTime)</visible> <label>$INFO[ListItem.EndTime]</label> </control> <control type="label"> @@ -355,7 +353,7 @@ <control type="textbox"> <top>382</top> <width>820</width> - <bottom>100</bottom> + <bottom>114</bottom> <label>[B]$INFO[ListItem.EpisodeName,,[CR]][/B]$INFO[ListItem.Plot]</label> </control> <control type="textbox"> diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml index 1ab021d3be..0b6ed504d8 100644 --- a/addons/skin.estuary/xml/MyPVRRecordings.xml +++ b/addons/skin.estuary/xml/MyPVRRecordings.xml @@ -38,7 +38,6 @@ <width>32</width> <height>32</height> <texture colordiffuse="white">$VAR[ListWatchedIconVar]</texture> - <animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation> </control> <control type="label"> <left>75</left> diff --git a/addons/skin.estuary/xml/SettingsProfile.xml b/addons/skin.estuary/xml/SettingsProfile.xml index 06abe32085..725a7157f1 100644 --- a/addons/skin.estuary/xml/SettingsProfile.xml +++ b/addons/skin.estuary/xml/SettingsProfile.xml @@ -194,9 +194,9 @@ <scrolltime>300</scrolltime> <itemlayout height="90" width="470"> <control type="label"> - <textoffsetx>30</textoffsetx> - <width>470</width> - <height>90</height> + <left>30</left> + <right>30</right> + <bottom>0</bottom> <label>$INFO[ListItem.Label]</label> <font>font37</font> <aligny>center</aligny> @@ -204,18 +204,18 @@ </itemlayout> <focusedlayout height="90" width="470"> <control type="image"> - <width>470</width> - <height>90</height> + <right>0</right> + <bottom>0</bottom> <texture colordiffuse="button_focus">lists/focus.png</texture> <animation effect="fade" start="100" end="50" time="40" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> - <textoffsetx>30</textoffsetx> - <width>470</width> - <height>90</height> + <left>30</left> + <right>30</right> + <bottom>0</bottom> + <label>$INFO[ListItem.Label]</label> <font>font37</font> <aligny>center</aligny> - <label>$INFO[ListItem.Label]</label> </control> </focusedlayout> <content> diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml index 40260af074..8ca7df23fa 100644 --- a/addons/skin.estuary/xml/SkinSettings.xml +++ b/addons/skin.estuary/xml/SkinSettings.xml @@ -51,8 +51,9 @@ <control type="radiobutton" id="704"> <label>$LOCALIZE[31093]</label> <include>DefaultSettingButton</include> - <onclick>Skin.ToggleSetting(show_weatherinfo)</onclick> - <selected>Skin.HasSetting(show_weatherinfo)</selected> + <onclick condition="!String.IsEmpty(Weather.Plugin)">Skin.ToggleSetting(show_weatherinfo)</onclick> + <onclick condition="String.IsEmpty(Weather.Plugin)">ActivateWindow(servicesettings,weather)</onclick> + <selected>Skin.HasSetting(show_weatherinfo) + !String.IsEmpty(Weather.Plugin)</selected> </control> <control type="radiobutton" id="705"> <label>$LOCALIZE[31160]</label> @@ -81,13 +82,14 @@ <label>$LOCALIZE[31156]</label> <label2>$VAR[BackgroundOverlayTypeVar]</label2> <include>DefaultSettingButton</include> - <onclick condition="String.IsEqual(Skin.String(background_overlay),7)">Skin.SetString(background_overlay,1)</onclick> + <onclick condition="String.IsEqual(Skin.String(background_overlay),7)">Skin.SetString(background_overlay,0)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),6)">Skin.SetString(background_overlay,7)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),5)">Skin.SetString(background_overlay,6)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),4)">Skin.SetString(background_overlay,5)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),3)">Skin.SetString(background_overlay,4)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),2)">Skin.SetString(background_overlay,3)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),1)">Skin.SetString(background_overlay,2)</onclick> + <onclick condition="String.IsEqual(Skin.String(background_overlay),0)">Skin.SetString(background_overlay,1)</onclick> </control> <control type="button" id="608"> <label>$LOCALIZE[31131]</label> @@ -124,6 +126,12 @@ <pagecontrol>60</pagecontrol> <ondown>610</ondown> <visible>Container(9000).HasFocus(2)</visible> + <control type="radiobutton" id="621"> + <label>$LOCALIZE[31008]</label> + <include>DefaultSettingButton</include> + <selected>!Skin.HasSetting(home_no_categories_widget)</selected> + <onclick>Skin.ToggleSetting(home_no_categories_widget)</onclick> + </control> <control type="radiobutton" id="611"> <label>$LOCALIZE[342]</label> <include>DefaultSettingButton</include> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 5bdf202619..35407add0b 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -34,7 +34,6 @@ <value>[COLOR grey]0[/COLOR]</value> </variable> <variable name="MusicInfoTextboxVar"> - <value condition="String.IsEqual(ListItem.DbType,song) + !String.IsEmpty(ListItem.ContributorAndRole)">$INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]]</value> <value condition="String.IsEqual(ListItem.DbType,song)">$INFO[ListItem.Comment,[B]$LOCALIZE[569][/B][CR][COLOR=white],[/COLOR]]</value> <value condition="String.IsEqual(ListItem.DbType,album)">$INFO[ListItem.Property(Album_Description),[COLOR=white],[/COLOR]]</value> <value condition="String.IsEqual(ListItem.DbType,artist)">$INFO[ListItem.Property(Artist_Description),[COLOR=white],[/COLOR]]</value> @@ -394,7 +393,7 @@ <value>$INFO[ListItem.EpisodeName]</value> </variable> <variable name="BackgroundOverlayTypeVar"> - <value condition="String.IsEqual(Skin.String(background_overlay),7)">$LOCALIZE[231]</value> + <value condition="String.IsEqual(Skin.String(background_overlay),0)">$LOCALIZE[231]</value> <value>$INFO[Skin.String(background_overlay),$LOCALIZE[467] ]</value> </variable> </includes> diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml index de4ad3a883..abef177b6f 100644 --- a/addons/skin.estuary/xml/VideoOSD.xml +++ b/addons/skin.estuary/xml/VideoOSD.xml @@ -163,7 +163,7 @@ </include> <onclick>Dialog.Close(VideoOSD)</onclick> <onclick>ActivateWindow(Teletext)</onclick> - <visible>Pvr.HasTxt</visible> + <visible>VideoPlayer.HasTeletext</visible> </control> <control type="radiobutton" id="704"> <include content="OSDButton"> diff --git a/addons/skin.estuary/xml/View_52_IconWall.xml b/addons/skin.estuary/xml/View_52_IconWall.xml index e39bc8311b..3777a6cb5e 100644 --- a/addons/skin.estuary/xml/View_52_IconWall.xml +++ b/addons/skin.estuary/xml/View_52_IconWall.xml @@ -69,11 +69,11 @@ <focusedlayout height="280" width="440" condition="Container.Content() | Container.Content(unknown) | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]"> <control type="group"> <depth>DepthContentPopout</depth> - <animation type="Focus" reversible="false"> - <effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" /> + <animation type="Focus"> + <effect type="zoom" start="100" end="112" time="200" tween="sine" easing="inout" center="auto" /> </animation> - <animation type="UnFocus" reversible="false"> - <effect type="zoom" center="auto" start="108" end="100" time="150" tween="sine" /> + <animation type="Unfocus"> + <effect type="zoom" start="112" end="100" time="200" tween="sine" easing="inout" center="auto" /> </animation> <top>150</top> <control type="image"> @@ -152,11 +152,11 @@ <control type="group"> <depth>DepthContentPopout</depth> <top>120</top> - <animation type="Focus" reversible="false"> - <effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" /> + <animation type="Focus"> + <effect type="zoom" start="100" end="112" time="200" tween="sine" easing="inout" center="auto" /> </animation> - <animation type="UnFocus" reversible="false"> - <effect type="zoom" center="auto" start="108" end="100" time="150" tween="sine" /> + <animation type="Unfocus"> + <effect type="zoom" start="112" end="100" time="200" tween="sine" easing="inout" center="auto" /> </animation> <control type="image"> <width>330</width> diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml index 8ae8c4d803..2f4fa70863 100644 --- a/addons/skin.estuary/xml/View_54_InfoWall.xml +++ b/addons/skin.estuary/xml/View_54_InfoWall.xml @@ -255,7 +255,7 @@ </control> <control type="textbox"> <left>40</left> - <top>250</top> + <top>244</top> <width>242</width> <height>120</height> <font>font27</font> @@ -266,9 +266,9 @@ <visible>!ListItem.IsParentFolder</visible> </control> <control type="image"> - <left>26</left> - <top>0</top> - <width>270</width> + <left>24</left> + <top>-1</top> + <width>272</width> <height>270</height> <texture fallback="DefaultMovies.png" background="true">$INFO[ListItem.Icon]</texture> <aspectratio>scale</aspectratio> |
