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

[Matt Layman]

All music screens have been fixed for clutter 1.0.

[Matt Layman (mblayman)]

Branch 4 of clutter 1.0 transition.

=== modified file 'entertainerlib/client/media_player.py'
--- entertainerlib/client/media_player.py	2009-06-30 01:06:01 +0000
+++ entertainerlib/client/media_player.py	2009-12-22 03:13:15 +0000
@@ -105,7 +105,9 @@
                 self.next()
         elif message.type == gst.MESSAGE_ERROR:
             self.video_texture.set_playing(False)
-            self.video_texture.set_property("position", 0)
+            # XXX: laymansterms - I don't know the implications of removing the
+            # position property.
+            #self.video_texture.set_property("position", 0)
             err, debug = message.parse_error()
             self.logger.error("Error: %(err)s, %(debug)s" % \
                 {'err': err, 'debug': debug})
@@ -167,7 +169,9 @@
             or self.media.get_type() == Playable.VIDEO_STREAM:
             self.video_texture.set_playing(False)
             self.video_texture.set_uri(playable.get_uri())
-            self.video_texture.set_property("position", 0)
+            # XXX: laymansterms - I don't know the implications of removing the
+            # position property.
+            #self.video_texture.set_property("position", 0)
 
     def get_media(self):
         '''Get URI of the current media stream.'''
@@ -248,7 +252,9 @@
             self.stage.set_color(self.bgcolor)
             self.stage.remove(self.video_texture)
         self.video_texture.set_playing(False)
-        self.video_texture.set_property("position", 0)
+        # XXX: laymansterms - I don't know the implications of removing the
+        # position property.
+        #self.video_texture.set_property("position", 0)
         self.emit('stop')
 
         if self._internal_callback_timeout_key is not None:
 
=== modified file 'entertainerlib/gui/screens/factory.py'
--- entertainerlib/gui/screens/factory.py	2009-12-22 03:13:15 +0000
+++ entertainerlib/gui/screens/factory.py	2009-12-22 03:13:15 +0000
@@ -3,15 +3,15 @@
 
 # XXX: laymansterms - comment out most of the imports to control how much of
 # clutter needs to be converted
-#from entertainerlib.gui.screens.artist import Artist
-#from entertainerlib.gui.screens.album import Album
-#from entertainerlib.gui.screens.audio_play import AudioPlay
+from entertainerlib.gui.screens.artist import Artist
+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.main import Main
 #from entertainerlib.gui.screens.movie import Movie
-#from entertainerlib.gui.screens.music import Music
+from entertainerlib.gui.screens.music import Music
 #from entertainerlib.gui.screens.photo import Photo
 #from entertainerlib.gui.screens.photo_albums import PhotoAlbums
 #from entertainerlib.gui.screens.photographs import Photographs
 
=== modified file 'entertainerlib/gui/tabs/albums_tab.py'
--- entertainerlib/gui/tabs/albums_tab.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/tabs/albums_tab.py	2009-12-22 03:13:15 +0000
@@ -54,11 +54,13 @@
         # Create album information (displays current menuitem information)
         self.album_title = Label(0.045, "title", 0.22, 0.79, "")
         self.album_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.album_title.set_line_wrap(False)
         self.album_title.width = 0.366
         self.add(self.album_title)
 
         self.album_artist = Label(0.037, "subtitle", 0.22, 0.86, "")
         self.album_artist.set_ellipsize(pango.ELLIPSIZE_END)
+        self.album_artist.set_line_wrap(False)
         self.album_artist.width = 0.366
         self.add(self.album_artist)
 
 
=== modified file 'entertainerlib/gui/tabs/artists_tab.py'
--- entertainerlib/gui/tabs/artists_tab.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/tabs/artists_tab.py	2009-12-22 03:13:15 +0000
@@ -37,6 +37,7 @@
         # Create artist label
         self.artist_title = Label(0.0416, "title", 0.22, 0.794, "")
         self.artist_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.artist_title.set_line_wrap(False)
         self.artist_title.width = 0.366
         self.add(self.artist_title)
 
@@ -46,7 +47,7 @@
         self.artist_tracks = Label(0.0365, "subtitle", 0.22, 0.911, "")
         self.add(self.artist_tracks)
 
-        # Create artis menu list indicator
+        # Create artist menu list indicator
         self.li = ListIndicator(0.77, 0.8, 0.18, 0.045,
             ListIndicator.VERTICAL)
         self.li.set_maximum(len(artists))
 
=== modified file 'entertainerlib/gui/tabs/tab.py'
--- entertainerlib/gui/tabs/tab.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/tabs/tab.py	2009-12-22 03:13:15 +0000
@@ -39,9 +39,9 @@
         }
 
         # show/hide animation on the Tab
-        self.timeline = clutter.Timeline(30, 60)
+        self.timeline = clutter.Timeline(500)
         self.timeline.connect('completed', self._on_timeline_completed)
-        self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
+        self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = clutter.BehaviourOpacity(0, 255, self.alpha)
         self.behaviour.apply(self)
 
 
=== modified file 'entertainerlib/gui/tabs/tracks_tab.py'
--- entertainerlib/gui/tabs/tracks_tab.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/tabs/tracks_tab.py	2009-12-22 03:13:15 +0000
@@ -34,11 +34,13 @@
 
         self.track_title = Label(0.045, "title", 0.22, 0.79, "")
         self.track_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.track_title.set_line_wrap(False)
         self.track_title.width = 0.366
         self.add(self.track_title)
 
         self.track_number = Label(0.037, "subtitle", 0.22, 0.86, "")
         self.track_number.set_ellipsize(pango.ELLIPSIZE_END)
+        self.track_number.set_line_wrap(False)
         self.track_number.width = 0.366
         self.add(self.track_number)
 
 
=== modified file 'entertainerlib/gui/widgets/image_menu.py'
--- entertainerlib/gui/widgets/image_menu.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/widgets/image_menu.py	2009-12-22 03:13:15 +0000
@@ -72,9 +72,13 @@
         pix_buffer = gtk.gdk.pixbuf_new_from_file(
             self.config.theme.getImage("default_movie_art"))
         self.movie_default = RoundedTexture(0.0, 0.0, 0.1, 0.25, pix_buffer)
+        self.movie_default.hide()
+        self.add(self.movie_default)
 
         self.album_default = Texture(
             self.config.theme.getImage("default_album_art"))
+        self.album_default.hide()
+        self.add(self.album_default)
 
     def add_item(self, texture, data):
         """Add a ImageMenuItem from a Texture."""
@@ -118,7 +122,9 @@
                 pix_buffer = gtk.gdk.pixbuf_new_from_file(item[0])
                 texture = RoundedTexture(0.0, 0.0, 0.1, 0.25, pix_buffer)
             else:
-                texture = clutter.CloneTexture(self.movie_default)
+                # 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])
 
@@ -142,7 +148,9 @@
             if item[1].has_album_art():
                 texture = Texture(item[0])
             else:
-                texture = clutter.CloneTexture(self.album_default)
+                # 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/loading_animation.py'
--- entertainerlib/gui/widgets/loading_animation.py	2009-07-12 17:02:32 +0000
+++ entertainerlib/gui/widgets/loading_animation.py	2009-12-22 03:13:16 +0000
@@ -5,12 +5,11 @@
 import cairo
 import clutter
 import gobject
-from cluttercairo import CairoTexture
 
 from entertainerlib.gui.widgets.base import Base
 
 
-class LoadingAnimation(Base, CairoTexture):
+class LoadingAnimation(Base, clutter.CairoTexture):
     """
     Loading animation widget
 
@@ -23,7 +22,7 @@
 
         abs_size = self.get_abs_x(size)
 
-        CairoTexture.__init__(self, abs_size, abs_size)
+        clutter.CairoTexture.__init__(self, abs_size, abs_size)
 
         self.set_anchor_point(abs_size / 2, abs_size / 2)
 
@@ -83,11 +82,9 @@
         return self.keep_going
 
     def hide(self):
-        """
-        Hide throbber smoothly and stop animation.
-        """
-        timeline = clutter.Timeline(35, 26)
-        alpha = clutter.Alpha(timeline, clutter.smoothstep_inc_func)
+        '''Hide throbber smoothly and stop animation.'''
+        timeline = clutter.Timeline(2000)
+        alpha = clutter.Alpha(timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = clutter.BehaviourOpacity(255, 0, alpha)
         self.behaviour.apply(self)
         timeline.start()
@@ -100,14 +97,12 @@
             return True
         else:
             self.keep_going = False
-            CairoTexture.hide(self)
+            clutter.CairoTexture.hide(self)
             return False
 
     def show(self):
-        """
-        Show throbber and activate animation
-        """
+        '''Show throbber and activate animation.'''
         self.keep_going = True
         gobject.timeout_add(50, self._rotate_throbber)
-        CairoTexture.show(self)
+        clutter.CairoTexture.show(self)
 
 
=== modified file 'entertainerlib/gui/widgets/progress_bar.py'
--- entertainerlib/gui/widgets/progress_bar.py	2009-06-30 01:06:01 +0000
+++ entertainerlib/gui/widgets/progress_bar.py	2009-12-22 03:13:16 +0000
@@ -5,7 +5,6 @@
 import math
 
 import clutter
-from cluttercairo import CairoTexture
 
 from entertainerlib.gui.widgets.base import Base
 from entertainerlib.gui.widgets.label import Label
@@ -36,12 +35,12 @@
         self._color = self._color_to_cairo_color(
             self.config.theme.get_color(color))
 
-        self._background = CairoTexture(self.bar_width, self.height)
+        self._background = clutter.CairoTexture(self.bar_width, self.height)
         self._draw_background()
         self._background.set_position(self.bar_x, 0)
         self.add(self._background)
 
-        self._foreground = CairoTexture(self.height, self.height)
+        self._foreground = clutter.CairoTexture(self.height, self.height)
         self._foreground.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
         self._draw_foreground()
         self._foreground.set_position(self.bar_x, 0)
@@ -59,8 +58,8 @@
         self._hide_timeout_key = None
         self.auto_display = False
         self._visible = None
-        self._timeline = clutter.Timeline(30, 60)
-        self._alpha = clutter.Alpha(self._timeline, clutter.smoothstep_inc_func)
+        self._timeline = clutter.Timeline(500)
+        self._alpha = clutter.Alpha(self._timeline, clutter.EASE_IN_OUT_SINE)
         self._behaviour = clutter.BehaviourOpacity(0, 255, self._alpha)
         self._behaviour.apply(self)
 
 
=== modified file 'entertainerlib/gui/widgets/reflection_texture.py'
--- entertainerlib/gui/widgets/reflection_texture.py	2009-07-12 17:02:32 +0000
+++ entertainerlib/gui/widgets/reflection_texture.py	2009-12-22 03:13:16 +0000
@@ -4,12 +4,11 @@
 import gtk
 import cairo
 import clutter
-from cluttercairo import CairoTexture
 
 from entertainerlib.gui.widgets.base import Base
 
 
-class ReflectionTexture(Base, CairoTexture):
+class ReflectionTexture(Base, clutter.CairoTexture):
     """
     Reflection texture
 
@@ -24,7 +23,7 @@
         abs_width = self.get_abs_x(width)
         abs_height = self.get_abs_y(height)
 
-        CairoTexture.__init__(self, abs_width, abs_height)
+        clutter.CairoTexture.__init__(self, abs_width, abs_height)
 
         context = self.cairo_create()
         ct = gtk.gdk.CairoContext(context)
 
=== modified file 'entertainerlib/gui/widgets/rounded_texture.py'
--- entertainerlib/gui/widgets/rounded_texture.py	2009-07-12 17:02:32 +0000
+++ entertainerlib/gui/widgets/rounded_texture.py	2009-12-22 03:13:16 +0000
@@ -1,13 +1,13 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Cairo based texture that rounds corners'''
 
-from cluttercairo import CairoTexture
+import clutter
 import gtk
 
 from entertainerlib.gui.widgets.base import Base
 
 
-class RoundedTexture(Base, CairoTexture):
+class RoundedTexture(Base, clutter.CairoTexture):
     """
     Texture with rounded corners
 
@@ -21,7 +21,7 @@
         abs_width = self.get_abs_x(width)
         abs_height = self.get_abs_y(height)
 
-        CairoTexture.__init__(self, abs_width, abs_height)
+        clutter.CairoTexture.__init__(self, abs_width, abs_height)
 
         context = self.cairo_create()
         ct = gtk.gdk.CairoContext(context)
 
=== modified file 'entertainerlib/gui/widgets/special_behaviours.py'
--- entertainerlib/gui/widgets/special_behaviours.py	2009-12-22 03:13:15 +0000
+++ entertainerlib/gui/widgets/special_behaviours.py	2009-12-22 03:13:16 +0000
@@ -25,9 +25,6 @@
         alpha = MAX_ALPHA positioned at end_index
         """
         raw_index = alpha_value * (self.end_index - self.start_index)
-        # XXX: laymansterms - alpha seems to be 1.0 now so MAX_ALPHA doesn't
-        # seem to do anything anymore
-        #raw_index /= clutter.MAX_ALPHA
         raw_index += self.start_index
 
         # we rescale the raw_index to be inside [0, 1[
@@ -66,9 +63,6 @@
     def do_alpha_notify(self, alpha_value):
         """Alpha function changing the `font-size` property of Labels."""
         size = alpha_value * (self.end_size - self.start_size)
-        # XXX: laymansterms - alpha seems to be 1.0 now so MAX_ALPHA doesn't
-        # seem to do anything anymore
-        #size /= clutter.MAX_ALPHA
         size += self.start_size
 
         for actor in self.get_actors():
 
=== modified file 'entertainerlib/gui/widgets/tab_group.py'
--- entertainerlib/gui/widgets/tab_group.py	2009-08-16 21:27:15 +0000
+++ entertainerlib/gui/widgets/tab_group.py	2009-12-22 03:13:16 +0000
@@ -113,8 +113,8 @@
         tab_title.set_reactive(True)
         tab_title.connect('button-press-event', self._on_tab_title_button_press)
 
-        timeline = clutter.Timeline(25, 60)
-        alpha = clutter.Alpha(timeline, clutter.smoothstep_inc_func)
+        timeline = clutter.Timeline(500)
+        alpha = clutter.Alpha(timeline, clutter.EASE_IN_OUT_SINE)
         behaviour = clutter.BehaviourOpacity(255, 96, alpha)
         behaviour.apply(tab_title)
         self.timelines.append((timeline, alpha, behaviour))
 
=== modified file 'entertainerlib/gui/widgets/text_menu.py'
--- entertainerlib/gui/widgets/text_menu.py	2009-12-22 03:13:15 +0000
+++ entertainerlib/gui/widgets/text_menu.py	2009-12-22 03:13:16 +0000
@@ -98,21 +98,20 @@
         TextMenuItem.__init__(self, width, height, text, extra_text)
 
         self.move_anchor_point_from_gravity(clutter.GRAVITY_WEST)
-        self.font_size = 0.025
+        self.font_size = 0.03
         self.update()
 
-        self.timeline = clutter.Timeline(500)
-        # XXX: laymansterms - play with different functions to make sure this
-        # is the correct one
+        self.timeline = clutter.Timeline(200)
         alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = FontSizeBehaviour(alpha)
         self.behaviour.apply(self)
 
     def animate_in(self):
         """Set labels font-size and color when an item gets selected."""
-        self.timeline.stop()
-        self.font_size = 0.05
+        self.behaviour.start_size = 0.03
+        self.behaviour.end_size = 0.05
         self.color = "menuitem_active"
+        self.timeline.start()
         self.update()
 
     def animate_out(self):
@@ -120,7 +119,7 @@
         self.color = "menuitem_inactive"
         self.update()
         self.behaviour.start_size = 0.05
-        self.behaviour.end_size = 0.025
+        self.behaviour.end_size = 0.03
         self.timeline.start()