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

[Matt Layman]

All screens related to RSS have been fixed for clutter 1.0

[Matt Layman (mblayman)]

Branch 3 of clutter 1.0 transition.

=== modified file 'entertainerlib/gui/screens/factory.py'
--- entertainerlib/gui/screens/factory.py	2009-12-22 03:13:11 +0000
+++ entertainerlib/gui/screens/factory.py	2009-12-22 03:13:12 +0000
@@ -7,8 +7,8 @@
 #from entertainerlib.gui.screens.album import Album
 #from entertainerlib.gui.screens.audio_play import AudioPlay
 #from entertainerlib.gui.screens.disc import Disc
-#from entertainerlib.gui.screens.feed import Feed
-#from entertainerlib.gui.screens.feed_entry import FeedEntry
+from entertainerlib.gui.screens.feed import Feed
+from entertainerlib.gui.screens.feed_entry import FeedEntry
 from entertainerlib.gui.screens.main import Main
 #from entertainerlib.gui.screens.movie import Movie
 #from entertainerlib.gui.screens.music import Music
@@ -16,12 +16,12 @@
 #from entertainerlib.gui.screens.photo_albums import PhotoAlbums
 #from entertainerlib.gui.screens.photographs import Photographs
 from entertainerlib.gui.screens.question import Question
-#from entertainerlib.gui.screens.rss import Rss
+from entertainerlib.gui.screens.rss import Rss
 #from entertainerlib.gui.screens.tv_episodes import TvEpisodes
 #from entertainerlib.gui.screens.tv_series import TvSeries
 #from entertainerlib.gui.screens.video import Video
 #from entertainerlib.gui.screens.video_osd import VideoOSD
-#from entertainerlib.gui.screens.weather import WeatherScreen
+from entertainerlib.gui.screens.weather import WeatherScreen
 
 
 class ScreenFactory(object):
 
=== modified file 'entertainerlib/gui/widgets/arrow_texture.py'
--- entertainerlib/gui/widgets/arrow_texture.py	2009-07-12 17:02:32 +0000
+++ entertainerlib/gui/widgets/arrow_texture.py	2009-12-22 03:13:12 +0000
@@ -2,12 +2,11 @@
 '''Displays text in rounded rectangle box'''
 
 import clutter
-from cluttercairo import CairoTexture
 
 from entertainerlib.gui.widgets.base import Base
 
 
-class ArrowTexture(Base, CairoTexture):
+class ArrowTexture(Base, clutter.CairoTexture):
     """Clutter CairoTexture which represents an arrow."""
 
     # Arrow direction (One of these should be passed as a paramter)
@@ -22,7 +21,7 @@
 
         abs_size = self.get_abs_x(size)
 
-        CairoTexture.__init__(self, abs_size, abs_size)
+        clutter.CairoTexture.__init__(self, abs_size, abs_size)
 
         context = self.cairo_create()
         context.scale(abs_size, abs_size)
@@ -64,20 +63,29 @@
         del(context) # Updates texture
 
         # Create bounce effect
-        self.timeline = clutter.Timeline(30)
-        self.alpha = clutter.Alpha(self.timeline, clutter.sine_func)
         self.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
-        self.behaviour = clutter.BehaviourScale(1.0, 1.0, 1.5, 1.5, self.alpha)
-        self.behaviour.apply(self)
+
+        in_time = clutter.Timeline(300)
+        in_alpha = clutter.Alpha(in_time, clutter.EASE_OUT_SINE)
+        self.in_behaviour = clutter.BehaviourScale(1.0, 1.0, 1.5, 1.5, in_alpha)
+        self.in_behaviour.apply(self)
+
+        out_time = clutter.Timeline(300)
+        out_alpha = clutter.Alpha(out_time, clutter.EASE_OUT_SINE)
+        self.out_behaviour = clutter.BehaviourScale(1.5, 1.5, 1.0, 1.0,
+            out_alpha)
+        self.out_behaviour.apply(self)
+
+        self.score = clutter.Score()
+        self.score.append(timeline=in_time)
+        self.score.append(timeline=out_time, parent=in_time)
 
         self.set_position(self.get_abs_x(x), self.get_abs_y(y))
 
     def bounce(self):
-        """
-        Execute bounce effect for this array.
-        """
-        if not self.timeline.is_playing():
-            self.timeline.start()
+        """Execute bounce effect for this array."""
+        if not self.score.is_playing():
+            self.score.start()
 
     def _color_to_cairo_color(self, color):
         """
 
=== modified file 'entertainerlib/gui/widgets/grid_menu.py'
--- entertainerlib/gui/widgets/grid_menu.py	2009-12-22 03:13:11 +0000
+++ entertainerlib/gui/widgets/grid_menu.py	2009-12-22 03:13:12 +0000
@@ -411,14 +411,14 @@
         if (x, y) == (self._moving_group_x, self._moving_group_y):
             return
 
-        self._moving_group_behaviour.clear()
-
-        start_knot = (self._moving_group_x * self._item_width_abs,
+        path = clutter.Path()
+        path.add_move_to(
+            self._moving_group_x * self._item_width_abs,
             self._moving_group_y * self._item_height_abs)
-        stop_knot = (x * self._item_width_abs,
+        path.add_line_to(
+            x * self._item_width_abs,
             y * self._item_height_abs)
-
-        self._moving_group_behaviour.append_knots(start_knot, stop_knot)
+        self._moving_group_behaviour.set_path(path)
 
         self._moving_group_x, self._moving_group_y = x, y
         self._moving_group_timeline.set_duration(duration)
 
=== modified file 'entertainerlib/gui/widgets/scroll_area.py'
--- entertainerlib/gui/widgets/scroll_area.py	2009-08-04 01:09:03 +0000
+++ entertainerlib/gui/widgets/scroll_area.py	2009-12-22 03:13:12 +0000
@@ -53,11 +53,11 @@
         self.add(self._fixed_group)
         self.content = None
 
-        self._motion_timeline = clutter.Timeline(fps=200, duration=500)
+        self._motion_timeline = clutter.Timeline(500)
         self._motion_timeline.connect('completed',
             self._motion_timeline_callback, None)
         self._motion_alpha = clutter.Alpha(self._motion_timeline,
-            clutter.sine_inc_func)
+            clutter.EASE_OUT_SINE)
         self._motion_behaviour = LoopedPathBehaviour(self._motion_alpha)
 
         self.set_content(content)