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

[Matt Layman]

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

[Matt Layman (mblayman)]

Branch 7 of clutter 1.0 transition.

[Matt Layman (mblayman)]

> 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.

[Francesco Marella (francesco-marella)]

Looks good to me. ;)

review: Approve

[lp:~mblayman/entertainer/clean-up-1.0]

418. By Matt Layman on 2010-01-03

Merge from future.

[Matt Layman (mblayman)]

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).

[Matt Layman (mblayman)]

I'm defaulting to Francesco's approval.

review: Approve

=== modified file 'entertainerlib/gui/user_interface.py'
--- entertainerlib/gui/user_interface.py	2010-01-03 22:55:21 +0000
+++ entertainerlib/gui/user_interface.py	2010-01-03 22:55:22 +0000
@@ -96,16 +96,14 @@
             self.config.stage_width, self.config.stage_height)
         self.stage.add(self.menu_overlay)
 
-        # XXX: laymansterms - Hide the volume indicator for now because it's
-        # blocking getting the main screen up and it's not critical.
-        #self.volume_indicator = VolumeIndicator()
-        #self.stage.add(self.volume_indicator)
-        #self.volume_indicator.connect('hiding',
-        #    self._on_volume_indicator_hiding)
-        #self.fade_screen_timeline = clutter.Timeline(13, 26)
-        #alpha = clutter.Alpha(self.fade_screen_timeline,
-        #    clutter.smoothstep_inc_func)
-        #self.fade_screen_behaviour = clutter.BehaviourOpacity(255, 0, alpha)
+        self.volume_indicator = VolumeIndicator()
+        self.stage.add(self.volume_indicator)
+        self.volume_indicator.connect('hiding',
+            self._on_volume_indicator_hiding)
+        self.fade_screen_timeline = clutter.Timeline(200)
+        alpha = clutter.Alpha(self.fade_screen_timeline,
+            clutter.EASE_IN_OUT_SINE)
+        self.fade_screen_behaviour = clutter.BehaviourOpacity(255, 0, alpha)
 
         # Transition object. Handles effects between screen changes.
         transition_factory = TransitionFactory(self._remove_from_stage)
@@ -186,9 +184,8 @@
         '''Set the window, stage, and config to fullscreen dimensions.'''
         self.window.fullscreen()
         self.stage.set_fullscreen(True)
-        width, height = self.stage.get_size()
-        self.config.stage_width = int(width)
-        self.config.stage_height = int(height)
+        self.config.stage_width = int(gtk.gdk.screen_width())
+        self.config.stage_height = int(gtk.gdk.screen_height())
 
     def destroy_callback(self, widget):
         '''Handle the GTK destroy signal and close gracefully.'''
 
=== modified file 'entertainerlib/gui/widgets/grid_menu.py'
--- entertainerlib/gui/widgets/grid_menu.py	2010-01-03 22:55:22 +0000
+++ entertainerlib/gui/widgets/grid_menu.py	2010-01-03 22:55:24 +0000
@@ -61,8 +61,6 @@
 
         # The moving_group is translated using a `BehaviourPath`.
         self._moving_group_timeline = clutter.Timeline(200)
-        # XXX: laymansterms - Experiment with different functions, the one
-        # selected was just to get things working.
         moving_group_alpha = clutter.Alpha(self._moving_group_timeline,
             clutter.EASE_IN_OUT_SINE)
         moving_group_path = clutter.Path()
@@ -76,8 +74,6 @@
         self._cursor_y = 0
         self._cursor = None
         self._cursor_timeline = clutter.Timeline(200)
-        # XXX: laymansterms - Experiment with different functions, the one
-        # selected was just to get things working.
         cursor_alpha = clutter.Alpha(self._cursor_timeline,
             clutter.EASE_IN_SINE)
         cursor_path = clutter.Path()
 
=== modified file 'entertainerlib/gui/widgets/image_menu.py'
--- entertainerlib/gui/widgets/image_menu.py	2010-01-03 22:55:22 +0000
+++ entertainerlib/gui/widgets/image_menu.py	2010-01-03 22:55:24 +0000
@@ -122,8 +122,6 @@
                 pix_buffer = gtk.gdk.pixbuf_new_from_file(item[0])
                 texture = RoundedTexture(0.0, 0.0, 0.1, 0.25, pix_buffer)
             else:
-                # XXX: laymansterms - something is fishy. Images aren't showing
-                # up using Clone. Must be related to the clutter warning.
                 texture = clutter.Clone(self.movie_default)
 
             self.add_item(texture, item[1])
@@ -148,8 +146,6 @@
             if item[1].has_album_art():
                 texture = Texture(item[0])
             else:
-                # XXX: laymansterms - something is fishy. Images aren't showing
-                # up using Clone. Must be related to the clutter warning.
                 texture = clutter.Clone(self.album_default)
 
             self.add_item(texture, item[1])
 
=== modified file 'entertainerlib/gui/widgets/menu_overlay.py'
--- entertainerlib/gui/widgets/menu_overlay.py	2010-01-03 22:55:22 +0000
+++ entertainerlib/gui/widgets/menu_overlay.py	2010-01-03 22:55:24 +0000
@@ -18,8 +18,6 @@
         """Initialize overlay texture."""
         Texture.__init__(self, filename = theme.getImage("menu_overlay"))
         self.timeline = clutter.Timeline(500)
-        # XXX: laymansterms - I don't know if this is the right function type.
-        # It needs to be played with.
         self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
         self.behaviour.apply(self)
 
=== modified file 'entertainerlib/gui/widgets/scroll_menu.py'
--- entertainerlib/gui/widgets/scroll_menu.py	2010-01-03 22:55:22 +0000
+++ entertainerlib/gui/widgets/scroll_menu.py	2010-01-03 22:55:24 +0000
@@ -57,7 +57,6 @@
         self._motion_handler = 0
 
         self._timeline = clutter.Timeline(300)
-        # XXX: laymansterms - Play with different functions to get this right.
         self._alpha = clutter.Alpha(self._timeline, clutter.EASE_IN_OUT_SINE)
 
         # preparation to pointer events handling
 
=== modified file 'entertainerlib/gui/widgets/volume_indicator.py'
--- entertainerlib/gui/widgets/volume_indicator.py	2009-07-14 04:24:07 +0000
+++ entertainerlib/gui/widgets/volume_indicator.py	2010-01-03 22:55:24 +0000
@@ -18,7 +18,11 @@
 
         theme = self.config.theme
         filled = clutter.Texture(theme.getImage("volume_filled"))
+        filled.hide()
+        self.add(filled)
         unfilled = clutter.Texture(theme.getImage("volume_unfilled"))
+        unfilled.hide()
+        self.add(unfilled)
         volume = clutter.Texture(theme.getImage("volume"))
         self.add(volume)
 
@@ -27,8 +31,8 @@
         bar_width = filled.get_width()
 
         for i in range(20):
-            bar_filled = clutter.CloneTexture(filled)
-            bar_unfilled = clutter.CloneTexture(unfilled)
+            bar_filled = clutter.Clone(filled)
+            bar_unfilled = clutter.Clone(unfilled)
             bar_filled.set_position(volume.get_width() + i * bar_width, 0)
             bar_unfilled.set_position(volume.get_width() + i * bar_width, 0)
             self.add(bar_filled)
@@ -39,8 +43,8 @@
         self.visible = False
         self.set_opacity(0)
 
-        self.timeline = clutter.Timeline(13, 26)
-        self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
+        self.timeline = clutter.Timeline(200)
+        self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = clutter.BehaviourOpacity(255, 0, self.alpha)
         self.behaviour.apply(self)
 
 
=== modified file 'entertainerlib/tests/test_arrowtexture.py'
--- entertainerlib/tests/test_arrowtexture.py	2009-07-14 04:56:55 +0000
+++ entertainerlib/tests/test_arrowtexture.py	2010-01-03 22:55:24 +0000
@@ -22,5 +22,5 @@
     def test_bounce(self):
         '''Test the bounce method.'''
         self.arrow.bounce()
-        self.assertTrue(self.arrow.timeline.is_playing())
+        self.assertTrue(self.arrow.score.is_playing())