Entertainer Media Center

Merge lp:~mblayman/entertainer/photos-1.0 into lp:entertainer/future

  1. photos-1.0
  2. Merge into entertainer-future
Proposed by Matt Layman
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mblayman/entertainer/photos-1.0
Merge into: lp:entertainer/future
Prerequisite: lp:~mblayman/entertainer/music-1.0
Diff against target: 77 lines (+14/-14)
3 files modified
entertainerlib/gui/screens/factory.py (+3/-3)
entertainerlib/gui/screens/photo.py (+3/-3)
entertainerlib/gui/screens/photo_albums.py (+8/-8)
To merge this branch: bzr merge lp:~mblayman/entertainer/photos-1.0
Reviewer Review Type Date Requested Status
Entertainer Release Team Pending
Review via email: mp+16468@code.launchpad.net

Commit message

All photo screens have been fixed for clutter 1.0.

To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

Branch 5 of clutter 1.0 transition.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'entertainerlib/gui/screens/factory.py'
--- entertainerlib/gui/screens/factory.py 2009-12-22 03:14:11 +0000
+++ entertainerlib/gui/screens/factory.py 2009-12-22 03:14:12 +0000
@@ -12,9 +12,9 @@
12from entertainerlib.gui.screens.main import Main12from entertainerlib.gui.screens.main import Main
13#from entertainerlib.gui.screens.movie import Movie13#from entertainerlib.gui.screens.movie import Movie
14from entertainerlib.gui.screens.music import Music14from entertainerlib.gui.screens.music import Music
15#from entertainerlib.gui.screens.photo import Photo15from entertainerlib.gui.screens.photo import Photo
16#from entertainerlib.gui.screens.photo_albums import PhotoAlbums16from entertainerlib.gui.screens.photo_albums import PhotoAlbums
17#from entertainerlib.gui.screens.photographs import Photographs17from entertainerlib.gui.screens.photographs import Photographs
18from entertainerlib.gui.screens.question import Question18from entertainerlib.gui.screens.question import Question
19from entertainerlib.gui.screens.rss import Rss19from entertainerlib.gui.screens.rss import Rss
20#from entertainerlib.gui.screens.tv_episodes import TvEpisodes20#from entertainerlib.gui.screens.tv_episodes import TvEpisodes
2121
=== modified file 'entertainerlib/gui/screens/photo.py'
--- entertainerlib/gui/screens/photo.py 2009-08-21 02:08:39 +0000
+++ entertainerlib/gui/screens/photo.py 2009-12-22 03:14:12 +0000
@@ -60,9 +60,9 @@
60 self.texture = Texture(image.get_filename())60 self.texture = Texture(image.get_filename())
61 self._scale_image(self.texture)61 self._scale_image(self.texture)
6262
63 timeline = clutter.Timeline(fps=120, duration=1000)63 timeline = clutter.Timeline(1000)
64 alpha = clutter.Alpha(timeline, clutter.smoothstep_inc_func)64 alpha = clutter.Alpha(timeline, clutter.EASE_IN_OUT_SINE)
65 self.opacity_behaviour = clutter.BehaviourOpacity(alpha=alpha, 65 self.opacity_behaviour = clutter.BehaviourOpacity(alpha=alpha,
66 opacity_start=0, opacity_end=255)66 opacity_start=0, opacity_end=255)
67 self.opacity_behaviour.apply(self.texture)67 self.opacity_behaviour.apply(self.texture)
68 self.texture.set_opacity(0)68 self.texture.set_opacity(0)
6969
=== modified file 'entertainerlib/gui/screens/photo_albums.py'
--- entertainerlib/gui/screens/photo_albums.py 2009-08-21 01:31:32 +0000
+++ entertainerlib/gui/screens/photo_albums.py 2009-12-22 03:14:12 +0000
@@ -165,8 +165,8 @@
165 self.add(self.preview)165 self.add(self.preview)
166166
167 #Fade out timeline167 #Fade out timeline
168 timeline1 = clutter.Timeline(10, 26)168 timeline1 = clutter.Timeline(500)
169 alpha1 = clutter.Alpha(timeline1, clutter.smoothstep_inc_func)169 alpha1 = clutter.Alpha(timeline1, clutter.EASE_IN_OUT_SINE)
170 self.out_opacity = clutter.BehaviourOpacity(255, 0, alpha1)170 self.out_opacity = clutter.BehaviourOpacity(255, 0, alpha1)
171 self.out_opacity.apply(old)171 self.out_opacity.apply(old)
172172
@@ -174,8 +174,8 @@
174 old)174 old)
175175
176 # Fade in timeline176 # Fade in timeline
177 timeline2 = clutter.Timeline(10, 26)177 timeline2 = clutter.Timeline(500)
178 alpha2 = clutter.Alpha(timeline2, clutter.smoothstep_inc_func)178 alpha2 = clutter.Alpha(timeline2, clutter.EASE_IN_OUT_SINE)
179 self.in_opacity = clutter.BehaviourOpacity(0, 255, alpha2)179 self.in_opacity = clutter.BehaviourOpacity(0, 255, alpha2)
180 self.in_opacity.apply(new)180 self.in_opacity.apply(new)
181181
@@ -212,14 +212,14 @@
212 self.preview_textures[0].set_opacity(255)212 self.preview_textures[0].set_opacity(255)
213 elif self.config.show_effects:213 elif self.config.show_effects:
214 #Fade out timeline214 #Fade out timeline
215 fade_out = clutter.Timeline(40, 26)215 fade_out = clutter.Timeline(500)
216 alpha_out = clutter.Alpha(fade_out, clutter.smoothstep_inc_func)216 alpha_out = clutter.Alpha(fade_out, clutter.EASE_IN_OUT_SINE)
217 self.out_behaviour = clutter.BehaviourOpacity(255, 0, alpha_out)217 self.out_behaviour = clutter.BehaviourOpacity(255, 0, alpha_out)
218 self.out_behaviour.apply(self.preview_textures[0])218 self.out_behaviour.apply(self.preview_textures[0])
219219
220 # Fade in timeline220 # Fade in timeline
221 fade_in = clutter.Timeline(40, 26)221 fade_in = clutter.Timeline(500)
222 alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)222 alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_OUT_SINE)
223 self.in_behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)223 self.in_behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)
224 self.in_behaviour.apply(self.preview_textures[1])224 self.in_behaviour.apply(self.preview_textures[1])
225225

Subscribers

People subscribed via source and target branches