diff options
| author | phil65 <philipptemminghoff@gmx.de> | 2016-12-07 17:58:42 +0100 |
|---|---|---|
| committer | phil65 <philipptemminghoff@gmx.de> | 2016-12-07 17:58:42 +0100 |
| commit | ee4c8e87a31064cb90e166233cafe451bf833060 (patch) | |
| tree | a72c188654824b038f5d3855d09106d6f28d4a60 /addons/skin.estuary | |
| parent | c82c65a2b629aee619e822d6ed2f51f658a37ebd (diff) | |
[estuary] sync
Diffstat (limited to 'addons/skin.estuary')
172 files changed, 422 insertions, 368 deletions
diff --git a/addons/skin.estuary/colors/chartreuse.xml b/addons/skin.estuary/colors/chartreuse.xml index 2c5da23356..4f2b5e9c4c 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">FF8EBD00</color> - <color name="secondary_background">70DF8020</color> + <color name="primary_background">FF67A61E</color> + <color name="secondary_background">90AF3F37</color> <color name="dialog_tint">FF222A22</color> - <color name="button_focus">FF5FCF00</color> + <color name="button_focus">FF4FAF00</color> <color name="selected">FF24C6C9</color> </colors> diff --git a/addons/skin.estuary/colors/defaults.xml b/addons/skin.estuary/colors/defaults.xml index 0c6bcd1afe..2b10155f67 100644 --- a/addons/skin.estuary/colors/defaults.xml +++ b/addons/skin.estuary/colors/defaults.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <colors> <color name="primary_background">FF006699</color> - <color name="secondary_background">8024CA7A</color> + <color name="secondary_background">80A6111F</color> <color name="dialog_tint">FF22282A</color> <color name="background">FF000000</color> <color name="bg_image">FF909090</color> @@ -11,7 +11,7 @@ <color name="grey">FFA0A0A0</color> <color name="blue">FF7ACAFE</color> <color name="red">FFCE4421</color> - <color name="button_focus">FF12B2E7</color> + <color name="button_focus">FF12A0C7</color> <color name="text_shadow">22000000</color> <color name="border_alpha">60FFFFFF</color> <color name="disabled">40FFFFFF</color> 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 da1756d8e6..16f34db7e8 100644 --- a/addons/skin.estuary/language/resource.language.en_gb/strings.po +++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po @@ -389,21 +389,25 @@ msgctxt "#31098" msgid "Select your Kodi user profile[CR]to login and continue" msgstr "" +#. viewtype name #: /1080i/View_52_IconWall.xml msgctxt "#31099" -msgid "Icon Wall" +msgid "IconWall" msgstr "" +#. viewtype name #: /1080i/View_53_Shift.xml msgctxt "#31100" msgid "Shift" msgstr "" +#. viewtype name #: /1080i/View_54_InfoWall.xml msgctxt "#31101" msgid "InfoWall" msgstr "" +#. viewtype name #: /1080i/View_500_Wall.xml msgctxt "#31102" msgid "Wall" @@ -429,6 +433,7 @@ msgctxt "#31106" msgid "Teletext" msgstr "" +#. viewtype name #: /1080i/View_55_WideList.xml msgctxt "#31107" msgid "WideList" diff --git a/addons/skin.estuary/media/buttons/button-nofo.png b/addons/skin.estuary/media/buttons/button-nofo.png Binary files differindex f0d93dda5c..318228a009 100644 --- a/addons/skin.estuary/media/buttons/button-nofo.png +++ b/addons/skin.estuary/media/buttons/button-nofo.png diff --git a/addons/skin.estuary/media/dialogs/dialog-bg-nobo.png b/addons/skin.estuary/media/dialogs/dialog-bg-nobo.png Binary files differindex 78802e8617..9f7b63b08e 100644 --- a/addons/skin.estuary/media/dialogs/dialog-bg-nobo.png +++ b/addons/skin.estuary/media/dialogs/dialog-bg-nobo.png diff --git a/addons/skin.estuary/media/dialogs/dialog-bg.png b/addons/skin.estuary/media/dialogs/dialog-bg.png Binary files differindex f0d93dda5c..318228a009 100644 --- a/addons/skin.estuary/media/dialogs/dialog-bg.png +++ b/addons/skin.estuary/media/dialogs/dialog-bg.png diff --git a/addons/skin.estuary/media/dialogs/extendedprogress/loading-back.png b/addons/skin.estuary/media/dialogs/extendedprogress/loading-back.png Binary files differindex df6ebd2803..275b8affc9 100644 --- a/addons/skin.estuary/media/dialogs/extendedprogress/loading-back.png +++ b/addons/skin.estuary/media/dialogs/extendedprogress/loading-back.png diff --git a/addons/skin.estuary/media/dialogs/extendedprogress/loading-placeholder.png b/addons/skin.estuary/media/dialogs/extendedprogress/loading-placeholder.png Binary files differdeleted file mode 100644 index e9194f8b42..0000000000 --- a/addons/skin.estuary/media/dialogs/extendedprogress/loading-placeholder.png +++ /dev/null diff --git a/addons/skin.estuary/media/dialogs/extendedprogress/loading.png b/addons/skin.estuary/media/dialogs/extendedprogress/loading.png Binary files differindex 353ca79b4b..386098c412 100644 --- a/addons/skin.estuary/media/dialogs/extendedprogress/loading.png +++ b/addons/skin.estuary/media/dialogs/extendedprogress/loading.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 0.png b/addons/skin.estuary/media/dialogs/volume/progress/p 0.png Binary files differindex a7b4092c5d..ad9532a3bd 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 0.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 0.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 1.png b/addons/skin.estuary/media/dialogs/volume/progress/p 1.png Binary files differindex 8dd3de6255..86dc6e8a56 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 1.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 1.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 2.png b/addons/skin.estuary/media/dialogs/volume/progress/p 2.png Binary files differindex 3efbce152c..bb85224df1 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 2.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 2.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 3.png b/addons/skin.estuary/media/dialogs/volume/progress/p 3.png Binary files differindex e378776721..e25a441039 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 3.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 3.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 4.png b/addons/skin.estuary/media/dialogs/volume/progress/p 4.png Binary files differindex d254e3038f..8a46ffeb9f 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 4.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 4.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 5.png b/addons/skin.estuary/media/dialogs/volume/progress/p 5.png Binary files differindex 371b9386cc..1110b1fdf6 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 5.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 5.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 6.png b/addons/skin.estuary/media/dialogs/volume/progress/p 6.png Binary files differindex 97884d762d..72478a52e4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 6.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 6.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 7.png b/addons/skin.estuary/media/dialogs/volume/progress/p 7.png Binary files differindex f0e2966cb4..1351bb5f5d 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 7.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 7.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 8.png b/addons/skin.estuary/media/dialogs/volume/progress/p 8.png Binary files differindex 91a5371698..4f8ee6b39b 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 8.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 8.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p 9.png b/addons/skin.estuary/media/dialogs/volume/progress/p 9.png Binary files differindex 4a38077a1e..3823349f40 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p 9.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p 9.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p0.png b/addons/skin.estuary/media/dialogs/volume/progress/p0.png Binary files differindex a7b4092c5d..ad9532a3bd 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p0.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p0.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p1.png b/addons/skin.estuary/media/dialogs/volume/progress/p1.png Binary files differindex 8dd3de6255..86dc6e8a56 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p1.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p1.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p10.png b/addons/skin.estuary/media/dialogs/volume/progress/p10.png Binary files differindex ce9faccf07..dfe58c46b5 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p10.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p10.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p100.png b/addons/skin.estuary/media/dialogs/volume/progress/p100.png Binary files differindex 61a6a85aaa..eb7d29ab08 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p100.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p100.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p11.png b/addons/skin.estuary/media/dialogs/volume/progress/p11.png Binary files differindex d9dc8c9fb6..16b34dcda4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p11.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p11.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p12.png b/addons/skin.estuary/media/dialogs/volume/progress/p12.png Binary files differindex 36e1b612c2..0cc19503a8 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p12.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p12.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p13.png b/addons/skin.estuary/media/dialogs/volume/progress/p13.png Binary files differindex 1483e29f3a..fbf39b856b 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p13.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p13.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p14.png b/addons/skin.estuary/media/dialogs/volume/progress/p14.png Binary files differindex 2820dbd438..ccb0ed9dbb 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p14.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p14.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p15.png b/addons/skin.estuary/media/dialogs/volume/progress/p15.png Binary files differindex 05f8e725e5..550e49966b 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p15.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p15.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p16.png b/addons/skin.estuary/media/dialogs/volume/progress/p16.png Binary files differindex 98c557076b..5ef07fb9c9 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p16.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p16.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p17.png b/addons/skin.estuary/media/dialogs/volume/progress/p17.png Binary files differindex 48ace2c067..10331f61d4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p17.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p17.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p18.png b/addons/skin.estuary/media/dialogs/volume/progress/p18.png Binary files differindex 2a84262475..66e42af6b7 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p18.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p18.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p19.png b/addons/skin.estuary/media/dialogs/volume/progress/p19.png Binary files differindex 1ebeb51c38..fb73309da9 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p19.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p19.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p2.png b/addons/skin.estuary/media/dialogs/volume/progress/p2.png Binary files differindex 3efbce152c..bb85224df1 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p2.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p2.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p20.png b/addons/skin.estuary/media/dialogs/volume/progress/p20.png Binary files differindex 60d4b85015..98130a5151 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p20.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p20.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p21.png b/addons/skin.estuary/media/dialogs/volume/progress/p21.png Binary files differindex de20e64450..d551843014 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p21.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p21.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p22.png b/addons/skin.estuary/media/dialogs/volume/progress/p22.png Binary files differindex 4a90af41d2..2d1e1f679e 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p22.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p22.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p23.png b/addons/skin.estuary/media/dialogs/volume/progress/p23.png Binary files differindex 24aebecc9d..6c0fae7aaf 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p23.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p23.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p24.png b/addons/skin.estuary/media/dialogs/volume/progress/p24.png Binary files differindex 85726adf32..8fdfb1a6ee 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p24.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p24.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p25.png b/addons/skin.estuary/media/dialogs/volume/progress/p25.png Binary files differindex dc21385cca..1977a8812e 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p25.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p25.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p26.png b/addons/skin.estuary/media/dialogs/volume/progress/p26.png Binary files differindex e8346f32a7..a05824c6c5 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p26.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p26.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p27.png b/addons/skin.estuary/media/dialogs/volume/progress/p27.png Binary files differindex f41a19fdb5..d71fb09f8e 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p27.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p27.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p28.png b/addons/skin.estuary/media/dialogs/volume/progress/p28.png Binary files differindex fc4b1be450..61ba51af85 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p28.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p28.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p29.png b/addons/skin.estuary/media/dialogs/volume/progress/p29.png Binary files differindex 9e6c0c3723..297b4ea922 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p29.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p29.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p3.png b/addons/skin.estuary/media/dialogs/volume/progress/p3.png Binary files differindex e378776721..e25a441039 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p3.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p3.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p30.png b/addons/skin.estuary/media/dialogs/volume/progress/p30.png Binary files differindex 1e1572fc61..137cd1fb90 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p30.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p30.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p31.png b/addons/skin.estuary/media/dialogs/volume/progress/p31.png Binary files differindex c1f7ae3d4b..b9fb501723 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p31.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p31.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p32.png b/addons/skin.estuary/media/dialogs/volume/progress/p32.png Binary files differindex fa719682c2..4de132f107 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p32.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p32.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p33.png b/addons/skin.estuary/media/dialogs/volume/progress/p33.png Binary files differindex 7e309bb91e..cf2f69ac24 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p33.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p33.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p34.png b/addons/skin.estuary/media/dialogs/volume/progress/p34.png Binary files differindex 325e623af0..71af273b1c 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p34.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p34.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p35.png b/addons/skin.estuary/media/dialogs/volume/progress/p35.png Binary files differindex f2be27b759..a6905d2797 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p35.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p35.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p36.png b/addons/skin.estuary/media/dialogs/volume/progress/p36.png Binary files differindex 808c4a802d..b349c020f4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p36.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p36.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p37.png b/addons/skin.estuary/media/dialogs/volume/progress/p37.png Binary files differindex 4bab1a72fb..0e885f6372 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p37.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p37.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p38.png b/addons/skin.estuary/media/dialogs/volume/progress/p38.png Binary files differindex 1b3bb4d683..e2aa0315b4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p38.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p38.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p39.png b/addons/skin.estuary/media/dialogs/volume/progress/p39.png Binary files differindex 7bc7c93bfe..7fc4e7584d 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p39.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p39.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p4.png b/addons/skin.estuary/media/dialogs/volume/progress/p4.png Binary files differindex d254e3038f..8a46ffeb9f 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p4.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p4.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p40.png b/addons/skin.estuary/media/dialogs/volume/progress/p40.png Binary files differindex b2cd9bac28..3ffa174967 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p40.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p40.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p41.png b/addons/skin.estuary/media/dialogs/volume/progress/p41.png Binary files differindex d4e6f6fb28..7eb2e93990 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p41.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p41.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p42.png b/addons/skin.estuary/media/dialogs/volume/progress/p42.png Binary files differindex 082e6539b2..6d712b6c61 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p42.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p42.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p43.png b/addons/skin.estuary/media/dialogs/volume/progress/p43.png Binary files differindex cb0d043df0..03503163fa 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p43.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p43.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p44.png b/addons/skin.estuary/media/dialogs/volume/progress/p44.png Binary files differindex 631a60c912..4ee8fde49b 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p44.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p44.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p45.png b/addons/skin.estuary/media/dialogs/volume/progress/p45.png Binary files differindex 65e6de8a68..52401daf38 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p45.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p45.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p46.png b/addons/skin.estuary/media/dialogs/volume/progress/p46.png Binary files differindex 9bc50c9792..deba640de0 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p46.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p46.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p47.png b/addons/skin.estuary/media/dialogs/volume/progress/p47.png Binary files differindex 82d9b63545..dc93211db4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p47.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p47.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p48.png b/addons/skin.estuary/media/dialogs/volume/progress/p48.png Binary files differindex 767de06f69..66a63885c5 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p48.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p48.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p49.png b/addons/skin.estuary/media/dialogs/volume/progress/p49.png Binary files differindex 8dcf6f95e5..63796d09bd 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p49.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p49.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p5.png b/addons/skin.estuary/media/dialogs/volume/progress/p5.png Binary files differindex 371b9386cc..1110b1fdf6 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p5.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p5.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p50.png b/addons/skin.estuary/media/dialogs/volume/progress/p50.png Binary files differindex 1fc3bb26f1..8b0c986820 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p50.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p50.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p51.png b/addons/skin.estuary/media/dialogs/volume/progress/p51.png Binary files differindex 81e7d34381..c27a065077 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p51.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p51.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p52.png b/addons/skin.estuary/media/dialogs/volume/progress/p52.png Binary files differindex 6385d1b2b1..6c57b468c8 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p52.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p52.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p53.png b/addons/skin.estuary/media/dialogs/volume/progress/p53.png Binary files differindex 526be41aff..208c6af197 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p53.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p53.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p54.png b/addons/skin.estuary/media/dialogs/volume/progress/p54.png Binary files differindex 1a3677476d..28edee8ad5 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p54.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p54.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p55.png b/addons/skin.estuary/media/dialogs/volume/progress/p55.png Binary files differindex 5ab8f60e0c..9d1aa43647 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p55.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p55.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p56.png b/addons/skin.estuary/media/dialogs/volume/progress/p56.png Binary files differindex 9452ee77a9..f315107769 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p56.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p56.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p57.png b/addons/skin.estuary/media/dialogs/volume/progress/p57.png Binary files differindex 278fa18a35..ee4fba694f 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p57.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p57.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p58.png b/addons/skin.estuary/media/dialogs/volume/progress/p58.png Binary files differindex 62b7150d18..d0471a8460 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p58.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p58.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p59.png b/addons/skin.estuary/media/dialogs/volume/progress/p59.png Binary files differindex 565d881d9f..da5c46af03 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p59.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p59.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p6.png b/addons/skin.estuary/media/dialogs/volume/progress/p6.png Binary files differindex 97884d762d..72478a52e4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p6.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p6.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p60.png b/addons/skin.estuary/media/dialogs/volume/progress/p60.png Binary files differindex 28d3ab79da..7a1e527724 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p60.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p60.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p61.png b/addons/skin.estuary/media/dialogs/volume/progress/p61.png Binary files differindex 218e04bb1b..b639ef744b 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p61.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p61.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p62.png b/addons/skin.estuary/media/dialogs/volume/progress/p62.png Binary files differindex e417c28e27..2a9f3305e8 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p62.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p62.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p63.png b/addons/skin.estuary/media/dialogs/volume/progress/p63.png Binary files differindex e0abbae4bd..3ed0dc8af9 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p63.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p63.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p64.png b/addons/skin.estuary/media/dialogs/volume/progress/p64.png Binary files differindex c89cce8051..8ef00d4b0e 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p64.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p64.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p65.png b/addons/skin.estuary/media/dialogs/volume/progress/p65.png Binary files differindex a00365a67d..3a75467da4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p65.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p65.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p66.png b/addons/skin.estuary/media/dialogs/volume/progress/p66.png Binary files differindex 1da194bc87..b28c4d3fbe 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p66.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p66.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p67.png b/addons/skin.estuary/media/dialogs/volume/progress/p67.png Binary files differindex ee92d84dea..4c9becdf0c 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p67.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p67.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p68.png b/addons/skin.estuary/media/dialogs/volume/progress/p68.png Binary files differindex a7b5d69de5..34193515c8 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p68.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p68.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p69.png b/addons/skin.estuary/media/dialogs/volume/progress/p69.png Binary files differindex a24f901885..baaece09b3 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p69.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p69.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p7.png b/addons/skin.estuary/media/dialogs/volume/progress/p7.png Binary files differindex f0e2966cb4..1351bb5f5d 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p7.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p7.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p70.png b/addons/skin.estuary/media/dialogs/volume/progress/p70.png Binary files differindex f234c007f0..85bfa88363 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p70.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p70.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p71.png b/addons/skin.estuary/media/dialogs/volume/progress/p71.png Binary files differindex cec46d8486..e5928a5bea 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p71.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p71.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p72.png b/addons/skin.estuary/media/dialogs/volume/progress/p72.png Binary files differindex 7c3348bdc4..396c0604bc 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p72.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p72.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p73.png b/addons/skin.estuary/media/dialogs/volume/progress/p73.png Binary files differindex 805f881161..ff7e6722c6 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p73.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p73.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p74.png b/addons/skin.estuary/media/dialogs/volume/progress/p74.png Binary files differindex 69df6c84f1..5529a9536a 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p74.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p74.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p75.png b/addons/skin.estuary/media/dialogs/volume/progress/p75.png Binary files differindex c19a457d56..4669052e11 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p75.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p75.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p76.png b/addons/skin.estuary/media/dialogs/volume/progress/p76.png Binary files differindex 7f17cde505..f075c7cdc0 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p76.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p76.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p77.png b/addons/skin.estuary/media/dialogs/volume/progress/p77.png Binary files differindex e8cb815389..2296b1688a 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p77.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p77.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p78.png b/addons/skin.estuary/media/dialogs/volume/progress/p78.png Binary files differindex 77abc73128..f3a53ed08a 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p78.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p78.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p79.png b/addons/skin.estuary/media/dialogs/volume/progress/p79.png Binary files differindex 6fe5e7c648..b388020a6a 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p79.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p79.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p8.png b/addons/skin.estuary/media/dialogs/volume/progress/p8.png Binary files differindex 91a5371698..4f8ee6b39b 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p8.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p8.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p80.png b/addons/skin.estuary/media/dialogs/volume/progress/p80.png Binary files differindex 9798278ab8..34907c5326 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p80.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p80.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p81.png b/addons/skin.estuary/media/dialogs/volume/progress/p81.png Binary files differindex 4398835c43..f1e1ba6daf 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p81.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p81.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p82.png b/addons/skin.estuary/media/dialogs/volume/progress/p82.png Binary files differindex d83a07a18a..e1926398cd 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p82.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p82.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p83.png b/addons/skin.estuary/media/dialogs/volume/progress/p83.png Binary files differindex 6d2ea6fd16..7000a84eeb 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p83.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p83.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p84.png b/addons/skin.estuary/media/dialogs/volume/progress/p84.png Binary files differindex 48631b7f6d..ef772a63cd 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p84.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p84.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p85.png b/addons/skin.estuary/media/dialogs/volume/progress/p85.png Binary files differindex a2d6f5b6a0..e649d559b4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p85.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p85.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p86.png b/addons/skin.estuary/media/dialogs/volume/progress/p86.png Binary files differindex ae5e9e464a..b5dd2122f1 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p86.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p86.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p87.png b/addons/skin.estuary/media/dialogs/volume/progress/p87.png Binary files differindex 6a6b0da922..be52065ea3 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p87.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p87.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p88.png b/addons/skin.estuary/media/dialogs/volume/progress/p88.png Binary files differindex c5c8dd55eb..163c81c848 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p88.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p88.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p89.png b/addons/skin.estuary/media/dialogs/volume/progress/p89.png Binary files differindex 213a64a546..f007771e20 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p89.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p89.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p9.png b/addons/skin.estuary/media/dialogs/volume/progress/p9.png Binary files differindex 4a38077a1e..3823349f40 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p9.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p9.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p90.png b/addons/skin.estuary/media/dialogs/volume/progress/p90.png Binary files differindex 2cf83ac9a1..24e35549c0 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p90.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p90.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p91.png b/addons/skin.estuary/media/dialogs/volume/progress/p91.png Binary files differindex b217610685..63975811f4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p91.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p91.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p92.png b/addons/skin.estuary/media/dialogs/volume/progress/p92.png Binary files differindex c39d492ab1..3b44ae35c7 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p92.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p92.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p93.png b/addons/skin.estuary/media/dialogs/volume/progress/p93.png Binary files differindex 30a808588f..f18df61b23 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p93.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p93.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p94.png b/addons/skin.estuary/media/dialogs/volume/progress/p94.png Binary files differindex afb4974cab..48dc22941d 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p94.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p94.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p95.png b/addons/skin.estuary/media/dialogs/volume/progress/p95.png Binary files differindex f1e48c975c..fccf641b81 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p95.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p95.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p96.png b/addons/skin.estuary/media/dialogs/volume/progress/p96.png Binary files differindex 79fed52139..26cb6d367c 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p96.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p96.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p97.png b/addons/skin.estuary/media/dialogs/volume/progress/p97.png Binary files differindex bcde957231..937e0b59a4 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p97.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p97.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p98.png b/addons/skin.estuary/media/dialogs/volume/progress/p98.png Binary files differindex 60c78841fd..382e13021d 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p98.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p98.png diff --git a/addons/skin.estuary/media/dialogs/volume/progress/p99.png b/addons/skin.estuary/media/dialogs/volume/progress/p99.png Binary files differindex 61a6a85aaa..8cbb6d2fa6 100644 --- a/addons/skin.estuary/media/dialogs/volume/progress/p99.png +++ b/addons/skin.estuary/media/dialogs/volume/progress/p99.png diff --git a/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png b/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png Binary files differindex cf719d34be..4f96312105 100644 --- a/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png +++ b/addons/skin.estuary/media/icons/pvr/PVR-IsRecording.png diff --git a/addons/skin.estuary/media/lists/panel-mediamenu.png b/addons/skin.estuary/media/lists/panel-mediamenu.png Binary files differindex 85a68eec06..882ebb09f4 100644 --- a/addons/skin.estuary/media/lists/panel-mediamenu.png +++ b/addons/skin.estuary/media/lists/panel-mediamenu.png diff --git a/addons/skin.estuary/media/lists/panel.png b/addons/skin.estuary/media/lists/panel.png Binary files differindex 78802e8617..908b4670e8 100644 --- a/addons/skin.estuary/media/lists/panel.png +++ b/addons/skin.estuary/media/lists/panel.png diff --git a/addons/skin.estuary/media/overlays/shadow.png b/addons/skin.estuary/media/overlays/shadow.png Binary files differindex ef5b4a6f5e..32a36f2ea5 100644 --- a/addons/skin.estuary/media/overlays/shadow.png +++ b/addons/skin.estuary/media/overlays/shadow.png diff --git a/addons/skin.estuary/media/windows/pvr/record.png b/addons/skin.estuary/media/windows/pvr/record.png Binary files differindex cf202e9727..0213e3d4c8 100644 --- a/addons/skin.estuary/media/windows/pvr/record.png +++ b/addons/skin.estuary/media/windows/pvr/record.png diff --git a/addons/skin.estuary/media/windows/pvr/timer.png b/addons/skin.estuary/media/windows/pvr/timer.png Binary files differindex bf1df5e1de..42597268d1 100644 --- a/addons/skin.estuary/media/windows/pvr/timer.png +++ b/addons/skin.estuary/media/windows/pvr/timer.png diff --git a/addons/skin.estuary/themes/curial/buttons/button-nofo.png b/addons/skin.estuary/themes/curial/buttons/button-nofo.png Binary files differindex 64cf388ffe..88edc2df8d 100644 --- a/addons/skin.estuary/themes/curial/buttons/button-nofo.png +++ b/addons/skin.estuary/themes/curial/buttons/button-nofo.png diff --git a/addons/skin.estuary/themes/curial/dialogs/dialog-bg.png b/addons/skin.estuary/themes/curial/dialogs/dialog-bg.png Binary files differindex b699e8c6bf..037fc071e1 100644 --- a/addons/skin.estuary/themes/curial/dialogs/dialog-bg.png +++ b/addons/skin.estuary/themes/curial/dialogs/dialog-bg.png diff --git a/addons/skin.estuary/themes/flat/buttons/button-nofo.png b/addons/skin.estuary/themes/flat/buttons/button-nofo.png Binary files differindex 3aa41eea1c..fc372204be 100644 --- a/addons/skin.estuary/themes/flat/buttons/button-nofo.png +++ b/addons/skin.estuary/themes/flat/buttons/button-nofo.png diff --git a/addons/skin.estuary/themes/flat/dialogs/dialog-bg.png b/addons/skin.estuary/themes/flat/dialogs/dialog-bg.png Binary files differindex 3aa41eea1c..a0f73a11cf 100644 --- a/addons/skin.estuary/themes/flat/dialogs/dialog-bg.png +++ b/addons/skin.estuary/themes/flat/dialogs/dialog-bg.png diff --git a/addons/skin.estuary/xml/AddonBrowser.xml b/addons/skin.estuary/xml/AddonBrowser.xml index 04b3d490e2..f3ee214b28 100644 --- a/addons/skin.estuary/xml/AddonBrowser.xml +++ b/addons/skin.estuary/xml/AddonBrowser.xml @@ -22,7 +22,9 @@ <include content="TopBar"> <param name="breadcrumbs_label" value="$LOCALIZE[24001]" /> </include> - <include>BottomBar</include> + <include content="BottomBar"> + <param name="info_visible" value="true" /> + </include> <include>MediaMenuMouseOverlay</include> <control type="group"> <include>MediaMenuCommon</include> diff --git a/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml index 72aece4efa..01ff0f8b1f 100644 --- a/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml +++ b/addons/skin.estuary/xml/Custom_1103_VolumeSlider.xml @@ -24,8 +24,8 @@ <top>0</top> <width>525</width> <height>152</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="progress"> diff --git a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml index 9956e2865f..dabc8c8534 100644 --- a/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml +++ b/addons/skin.estuary/xml/Custom_1105_MusicOSDSettings.xml @@ -28,7 +28,7 @@ <visible>system.getbool(audiooutput.dspaddonsenabled)</visible> </item> <item> - <label>$LOCALIZE[250]: [COLOR button_focus]$INFO[Visualisation.Name][/COLOR]</label> + <label>$LOCALIZE[250]$INFO[Visualisation.Name,: [COLOR button_focus],[/COLOR]]</label> <onclick>Dialog.Close(all)</onclick> <onclick>SendClick(500)</onclick> </item> @@ -42,7 +42,7 @@ <visible>Visualisation.HasPresets</visible> </item> <item> - <label>$LOCALIZE[31082]: [COLOR button_focus]$INFO[Skin.String(LyricScript_Path)][/COLOR]</label> + <label>$LOCALIZE[31082]$INFO[Skin.String(LyricScript_Path),: [COLOR button_focus],[/COLOR]]</label> <onclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick> </item> <item> diff --git a/addons/skin.estuary/xml/Defaults.xml b/addons/skin.estuary/xml/Defaults.xml index ab41022b12..5980707c15 100644 --- a/addons/skin.estuary/xml/Defaults.xml +++ b/addons/skin.estuary/xml/Defaults.xml @@ -27,8 +27,8 @@ <disabledcolor>disabled</disabledcolor> </default> <default type="button"> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> <font>font13</font> <textcolor>white</textcolor> <disabledcolor>disabled</disabledcolor> @@ -37,10 +37,10 @@ <pulseonselect>no</pulseonselect> </default> <default type="togglebutton"> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> - <alttexturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</alttexturefocus> - <alttexturenofocus border="40">buttons/button-nofo.png</alttexturenofocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> + <alttexturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</alttexturefocus> + <alttexturenofocus border="21">buttons/button-nofo.png</alttexturenofocus> <textcolor>white</textcolor> <font>font13</font> <disabledcolor>disabled</disabledcolor> @@ -105,8 +105,8 @@ <textureradiooffnofocus>buttons/radio-button-off.png</textureradiooffnofocus> <textureradioondisabled colordiffuse="disabled">buttons/radio-button-on.png</textureradioondisabled> <textureradiooffdisabled colordiffuse="disabled">buttons/radio-button-off.png</textureradiooffdisabled> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> <font>font13</font> <textcolor>white</textcolor> <disabledcolor>disabled</disabledcolor> diff --git a/addons/skin.estuary/xml/DialogAddonInfo.xml b/addons/skin.estuary/xml/DialogAddonInfo.xml index f46f8f4000..947eba6af2 100644 --- a/addons/skin.estuary/xml/DialogAddonInfo.xml +++ b/addons/skin.estuary/xml/DialogAddonInfo.xml @@ -43,7 +43,7 @@ <height>260</height> <texture background="true">DefaultNoPreview.png</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -52,7 +52,7 @@ <height>260</height> <texture background="true">DefaultNoPreview.png</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -61,7 +61,7 @@ <height>260</height> <texture background="true">DefaultNoPreview.png</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> </control> @@ -80,7 +80,7 @@ <height>260</height> <texture background="true">DefaultNoPreview.png</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -89,7 +89,7 @@ <height>260</height> <texture background="true">$INFO[ListItem.Icon]</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> </itemlayout> @@ -100,7 +100,7 @@ <height>260</height> <texture background="true">DefaultNoPreview.png</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -109,7 +109,7 @@ <height>260</height> <texture background="true">$INFO[ListItem.Icon]</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -195,7 +195,7 @@ <height>540</height> <aspectratio>scale</aspectratio> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -233,7 +233,7 @@ <width>540</width> <height>150</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="grouplist"> diff --git a/addons/skin.estuary/xml/DialogAddonSettings.xml b/addons/skin.estuary/xml/DialogAddonSettings.xml index 9147c8a5f6..37bbf6a40f 100644 --- a/addons/skin.estuary/xml/DialogAddonSettings.xml +++ b/addons/skin.estuary/xml/DialogAddonSettings.xml @@ -4,121 +4,121 @@ <include>Animation_DialogPopupOpenClose</include> <controls> <control type="group"> - <centertop>50%</centertop> - <height>800</height> - <centerleft>50%</centerleft> - <width>1820</width> - <include content="DialogBackgroundCommons"> - <param name="width" value="1820" /> - <param name="height" value="800" /> - <param name="header_label" value="" /> - <param name="header_id" value="20" /> - </include> - <control type="grouplist" id="9"> - <description>button area</description> - <left>20</left> - <top>70</top> - <width>400</width> - <height>700</height> - <itemgap>-25</itemgap> - <orientation>vertical</orientation> - <onleft>9001</onleft> - <onright>2</onright> - <onup>9</onup> - <ondown>9</ondown> - </control> - <include content="UpDownArrows"> - <param name="container_id" value="2" /> - <param name="posx" value="830" /> - <param name="up_posy" value="-42" /> - <param name="down_posy" value="814" /> - </include> - <control type="image"> - <left>400</left> - <top>70</top> - <width>1100</width> - <height>722</height> - <texture border="40">buttons/dialogbutton-nofo.png</texture> - </control> - <control type="grouplist" id="2"> - <description>control area</description> - <left>420</left> - <top>90</top> - <width>1060</width> - <height>680</height> - <onup>2</onup> - <ondown>2</ondown> - <onleft>9</onleft> - <onright>9001</onright> - </control> - <control type="grouplist" id="9001"> - <right>20</right> - <top>70</top> - <width>300</width> - <height>700</height> - <itemgap>dialogbuttons_itemgap</itemgap> - <align>left</align> - <orientation>vertical</orientation> - <onup>9001</onup> - <ondown>9001</ondown> - <onleft>2</onleft> - <onright>9</onright> - <include content="DefaultDialogButton"> - <param name="id" value="10" /> - <param name="label" value="$LOCALIZE[186]" /> + <centertop>50%</centertop> + <height>800</height> + <centerleft>50%</centerleft> + <width>1820</width> + <include content="DialogBackgroundCommons"> + <param name="width" value="1820" /> + <param name="height" value="800" /> + <param name="header_label" value="" /> + <param name="header_id" value="20" /> </include> - <include content="DefaultDialogButton"> - <param name="id" value="11" /> - <param name="label" value="$LOCALIZE[222]" /> + <control type="grouplist" id="9"> + <description>button area</description> + <left>20</left> + <top>70</top> + <width>400</width> + <height>700</height> + <itemgap>-25</itemgap> + <orientation>vertical</orientation> + <onleft>9001</onleft> + <onright>2</onright> + <onup>9</onup> + <ondown>9</ondown> + </control> + <include content="UpDownArrows"> + <param name="container_id" value="2" /> + <param name="posx" value="830" /> + <param name="up_posy" value="-42" /> + <param name="down_posy" value="814" /> </include> - <include content="DefaultDialogButton"> - <param name="id" value="12" /> - <param name="label" value="$LOCALIZE[409]" /> - </include> - </control> - <control type="button" id="13"> - <description>Default Category Button</description> - <height>120</height> - <width>390</width> - <textoffsetx>20</textoffsetx> - <align>center</align> - <aligny>center</aligny> - <font>font25_title</font> - <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> - <control type="label" id="7"> - <height>60</height> - <font>font12</font> - <label></label> - <textoffsetx>40</textoffsetx> - <textoffsety>20</textoffsety> - <textcolor>button_focus</textcolor> - <shadowcolor>black</shadowcolor> - <aligny>bottom</aligny> - </control> - <control type="image" id="6"> - <description>separator image</description> - <height>3</height> - <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 type="image"> + <left>400</left> + <top>70</top> + <width>1100</width> + <height>722</height> + <texture border="40">buttons/dialogbutton-nofo.png</texture> + </control> + <control type="grouplist" id="2"> + <description>control area</description> + <left>420</left> + <top>90</top> + <width>1060</width> + <height>680</height> + <onup>2</onup> + <ondown>2</ondown> + <onleft>9</onleft> + <onright>9001</onright> + </control> + <control type="grouplist" id="9001"> + <right>20</right> + <top>70</top> + <width>300</width> + <height>700</height> + <itemgap>dialogbuttons_itemgap</itemgap> + <align>left</align> + <orientation>vertical</orientation> + <onup>9001</onup> + <ondown>9001</ondown> + <onleft>2</onleft> + <onright>9</onright> + <include content="DefaultDialogButton"> + <param name="id" value="10" /> + <param name="label" value="$LOCALIZE[186]" /> + </include> + <include content="DefaultDialogButton"> + <param name="id" value="11" /> + <param name="label" value="$LOCALIZE[222]" /> + </include> + <include content="DefaultDialogButton"> + <param name="id" value="12" /> + <param name="label" value="$LOCALIZE[409]" /> + </include> + </control> + <control type="button" id="13"> + <description>Default Category Button</description> + <height>120</height> + <width>390</width> + <textoffsetx>20</textoffsetx> + <align>center</align> + <aligny>center</aligny> + <font>font25_title</font> + <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> + <control type="label" id="7"> + <height>60</height> + <font>font12</font> + <label></label> + <textoffsetx>40</textoffsetx> + <textoffsety>20</textoffsety> + <textcolor>button_focus</textcolor> + <shadowcolor>black</shadowcolor> + <aligny>bottom</aligny> + </control> + <control type="image" id="6"> + <description>separator image</description> + <height>3</height> + <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> </controls> </window> diff --git a/addons/skin.estuary/xml/DialogBusy.xml b/addons/skin.estuary/xml/DialogBusy.xml index 02d55f6070..3d6fe2eee1 100644 --- a/addons/skin.estuary/xml/DialogBusy.xml +++ b/addons/skin.estuary/xml/DialogBusy.xml @@ -40,8 +40,8 @@ <control type="image"> <centerleft>50%</centerleft> <centertop>50%</centertop> - <width>50</width> - <height>50</height> + <width>30</width> + <height>30</height> <texture colordiffuse="button_focus">$INFO[Control.GetLabel(10),dialogs/volume/progress/p,.png]</texture> </control> <control type="progress" id="10"> diff --git a/addons/skin.estuary/xml/DialogExtendedProgressBar.xml b/addons/skin.estuary/xml/DialogExtendedProgressBar.xml index 59707fa7ea..65532c6691 100644 --- a/addons/skin.estuary/xml/DialogExtendedProgressBar.xml +++ b/addons/skin.estuary/xml/DialogExtendedProgressBar.xml @@ -12,28 +12,28 @@ <animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation> <animation effect="slide" end="0,-80" time="150" condition="Window.IsVisible(FullscreenVideo)">conditional</animation> <control type="image"> - <left>-4</left> - <top>-11</top> - <width>100</width> - <height>100</height> - <texture colordiffuse="button_focus">dialogs/extendedprogress/loading-back.png</texture> + <left>20</left> + <top>10</top> + <width>60</width> + <height>60</height> + <texture>dialogs/extendedprogress/loading-back.png</texture> </control> <control type="group"> <visible>!Window.IsActive(volumebar)</visible> <animation effect="fade" time="200">VisibleChange</animation> <control type="image"> - <left>-4</left> - <top>-11</top> - <width>100</width> - <height>100</height> + <left>20</left> + <top>10</top> + <width>60</width> + <height>60</height> <texture>$INFO[Control.GetLabel(32),dialogs/volume/progress/p,.png]</texture> <animation effect="fade" end="50" time="0" condition="true">Conditional</animation> </control> <control type="image"> - <left>-4</left> - <top>-11</top> - <width>100</width> - <height>100</height> + <left>20</left> + <top>10</top> + <width>60</width> + <height>60</height> <texture>dialogs/extendedprogress/loading.png</texture> <animation effect="rotate" center="auto" start="360" end="0" time="1500" loop="true" condition="true">Conditional</animation> </control> diff --git a/addons/skin.estuary/xml/DialogFullScreenInfo.xml b/addons/skin.estuary/xml/DialogFullScreenInfo.xml index 429e3b07ee..f89dc2e1db 100644 --- a/addons/skin.estuary/xml/DialogFullScreenInfo.xml +++ b/addons/skin.estuary/xml/DialogFullScreenInfo.xml @@ -26,7 +26,7 @@ <height>600</height> <aspectratio aligny="bottom">keep</aspectratio> <texture fallback="DefaultVideo.png" background="true">$VAR[NowPlayingPosterVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <include>OpenClose_Left</include> </control> @@ -37,8 +37,8 @@ <top>-240</top> <right>20</right> <height>350</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="textbox"> diff --git a/addons/skin.estuary/xml/DialogMusicInfo.xml b/addons/skin.estuary/xml/DialogMusicInfo.xml index 0cc624e9f0..4f895ab4e2 100644 --- a/addons/skin.estuary/xml/DialogMusicInfo.xml +++ b/addons/skin.estuary/xml/DialogMusicInfo.xml @@ -20,7 +20,7 @@ <height>607</height> <aspectratio>scale</aspectratio> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -162,7 +162,7 @@ <top>-10</top> <width>595</width> <height>100</height> - <texture border="40">buttons/button-nofo.png</texture> + <texture border="21">buttons/button-nofo.png</texture> </control> <control type="label"> <left>40</left> @@ -179,7 +179,7 @@ <top>-10</top> <width>595</width> <height>100</height> - <texture border="40" colordiffuse="button_focus">buttons/button-fo.png</texture> + <texture border="21" colordiffuse="button_focus">buttons/button-fo.png</texture> </control> <control type="label"> <left>40</left> @@ -196,7 +196,7 @@ <top>-10</top> <width>595</width> <height>100</height> - <texture border="40">buttons/button-nofo.png</texture> + <texture border="21">buttons/button-nofo.png</texture> </control> <control type="label"> <left>40</left> @@ -219,7 +219,7 @@ <top>-10</top> <width>595</width> <height>100</height> - <texture border="40" colordiffuse="button_focus">buttons/button-fo.png</texture> + <texture border="21" colordiffuse="button_focus">buttons/button-fo.png</texture> </control> <control type="label"> <left>40</left> @@ -242,7 +242,7 @@ <top>-10</top> <width>250</width> <height>312</height> - <texture border="40">buttons/button-nofo.png</texture> + <texture border="21">buttons/button-nofo.png</texture> </control> <control type="image"> <left>30</left> @@ -278,7 +278,7 @@ <top>-10</top> <width>250</width> <height>312</height> - <texture border="40">buttons/button-nofo.png</texture> + <texture border="21">buttons/button-nofo.png</texture> </control> <control type="image"> <left>30</left> @@ -329,6 +329,20 @@ <align>center</align> <itemgap>0</itemgap> <orientation>horizontal</orientation> + <control type="radiobutton" id="155"> + <include content="VideoInfoButtonsCommon"> + <param name="icon" value="icons/infodialogs/play.png" /> + </include> + <label>$LOCALIZE[208]</label> + <onup>130</onup> + <onleft>12</onleft> + <onright>120</onright> + <onclick condition="System.HasAddon(script.playalbum) + String.IsEqual(ListItem.DBType,album)">RunScript(script.playalbum,albumid=$INFO[ListItem.DBID])</onclick> + <onclick condition="System.HasAddon(script.playalbum) + String.IsEqual(ListItem.DBType,song)">RunScript(script.playalbum,songid=$INFO[ListItem.DBID])</onclick> + <onclick condition="System.HasAddon(script.playalbum)">Action(close)</onclick> + <onclick condition="!System.HasAddon(script.playalbum)">InstallAddon(script.playalbum)</onclick> + <visible>[String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)] + !String.IsEmpty(ListItem.Dbid)</visible> + </control> <control type="group" id="420"> <width>262</width> <visible>String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)</visible> diff --git a/addons/skin.estuary/xml/DialogNotification.xml b/addons/skin.estuary/xml/DialogNotification.xml index fb0211dd1a..c75d92d64d 100644 --- a/addons/skin.estuary/xml/DialogNotification.xml +++ b/addons/skin.estuary/xml/DialogNotification.xml @@ -14,8 +14,8 @@ <top>0</top> <width>640</width> <height>160</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image" id="400"> diff --git a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml index 68cfb2bdae..31fbc1cd0a 100644 --- a/addons/skin.estuary/xml/DialogPVRGuideOSD.xml +++ b/addons/skin.estuary/xml/DialogPVRGuideOSD.xml @@ -31,13 +31,6 @@ <textcolor>grey</textcolor> <label>$INFO[ListItem.StartTime]</label> </control> - <control type="image"> - <left>120</left> - <top>5</top> - <width>30</width> - <height>20</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> <control type="label"> <left>150</left> <width>610</width> @@ -63,13 +56,6 @@ <aligny>center</aligny> <label>$INFO[ListItem.StartTime]</label> </control> - <control type="image"> - <left>120</left> - <top>5</top> - <width>30</width> - <height>20</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> <control type="label"> <left>150</left> <width>610</width> diff --git a/addons/skin.estuary/xml/DialogPictureInfo.xml b/addons/skin.estuary/xml/DialogPictureInfo.xml index 12bba1ab51..2de0bd6fca 100644 --- a/addons/skin.estuary/xml/DialogPictureInfo.xml +++ b/addons/skin.estuary/xml/DialogPictureInfo.xml @@ -18,7 +18,7 @@ <left>70</left> <width>1280</width> <height>820</height> - <texture border="22">dialogs/dialog-bg.png</texture> + <texture border="21">dialogs/dialog-bg.png</texture> </control> <control type="image"> <left>120</left> diff --git a/addons/skin.estuary/xml/DialogSeekBar.xml b/addons/skin.estuary/xml/DialogSeekBar.xml index f134404896..b241009e37 100644 --- a/addons/skin.estuary/xml/DialogSeekBar.xml +++ b/addons/skin.estuary/xml/DialogSeekBar.xml @@ -46,6 +46,25 @@ <label>[COLOR button_focus]$LOCALIZE[21396]:[CR][/COLOR]$INFO[player.chapter]$INFO[player.chaptercount, / ]</label> <visible>player.chaptercount</visible> </control> + <control type="group"> + <visible>Player.Recording</visible> + <control type="image"> + <top>100</top> + <left>20</left> + <width>74</width> + <height>74</height> + <texture>osd/fullscreen/buttons/record.png</texture> + </control> + <control type="label"> + <top>110</top> + <left>90</left> + <width>400</width> + <height>50</height> + <aligny>center</aligny> + <font>font25_title</font> + <label>$LOCALIZE[19158]</label> + </control> + </control> <control type="label"> <top>110</top> <right>20</right> diff --git a/addons/skin.estuary/xml/DialogSlider.xml b/addons/skin.estuary/xml/DialogSlider.xml index 8209b1876d..415cd0a5a3 100644 --- a/addons/skin.estuary/xml/DialogSlider.xml +++ b/addons/skin.estuary/xml/DialogSlider.xml @@ -13,8 +13,8 @@ <top>-30</top> <width>840</width> <height>155</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="label" id="10"> diff --git a/addons/skin.estuary/xml/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml index d5dc88b057..4545096cea 100644 --- a/addons/skin.estuary/xml/DialogVideoInfo.xml +++ b/addons/skin.estuary/xml/DialogVideoInfo.xml @@ -20,7 +20,7 @@ <width>566</width> <height>841</height> <texture>colors/black.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -50,7 +50,7 @@ <height>801</height> <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Thumb]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> </control> @@ -58,7 +58,7 @@ <control type="group"> <top>154</top> <left>70</left> - <visible>Stringcompare(ListItem.DBType,musicvideo)</visible> + <visible>String.IsEqual(ListItem.DBType,musicvideo)</visible> <include>OpenClose_Left</include> <control type="image"> <width>526</width> @@ -72,7 +72,7 @@ <height>801</height> <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Thumb]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> </control> @@ -121,7 +121,7 @@ <onleft>139</onleft> <onright>139</onright> <ondown>5000</ondown> - <texturenofocus border="40">dialogs/dialog-bg.png</texturenofocus> + <texturenofocus border="21">dialogs/dialog-bg.png</texturenofocus> <visible>!Integer.IsGreater(Container(4000).NumItems,0)</visible> </control> <control type="textbox"> @@ -171,7 +171,7 @@ <include content="InfoDialogMetadata"> <param name="control_id" value="150" /> <param name="label" value="[COLOR button_focus]$LOCALIZE[515]: [/COLOR]$INFO[ListItem.Genre]" /> - <param name="visible" value="!String.IsEmpty(ListItem.Genre) + Stringcompare(ListItem.DBType,movie)" /> + <param name="visible" value="!String.IsEmpty(ListItem.Genre) + String.IsEqual(ListItem.DBType,movie)" /> </include> <include content="InfoDialogMetadata"> <param name="control_id" value="152" /> @@ -191,7 +191,7 @@ <include content="InfoDialogMetadata"> <param name="control_id" value="155" /> <param name="label" value="[COLOR button_focus]$LOCALIZE[31048]: [/COLOR]$INFO[ListItem.Season,, $LOCALIZE[36905]]$INFO[ListItem.Episode, (, $LOCALIZE[20453])]" /> - <param name="visible" value="!String.IsEmpty(ListItem.Season) + !Stringcompare(ListItem.DBType,episode)" /> + <param name="visible" value="!String.IsEmpty(ListItem.Season) + !String.IsEqual(ListItem.DBType,episode)" /> </include> <include content="InfoDialogMetadata"> <param name="control_id" value="156" /> @@ -264,7 +264,7 @@ <height>317</height> <texture>DefaultActorSolid.png</texture> <aspectratio aligny="center">scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -316,7 +316,7 @@ <height>317</height> <texture>DefaultActorSolid.png</texture> <aspectratio aligny="center">scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -451,7 +451,7 @@ <param name="icon" value="icons/infodialogs/info.png" /> <param name="label" value="$LOCALIZE[31034]" /> <param name="onclick_1" value="RunScript(script.extendedinfo,info=openinfodialog)" /> - <param name="visible" value="System.hasAddon(script.extendedinfo) + [Stringcompare(ListItem.DbType,movie) | Stringcompare(ListItem.DbType,tvshow) | Stringcompare(ListItem.DbType,season) | Stringcompare(ListItem.DbType,episode)]" /> + <param name="visible" value="System.hasAddon(script.extendedinfo) + [String.IsEqual(ListItem.DbType,movie) | String.IsEqual(ListItem.DbType,tvshow) | String.IsEqual(ListItem.DbType,season) | String.IsEqual(ListItem.DbType,episode)]" /> </include> <include content="InfoDialogButton"> <param name="id" value="102" /> diff --git a/addons/skin.estuary/xml/DialogVolumeBar.xml b/addons/skin.estuary/xml/DialogVolumeBar.xml index 749ee3d340..222150b7bd 100644 --- a/addons/skin.estuary/xml/DialogVolumeBar.xml +++ b/addons/skin.estuary/xml/DialogVolumeBar.xml @@ -27,14 +27,14 @@ <top>15</top> <width>68</width> <height>68</height> - <texture colordiffuse="1AFFFFFF">dialogs/extendedprogress/loading-placeholder.png</texture> + <texture>dialogs/extendedprogress/loading-back.png</texture> <animation effect="fade" start="100" end="0" delay="300" time="500" tween="sine" condition="Player.Muted">Conditional</animation> </control> <control type="image"> - <left>-4</left> - <top>-11</top> - <width>120</width> - <height>120</height> + <left>22</left> + <top>15</top> + <width>68</width> + <height>68</height> <texture>$INFO[Control.GetLabel(29999),dialogs/volume/progress/p,.png]</texture> <animation effect="fade" start="100" end="0" delay="300" time="500" tween="sine" condition="Player.Muted">Conditional</animation> </control> diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml index ee9d3ab574..41c78b5e2f 100644 --- a/addons/skin.estuary/xml/EventLog.xml +++ b/addons/skin.estuary/xml/EventLog.xml @@ -115,7 +115,7 @@ <depth>DepthContentPanel</depth> <include>OpenClose_Left</include> <include content="ContentPanel"> - <param name="width" value="547" /> + <param name="width" value="550" /> </include> <control type="grouplist" id="9000"> <orientation>vertical</orientation> @@ -127,9 +127,8 @@ <onleft>50</onleft> <onright>50</onright> <usecontrolcoords>true</usecontrolcoords> - <width>487</width> + <width>490</width> <control type="togglebutton" id="4"> - <width>487</width> <height>110</height> <aligny>top</aligny> <textoffsetx>40</textoffsetx> @@ -147,7 +146,6 @@ <param name="label" value="" /> </include> <control type="radiobutton" id="22"> - <width>487</width> <height>110</height> <aligny>top</aligny> <texturenofocus /> @@ -174,7 +172,7 @@ <fadetime>300</fadetime> <aspectratio aligny="bottom">keep</aspectratio> <texture fallback="DefaultVideo.png">$INFO[ListItem.Icon]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> </control> diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml index d691b70982..2dc66139dd 100644 --- a/addons/skin.estuary/xml/Home.xml +++ b/addons/skin.estuary/xml/Home.xml @@ -366,7 +366,7 @@ <visible>PVR.IsRecordingTV | PVR.HasNonRecordingTVTimer</visible> <align>center</align> <control type="group"> - <width>680</width> + <width>674</width> <visible>PVR.IsRecordingTV</visible> <include content="PVRWidget"> <param name="icon" value="$INFO[PVR.TVNowRecordingChannelIcon]" /> @@ -376,7 +376,7 @@ </include> </control> <control type="group"> - <width>680</width> + <width>674</width> <visible>PVR.HasNonRecordingTVTimer</visible> <include content="PVRWidget"> <param name="icon" value="$INFO[PVR.TVNextRecordingChannelIcon]" /> @@ -560,7 +560,7 @@ <control type="image"> <bottom>90</bottom> <width>100%</width> - <texture border="22">dialogs/dialog-bg.png</texture> + <texture border="21">dialogs/dialog-bg.png</texture> </control> <control type="label"> <left>300</left> @@ -629,13 +629,12 @@ <param name="visible" value="!String.IsEmpty(Window(weather).Property(Daily.IsFetched))" /> </include> </control> - <include content="ImageWidget"> + <include content="ImageWidget" condition="String.IsEmpty(Weather.plugin)"> <param name="image_path" value="special://skin/extras/home-images/weather.jpg"/> <param name="text_label" value="$LOCALIZE[31120]" /> <param name="button_label" value="$LOCALIZE[31121]" /> <param name="button_onclick" value="ActivateWindow(servicesettings,weather)"/> <param name="button_id" value="15300"/> - <param name="visible" value="String.IsEmpty(Weather.plugin)"/> <param name="button2_onclick" value="Skin.SetBool(HomeMenuNoWeatherButton)"/> </include> </control> @@ -659,6 +658,7 @@ <param name="widget_target" value="videos"/> <param name="main_label" value="$INFO[ListItem.Label]" /> <param name="sub_label" value="$INFO[ListItem.Artist]" /> + <param name="thumb_label" value="$INFO[ListItem.Year]" /> <param name="fallback_image" value="DefaultMusicSongs.png" /> <param name="list_id" value="16300"/> </include> @@ -668,6 +668,7 @@ <param name="widget_target" value="videos"/> <param name="main_label" value="$INFO[ListItem.Label]" /> <param name="sub_label" value="$INFO[ListItem.Artist]" /> + <param name="thumb_label" value="$INFO[ListItem.Year]" /> <param name="fallback_image" value="DefaultMusicSongs.png" /> <param name="list_id" value="16400"/> </include> @@ -684,6 +685,7 @@ <param name="widget_target" value="videos"/> <param name="main_label" value="$INFO[ListItem.Label]" /> <param name="sub_label" value="$INFO[ListItem.Artist]" /> + <param name="thumb_label" value="$INFO[ListItem.Year]" /> <param name="fallback_image" value="DefaultMusicSongs.png" /> <param name="list_id" value="16500"/> </include> diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml index 4d4bc29e51..4af57b2dc4 100644 --- a/addons/skin.estuary/xml/Includes.xml +++ b/addons/skin.estuary/xml/Includes.xml @@ -110,7 +110,7 @@ </include> <include name="InfoList"> <param name="item_label">$INFO[ListItem.Year,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label]</param> - <param name="path">$INFO[ListItem.Path]</param> + <param name="path">$VAR[InfoListPathVar]</param> <param name="item_height">40</param> <param name="bottom">100</param> <param name="width">1152</param> @@ -118,12 +118,14 @@ <param name="font">font13</param> <param name="sortby"></param> <param name="sortorder">ascending</param> + <param name="visible">true</param> <definition> <control type="panel" id="$PARAM[list_id]"> <top>0</top> <width>$PARAM[width]</width> <bottom>$PARAM[bottom]</bottom> <orientation>vertical</orientation> + <visible>$PARAM[visible]</visible> <focusedlayout height="$PARAM[item_height]" width="$PARAM[width]"> <control type="label"> <left>10</left> @@ -521,7 +523,7 @@ <include content="Visible_Right_Delayed"> <param name="id" value="$PARAM[id]"/> </include> - <visible>StringCompare(Container(9000).ListItem.Property(id),$PARAM[id])</visible> + <visible>String.IsEqual(Container(9000).ListItem.Property(id),$PARAM[id])</visible> <control type="group"> <visible>Integer.IsGreater(Container($PARAM[group_id]50).NumItems,0) | Container($PARAM[group_id]50).IsUpdating</visible> <control type="panel" id="$PARAM[group_id]50"> diff --git a/addons/skin.estuary/xml/Includes_Buttons.xml b/addons/skin.estuary/xml/Includes_Buttons.xml index b91606ece9..967883b706 100644 --- a/addons/skin.estuary/xml/Includes_Buttons.xml +++ b/addons/skin.estuary/xml/Includes_Buttons.xml @@ -120,7 +120,7 @@ <font>font45</font> </include> <include name="PlaylistWindowButton"> - <param name="width">487</param> + <param name="width">100%</param> <definition> <control type="button" id="$PARAM[control_id]"> <width>$PARAM[width]</width> @@ -196,8 +196,8 @@ <height>142</height> <align>center</align> <aligny>top</aligny> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> <textoffsetx>35</textoffsetx> <textoffsety>78</textoffsety> <radioposx>108</radioposx> @@ -220,8 +220,8 @@ <height>142</height> <align>center</align> <aligny>top</aligny> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> <textoffsetx>35</textoffsetx> <textoffsety>78</textoffsety> <radioposx>108</radioposx> @@ -250,8 +250,8 @@ <height>142</height> <align>center</align> <aligny>top</aligny> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> <textoffsetx>35</textoffsetx> <textoffsety>78</textoffsety> <radioposx>108</radioposx> diff --git a/addons/skin.estuary/xml/Includes_Home.xml b/addons/skin.estuary/xml/Includes_Home.xml index 0306b94918..55b4bf79c2 100644 --- a/addons/skin.estuary/xml/Includes_Home.xml +++ b/addons/skin.estuary/xml/Includes_Home.xml @@ -27,10 +27,10 @@ <include name="PVRWidget"> <control type="image"> <top>80</top> - <left>15</left> + <left>16</left> <width>670</width> <height>225</height> - <texture border="22">dialogs/dialog-bg.png</texture> + <texture border="21">dialogs/dialog-bg.png</texture> </control> <control type="image"> <left>55</left> @@ -66,6 +66,10 @@ <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> + <include content="BusyListSpinner"> + <param name="list_id" value="$PARAM[list_id]"/> + <param name="posy" value="250"/> + </include> <control type="panel" id="$PARAM[list_id]"> <left>0</left> <top>115</top> @@ -173,6 +177,7 @@ <include name="WidgetListEpisodes"> <param name="main_label">$INFO[ListItem.Title]</param> <param name="sub_label">$INFO[ListItem.TVShowTitle]</param> + <param name="thumb_label">$INFO[ListItem.Season,,x]$INFO[ListItem.Episode]</param> <param name="sortby"></param> <param name="visible">True</param> <param name="sortorder">ascending</param> @@ -182,6 +187,10 @@ <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> + <include content="BusyListSpinner"> + <param name="list_id" value="$PARAM[list_id]"/> + <param name="posy" value="200"/> + </include> <control type="panel" id="$PARAM[list_id]"> <left>0</left> <top>105</top> @@ -199,6 +208,7 @@ <include content="InfoWallEpisodeLayout"> <param name="main_label" value="$PARAM[main_label]" /> <param name="sub_label" value="$PARAM[sub_label]" /> + <param name="thumb_label" value="$PARAM[thumb_label]" /> <param name="focused" value="false" /> </include> </control> @@ -217,6 +227,7 @@ <include content="InfoWallEpisodeLayout"> <param name="main_label" value="$PARAM[main_label]" /> <param name="sub_label" value="$PARAM[sub_label]" /> + <param name="thumb_label" value="$PARAM[thumb_label]" /> <param name="focused" value="true" /> </include> </control> @@ -237,6 +248,10 @@ <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> + <include content="BusyListSpinner"> + <param name="list_id" value="$PARAM[list_id]"/> + <param name="posy" value="220"/> + </include> <control type="panel" id="$PARAM[list_id]"> <left>0</left> <top>120</top> @@ -293,6 +308,10 @@ <param name="list_id" value="$PARAM[list_id]"/> <param name="visible" value="$PARAM[visible]"/> </include> + <include content="BusyListSpinner"> + <param name="list_id" value="$PARAM[list_id]"/> + <param name="visible" value="$PARAM[visible]"/> + </include> <control type="panel" id="$PARAM[list_id]"> <left>0</left> <top>110</top> @@ -310,7 +329,7 @@ <width>316</width> <height>200</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -339,16 +358,16 @@ <depth>DepthContentPopout</depth> <left>70</left> <animation type="Focus"> - <effect type="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="240,70" /> + <effect type="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="228,70" /> </animation> <animation type="Unfocus"> - <effect type="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="240,70" /> + <effect type="zoom" start="115" end="100" time="200" tween="sine" easing="inout" center="228,70" /> </animation> <control type="image"> <width>316</width> <height>200</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -437,6 +456,10 @@ <param name="label">$PARAM[widget_header]</param> <param name="list_id" value="$PARAM[list_id]"/> </include> + <include content="BusyListSpinner"> + <param name="list_id" value="$PARAM[list_id]"/> + <param name="posy" value="200"/> + </include> <control type="panel" id="$PARAM[list_id]"> <left>0</left> <top>120</top> @@ -453,7 +476,7 @@ <width>319</width> <height>340</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -487,7 +510,7 @@ <aligny>top</aligny> </control> <control type="image"> - <left>270</left> + <left>260</left> <top>30</top> <width>32</width> <height>32</height> @@ -509,7 +532,7 @@ <width>319</width> <height>340</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -552,7 +575,7 @@ <aligny>top</aligny> </control> <control type="image"> - <left>270</left> + <left>260</left> <top>30</top> <width>32</width> <height>32</height> @@ -590,7 +613,7 @@ <width>254</width> <height>350</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -641,7 +664,7 @@ <width>254</width> <height>350</height> <texture>dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -819,8 +842,8 @@ <top>100</top> <width>1820</width> <height>920</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image" id="700$PARAM[item_id]2"> @@ -857,9 +880,9 @@ <aligny>center</aligny> <textoffsetx>40</textoffsetx> <textoffsety>0</textoffsety> - <texturenofocus border="40">buttons/button-nofo.png</texturenofocus> + <texturenofocus border="21">buttons/button-nofo.png</texturenofocus> <animation effect="slide" end="0,-90" time="0" condition="true">Conditional</animation> - <texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> + <texturefocus border="21" colordiffuse="button_focus">buttons/button-fo.png</texturefocus> <font>font30_title</font> <onclick>Weather.LocationNext</onclick> <label>$INFO[Window(weather).Property(Map.$PARAM[item_id].Heading)]</label> @@ -880,4 +903,31 @@ <onback>PageUp</onback> <preloaditems>2</preloaditems> </include> + <include name="BusyListSpinner"> + <param name="posy">160</param> + <param name="visible">true</param> + <definition> + <control type="group" id="$PARAM[list_id]599"> + <height>160</height> + <left>180</left> + <visible>Container($PARAM[list_id]).IsUpdating + !Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)</visible> + <visible>$PARAM[visible]</visible> + <control type="image"> + <top>$PARAM[posy]</top> + <width>100</width> + <height>100</height> + <aspectratio aligny="center">keep</aspectratio> + <texture colordiffuse="black">dialogs/extendedprogress/loading-back.png</texture> + </control> + <control type="image"> + <top>$PARAM[posy]</top> + <width>100</width> + <height>100</height> + <aspectratio aligny="center">keep</aspectratio> + <texture>dialogs/extendedprogress/loading.png</texture> + <animation effect="rotate" center="auto" start="360" end="0" time="1500" loop="true" condition="true">Conditional</animation> + </control> + </control> + </definition> + </include> </includes> diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml index 158bf2bee3..0e2068322f 100644 --- a/addons/skin.estuary/xml/Includes_MediaMenu.xml +++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml @@ -54,10 +54,7 @@ <onleft>9000</onleft> <onup>9000</onup> <onright condition="!Window.IsActive(MyPVRGuide.xml)">50</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(10)">10</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(11)">11</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(12)">12</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(13)">13</onright> + <onright condition="Window.IsActive(MyPVRGuide.xml)">11</onright> <ondown>14100</ondown> <onback>50</onback> <defaultcontrol>6054</defaultcontrol> @@ -88,10 +85,7 @@ <height>120</height> <onleft>6056</onleft> <onright condition="!Window.IsActive(MyPVRGuide.xml)">50</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(10)">10</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(11)">11</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(12)">12</onright> - <onright condition="Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(13)">13</onright> + <onright condition="Window.IsActive(MyPVRGuide.xml)">11</onright> <onup>14100</onup> <ondown>6054</ondown> <width>1000</width> diff --git a/addons/skin.estuary/xml/MusicVisualisation.xml b/addons/skin.estuary/xml/MusicVisualisation.xml index 942a3e4826..a88865aad0 100644 --- a/addons/skin.estuary/xml/MusicVisualisation.xml +++ b/addons/skin.estuary/xml/MusicVisualisation.xml @@ -25,10 +25,10 @@ <control type="group"> <bottom>0</bottom> <height>1080</height> + <include>OpenClose_Left</include> <control type="image"> <left>33</left> <top>200</top> - <include>OpenClose_Left</include> <include>Visible_Left</include> <visible>Player.ShowInfo | Window.IsActive(musicosd)</visible> <width>500</width> @@ -42,7 +42,6 @@ <control type="group"> <top>-30</top> <visible>[Player.ShowInfo | Window.IsActive(musicosd)] + !Window.IsActive(playerprocessinfo)</visible> - <include>OpenClose_Left</include> <include>Visible_Left</include> <control type="group"> <left>30</left> diff --git a/addons/skin.estuary/xml/MyPVRGuide.xml b/addons/skin.estuary/xml/MyPVRGuide.xml index 174f9a5231..28b78d50ca 100644 --- a/addons/skin.estuary/xml/MyPVRGuide.xml +++ b/addons/skin.estuary/xml/MyPVRGuide.xml @@ -171,22 +171,13 @@ <control type="group"> <bottom>0</bottom> <height>300</height> - <control type="image" id="82"> - <width>450</width> - <height>240</height> - <aspectratio align="center" aligny="top">keep</aspectratio> - <fadetime>400</fadetime> - <texture>$INFO[ListItem.PlotOutline]</texture> - <visible>String.StartsWith(ListItem.PlotOutline,http://) | String.StartsWith(ListItem.PlotOutline,https://)</visible> - </control> <control type="image"> <left>10</left> <width>240</width> <height>200</height> <aspectratio align="right">keep</aspectratio> <fadetime>400</fadetime> - <texture>$INFO[Container(10).ListItem.Icon]</texture> - <visible>!Control.IsVisible(82)</visible> + <texture>$INFO[ListItem.Icon]</texture> </control> <control type="label"> <top>-9</top> @@ -194,13 +185,13 @@ <right>60</right> <height>30</height> <textcolor>button_focus</textcolor> - <label>$INFO[ListItem.StartTime,, - ]$INFO[ListItem.EndTime]$INFO[ListItem.EpgEventTitle, [COLOR grey],[/COLOR]]$INFO[ListItem.EpisodeName, [COLOR grey](,)[/COLOR]]$INFO[ListItem.Genre, $LOCALIZE[515]: [COLOR grey],[/COLOR]]</label> + <label>$INFO[ListItem.StartTime,, - ]$INFO[ListItem.EndTime]$INFO[ListItem.EpgEventTitle, [COLOR white],[/COLOR]]$INFO[ListItem.EpisodeName, [COLOR grey](,)[/COLOR]]$INFO[ListItem.Genre, $LOCALIZE[515]: [COLOR grey],[/COLOR]]</label> </control> <control type="textbox"> <left>300</left> <top>38</top> <right>60</right> - <height>179</height> + <height>173</height> <label>$INFO[ListItem.Plot]</label> <autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll> </control> diff --git a/addons/skin.estuary/xml/MyPVRSearch.xml b/addons/skin.estuary/xml/MyPVRSearch.xml index a09a9385fc..9b86368ad5 100644 --- a/addons/skin.estuary/xml/MyPVRSearch.xml +++ b/addons/skin.estuary/xml/MyPVRSearch.xml @@ -64,13 +64,6 @@ <aligny>center</aligny> <label>$INFO[ListItem.Date]</label> </control> - <control type="image"> - <left>980</left> - <top>50</top> - <width>50</width> - <height>50</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> </control> </itemlayout> <focusedlayout height="100" width="tvchannelslist_width"> @@ -120,13 +113,6 @@ <aligny>center</aligny> <label>$INFO[ListItem.Date]</label> </control> - <control type="image"> - <left>980</left> - <top>50</top> - <width>50</width> - <height>50</height> - <texture>$VAR[PVRStatusImageVar]</texture> - </control> </control> </focusedlayout> </control> diff --git a/addons/skin.estuary/xml/MyPVRTimers.xml b/addons/skin.estuary/xml/MyPVRTimers.xml index 58c7d01295..c7d59d6dfb 100644 --- a/addons/skin.estuary/xml/MyPVRTimers.xml +++ b/addons/skin.estuary/xml/MyPVRTimers.xml @@ -26,7 +26,7 @@ <control type="label"> <left>30</left> <top>0</top> - <width>500</width> + <right>30</right> <height>100</height> <font>font36_title</font> <aligny>center</aligny> @@ -86,7 +86,7 @@ <control type="label"> <left>30</left> <top>0</top> - <width>250</width> + <right>30</right> <height>100</height> <font>font36_title</font> <aligny>center</aligny> diff --git a/addons/skin.estuary/xml/MyPlaylist.xml b/addons/skin.estuary/xml/MyPlaylist.xml index 16592dda46..9dea4efef5 100644 --- a/addons/skin.estuary/xml/MyPlaylist.xml +++ b/addons/skin.estuary/xml/MyPlaylist.xml @@ -106,17 +106,14 @@ <include content="PlaylistWindowButton"> <param name="control_id" value="26" /> <param name="label" value="" /> - <param name="width" value="402" /> </include> <include content="PlaylistWindowButton"> <param name="control_id" value="21" /> <param name="label" value="$LOCALIZE[190]" /> - <param name="width" value="402" /> </include> <include content="PlaylistWindowButton"> <param name="control_id" value="22" /> <param name="label" value="$LOCALIZE[192]" /> - <param name="width" value="402" /> </include> </control> </control> @@ -130,14 +127,14 @@ <param name="flip_bg" value="true" /> </include> <control type="scrollbar" id="60"> - <left>0</left> - <top>80</top> + <left>-20</left> + <top>0</top> <width>12</width> - <bottom>80</bottom> + <bottom>0</bottom> <onleft>50</onleft> <texturesliderbackground /> <onright>700</onright> - <animation effect="zoom" end="50,100" time="300" tween="sine" center="0,0" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> + <animation effect="zoom" end="50,100" time="300" tween="sine" center="-20,0" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> <orientation>vertical</orientation> </control> </control> diff --git a/addons/skin.estuary/xml/MyVideoNav.xml b/addons/skin.estuary/xml/MyVideoNav.xml index cbfe038673..8b2b8f8da3 100644 --- a/addons/skin.estuary/xml/MyVideoNav.xml +++ b/addons/skin.estuary/xml/MyVideoNav.xml @@ -29,7 +29,6 @@ <include>OpenClose_Left</include> <visible>Control.IsVisible(50) | Control.Isvisible(54) | [Control.IsVisible(501) + String.IsEqual(Skin.AspectRatio,21:9)]</visible> <include>Visible_Left</include> - <visible>Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos)</visible> <include content="ContentPanel"> <param name="width" value="656" /> </include> diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml index 675f1a8aaf..b2a44a0105 100644 --- a/addons/skin.estuary/xml/Settings.xml +++ b/addons/skin.estuary/xml/Settings.xml @@ -29,8 +29,8 @@ <control type="image"> <width>430</width> <height>270</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -70,8 +70,8 @@ <control type="image"> <width>430</width> <height>270</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/SettingsProfile.xml b/addons/skin.estuary/xml/SettingsProfile.xml index 1d038082e0..06abe32085 100644 --- a/addons/skin.estuary/xml/SettingsProfile.xml +++ b/addons/skin.estuary/xml/SettingsProfile.xml @@ -47,8 +47,8 @@ <top>5</top> <width>320</width> <height>380</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -101,8 +101,8 @@ <top>5</top> <width>320</width> <height>380</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml index 07083bc378..04daad7204 100644 --- a/addons/skin.estuary/xml/SkinSettings.xml +++ b/addons/skin.estuary/xml/SkinSettings.xml @@ -81,7 +81,6 @@ <label>$LOCALIZE[31156]</label> <label2>$INFO[Skin.String(background_overlay),$LOCALIZE[467] ]</label2> <include>DefaultSettingButton</include> - <onclick condition="String.IsEqual(Skin.String(background_overlay),1)">Skin.SetString(background_overlay,2)</onclick> <onclick condition="String.IsEqual(Skin.String(background_overlay),7)">Skin.SetString(background_overlay,1)</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> @@ -122,6 +121,7 @@ <onleft>9000</onleft> <onright>60</onright> <onup>610</onup> + <pagecontrol>60</pagecontrol> <ondown>610</ondown> <visible>Container(9000).HasFocus(2)</visible> <control type="radiobutton" id="611"> @@ -288,6 +288,22 @@ </content> </control> </control> + <control type="scrollbar" id="60"> + <right>0</right> + <top>163</top> + <width>12</width> + <bottom>137</bottom> + <orientation>vertical</orientation> + <texturesliderbackground /> + <animation effect="slide" end="6,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation> + <onleft>610</onleft> + <onright>610</onright> + <animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation> + <animation effect="fade" start="100" end="0" time="200">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> + <visible>Control.IsVisible(610)</visible> + </control> <include content="TopBar"> <param name="breadcrumbs_label" value="$LOCALIZE[5] / $LOCALIZE[20077]" /> </include> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 342750708e..deb45b0b3d 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -2,9 +2,7 @@ <includes> <variable name="PVRStatusImageVar"> <value condition="ListItem.IsRecording">windows/pvr/record.png</value> - <value condition="ListItem.HasTimer + !ListItem.IsRecording + !ListItem.HasTimerSchedule">windows/pvr/timer.png</value> - <value condition="ListItem.HasTimerSchedule + !ListItem.IsRecording">windows/pvr/timer.png</value> - <value condition="ListItem.HasRecording + !ListItem.IsRecording + !ListItem.HasTimer">windows/pvr/timer.png</value> + <value condition="ListItem.HasTimer | ListItem.HasTimerSchedule">windows/pvr/timer.png</value> </variable> <variable name="AutoCompletionContentVar"> <value condition="System.HasAddon(plugin.program.autocompletion) + !System.HasHiddenInput">plugin://plugin.program.autocompletion?info=autocomplete&&id=$INFO[Control.GetLabel(312).index(1)]&&limit=9</value> @@ -13,6 +11,10 @@ <value condition="Window.IsActive(musicplaylist)">$INFO[ListItem.Duration]</value> <value>$INFO[ListItem.Duration,, $LOCALIZE[12391]]</value> </variable> + <variable name="InfoListPathVar"> + <value condition="String.IsEmpty(Container.PluginName)">$INFO[ListItem.FolderPath]</value> + <value></value> + </variable> <variable name="AddonCountLabel"> <value condition="Integer.IsGreater(Container(8000).NumItems,10)">>9</value> <value condition="Integer.IsGreater(Container(8000).NumItems,9)">9</value> diff --git a/addons/skin.estuary/xml/VideoFullScreen.xml b/addons/skin.estuary/xml/VideoFullScreen.xml index cc5b4edd56..248b686fa2 100644 --- a/addons/skin.estuary/xml/VideoFullScreen.xml +++ b/addons/skin.estuary/xml/VideoFullScreen.xml @@ -52,13 +52,13 @@ <centertop>50%</centertop> <width>92</width> <height>92</height> - <texture colordiffuse="1AFFFFFF">dialogs/extendedprogress/loading-placeholder.png</texture> + <texture>dialogs/extendedprogress/loading-back.png</texture> </control> <control type="image" id="1"> <centerleft>50%</centerleft> <centertop>50%</centertop> - <width>160</width> - <height>160</height> + <width>92</width> + <height>92</height> <texture colordiffuse="button_focus">$INFO[Player.CacheLevel,dialogs/volume/progress/p,.png]</texture> </control> <control type="label" id="1"> diff --git a/addons/skin.estuary/xml/View_500_Wall.xml b/addons/skin.estuary/xml/View_500_Wall.xml index ba72632e05..776b85ac59 100644 --- a/addons/skin.estuary/xml/View_500_Wall.xml +++ b/addons/skin.estuary/xml/View_500_Wall.xml @@ -21,7 +21,7 @@ <preloaditems>2</preloaditems> <pagecontrol>531</pagecontrol> <scrolltime tween="cubic" easing="out">500</scrolltime> - <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons) | Container.Content(images)</visible> + <visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons) | Container.Content(images) | Container.Content(videos)</visible> <itemlayout height="445" width="300" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)"> <control type="group"> <top>120</top> @@ -39,7 +39,7 @@ </include> </control> </focusedlayout> - <itemlayout height="300" width="300" condition="Container.Content(episodes)"> + <itemlayout height="300" width="300" condition="Container.Content(episodes) | Container.Content(videos) | Container.Content(musicvideos)"> <control type="group"> <top>110</top> <include content="InfoWallEpisodeLayout"> @@ -48,7 +48,7 @@ </include> </control> </itemlayout> - <focusedlayout height="300" width="300" condition="Container.Content(episodes)"> + <focusedlayout height="300" width="300" condition="Container.Content(episodes) | Container.Content(videos) | Container.Content(musicvideos)"> <control type="group"> <depth>DepthContentPopout</depth> <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="160,280">Focus</animation> @@ -79,7 +79,7 @@ </include> </control> </focusedlayout> - <itemlayout height="400" width="300" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)"> + <itemlayout height="400" width="300" condition="Container.Content(artists) | Container.Content(albums)"> <control type="group"> <top>150</top> <include content="InfoWallMusicLayout"> @@ -87,7 +87,7 @@ </include> </control> </itemlayout> - <focusedlayout height="400" width="300" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)"> + <focusedlayout height="400" width="300" condition="Container.Content(artists) | Container.Content(albums)"> <control type="group"> <depth>DepthContentPopout</depth> <top>150</top> diff --git a/addons/skin.estuary/xml/View_501_Banner.xml b/addons/skin.estuary/xml/View_501_Banner.xml index 2931610a0b..c06722bca1 100644 --- a/addons/skin.estuary/xml/View_501_Banner.xml +++ b/addons/skin.estuary/xml/View_501_Banner.xml @@ -29,9 +29,9 @@ <top>0</top> <width>860</width> <height>195</height> - <texture border="2" fallback="dialogs/dialog-bg-nobo.png" background="true">$VAR[BannerArtVar]</texture> + <texture fallback="dialogs/dialog-bg-nobo.png" background="true">$VAR[BannerArtVar]</texture> <aspectratio aligny="center">scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="label"> @@ -66,9 +66,9 @@ <top>0</top> <width>860</width> <height>195</height> - <texture border="2" fallback="dialogs/dialog-bg-nobo.png" background="true">$VAR[BannerArtVar]</texture> + <texture fallback="dialogs/dialog-bg-nobo.png" background="true">$VAR[BannerArtVar]</texture> <aspectratio aligny="center">scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="label"> diff --git a/addons/skin.estuary/xml/View_502_FanArt.xml b/addons/skin.estuary/xml/View_502_FanArt.xml index 4938f10c15..76a6bfc3cf 100644 --- a/addons/skin.estuary/xml/View_502_FanArt.xml +++ b/addons/skin.estuary/xml/View_502_FanArt.xml @@ -43,7 +43,7 @@ <left>50</left> <right>50</right> <top>769</top> - <bottom>108</bottom> + <bottom>105</bottom> <label>$INFO[ListItem.Plot]</label> <autoscroll time="3000" delay="7000" repeat="5000">!System.HasModalDialog + Skin.HasSetting(AutoScroll)</autoscroll> </control> diff --git a/addons/skin.estuary/xml/View_50_List.xml b/addons/skin.estuary/xml/View_50_List.xml index 086db0f827..f3e90ae45b 100644 --- a/addons/skin.estuary/xml/View_50_List.xml +++ b/addons/skin.estuary/xml/View_50_List.xml @@ -217,32 +217,24 @@ <left>20</left> <top>640</top> <visible>!String.IsEmpty(ListItem.DBID)</visible> - <control type="group"> - <visible>String.IsEqual(ListItem.DBType,artist)</visible> - <include content="InfoList"> - <param name="list_id" value="42000" /> - <param name="bottom" value="100" /> - <param name="width" value="540" /> - <param name="sortby" value="year" /> - <param name="sortorder" value="descending" /> - <param name="font" value="font13" /> - <param name="path" value="$INFO[ListItem.FolderPath]" /> - <param name="item_label" value="$INFO[ListItem.Year,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label]" /> - </include> - </control> - <control type="group"> - <visible>String.IsEqual(ListItem.DBType,album)</visible> - <include content="InfoList"> - <param name="list_id" value="43000" /> - <param name="bottom" value="100" /> - <param name="width" value="540" /> - <param name="sortby" value="track" /> - <param name="sortorder" value="ascending" /> - <param name="font" value="font13" /> - <param name="path" value="$INFO[ListItem.FolderPath]" /> - <param name="item_label" value="$INFO[ListItem.Duration,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label]" /> - </include> - </control> + <include content="InfoList"> + <param name="list_id" value="42000" /> + <param name="bottom" value="100" /> + <param name="width" value="540" /> + <param name="sortby" value="year" /> + <param name="sortorder" value="descending" /> + <param name="item_label" value="$INFO[ListItem.Year,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label]" /> + <param name="visible" value="String.IsEqual(ListItem.DBType,artist)" /> + </include> + <include content="InfoList"> + <param name="list_id" value="43000" /> + <param name="bottom" value="100" /> + <param name="width" value="540" /> + <param name="sortby" value="track" /> + <param name="sortorder" value="ascending" /> + <param name="item_label" value="$INFO[ListItem.Duration,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Label]" /> + <param name="visible" value="String.IsEqual(ListItem.DBType,album)" /> + </include> </control> </control> </control> diff --git a/addons/skin.estuary/xml/View_51_Poster.xml b/addons/skin.estuary/xml/View_51_Poster.xml index 17f4618f75..59b64a7acf 100644 --- a/addons/skin.estuary/xml/View_51_Poster.xml +++ b/addons/skin.estuary/xml/View_51_Poster.xml @@ -56,7 +56,7 @@ <height>394</height> <aspectratio>scale</aspectratio> <texture fallback="DefaultVideo.png">$VAR[ListPosterVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="textbox"> @@ -103,7 +103,7 @@ <height>394</height> <aspectratio>scale</aspectratio> <texture fallback="DefaultVideo.png">$VAR[ListPosterVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>Container.OnScrollPrevious</visible> <animation effect="fade" time="200" start="100" end="0">Hidden</animation> @@ -116,7 +116,7 @@ <height>394</height> <aspectratio>scale</aspectratio> <texture fallback="DefaultVideo.png">$VAR[ListPosterVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>Container.OnScrollNext</visible> <animation effect="fade" time="200" start="100" end="0">Hidden</animation> @@ -208,7 +208,7 @@ <width>516</width> <height>756</height> <texture>colors/black.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/View_52_IconWall.xml b/addons/skin.estuary/xml/View_52_IconWall.xml index 0f38a2990e..e39bc8311b 100644 --- a/addons/skin.estuary/xml/View_52_IconWall.xml +++ b/addons/skin.estuary/xml/View_52_IconWall.xml @@ -25,8 +25,8 @@ <control type="image"> <width>396</width> <height>245</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -79,8 +79,8 @@ <control type="image"> <width>396</width> <height>245</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -133,8 +133,8 @@ <control type="image"> <width>330</width> <height>140</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="textbox"> @@ -161,8 +161,8 @@ <control type="image"> <width>330</width> <height>140</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> diff --git a/addons/skin.estuary/xml/View_53_Shift.xml b/addons/skin.estuary/xml/View_53_Shift.xml index 954ffbe4f2..e0758c35d9 100644 --- a/addons/skin.estuary/xml/View_53_Shift.xml +++ b/addons/skin.estuary/xml/View_53_Shift.xml @@ -70,7 +70,7 @@ <height>480</height> <aspectratio aligny="center">keep</aspectratio> <texture fallback="DefaultVideo.png">$VAR[ShiftThumbVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="textbox"> @@ -99,7 +99,7 @@ <height>480</height> <aspectratio aligny="center">keep</aspectratio> <texture fallback="DefaultVideo.png">$VAR[ShiftThumbVar]</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="textbox"> @@ -169,7 +169,7 @@ <shadowcolor>text_shadow</shadowcolor> </control> </itemlayout> - <content sortby="year" sortorder="descending">$INFO[ListItem.Path]</content> + <content sortby="year" sortorder="descending">$VAR[InfoListPathVar]</content> </control> </control> </control> diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml index b4533c6b66..5add11f6a7 100644 --- a/addons/skin.estuary/xml/View_54_InfoWall.xml +++ b/addons/skin.estuary/xml/View_54_InfoWall.xml @@ -7,8 +7,8 @@ <top>-10</top> <width>376</width> <height>380</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -17,7 +17,7 @@ <width>384</width> <height>388</height> <texture colordiffuse="button_focus">colors/grey.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused]</visible> <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> @@ -45,8 +45,8 @@ </include> <include name="InfoWallMusicLayout"> <param name="fallback_image">DefaultFolder.png</param> - <param name="main_label">$INFO[ListItem.Artist]</param> - <param name="sub_label">$INFO[ListItem.Year,[B],[/B]]</param> + <param name="main_label">$INFO[ListItem.Artist,[COLOR grey],[/COLOR]]</param> + <param name="sub_label">$INFO[ListItem.Title]</param> <param name="single_label">$INFO[ListItem.Label]</param> <param name="focused">false</param> <definition> @@ -54,8 +54,8 @@ <top>0</top> <width>316</width> <height>386</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -64,7 +64,7 @@ <width>324</width> <height>394</height> <texture colordiffuse="button_focus">colors/grey.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused]</visible> <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> @@ -130,8 +130,8 @@ <top>10</top> <width>316</width> <height>288</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -140,7 +140,7 @@ <width>324</width> <height>296</height> <texture colordiffuse="button_focus">colors/grey.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused]</visible> <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> @@ -160,7 +160,7 @@ <width>160</width> <height>70</height> <texture flipx="true">overlays/overlay-bg.png</texture> - <visible>String.IsEqual(ListItem.DBtype,episode)</visible> + <visible>!ListItem.IsParentFolder</visible> </control> <control type="label"> <left>31</left> @@ -239,8 +239,8 @@ <top>-10</top> <width>290</width> <height>400</height> - <texture border="21">dialogs/dialog-bg-nobo.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <texture>dialogs/dialog-bg-nobo.png</texture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -280,7 +280,7 @@ <width>298</width> <height>408</height> <texture colordiffuse="button_focus">colors/grey.png</texture> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> <visible>$PARAM[focused] + !String.IsEmpty(ListItem.Art(poster))</visible> <include condition="$PARAM[focused]">Animation_FocusTextureFade</include> @@ -294,7 +294,7 @@ <height>400</height> <texture background="true">$INFO[ListItem.Art(poster)]</texture> <aspectratio>scale</aspectratio> - <bordertexture border="20">overlays/shadow.png</bordertexture> + <bordertexture border="21">overlays/shadow.png</bordertexture> <bordersize>20</bordersize> </control> <control type="image"> @@ -379,7 +379,7 @@ <preloaditems>2</preloaditems> <pagecontrol>531</pagecontrol> <scrolltime tween="cubic" easing="out">500</scrolltime> - <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos) | Container.Content(images)</visible> + <visible>Container.Content(artists) | Container.Content(albums) | Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos) | Container.Content(images) | Container.Content(videos)</visible> <itemlayout height="445" width="320" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)"> <control type="group"> <left>30</left> @@ -399,7 +399,7 @@ </include> </control> </focusedlayout> - <itemlayout height="300" width="300" condition="Container.Content(episodes)"> + <itemlayout height="300" width="300" condition="Container.Content(episodes) | Container.Content(videos) | Container.Content(musicvideos)"> <control type="group"> <left>64</left> <top>110</top> @@ -409,7 +409,7 @@ </include> </control> </itemlayout> - <focusedlayout height="300" width="300" condition="Container.Content(episodes)"> + <focusedlayout height="300" width="300" condition="Container.Content(episodes) | Container.Content(videos) | Container.Content(musicvideos)"> <control type="group"> <depth>DepthContentPopout</depth> <animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="220,250">Focus</animation> @@ -422,14 +422,14 @@ </include> </control> </focusedlayout> - <itemlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)"> + <itemlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums)"> <control type="group"> <top>150</top> <left>40</left> <include>InfoWallMusicLayout</include> </control> </itemlayout> - <focusedlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)"> + <focusedlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums)"> <control type="group"> <depth>DepthContentPopout</depth> <animation effect="zoom" start="100" end="115" time="200" tween="sine" easing="inout" center="200,350">Focus</animation> |
