Auto stash before merge of "feature/jf-photo-slideshow" and "jimdogx/feature/jf-photo-slideshow"
This commit is contained in:
parent
3e57cb2095
commit
10bb0115dd
|
@ -9,6 +9,10 @@ sub init()
|
||||||
m.statusTimer.observeField("fire", "statusUpdate")
|
m.statusTimer.observeField("fire", "statusUpdate")
|
||||||
m.slideshow = get_user_setting("photos.slideshow")
|
m.slideshow = get_user_setting("photos.slideshow")
|
||||||
m.shuffle = get_user_setting("photos.shuffle")
|
m.shuffle = get_user_setting("photos.shuffle")
|
||||||
|
|
||||||
|
m.showStatusAnimation = m.top.findNode("showStatusAnimation")
|
||||||
|
m.hideStatusAnimation = m.top.findNode("hideStatusAnimation")
|
||||||
|
|
||||||
itemContentChanged()
|
itemContentChanged()
|
||||||
end sub
|
end sub
|
||||||
|
|
||||||
|
@ -56,9 +60,7 @@ end sub
|
||||||
|
|
||||||
sub statusUpdate()
|
sub statusUpdate()
|
||||||
m.statusTimer.control = "stop"
|
m.statusTimer.control = "stop"
|
||||||
m.textBackground.visible = false
|
m.hideStatusAnimation.control = "start"
|
||||||
m.status.visible = false
|
|
||||||
m.status.text = ""
|
|
||||||
end sub
|
end sub
|
||||||
|
|
||||||
function onKeyEvent(key as string, press as boolean) as boolean
|
function onKeyEvent(key as string, press as boolean) as boolean
|
||||||
|
@ -85,14 +87,16 @@ function onKeyEvent(key as string, press as boolean) as boolean
|
||||||
' stop the slideshow if the user hits "pause"
|
' stop the slideshow if the user hits "pause"
|
||||||
m.slideshowTimer.control = "stop"
|
m.slideshowTimer.control = "stop"
|
||||||
m.status.text = tr("Slideshow Paused")
|
m.status.text = tr("Slideshow Paused")
|
||||||
m.status.visible = true
|
if m.textBackground.opacity = 0
|
||||||
m.textBackground.visible = true
|
m.showStatusAnimation.control = "start"
|
||||||
|
end if
|
||||||
m.statusTimer.control = "start"
|
m.statusTimer.control = "start"
|
||||||
else
|
else
|
||||||
' start the slideshow if the user hits "play"
|
' start the slideshow if the user hits "play"
|
||||||
m.status.text = tr("Slideshow Resumed")
|
m.status.text = tr("Slideshow Resumed")
|
||||||
m.status.visible = true
|
if m.textBackground.opacity = 0
|
||||||
m.textBackground.visible = true
|
m.showStatusAnimation.control = "start"
|
||||||
|
end if
|
||||||
m.slideshow = "true"
|
m.slideshow = "true"
|
||||||
m.statusTimer.control = "start"
|
m.statusTimer.control = "start"
|
||||||
m.slideshowTimer.control = "start"
|
m.slideshowTimer.control = "start"
|
||||||
|
|
|
@ -2,11 +2,21 @@
|
||||||
<component name="PhotoDetails" extends="JFGroup">
|
<component name="PhotoDetails" extends="JFGroup">
|
||||||
<children>
|
<children>
|
||||||
<Poster id="photo" width="1920" height="1080" loadDisplayMode="scaleToFit"/>
|
<Poster id="photo" width="1920" height="1080" loadDisplayMode="scaleToFit"/>
|
||||||
<Rectangle id="background" color="0x880088FF" height="64" width="500" Translation="[150,150]" opacity="1" visible="false">
|
<Rectangle id="background" color="0x101010EE" height="120" width="500" Translation="[700, -150]" opacity="0">
|
||||||
<Label id="status" font="font:MediumSystemFont" height="64" visible="false"/>
|
<Label id="status" font="font:MediumSystemFont" height="100" width="500" horizAlign="center" vertAlign="bottom"/>
|
||||||
</Rectangle>
|
</Rectangle>
|
||||||
<Timer id="slideshowTimer" duration="5" repeat="false" />
|
<Timer id="slideshowTimer" duration="5" repeat="false" />
|
||||||
<Timer id="statusTimer" duration="2" repeat="false" />
|
<Timer id="statusTimer" duration="2" repeat="false" />
|
||||||
|
|
||||||
|
<Animation id="showStatusAnimation" duration="1" repeat="false">
|
||||||
|
<FloatFieldInterpolator key="[0.0, 0.1]" keyValue="[0, 1]" fieldToInterp="background.opacity" />
|
||||||
|
<Vector2DFieldInterpolator key="[0.1, 1]" keyValue="[[700, -150], [700, -5]]" fieldToInterp="background.translation" />
|
||||||
|
</Animation>
|
||||||
|
<Animation id="hideStatusAnimation" duration="1" repeat="false">
|
||||||
|
<Vector2DFieldInterpolator key="[0.0, 0.9]" keyValue="[[700, -5], [700, -150]]" fieldToInterp="background.translation" />
|
||||||
|
<FloatFieldInterpolator key="[0.9, 1]" keyValue="[1, 0]" fieldToInterp="background.opacity" />
|
||||||
|
</Animation>
|
||||||
|
|
||||||
</children>
|
</children>
|
||||||
<interface>
|
<interface>
|
||||||
<field id="items" type="node" />
|
<field id="items" type="node" />
|
||||||
|
|
Loading…
Reference in New Issue
Block a user