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
1=== modified file 'entertainerlib/gui/screens/factory.py'
2--- entertainerlib/gui/screens/factory.py 2009-12-22 03:14:11 +0000
3+++ entertainerlib/gui/screens/factory.py 2009-12-22 03:14:12 +0000
4@@ -12,9 +12,9 @@
5 from entertainerlib.gui.screens.main import Main
6 #from entertainerlib.gui.screens.movie import Movie
7 from entertainerlib.gui.screens.music import Music
8-#from entertainerlib.gui.screens.photo import Photo
9-#from entertainerlib.gui.screens.photo_albums import PhotoAlbums
10-#from entertainerlib.gui.screens.photographs import Photographs
11+from entertainerlib.gui.screens.photo import Photo
12+from entertainerlib.gui.screens.photo_albums import PhotoAlbums
13+from entertainerlib.gui.screens.photographs import Photographs
14 from entertainerlib.gui.screens.question import Question
15 from entertainerlib.gui.screens.rss import Rss
16 #from entertainerlib.gui.screens.tv_episodes import TvEpisodes
17
18=== modified file 'entertainerlib/gui/screens/photo.py'
19--- entertainerlib/gui/screens/photo.py 2009-08-21 02:08:39 +0000
20+++ entertainerlib/gui/screens/photo.py 2009-12-22 03:14:12 +0000
21@@ -60,9 +60,9 @@
22 self.texture = Texture(image.get_filename())
23 self._scale_image(self.texture)
24
25- timeline = clutter.Timeline(fps=120, duration=1000)
26- alpha = clutter.Alpha(timeline, clutter.smoothstep_inc_func)
27- self.opacity_behaviour = clutter.BehaviourOpacity(alpha=alpha,
28+ timeline = clutter.Timeline(1000)
29+ alpha = clutter.Alpha(timeline, clutter.EASE_IN_OUT_SINE)
30+ self.opacity_behaviour = clutter.BehaviourOpacity(alpha=alpha,
31 opacity_start=0, opacity_end=255)
32 self.opacity_behaviour.apply(self.texture)
33 self.texture.set_opacity(0)
34
35=== modified file 'entertainerlib/gui/screens/photo_albums.py'
36--- entertainerlib/gui/screens/photo_albums.py 2009-08-21 01:31:32 +0000
37+++ entertainerlib/gui/screens/photo_albums.py 2009-12-22 03:14:12 +0000
38@@ -165,8 +165,8 @@
39 self.add(self.preview)
40
41 #Fade out timeline
42- timeline1 = clutter.Timeline(10, 26)
43- alpha1 = clutter.Alpha(timeline1, clutter.smoothstep_inc_func)
44+ timeline1 = clutter.Timeline(500)
45+ alpha1 = clutter.Alpha(timeline1, clutter.EASE_IN_OUT_SINE)
46 self.out_opacity = clutter.BehaviourOpacity(255, 0, alpha1)
47 self.out_opacity.apply(old)
48
49@@ -174,8 +174,8 @@
50 old)
51
52 # Fade in timeline
53- timeline2 = clutter.Timeline(10, 26)
54- alpha2 = clutter.Alpha(timeline2, clutter.smoothstep_inc_func)
55+ timeline2 = clutter.Timeline(500)
56+ alpha2 = clutter.Alpha(timeline2, clutter.EASE_IN_OUT_SINE)
57 self.in_opacity = clutter.BehaviourOpacity(0, 255, alpha2)
58 self.in_opacity.apply(new)
59
60@@ -212,14 +212,14 @@
61 self.preview_textures[0].set_opacity(255)
62 elif self.config.show_effects:
63 #Fade out timeline
64- fade_out = clutter.Timeline(40, 26)
65- alpha_out = clutter.Alpha(fade_out, clutter.smoothstep_inc_func)
66+ fade_out = clutter.Timeline(500)
67+ alpha_out = clutter.Alpha(fade_out, clutter.EASE_IN_OUT_SINE)
68 self.out_behaviour = clutter.BehaviourOpacity(255, 0, alpha_out)
69 self.out_behaviour.apply(self.preview_textures[0])
70
71 # Fade in timeline
72- fade_in = clutter.Timeline(40, 26)
73- alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)
74+ fade_in = clutter.Timeline(500)
75+ alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_OUT_SINE)
76 self.in_behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)
77 self.in_behaviour.apply(self.preview_textures[1])
78

Subscribers

People subscribed via source and target branches