Merge lp:~mblayman/entertainer/text-menu-1.0 into lp:entertainer/future

[Matt Layman]

All TextMenu widget problems have been fixed to work with clutter 1.0.

[Matt Layman (mblayman)]

Branch 2 of clutter 1.0 transition.

=== modified file 'entertainerlib/gui/widgets/grid_menu.py'
--- entertainerlib/gui/widgets/grid_menu.py	2009-12-22 03:12:16 +0000
+++ entertainerlib/gui/widgets/grid_menu.py	2009-12-22 03:12:17 +0000
@@ -432,14 +432,14 @@
         if (x, y) == (self._cursor_x, self._cursor_y):
             return
 
-        self._cursor_behaviour.clear()
-
-        start_knot = (self._cursor_x * self._item_width_abs + self._dx,
+        path = clutter.Path()
+        path.add_move_to(
+            self._cursor_x * self._item_width_abs + self._dx,
             self._cursor_y * self._item_height_abs + self._dy)
-        stop_knot = (x * self._item_width_abs + self._dx,
+        path.add_line_to(
+            x * self._item_width_abs + self._dx,
             y * self._item_height_abs + self._dy)
-
-        self._cursor_behaviour.append_knots(start_knot, stop_knot)
+        self._cursor_behaviour.set_path(path)
 
         self._cursor_x, self._cursor_y = x, y
         self._cursor_timeline.set_duration(duration)

=== modified file 'entertainerlib/gui/widgets/selector.py'
--- entertainerlib/gui/widgets/selector.py	2009-12-22 03:12:16 +0000
+++ entertainerlib/gui/widgets/selector.py	2009-12-22 03:12:17 +0000
@@ -27,13 +27,21 @@
         self.add(self.glow)
 
         # Animate selector (Glow effect with glow overlay texture)
-        # XXX: laymansterms - play with the time length to find what will work.
-        self.timeline = clutter.Timeline(500)
-        self.timeline.set_loop(True)
-        # XXX: laymansterms - try different functions to see what fits best.
-        self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
-        self.behaviour = clutter.BehaviourOpacity(0, 255, self.alpha)
-        self.behaviour.apply(self.glow)
+        self.in_time = clutter.Timeline(1500)
+        self.in_alpha = clutter.Alpha(self.in_time, clutter.EASE_IN_OUT_SINE)
+        self.in_behaviour = clutter.BehaviourOpacity(0, 255, self.in_alpha)
+        self.in_behaviour.apply(self.glow)
+
+        self.out_time = clutter.Timeline(1500)
+        self.out_alpha = clutter.Alpha(self.out_time, clutter.EASE_IN_OUT_SINE)
+        self.out_behaviour = clutter.BehaviourOpacity(255, 0, self.out_alpha)
+        self.out_behaviour.apply(self.glow)
+
+        self.score = clutter.Score()
+        self.score.set_loop(True)
+        self.score.append(timeline=self.in_time)
+        # Link the out Timeline so that there is a smooth fade out.
+        self.score.append(timeline=self.out_time, parent=self.in_time)
 
     def set_size(self, width, height):
         """Overrides clutter.Actor.set_size()"""
@@ -42,12 +50,12 @@
 
     def stop_animation(self):
         """Stop selector animation"""
-        self.timeline.stop()
+        self.score.stop()
         self.glow.set_opacity(0)
 
     def start_animation(self):
         """Start selector animation"""
-        self.timeline.start()
+        self.score.start()
 
     def hide(self):
         """Overrides clutter.Actor.hide()"""

=== modified file 'entertainerlib/gui/widgets/text_menu.py'
--- entertainerlib/gui/widgets/text_menu.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/widgets/text_menu.py	2009-12-22 03:12:17 +0000
@@ -71,6 +71,7 @@
         self.label.font_size = self.font_size
         self.label.set_text(first_line)
         self.label.position = (0.01, (self.height - self.label.height) / 2)
+        self.label.set_line_wrap(False)
         self.label.set_ellipsize(pango.ELLIPSIZE_END)
 
         # Set extra text
@@ -100,8 +101,10 @@
         self.font_size = 0.025
         self.update()
 
-        self.timeline = clutter.Timeline(fps=100, duration=500)
-        alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
+        self.timeline = clutter.Timeline(500)
+        # XXX: laymansterms - play with different functions to make sure this
+        # is the correct one
+        alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = FontSizeBehaviour(alpha)
         self.behaviour.apply(self)