Entertainer Media Center

Merge lp://staging/~mblayman/entertainer/clean-up-1.0 into lp://staging/entertainer/future

  1. clean-up-1.0
  2. Merge into entertainer-future
Proposed by Matt Layman
Status: Merged
Approved by: Matt Layman
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~mblayman/entertainer/clean-up-1.0
Merge into: lp://staging/entertainer/future
Prerequisite: lp://staging/~mblayman/entertainer/videos-1.0
Diff against target: 157 lines (+19/-29)
7 files modified
entertainerlib/gui/user_interface.py (+10/-13)
entertainerlib/gui/widgets/grid_menu.py (+0/-4)
entertainerlib/gui/widgets/image_menu.py (+0/-4)
entertainerlib/gui/widgets/menu_overlay.py (+0/-2)
entertainerlib/gui/widgets/scroll_menu.py (+0/-1)
entertainerlib/gui/widgets/volume_indicator.py (+8/-4)
entertainerlib/tests/test_arrowtexture.py (+1/-1)
To merge this branch: bzr merge lp://staging/~mblayman/entertainer/clean-up-1.0
Reviewer Review Type Date Requested Status
Matt Layman Approve
Francesco Marella (community) Approve
Review via email: mp+16470@code.staging.launchpad.net

Commit message

Final cleanup of clutter 1.0 transition. Fixed the fullscreen size problem.

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

Branch 7 of clutter 1.0 transition.

Revision history for this message
Matt Layman (mblayman) wrote :

> Branch 7 of clutter 1.0 transition.

Since this might be the only branch people will review. Please see my "just-enough" branch merge proposal for context.

Revision history for this message
Francesco Marella (francesco-marella) wrote :

Looks good to me. ;)

review: Approve
lp://staging/~mblayman/entertainer/clean-up-1.0 updated
418. By Matt Layman

Merge from future.

Revision history for this message
Matt Layman (mblayman) wrote :

Paul, is there a statute of limitations on merge proposals?

I don't really want to merge/approve my own code and I'd like to get an Entertainer Release Team approval. But these days, any Entertainer Release Team approval that's not me is you. I saw your blog post about getting away from computers and that's awesome for you, but does that mean I need to adopt a different philosophy about merge proposals in the future?

I'm kind of wondering if you just no longer commit any time to Entertainer. I know my own time is pretty minimal, but I'm trying to figure out if Entertainer is a team of one (plus occasional drive-by contributions).

Revision history for this message
Matt Layman (mblayman) wrote :

I'm defaulting to Francesco's approval.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'entertainerlib/gui/user_interface.py'
2--- entertainerlib/gui/user_interface.py 2010-01-03 22:55:21 +0000
3+++ entertainerlib/gui/user_interface.py 2010-01-03 22:55:22 +0000
4@@ -96,16 +96,14 @@
5 self.config.stage_width, self.config.stage_height)
6 self.stage.add(self.menu_overlay)
7
8- # XXX: laymansterms - Hide the volume indicator for now because it's
9- # blocking getting the main screen up and it's not critical.
10- #self.volume_indicator = VolumeIndicator()
11- #self.stage.add(self.volume_indicator)
12- #self.volume_indicator.connect('hiding',
13- # self._on_volume_indicator_hiding)
14- #self.fade_screen_timeline = clutter.Timeline(13, 26)
15- #alpha = clutter.Alpha(self.fade_screen_timeline,
16- # clutter.smoothstep_inc_func)
17- #self.fade_screen_behaviour = clutter.BehaviourOpacity(255, 0, alpha)
18+ self.volume_indicator = VolumeIndicator()
19+ self.stage.add(self.volume_indicator)
20+ self.volume_indicator.connect('hiding',
21+ self._on_volume_indicator_hiding)
22+ self.fade_screen_timeline = clutter.Timeline(200)
23+ alpha = clutter.Alpha(self.fade_screen_timeline,
24+ clutter.EASE_IN_OUT_SINE)
25+ self.fade_screen_behaviour = clutter.BehaviourOpacity(255, 0, alpha)
26
27 # Transition object. Handles effects between screen changes.
28 transition_factory = TransitionFactory(self._remove_from_stage)
29@@ -186,9 +184,8 @@
30 '''Set the window, stage, and config to fullscreen dimensions.'''
31 self.window.fullscreen()
32 self.stage.set_fullscreen(True)
33- width, height = self.stage.get_size()
34- self.config.stage_width = int(width)
35- self.config.stage_height = int(height)
36+ self.config.stage_width = int(gtk.gdk.screen_width())
37+ self.config.stage_height = int(gtk.gdk.screen_height())
38
39 def destroy_callback(self, widget):
40 '''Handle the GTK destroy signal and close gracefully.'''
41
42=== modified file 'entertainerlib/gui/widgets/grid_menu.py'
43--- entertainerlib/gui/widgets/grid_menu.py 2010-01-03 22:55:22 +0000
44+++ entertainerlib/gui/widgets/grid_menu.py 2010-01-03 22:55:24 +0000
45@@ -61,8 +61,6 @@
46
47 # The moving_group is translated using a `BehaviourPath`.
48 self._moving_group_timeline = clutter.Timeline(200)
49- # XXX: laymansterms - Experiment with different functions, the one
50- # selected was just to get things working.
51 moving_group_alpha = clutter.Alpha(self._moving_group_timeline,
52 clutter.EASE_IN_OUT_SINE)
53 moving_group_path = clutter.Path()
54@@ -76,8 +74,6 @@
55 self._cursor_y = 0
56 self._cursor = None
57 self._cursor_timeline = clutter.Timeline(200)
58- # XXX: laymansterms - Experiment with different functions, the one
59- # selected was just to get things working.
60 cursor_alpha = clutter.Alpha(self._cursor_timeline,
61 clutter.EASE_IN_SINE)
62 cursor_path = clutter.Path()
63
64=== modified file 'entertainerlib/gui/widgets/image_menu.py'
65--- entertainerlib/gui/widgets/image_menu.py 2010-01-03 22:55:22 +0000
66+++ entertainerlib/gui/widgets/image_menu.py 2010-01-03 22:55:24 +0000
67@@ -122,8 +122,6 @@
68 pix_buffer = gtk.gdk.pixbuf_new_from_file(item[0])
69 texture = RoundedTexture(0.0, 0.0, 0.1, 0.25, pix_buffer)
70 else:
71- # XXX: laymansterms - something is fishy. Images aren't showing
72- # up using Clone. Must be related to the clutter warning.
73 texture = clutter.Clone(self.movie_default)
74
75 self.add_item(texture, item[1])
76@@ -148,8 +146,6 @@
77 if item[1].has_album_art():
78 texture = Texture(item[0])
79 else:
80- # XXX: laymansterms - something is fishy. Images aren't showing
81- # up using Clone. Must be related to the clutter warning.
82 texture = clutter.Clone(self.album_default)
83
84 self.add_item(texture, item[1])
85
86=== modified file 'entertainerlib/gui/widgets/menu_overlay.py'
87--- entertainerlib/gui/widgets/menu_overlay.py 2010-01-03 22:55:22 +0000
88+++ entertainerlib/gui/widgets/menu_overlay.py 2010-01-03 22:55:24 +0000
89@@ -18,8 +18,6 @@
90 """Initialize overlay texture."""
91 Texture.__init__(self, filename = theme.getImage("menu_overlay"))
92 self.timeline = clutter.Timeline(500)
93- # XXX: laymansterms - I don't know if this is the right function type.
94- # It needs to be played with.
95 self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
96 self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
97 self.behaviour.apply(self)
98
99=== modified file 'entertainerlib/gui/widgets/scroll_menu.py'
100--- entertainerlib/gui/widgets/scroll_menu.py 2010-01-03 22:55:22 +0000
101+++ entertainerlib/gui/widgets/scroll_menu.py 2010-01-03 22:55:24 +0000
102@@ -57,7 +57,6 @@
103 self._motion_handler = 0
104
105 self._timeline = clutter.Timeline(300)
106- # XXX: laymansterms - Play with different functions to get this right.
107 self._alpha = clutter.Alpha(self._timeline, clutter.EASE_IN_OUT_SINE)
108
109 # preparation to pointer events handling
110
111=== modified file 'entertainerlib/gui/widgets/volume_indicator.py'
112--- entertainerlib/gui/widgets/volume_indicator.py 2009-07-14 04:24:07 +0000
113+++ entertainerlib/gui/widgets/volume_indicator.py 2010-01-03 22:55:24 +0000
114@@ -18,7 +18,11 @@
115
116 theme = self.config.theme
117 filled = clutter.Texture(theme.getImage("volume_filled"))
118+ filled.hide()
119+ self.add(filled)
120 unfilled = clutter.Texture(theme.getImage("volume_unfilled"))
121+ unfilled.hide()
122+ self.add(unfilled)
123 volume = clutter.Texture(theme.getImage("volume"))
124 self.add(volume)
125
126@@ -27,8 +31,8 @@
127 bar_width = filled.get_width()
128
129 for i in range(20):
130- bar_filled = clutter.CloneTexture(filled)
131- bar_unfilled = clutter.CloneTexture(unfilled)
132+ bar_filled = clutter.Clone(filled)
133+ bar_unfilled = clutter.Clone(unfilled)
134 bar_filled.set_position(volume.get_width() + i * bar_width, 0)
135 bar_unfilled.set_position(volume.get_width() + i * bar_width, 0)
136 self.add(bar_filled)
137@@ -39,8 +43,8 @@
138 self.visible = False
139 self.set_opacity(0)
140
141- self.timeline = clutter.Timeline(13, 26)
142- self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
143+ self.timeline = clutter.Timeline(200)
144+ self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
145 self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
146 self.behaviour.apply(self)
147
148
149=== modified file 'entertainerlib/tests/test_arrowtexture.py'
150--- entertainerlib/tests/test_arrowtexture.py 2009-07-14 04:56:55 +0000
151+++ entertainerlib/tests/test_arrowtexture.py 2010-01-03 22:55:24 +0000
152@@ -22,5 +22,5 @@
153 def test_bounce(self):
154 '''Test the bounce method.'''
155 self.arrow.bounce()
156- self.assertTrue(self.arrow.timeline.is_playing())
157+ self.assertTrue(self.arrow.score.is_playing())
158

Subscribers

People subscribed via source and target branches