Aplying tray

2 files changed, 22 insertions, 25 deletions

diff --git a/activity.py b/activity.py
index b30a01b..c8d765c 100644
--- a/activity.py
+++ b/activity.py
@@ -37,9 +37,9 @@ from gettext import gettext as _
 from StringIO import StringIO
 
 import animation
-from frames_list import FramesList
+from frames_tray import FramesTray
 from toolbars import AnimateToolbarBox
-from toolbars import FramesToolbar
+#from toolbars import FramesToolbar
 
 
 class AnimateActivity(activity.Activity):
@@ -54,33 +54,30 @@ class AnimateActivity(activity.Activity):
         self.set_toolbar_box(self._toolbarbox)
         self._toolbarbox.show_all()
 
-        canvas = gtk.HBox()
+        canvas = gtk.EventBox()
 
         self._animation = None
         self._animation_frames = []
         self.animation_mode = animation.MODE_RETURN
         self.modes_buttons = self._toolbarbox.modes_buttons
 
-        self._frames_list = FramesList()
-        self._frames_list.connect("current-frame-changed",
-                                  self._current_frame_changed_cb)
-        self._frames_list.connect("move", self._move_cb)
-        self._frames_list.connect('get-current-frame',
-                                lambda w: self._animation.get_current_frame())
-        self._frames_list.show()
-
-        vbox = gtk.VBox()
-        vbox.pack_start(self._frames_list, True, True, 0)
-
-        self._frames_toolbar = FramesToolbar()
-        self._frames_toolbar.connect('go-up', self._frames_list.move_up)
-        self._frames_toolbar.connect('go-down', self._frames_list.move_down)
-        vbox.pack_end(self._frames_toolbar, False, True, 0)
-        canvas.pack_end(vbox, False, True, 0)
+        self._frames_tray = FramesTray()
+#        self._frames_tray.connect("current-frame-changed",
+#                                  self._current_frame_changed_cb)
+#        self._frames_tray.connect("move", self._move_cb)
+#        self._frames_tray.connect('get-current-frame',
+#                                lambda w: self._animation.get_current_frame())
+        self._frames_tray.show()
+        self.set_tray(self._frames_tray, gtk.POS_BOTTOM)
+
+#        self._frames_toolbar = FramesToolbar()
+#        self._frames_toolbar.connect('go-up', self._frames_list.move_up)
+#        self._frames_toolbar.connect('go-down', self._frames_list.move_down)
+#        vbox.pack_end(self._frames_toolbar, False, True, 0)
+#        canvas.pack_end(vbox, False, True, 0)
 
         canvas.connect("expose-event", self.__canvas_expose_cb)
         canvas.show()
-        vbox.show_all()
         self.set_canvas(canvas)
 
         self.show()
@@ -203,7 +200,7 @@ class AnimateActivity(activity.Activity):
                                     self._frames_toolbar.set_buttons_sensitive)
             for pixbuf in self._animation_frames:
                 self._animation.add_frame(pixbuf)
-                self._frames_list.add_frame(pixbuf)
+                self._frames_tray.add_frame(pixbuf)
             self._animation.set_fps(self._toolbarbox.get_fps())
             self._animation.connect("current-frame-updated",
                                     self._current_frame_updated_cb)
@@ -211,7 +208,7 @@ class AnimateActivity(activity.Activity):
 
             del self._animation_mode
 
-            canvas.pack_start(self._animation, True, True, 0)
+            canvas.add(self._animation)
 
     def _current_frame_updated_cb(self, widget, index):
         if widget.frames_reverse:
@@ -220,13 +217,13 @@ class AnimateActivity(activity.Activity):
         return index
 
     def _view_fullscreen(self, widget):
-        self._frames_list.hide()
+        self._frames_try.hide()
         self._animation.set_size(gtk.gdk.screen_width(),
                                  gtk.gdk.screen_height())
         activity.Activity.fullscreen(self)
 
     def unfullscreen(self):
-        self._frames_list.show()
+        self._framestray.show()
         width, height = self._get_animation_size()
         self._animation.set_size(width, height)
 
diff --git a/frames_tray.py b/frames_tray.py
index ef0b2bb..621e20b 100644
--- a/frames_tray.py
+++ b/frames_tray.py
@@ -22,7 +22,7 @@
 # MA 02110-1301, USA.
 
 import gtk
-from sugar.grapihcs.tray import HTray
+from sugar.graphics.tray import HTray
 
 
 class FramesTray(HTray):