diff options
| author | Philipp Te <philipptemminghoff@gmx.de> | 2015-03-06 22:39:55 +0100 |
|---|---|---|
| committer | Philipp Te <philipptemminghoff@gmx.de> | 2015-03-06 22:39:55 +0100 |
| commit | 145a3bba6242e1c2add18e1a8226035f33eda0fe (patch) | |
| tree | 80bcc7612d2cdff31a63c1c7b365b76bc5d34cef /addons | |
| parent | da46ecfbc49762a345710b5305a55a9f131bce05 (diff) | |
[CONFLUENCE] - second conversion with XML tool ("scaling" values with 0.75)
Diffstat (limited to 'addons')
46 files changed, 258 insertions, 258 deletions
diff --git a/addons/skin.confluence/720p/DialogAlbumInfo.xml b/addons/skin.confluence/720p/DialogAlbumInfo.xml index 4f00cacf46..574d6fe963 100644 --- a/addons/skin.confluence/720p/DialogAlbumInfo.xml +++ b/addons/skin.confluence/720p/DialogAlbumInfo.xml @@ -5,8 +5,8 @@ <controls> <control type="group"> <visible>!Window.IsVisible(FileBrowser)</visible> - <animation effect="slide" start="1100,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" start="0,0" end="1100,0" time="400" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="1100,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" start="0,0" end="1100,0" time="300" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <left>180</left> <top>0</top> @@ -32,8 +32,8 @@ <visible>system.getbool(input.enablemouse)</visible> </control> <control type="group"> - <animation effect="fade" delay="400" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" delay="300" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <control type="label"> <description>Album header label</description> <left>210</left> diff --git a/addons/skin.confluence/720p/DialogBusy.xml b/addons/skin.confluence/720p/DialogBusy.xml index 54c9c7768c..e0419ed781 100644 --- a/addons/skin.confluence/720p/DialogBusy.xml +++ b/addons/skin.confluence/720p/DialogBusy.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <animation effect="fade" time="100">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <animation effect="fade" time="75">WindowOpen</animation> + <animation effect="fade" time="150">WindowClose</animation> <coordinates> <system>1</system> <left>0</left> @@ -27,7 +27,7 @@ <height>32</height> <texture>busy.png</texture> <aspectratio>keep</aspectratio> - <animation effect="rotate" start="0" end="360" center="36,36" time="1200" loop="true" condition="true">conditional</animation> + <animation effect="rotate" start="0" end="360" center="36,36" time="900" loop="true" condition="true">conditional</animation> </control> <control type="label"> <description>Busy label</description> diff --git a/addons/skin.confluence/720p/DialogContentSettings.xml b/addons/skin.confluence/720p/DialogContentSettings.xml index dd6f0eb49c..c19ad7ec11 100644 --- a/addons/skin.confluence/720p/DialogContentSettings.xml +++ b/addons/skin.confluence/720p/DialogContentSettings.xml @@ -9,7 +9,7 @@ <include>dialogeffect</include> <controls> <control type="group"> - <animation effect="fade" start="100" end="0" time="200" condition="Window.IsActive(AddonSettings)">Conditional</animation> + <animation effect="fade" start="100" end="0" time="150" condition="Window.IsActive(AddonSettings)">Conditional</animation> <control type="image"> <description>background image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml index b24ad8cbe3..5f466fad00 100644 --- a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml +++ b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol /> - <animation effect="slide" start="0,-70" end="0,0" time="100">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,-70" delay="400" time="100">WindowClose</animation> + <animation effect="slide" start="0,-70" end="0,0" time="75">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,-70" delay="300" time="75">WindowClose</animation> <controls> <control type="group"> <left>720</left> <top>0</top> - <animation effect="slide" end="0,-80" time="200" condition="Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)">conditional</animation> + <animation effect="slide" end="0,-80" time="150" condition="Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)">conditional</animation> <control type="image"> <left>0</left> <top>-10</top> diff --git a/addons/skin.confluence/720p/DialogFavourites.xml b/addons/skin.confluence/720p/DialogFavourites.xml index 124421c7eb..9e1187ed79 100644 --- a/addons/skin.confluence/720p/DialogFavourites.xml +++ b/addons/skin.confluence/720p/DialogFavourites.xml @@ -8,8 +8,8 @@ </coordinates> <controls> <control type="group"> - <animation effect="slide" start="400,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" start="0,0" end="400,0" time="400" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="400,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" start="0,0" end="400,0" time="300" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <left>400r</left> <top>0</top> diff --git a/addons/skin.confluence/720p/DialogKaiToast.xml b/addons/skin.confluence/720p/DialogKaiToast.xml index 27b6b56e75..cf36d656e3 100644 --- a/addons/skin.confluence/720p/DialogKaiToast.xml +++ b/addons/skin.confluence/720p/DialogKaiToast.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <window> - <animation effect="fade" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <coordinates> <left>860</left> <top>640</top> </coordinates> <controls> <control type="group"> - <animation effect="slide" start="0,0" end="-190,0" time="200" condition="Window.IsVisible(BusyDialog)">conditional</animation> + <animation effect="slide" start="0,0" end="-190,0" time="150" condition="Window.IsVisible(BusyDialog)">conditional</animation> <control type="image"> <left>0</left> <top>0</top> diff --git a/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml b/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml index 5d45652aba..b2f2847d4d 100644 --- a/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml +++ b/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <window type="dialog"> - <animation effect="slide" start="0,-40" end="0,0" time="100">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,-40" delay="400" time="100">WindowClose</animation> + <animation effect="slide" start="0,-40" end="0,0" time="75">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,-40" delay="300" time="75">WindowClose</animation> <controls> <control type="group"> <left>100</left> diff --git a/addons/skin.confluence/720p/DialogPVRGroupManager.xml b/addons/skin.confluence/720p/DialogPVRGroupManager.xml index 8f4601f6c5..54f0cb586d 100644 --- a/addons/skin.confluence/720p/DialogPVRGroupManager.xml +++ b/addons/skin.confluence/720p/DialogPVRGroupManager.xml @@ -4,8 +4,8 @@ <controls> <control type="group"> <visible>!Window.IsVisible(FileBrowser)</visible> - <animation effect="slide" start="1150,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" start="0,0" end="1150,0" time="400" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="1150,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" start="0,0" end="1150,0" time="300" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <left>50</left> <top>0</top> @@ -48,8 +48,8 @@ <visible>system.getbool(input.enablemouse)</visible> </control> <control type="group"> - <animation effect="fade" delay="400" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" delay="300" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <control type="label"> <description>header label</description> <left>90</left> diff --git a/addons/skin.confluence/720p/DialogSeekBar.xml b/addons/skin.confluence/720p/DialogSeekBar.xml index 357de03782..500f0ec78d 100644 --- a/addons/skin.confluence/720p/DialogSeekBar.xml +++ b/addons/skin.confluence/720p/DialogSeekBar.xml @@ -2,8 +2,8 @@ <window> <defaultcontrol>1</defaultcontrol> <visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding</visible> - <animation effect="fade" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <controls> <control type="group"> <visible>player.chaptercount + Window.IsVisible(FullScreenVideo)</visible> diff --git a/addons/skin.confluence/720p/DialogSlider.xml b/addons/skin.confluence/720p/DialogSlider.xml index 98a3a892d1..32d7236799 100644 --- a/addons/skin.confluence/720p/DialogSlider.xml +++ b/addons/skin.confluence/720p/DialogSlider.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>11</defaultcontrol> - <animation effect="slide" start="0,-80" end="0,0" time="100">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,-80" time="100">WindowClose</animation> + <animation effect="slide" start="0,-80" end="0,0" time="75">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,-80" time="75">WindowClose</animation> <coordinates> <system>1</system> <left>405</left> diff --git a/addons/skin.confluence/720p/DialogSubtitles.xml b/addons/skin.confluence/720p/DialogSubtitles.xml index 95185a827c..f27deac1d7 100644 --- a/addons/skin.confluence/720p/DialogSubtitles.xml +++ b/addons/skin.confluence/720p/DialogSubtitles.xml @@ -7,9 +7,9 @@ </coordinates> <controls> <control type="group" id="250"> - <animation effect="slide" start="0,0" end="900,0" time="500" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="0,0" end="900,0" time="375" tween="quadratic" easing="out">WindowClose</animation> <animation type="Conditional" condition="Control.HasFocus(150) | Control.HasFocus(160)" reversible="true"> - <effect type="slide" end="-250,0" time="400" /> + <effect type="slide" end="-250,0" time="300" /> </animation> <control type="button" id="8999"> <description>Fake button for mouse control</description> diff --git a/addons/skin.confluence/720p/DialogTextViewer.xml b/addons/skin.confluence/720p/DialogTextViewer.xml index 6b3b8f8c66..3c21026fd6 100644 --- a/addons/skin.confluence/720p/DialogTextViewer.xml +++ b/addons/skin.confluence/720p/DialogTextViewer.xml @@ -3,8 +3,8 @@ <defaultcontrol>61</defaultcontrol> <controls> <control type="group"> - <animation effect="slide" start="1100,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" start="0,0" end="1100,0" time="400" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="1100,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" start="0,0" end="1100,0" time="300" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <left>180</left> <top>0</top> @@ -30,8 +30,8 @@ <visible>system.getbool(input.enablemouse)</visible> </control> <control type="group"> - <animation effect="fade" delay="400" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" delay="300" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <control type="label" id="1"> <description>header label</description> <left>210</left> diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml index 3110711850..8b9bb63dd9 100644 --- a/addons/skin.confluence/720p/DialogVideoInfo.xml +++ b/addons/skin.confluence/720p/DialogVideoInfo.xml @@ -6,8 +6,8 @@ <controls> <control type="group"> <visible>!Window.IsVisible(FileBrowser)</visible> - <animation effect="slide" start="1100,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" start="0,0" end="1100,0" time="400" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="1100,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" start="0,0" end="1100,0" time="300" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <left>180</left> <top>0</top> @@ -33,8 +33,8 @@ <visible>system.getbool(input.enablemouse)</visible> </control> <control type="group"> - <animation effect="fade" delay="400" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" delay="300" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <control type="label"> <description>header label</description> <left>210</left> diff --git a/addons/skin.confluence/720p/DialogVolumeBar.xml b/addons/skin.confluence/720p/DialogVolumeBar.xml index 50da26e80a..58bba5da17 100644 --- a/addons/skin.confluence/720p/DialogVolumeBar.xml +++ b/addons/skin.confluence/720p/DialogVolumeBar.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <window> <defaultcontrol>1</defaultcontrol> - <animation effect="slide" start="0,-40" end="0,0" time="100">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,-40" delay="400" time="100">WindowClose</animation> + <animation effect="slide" start="0,-40" end="0,0" time="75">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,-40" delay="300" time="75">WindowClose</animation> <controls> <control type="group"> <left>820</left> diff --git a/addons/skin.confluence/720p/FileBrowser.xml b/addons/skin.confluence/720p/FileBrowser.xml index ef75cdf21d..38fd2f473a 100644 --- a/addons/skin.confluence/720p/FileBrowser.xml +++ b/addons/skin.confluence/720p/FileBrowser.xml @@ -10,10 +10,10 @@ <controls> <control type="group"> <left>360</left> - <animation effect="slide" start="700,0" end="0,0" time="400" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation> - <animation effect="slide" start="-180,0" end="0,0" time="400" tween="quadratic" easing="out" condition="[Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation> - <animation effect="slide" start="0,0" end="700,0" time="400" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation> - <animation effect="slide" start="0,0" end="-400,0" time="400" tween="quadratic" easing="out" condition="[Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation> + <animation effect="slide" start="700,0" end="0,0" time="300" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation> + <animation effect="slide" start="-180,0" end="0,0" time="300" tween="quadratic" easing="out" condition="[Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation> + <animation effect="slide" start="0,0" end="700,0" time="300" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation> + <animation effect="slide" start="0,0" end="-400,0" time="300" tween="quadratic" easing="out" condition="[Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation> <control type="image"> <left>0</left> <top>0</top> @@ -56,8 +56,8 @@ <visible>system.getbool(input.enablemouse)</visible> </control> <control type="group"> - <animation effect="fade" delay="400" start="0" end="100" time="200">WindowOpen</animation> - <animation effect="fade" start="100" end="0" time="200">WindowClose</animation> + <animation effect="fade" delay="300" start="0" end="100" time="150">WindowOpen</animation> + <animation effect="fade" start="100" end="0" time="150">WindowClose</animation> <control type="label" id="411"> <description>header label</description> <left>40</left> diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml index ebd0c89827..e2c5b28d7b 100644 --- a/addons/skin.confluence/720p/FileManager.xml +++ b/addons/skin.confluence/720p/FileManager.xml @@ -10,8 +10,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="image"> <description>Section header image</description> @@ -39,12 +39,12 @@ <left>30</left> <top>40</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>0</left> @@ -213,12 +213,12 @@ <left>650</left> <top>40</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>0</left> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 6bc0752a17..e7d884dc0a 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -12,8 +12,8 @@ <width>1280</width> <height>90</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="image"> <description>LOGO</description> @@ -92,7 +92,7 @@ <visible>Container(9000).HasFocus(12) + [PVR.IsRecording | PVR.HasNonRecordingTimer]</visible> <include>VisibleFadeEffect</include> <include>Window_OpenClose_Animation</include> - <animation effect="fade" start="100" end="0" time="200" condition="Window.IsActive(Favourites)">conditional</animation> + <animation effect="fade" start="100" end="0" time="150" condition="Window.IsActive(Favourites)">conditional</animation> <control type="group"> <animation effect="slide" start="0,0" end="0,100" time="0" condition="PVR.IsRecording">conditional</animation> <visible>PVR.HasNonRecordingTimer</visible> @@ -457,14 +457,14 @@ <description>Controls for currently playing media</description> <left>545r</left> <top>370</top> - <animation effect="slide" start="0,0" end="365,0" time="300" condition="!Player.HasMedia">conditional</animation> + <animation effect="slide" start="0,0" end="365,0" time="225" condition="!Player.HasMedia">conditional</animation> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <description>Background End image</description> @@ -673,7 +673,7 @@ <ondown>9000</ondown> <onclick>PlayerControl(Play)</onclick> <enable>Player.PauseEnabled</enable> - <animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Player.PauseEnabled">Conditional</animation> </control> <control type="button" id="606"> <left>160</left> @@ -724,12 +724,12 @@ <control type="group"> <top>400</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="group" id="9001"> <left>0</left> @@ -1217,7 +1217,7 @@ <shadowcolor>black</shadowcolor> <label>$INFO[System.Date]</label> <include>Window_OpenClose_Animation</include> - <animation effect="slide" start="0,0" end="-40,0" time="100" condition="Window.IsVisible(Mutebug)">conditional</animation> + <animation effect="slide" start="0,0" end="-40,0" time="75" condition="Window.IsVisible(Mutebug)">conditional</animation> </control> </controls> </window> diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index 67d9db4f61..df4b3032d2 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -77,8 +77,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> diff --git a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml index b6d58d66c0..0a99a17aed 100644 --- a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml +++ b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml @@ -7,8 +7,8 @@ <ondown condition="!System.HasAddon(script.globalsearch)">603</ondown> <visible>!Window.IsVisible(Favourites)</visible> <include>VisibleFadeEffect</include> - <animation effect="fade" time="300" delay="1000">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <animation effect="fade" time="225" delay="750">WindowOpen</animation> + <animation effect="fade" time="150">WindowClose</animation> <control type="group"> <left>190</left> <top>50</top> diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml index b3f1a28732..5b6f895003 100644 --- a/addons/skin.confluence/720p/LoginScreen.xml +++ b/addons/skin.confluence/720p/LoginScreen.xml @@ -17,8 +17,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="image"> <description>LOGO</description> @@ -226,7 +226,7 @@ <shadowcolor>black</shadowcolor> <label>$INFO[System.Date]</label> <include>Window_OpenClose_Animation</include> - <animation effect="slide" start="0,0" end="-40,0" time="100" condition="Window.IsVisible(Mutebug)">conditional</animation> + <animation effect="slide" start="0,0" end="-40,0" time="75" condition="Window.IsVisible(Mutebug)">conditional</animation> </control> </controls> </window> diff --git a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml index c6efe3a376..0a63ce81c7 100644 --- a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml +++ b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml @@ -19,7 +19,7 @@ </control> <control type="group"> <visible>MusicPlayer.Offset(number).Exists + !IntegerGreaterThan(Player.TimeRemaining,20)</visible> - <animation effect="slide" start="0,-40" end="0,0" time="100">Visible</animation> + <animation effect="slide" start="0,-40" end="0,0" time="75">Visible</animation> <left>420</left> <top>0</top> <control type="image"> diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml index 88d1b8dfaa..636e37420a 100644 --- a/addons/skin.confluence/720p/MusicOSD.xml +++ b/addons/skin.confluence/720p/MusicOSD.xml @@ -25,7 +25,7 @@ <onright>1000</onright> <onup>100</onup> <ondown>100</ondown> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> </control> <control type="slider" id="87"> @@ -40,7 +40,7 @@ <texturesliderbar>seekslider2.png</texturesliderbar> <textureslidernib>osd_slider_nibNF.png</textureslidernib> <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> </control> <control type="grouplist" id="100"> @@ -50,7 +50,7 @@ <ondown>1000</ondown> <orientation>horizontal</orientation> <itemgap>0</itemgap> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> <control type="button" id="300"> <width>55</width> @@ -89,7 +89,7 @@ <font>-</font> <texturefocus>OSDRewindFO.png</texturefocus> <texturenofocus>OSDRewindNF.png</texturenofocus> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation> <onclick>PlayerControl(Rewind)</onclick> <enable>Player.SeekEnabled</enable> </control> @@ -104,7 +104,7 @@ <usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture> <alttexturefocus>OSDPlayFO.png</alttexturefocus> <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.PauseEnabled">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.PauseEnabled">Conditional</animation> <onclick>PlayerControl(Play)</onclick> <enable>Player.PauseEnabled</enable> </control> @@ -124,7 +124,7 @@ <font>-</font> <texturefocus>OSDForwardFO.png</texturefocus> <texturenofocus>OSDForwardNF.png</texturenofocus> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation> <onclick>PlayerControl(Forward)</onclick> <enable>Player.SeekEnabled</enable> </control> @@ -308,7 +308,7 @@ <texturenofocus>OSDRecordOffNF.png</texturenofocus> <onclick>PlayerControl(record)</onclick> <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.CanRecord">Conditional</animation> </control> </control> </controls> diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml index 872b6e6140..c925d8bbc4 100644 --- a/addons/skin.confluence/720p/MusicVisualisation.xml +++ b/addons/skin.confluence/720p/MusicVisualisation.xml @@ -24,7 +24,7 @@ </control> <!-- media infos --> <control type="group"> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> <control type="image"> <left>0</left> @@ -181,7 +181,7 @@ <textcolor>grey</textcolor> <scroll>true</scroll> <visible>MusicPlayer.HasNext + !Window.IsVisible(MusicOSD)</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> </control> </control> <control type="group"> @@ -222,7 +222,7 @@ <left>0</left> <top>50</top> <visible>Player.ShowCodec + ![Window.IsVisible(script-cu-lrclyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <control type="image"> <description>media info background image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml index 9a93d95ad5..08c330ef8a 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml @@ -119,8 +119,8 @@ </control> </control> <control type="group"> - <animation effect="slide" start="-480,0" end="0,0" time="500" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" end="-480,0" start="0,0" time="500" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="-480,0" end="0,0" time="375" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" end="-480,0" start="0,0" time="375" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <left>0</left> <top>0</top> @@ -257,8 +257,8 @@ </control> </control> <control type="group"> - <animation effect="slide" start="480,0" end="0,0" time="500" tween="quadratic" easing="out">WindowOpen</animation> - <animation effect="slide" end="480,0" start="0,0" time="500" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="480,0" end="0,0" time="375" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" end="480,0" start="0,0" time="375" tween="quadratic" easing="out">WindowClose</animation> <left>800</left> <control type="image"> <left>0</left> diff --git a/addons/skin.confluence/720p/MyPVRChannels.xml b/addons/skin.confluence/720p/MyPVRChannels.xml index 4693832f49..64ffdafadd 100644 --- a/addons/skin.confluence/720p/MyPVRChannels.xml +++ b/addons/skin.confluence/720p/MyPVRChannels.xml @@ -11,8 +11,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -421,8 +421,8 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">Visible</animation> - <animation effect="fade" time="200">Hidden</animation> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> <include>PVRSideBlade</include> diff --git a/addons/skin.confluence/720p/MyPVRGuide.xml b/addons/skin.confluence/720p/MyPVRGuide.xml index 58b1090a1a..a8ae1825cc 100644 --- a/addons/skin.confluence/720p/MyPVRGuide.xml +++ b/addons/skin.confluence/720p/MyPVRGuide.xml @@ -11,8 +11,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -22,8 +22,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -64,8 +64,8 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">Visible</animation> - <animation effect="fade" time="200">Hidden</animation> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> <include>PVRSideBlade</include> diff --git a/addons/skin.confluence/720p/MyPVRRecordings.xml b/addons/skin.confluence/720p/MyPVRRecordings.xml index 00342b0644..00a36cfcd8 100644 --- a/addons/skin.confluence/720p/MyPVRRecordings.xml +++ b/addons/skin.confluence/720p/MyPVRRecordings.xml @@ -11,8 +11,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -294,7 +294,7 @@ <left>10</left> <top>548</top> <width>290</width> - <height>12</height>> + <height>12</height> <info>PVR.backenddiskspaceprogr</info><visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible></control> </control> </control> @@ -307,8 +307,8 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">Visible</animation> - <animation effect="fade" time="200">Hidden</animation> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> <include>PVRSideBlade</include> diff --git a/addons/skin.confluence/720p/MyPVRSearch.xml b/addons/skin.confluence/720p/MyPVRSearch.xml index bfe88dc23a..a387fd6781 100644 --- a/addons/skin.confluence/720p/MyPVRSearch.xml +++ b/addons/skin.confluence/720p/MyPVRSearch.xml @@ -11,8 +11,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -22,8 +22,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -431,8 +431,8 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">Visible</animation> - <animation effect="fade" time="200">Hidden</animation> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> <include>PVRSideBlade</include> diff --git a/addons/skin.confluence/720p/MyPVRTimers.xml b/addons/skin.confluence/720p/MyPVRTimers.xml index 79a6e352ff..2eefbfc1fd 100644 --- a/addons/skin.confluence/720p/MyPVRTimers.xml +++ b/addons/skin.confluence/720p/MyPVRTimers.xml @@ -11,8 +11,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -22,8 +22,8 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -344,8 +344,8 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">Visible</animation> - <animation effect="fade" time="200">Hidden</animation> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> <visible>Window.IsActive(FileBrowser) | Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRTimerSetting) | Window.IsActive(PVRGroupManager) | Window.IsActive(PVRGuideSearch)</visible> </control> <include>PVRSideBlade</include> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index d4fc5c6c55..141659de01 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -16,7 +16,7 @@ <fadetime>1000</fadetime> <include>VisibleFadeEffect</include> <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible> - <animation effect="fade" time="200">WindowClose</animation> + <animation effect="fade" time="150">WindowClose</animation> </control> <control type="image"> <description>Section header image</description> @@ -47,17 +47,17 @@ <height>100</height> <texture>floor.png</texture> <include>VisibleFadeEffect</include> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <include>VisibleFadeEffect</include> <control type="group"> diff --git a/addons/skin.confluence/720p/PlayerControls.xml b/addons/skin.confluence/720p/PlayerControls.xml index 32357f495f..1b4ddf194b 100644 --- a/addons/skin.confluence/720p/PlayerControls.xml +++ b/addons/skin.confluence/720p/PlayerControls.xml @@ -129,7 +129,7 @@ <ondown>200</ondown> <onclick>PlayerControl(record)</onclick> <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="30" time="100" condition="!Player.CanRecord">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation> <visible>!VideoPlayer.Content(LiveTV)</visible> </control> <control type="group"> @@ -274,7 +274,7 @@ <onclick>PlayerControl(Rewind)</onclick> <visible>VideoPlayer.Content(LiveTV)</visible> <enable>Player.SeekEnabled</enable> - <animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="true">Conditional</animation> </control> <control type="button" id="702"> <left>40</left> @@ -311,7 +311,7 @@ <visible>VideoPlayer.Content(LiveTV)</visible> <enable>false</enable> <enable>Player.PauseEnabled</enable> - <animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="true">Conditional</animation> </control> <control type="button" id="704"> <left>120</left> @@ -328,7 +328,7 @@ <onclick>PlayerControl(Forward)</onclick> <visible>VideoPlayer.Content(LiveTV)</visible> <enable>Player.SeekEnabled</enable> - <animation effect="fade" start="100" end="50" time="100" condition="true">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="true">Conditional</animation> </control> <control type="button" id="700"> <left>200</left> @@ -374,7 +374,7 @@ <ondown>200</ondown> <onclick>PlayerControl(record)</onclick> <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="30" time="100" condition="!Player.CanRecord">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation> <visible>VideoPlayer.Content(LiveTV)</visible> </control> </control> diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index b376141632..e2332758f5 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -10,19 +10,19 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>5</left> diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml index c284e8a893..7120e4bbe3 100644 --- a/addons/skin.confluence/720p/SettingsCategory.xml +++ b/addons/skin.confluence/720p/SettingsCategory.xml @@ -16,12 +16,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>5</left> diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index 17e3a7a831..85c163e5a7 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -10,19 +10,19 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>5</left> @@ -102,7 +102,7 @@ <width>260</width> <height>55</height> <texture border="5">MenuItemFO.png</texture> - <animation effect="fade" start="100" end="30" time="100" condition="!Control.HasFocus(9000)">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> <left>10</left> diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml index 732aa5e676..3e4ed90fb0 100644 --- a/addons/skin.confluence/720p/SettingsSystemInfo.xml +++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml @@ -10,19 +10,19 @@ <width>1280</width> <height>100</height> <texture>floor.png</texture> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="group"> <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>5</left> diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml index 049e3ad417..f4a15cbc10 100644 --- a/addons/skin.confluence/720p/SkinSettings.xml +++ b/addons/skin.confluence/720p/SkinSettings.xml @@ -42,12 +42,12 @@ <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>5</left> @@ -138,7 +138,7 @@ <width>260</width> <height>81</height> <texture border="5">MenuItemFO.png</texture> - <animation effect="fade" start="100" end="30" time="100" condition="!Control.HasFocus(9000)">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> <left>10</left> diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml index 3200269948..5bab352126 100644 --- a/addons/skin.confluence/720p/VideoFullScreen.xml +++ b/addons/skin.confluence/720p/VideoFullScreen.xml @@ -5,7 +5,7 @@ <!-- media infos --> <control type="group" id="1"> <visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(SliderDialog)]</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <control type="image" id="1"> <left>0</left> <top>-150</top> @@ -274,7 +274,7 @@ <textcolor>grey</textcolor> <scroll>true</scroll> <visible>!Window.IsVisible(VideoOSD) + !VideoPlayer.Content(LiveTV)</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> </control> <control type="label" id="1"> <left>0</left> @@ -288,7 +288,7 @@ <textcolor>grey</textcolor> <scroll>true</scroll> <visible>!Window.IsVisible(VideoOSD) + VideoPlayer.Content(LiveTV)</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> </control> </control> <control type="group" id="1"> @@ -362,7 +362,7 @@ <control type="group" id="0"> <left>0</left> <top>20</top> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <control type="image"> <description>media info background image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml index 54aef3e801..c8d7b58c22 100644 --- a/addons/skin.confluence/720p/VideoOSD.xml +++ b/addons/skin.confluence/720p/VideoOSD.xml @@ -25,7 +25,7 @@ <onright>1000</onright> <onup>100</onup> <ondown>100</ondown> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible> </control> <control type="slider" id="87"> @@ -40,7 +40,7 @@ <texturesliderbar>seekslider2.png</texturesliderbar> <textureslidernib>osd_slider_nibNF.png</textureslidernib> <textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)]</visible> </control> <control type="grouplist" id="100"> @@ -48,7 +48,7 @@ <top>60r</top> <orientation>horizontal</orientation> <itemgap>0</itemgap> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible> <onup>1000</onup> <control type="button" id="300"> @@ -89,7 +89,7 @@ <texturefocus>OSDRewindFO.png</texturefocus> <texturenofocus>OSDRewindNF.png</texturenofocus> <enable>Player.SeekEnabled</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation> <onclick>PlayerControl(Rewind)</onclick> </control> <control type="togglebutton" id="202"> @@ -105,7 +105,7 @@ <alttexturenofocus>OSDPlayNF.png</alttexturenofocus> <onclick>PlayerControl(Play)</onclick> <enable>Player.PauseEnabled</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.PauseEnabled">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.PauseEnabled">Conditional</animation> </control> <control type="button" id="203"> <width>55</width> @@ -124,7 +124,7 @@ <texturefocus>OSDForwardFO.png</texturefocus> <texturenofocus>OSDForwardNF.png</texturenofocus> <enable>Player.SeekEnabled</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation> <onclick>PlayerControl(Forward)</onclick> </control> <control type="button" id="205"> @@ -181,7 +181,7 @@ </control> <control type="button" id="255"> <enable>VideoPlayer.IsStereoscopic</enable> - <animation effect="fade" start="100" end="0" time="100" condition="!VideoPlayer.IsStereoscopic">Conditional</animation> + <animation effect="fade" start="100" end="0" time="75" condition="!VideoPlayer.IsStereoscopic">Conditional</animation> <width>55</width> <height>55</height> <label>36501</label> @@ -246,7 +246,7 @@ <ondown>1000</ondown> <onclick>PlayerControl(ShowVideoMenu)</onclick> <enable>VideoPlayer.HasMenu</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!VideoPlayer.HasMenu">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!VideoPlayer.HasMenu">Conditional</animation> <visible>!VideoPlayer.Content(LiveTV)</visible> </control> <control type="togglebutton" id="353"> @@ -262,7 +262,7 @@ <alttexturenofocus>OSDRecordOnNF.png</alttexturenofocus> <onclick>PlayerControl(Record)</onclick> <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Player.CanRecord">Conditional</animation> <visible>VideoPlayer.Content(LiveTV)</visible> </control> </control> @@ -281,7 +281,7 @@ </control> <control type="grouplist" id="400"> <visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <animation effect="slide" start="0,0" end="0,80" time="0" condition="![VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled]">Conditional</animation> <animation effect="slide" start="0,0" end="0,40" time="0" condition="!VideoPlayer.HasSubtitles">Conditional</animation> <animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation> @@ -403,7 +403,7 @@ </control> <control type="grouplist" id="500"> <visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)]</visible> - <animation effect="fade" time="200">VisibleChange</animation> + <animation effect="fade" time="150">VisibleChange</animation> <animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation> <right>200</right> <bottom>45</bottom> diff --git a/addons/skin.confluence/720p/VideoOSDSettings.xml b/addons/skin.confluence/720p/VideoOSDSettings.xml index e2081bb39f..4b58f14b07 100644 --- a/addons/skin.confluence/720p/VideoOSDSettings.xml +++ b/addons/skin.confluence/720p/VideoOSDSettings.xml @@ -9,7 +9,7 @@ <include>dialogeffect</include> <controls> <control type="group"> - <animation effect="fade" start="100" end="0" time="400" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)">Conditional</animation> + <animation effect="fade" start="100" end="0" time="300" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)">Conditional</animation> <control type="image"> <description>background image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/ViewsMusicLibrary.xml b/addons/skin.confluence/720p/ViewsMusicLibrary.xml index e378b6acd2..03f81df73b 100644 --- a/addons/skin.confluence/720p/ViewsMusicLibrary.xml +++ b/addons/skin.confluence/720p/ViewsMusicLibrary.xml @@ -252,7 +252,7 @@ <align>center</align> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> - <animation effect="slide" start="0,0" end="0,20" time="200" condition="!Control.HasFocus(509)">conditional</animation> + <animation effect="slide" start="0,0" end="0,20" time="150" condition="!Control.HasFocus(509)">conditional</animation> </control> </control> <control type="group"> @@ -322,8 +322,8 @@ <bordersize>8</bordersize> <fadetime>200</fadetime> <texture background="true">$INFO[ListItem.Icon]</texture> - <animation reversible="false" effect="zoom" start="-2,16,168,168" end="-12,-4,198,198" time="200">focus</animation> - <animation reversible="false" effect="zoom" end="-2,16,168,168" start="-12,-4,198,198" time="200">unfocus</animation> + <animation reversible="false" effect="zoom" start="-2,16,168,168" end="-12,-4,198,198" time="150">focus</animation> + <animation reversible="false" effect="zoom" end="-2,16,168,168" start="-12,-4,198,198" time="150">unfocus</animation> </control> <control type="image"> <left>180</left> @@ -333,12 +333,12 @@ <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Overlay]</texture> <animation type="focus"> - <effect type="fade" start="0" end="100" time="200" /> - <effect type="slide" start="0,0" end="40,40" time="200" /> + <effect type="fade" start="0" end="100" time="150" /> + <effect type="slide" start="0,0" end="40,40" time="150" /> </animation> <animation type="unfocus"> - <effect type="fade" start="100" end="0" time="200" /> - <effect type="slide" end="0,0" start="40,40" time="200" /> + <effect type="fade" start="100" end="0" time="150" /> + <effect type="slide" end="0,0" start="40,40" time="150" /> </animation> </control> </focusedlayout> diff --git a/addons/skin.confluence/720p/ViewsPictures.xml b/addons/skin.confluence/720p/ViewsPictures.xml index 552aaf6069..22e66e49f7 100644 --- a/addons/skin.confluence/720p/ViewsPictures.xml +++ b/addons/skin.confluence/720p/ViewsPictures.xml @@ -53,8 +53,8 @@ <bordersize>8</bordersize> <fadetime>200</fadetime> <texture border="2">ThumbBG.png</texture> - <animation reversible="false" effect="zoom" start="15,40,160,160" end="-10,-5,210,210" time="200">focus</animation> - <animation reversible="false" effect="zoom" end="15,40,160,160" start="-10,-5,210,210" time="200">unfocus</animation> + <animation reversible="false" effect="zoom" start="15,40,160,160" end="-10,-5,210,210" time="150">focus</animation> + <animation reversible="false" effect="zoom" end="15,40,160,160" start="-10,-5,210,210" time="150">unfocus</animation> </control> <control type="image"> <left>25</left> @@ -63,8 +63,8 @@ <height>140</height> <aspectratio>keep</aspectratio> <texture background="true">$INFO[ListItem.Icon]</texture> - <animation reversible="false" effect="zoom" start="25,50,140,140" end="5,10,180,180" time="200">focus</animation> - <animation reversible="false" effect="zoom" end="25,50,140,140" start="5,10,180,180" time="200">unfocus</animation> + <animation reversible="false" effect="zoom" start="25,50,140,140" end="5,10,180,180" time="150">focus</animation> + <animation reversible="false" effect="zoom" end="25,50,140,140" start="5,10,180,180" time="150">unfocus</animation> </control> </focusedlayout> </control> diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index 9750289ddf..3b173be113 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -50,8 +50,8 @@ <bordertexture border="8">ThumbBorder.png</bordertexture> <bordersize>8</bordersize> <texture background="true">$VAR[PosterThumb]</texture> - <animation reversible="false" effect="zoom" start="-2,36,222,318" end="-28,0,284,390" time="200">focus</animation> - <animation reversible="false" effect="zoom" end="-2,36,222,318" start="-28,0,284,390" time="200">unfocus</animation> + <animation reversible="false" effect="zoom" start="-2,36,222,318" end="-28,0,284,390" time="150">focus</animation> + <animation reversible="false" effect="zoom" end="-2,36,222,318" start="-28,0,284,390" time="150">unfocus</animation> </control> <control type="image"> <left>6</left> @@ -60,8 +60,8 @@ <height>180</height> <aspectratio>stretch</aspectratio> <texture>GlassOverlay.png</texture> - <animation reversible="false" effect="zoom" start="6,44,170,180" end="-24,4,240,250" time="200">focus</animation> - <animation reversible="false" effect="zoom" end="6,44,170,180" start="-24,4,240,250" time="200">unfocus</animation> + <animation reversible="false" effect="zoom" start="6,44,170,180" end="-24,4,240,250" time="150">focus</animation> + <animation reversible="false" effect="zoom" end="6,44,170,180" start="-24,4,240,250" time="150">unfocus</animation> </control> <control type="image"> <left>185</left> @@ -71,12 +71,12 @@ <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Overlay]</texture> <animation type="focus"> - <effect type="fade" start="0" end="100" time="200" /> - <effect type="slide" start="0,0" end="40,40" time="200" /> + <effect type="fade" start="0" end="100" time="150" /> + <effect type="slide" start="0,0" end="40,40" time="150" /> </animation> <animation type="unfocus"> - <effect type="fade" start="100" end="0" time="200" /> - <effect type="slide" end="0,0" start="40,40" time="200" /> + <effect type="fade" start="100" end="0" time="150" /> + <effect type="slide" end="0,0" start="40,40" time="150" /> </animation> </control> </focusedlayout> @@ -300,7 +300,7 @@ <align>center</align> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> - <animation effect="slide" start="0,0" end="0,25" time="200" condition="!Control.HasFocus(508)">conditional</animation> + <animation effect="slide" start="0,0" end="0,25" time="150" condition="!Control.HasFocus(508)">conditional</animation> </control> </control> <control type="group"> @@ -370,8 +370,8 @@ <bordersize>8</bordersize> <fadetime>200</fadetime> <texture background="true">$VAR[PosterThumb]</texture> - <animation reversible="false" effect="zoom" start="-2,16,128,168" end="-12,-10,148,198" time="200">focus</animation> - <animation reversible="false" effect="zoom" end="-2,16,128,168" start="-12,-10,148,198" time="200">unfocus</animation> + <animation reversible="false" effect="zoom" start="-2,16,128,168" end="-12,-10,148,198" time="150">focus</animation> + <animation reversible="false" effect="zoom" end="-2,16,128,168" start="-12,-10,148,198" time="150">unfocus</animation> </control> <control type="image"> <left>2</left> @@ -392,12 +392,12 @@ <aspectratio>keep</aspectratio> <texture>$INFO[ListItem.Overlay]</texture> <animation type="focus"> - <effect type="fade" start="0" end="100" time="200" /> - <effect type="slide" start="0,0" end="10,5" time="200" /> + <effect type="fade" start="0" end="100" time="150" /> + <effect type="slide" start="0,0" end="10,5" time="150" /> </animation> <animation type="unfocus"> - <effect type="fade" start="100" end="0" time="200" /> - <effect type="slide" end="0,0" start="10,5" time="200" /> + <effect type="fade" start="100" end="0" time="150" /> + <effect type="slide" end="0,0" start="10,5" time="150" /> </animation> </control> </focusedlayout> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index 3db3d44943..46d50a40b2 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -75,8 +75,8 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">Visible</animation> - <animation effect="fade" time="200">Hidden</animation> + <animation effect="fade" time="300">Visible</animation> + <animation effect="fade" time="150">Hidden</animation> <visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings) | Window.IsActive(script-cu-lrclyrics-main.xml) | Window.IsActive(MediaFilter)</visible> </control> </include> @@ -137,8 +137,8 @@ <ondown>9002</ondown> <itemgap>0</itemgap> <orientation>Horizontal</orientation> - <animation effect="slide" start="0,-40" end="0,0" delay="200" time="200" tween="quadratic" easing="out">Visible</animation> - <animation effect="slide" start="0,0" end="0,-40" time="200" tween="quadratic" easing="out">Hidden</animation> + <animation effect="slide" start="0,-40" end="0,0" delay="150" time="150" tween="quadratic" easing="out">Visible</animation> + <animation effect="slide" start="0,0" end="0,-40" time="150" tween="quadratic" easing="out">Hidden</animation> </include> <include name="ButtonInfoDialogsCommonValues"> <height>40</height> @@ -152,10 +152,10 @@ <pulseonselect>false</pulseonselect> </include> <include name="SideBladeLeft"> - <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001) | Control.HasFocus(8999)">Conditional</animation> - <animation effect="slide" start="0,0" end="-300,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001)">WindowClose</animation> - <animation effect="slide" start="0,0" end="-50,0" time="300" tween="quadratic" easing="out" condition="![ControlGroup(9000).HasFocus | Control.HasFocus(9001)]">WindowClose</animation> - <animation effect="slide" start="-50,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation> + <animation effect="slide" start="0,0" end="250,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001) | Control.HasFocus(8999)">Conditional</animation> + <animation effect="slide" start="0,0" end="-300,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001)">WindowClose</animation> + <animation effect="slide" start="0,0" end="-50,0" time="225" tween="quadratic" easing="out" condition="![ControlGroup(9000).HasFocus | Control.HasFocus(9001)]">WindowClose</animation> + <animation effect="slide" start="-50,0" end="0,0" time="225" tween="quadratic" easing="out">WindowOpen</animation> <control type="button" id="8999"> <description>Fake button for mouse control</description> <left>0</left> @@ -198,8 +198,8 @@ <control type="group"> <left>120r</left> <top>55r</top> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> <visible>system.getbool(input.enablemouse)</visible> <control type="button"> <description>Back push button</description> @@ -257,8 +257,8 @@ <control type="group"> <visible>Player.HasMedia + !SubString(Window(videolibrary).Property(TvTunesIsAlive),TRUE)</visible> <include>VisibleFadeEffect</include> - <animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation> <control type="button"> <description>push button</description> <left>30</left> @@ -697,7 +697,7 @@ <onback>50</onback> <onclick>PlayerControl(Play)</onclick> <enable>Player.PauseEnabled</enable> - <animation effect="fade" start="100" end="30" time="100" condition="!Player.PauseEnabled">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Player.PauseEnabled">Conditional</animation> </control> <control type="button" id="605"> <left>180</left> @@ -713,7 +713,7 @@ <ondown>611</ondown> <onclick>PlayerControl(record)</onclick> <enable>Player.CanRecord</enable> - <animation effect="fade" start="100" end="30" time="100" condition="!Player.CanRecord">Conditional</animation> + <animation effect="fade" start="100" end="30" time="75" condition="!Player.CanRecord">Conditional</animation> </control> </control> <control type="group" id="9005"> @@ -936,8 +936,8 @@ <include name="ScrollOffsetLabel"> <control type="group"> <visible>Container.Scrolling + [StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556])]</visible> - <animation effect="slide" start="0,0" end="0,-60" time="100">Visible</animation> - <animation effect="slide" start="0,-60" end="0,0" delay="400" time="100">Hidden</animation> + <animation effect="slide" start="0,0" end="0,-60" time="75">Visible</animation> + <animation effect="slide" start="0,-60" end="0,0" delay="300" time="75">Hidden</animation> <left>300r</left> <top>720</top> <control type="image"> @@ -973,18 +973,18 @@ <textcolor>white</textcolor> <shadowcolor>black</shadowcolor> <label>$INFO[System.Time]</label> - <animation effect="slide" start="0,0" end="-40,0" time="100" condition="Window.IsVisible(Mutebug)">conditional</animation> + <animation effect="slide" start="0,0" end="-40,0" time="75" condition="Window.IsVisible(Mutebug)">conditional</animation> </control> </include> <include name="HomeAddonsCommonLayout"> <include>Window_OpenClose_Animation</include> <animation type="Visible"> - <effect type="slide" start="0,30" end="0,0" delay="200" easing="out" tween="quadratic" time="200" /> - <effect type="fade" start="0" end="100" delay="200" time="200" /> + <effect type="slide" start="0,30" end="0,0" delay="150" easing="out" tween="quadratic" time="150" /> + <effect type="fade" start="0" end="100" delay="150" time="150" /> </animation> <animation type="Hidden"> - <effect type="zoom" start="100" end="70" center="auto" easing="in" tween="quadratic" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="70" center="auto" easing="in" tween="quadratic" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <hitrect x="0" y="530" w="1280" h="120" /> <left>0</left> @@ -1253,20 +1253,20 @@ </focusedlayout> </include> <include name="backgroundfade"> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </include> <include name="Window_OpenClose_Animation"> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> </include> <include name="dialogeffect"> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> </include> <include name="VisibleFadeEffect"> - <animation effect="fade" time="300">Visible</animation> - <animation effect="fade" time="300">Hidden</animation> + <animation effect="fade" time="225">Visible</animation> + <animation effect="fade" time="225">Hidden</animation> </include> <include name="KeyboardButton"> <width>50</width> diff --git a/addons/skin.confluence/720p/script-NextAired-TVGuide.xml b/addons/skin.confluence/720p/script-NextAired-TVGuide.xml index 98ae1315fc..9b96d728ca 100644 --- a/addons/skin.confluence/720p/script-NextAired-TVGuide.xml +++ b/addons/skin.confluence/720p/script-NextAired-TVGuide.xml @@ -21,8 +21,8 @@ <texture background="true">$INFO[Container(200).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(200)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> <control type="image"> <left>0</left> @@ -33,8 +33,8 @@ <texture background="true">$INFO[Container(201).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(201)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> <control type="image"> <left>0</left> @@ -45,8 +45,8 @@ <texture background="true">$INFO[Container(202).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(202)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> <control type="image"> <left>0</left> @@ -57,8 +57,8 @@ <texture background="true">$INFO[Container(203).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(203)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> <control type="image"> <left>0</left> @@ -69,8 +69,8 @@ <texture background="true">$INFO[Container(204).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(204)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> <control type="image"> <left>0</left> @@ -81,8 +81,8 @@ <texture background="true">$INFO[Container(205).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(205)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> <control type="image"> <left>0</left> @@ -93,8 +93,8 @@ <texture background="true">$INFO[Container(206).ListItem.Property(Fanart)]</texture> <visible>Control.HasFocus(206)</visible> <fadetime>600</fadetime> - <animation effect="fade" time="600">Visible</animation> - <animation effect="fade" time="600">Hidden</animation> + <animation effect="fade" time="450">Visible</animation> + <animation effect="fade" time="450">Hidden</animation> </control> </control> <control type="image"> @@ -104,8 +104,8 @@ <height>100</height> <texture>floor.png</texture> <aspectratio>stretch</aspectratio> - <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> - <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> + <animation effect="slide" start="0,10" end="0,0" time="150" condition="Window.Previous(Home)">WindowOpen</animation> + <animation effect="slide" start="0,0" end="0,10" time="150" condition="Window.Next(Home)">WindowClose</animation> </control> <control type="image"> <description>Section header image</description> diff --git a/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml b/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml index c095f28b11..ee3d6c94b6 100644 --- a/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml +++ b/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml @@ -8,9 +8,9 @@ </coordinates> <controls> <control type="group"> - <animation effect="slide" start="600,0" end="0,0" time="400" tween="quadratic" easing="out" condition="!Player.ShowCodec">WindowOpen</animation> - <animation effect="slide" start="600,0" end="0,0" time="400" delay="400" tween="quadratic" easing="out" condition="Player.ShowCodec">WindowOpen</animation> - <animation effect="slide" start="0,0" end="600,0" time="200" tween="quadratic" easing="out">WindowClose</animation> + <animation effect="slide" start="600,0" end="0,0" time="300" tween="quadratic" easing="out" condition="!Player.ShowCodec">WindowOpen</animation> + <animation effect="slide" start="600,0" end="0,0" time="300" delay="300" tween="quadratic" easing="out" condition="Player.ShowCodec">WindowOpen</animation> + <animation effect="slide" start="0,0" end="600,0" time="150" tween="quadratic" easing="out">WindowClose</animation> <control type="image"> <description>media info background image</description> <left>0</left> diff --git a/addons/skin.confluence/720p/script-globalsearch-main.xml b/addons/skin.confluence/720p/script-globalsearch-main.xml index 40449993d1..42c2412b32 100644 --- a/addons/skin.confluence/720p/script-globalsearch-main.xml +++ b/addons/skin.confluence/720p/script-globalsearch-main.xml @@ -111,19 +111,19 @@ <width>1280</width> <height>720</height> <texture>black-back.png</texture> - <animation effect="fade" time="400">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <animation effect="fade" time="300">WindowOpen</animation> + <animation effect="fade" time="150">WindowClose</animation> </control> <control type="group"> <left>90</left> <top>30</top> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <control type="image"> <left>5</left> @@ -214,7 +214,7 @@ <width>260</width> <height>61</height> <texture border="5">MenuItemFO.png</texture> - <animation effect="fade" start="100" end="50" time="100" condition="!Control.HasFocus(9000)">Conditional</animation> + <animation effect="fade" start="100" end="50" time="75" condition="!Control.HasFocus(9000)">Conditional</animation> </control> <control type="label"> <left>10</left> @@ -378,12 +378,12 @@ </control> <control type="group"> <animation type="WindowOpen" reversible="false"> - <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" /> - <effect type="fade" start="0" end="100" time="300" /> + <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="225" /> + <effect type="fade" start="0" end="100" time="225" /> </animation> <animation type="WindowClose" reversible="false"> - <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" /> - <effect type="fade" start="100" end="0" time="300" /> + <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="225" /> + <effect type="fade" start="100" end="0" time="225" /> </animation> <left>380</left> <top>90</top> |