ClipboardBox to ClipboardTray. Make it a VTray instead of hippo.CanvasBox.

3 files changed, 14 insertions, 18 deletions

diff --git a/src/view/frame/Makefile.am b/src/view/frame/Makefile.am
index 02951b9..9bf5952 100644
--- a/src/view/frame/Makefile.am
+++ b/src/view/frame/Makefile.am
@@ -3,8 +3,8 @@ sugar_PYTHON =				\
 	__init__.py			\
 	activitiestray.py		\
 	activitybutton.py		\
-	clipboardbox.py			\
 	clipboardpanelwindow.py		\
+	clipboardtray.py		\
 	frameinvoker.py			\
 	friendstray.py			\
 	eventarea.py			\
diff --git a/src/view/frame/clipboardpanelwindow.py b/src/view/frame/clipboardpanelwindow.py
index e579b8c..04e7408 100644
--- a/src/view/frame/clipboardpanelwindow.py
+++ b/src/view/frame/clipboardpanelwindow.py
@@ -21,7 +21,7 @@ import gtk
 import hippo
 
 from view.frame.framewindow import FrameWindow
-from view.frame.clipboardbox import ClipboardBox
+from view.frame.clipboardtray import ClipboardTray
 from sugar.clipboard import clipboardservice
 from sugar import util
 
@@ -37,20 +37,21 @@ class ClipboardPanelWindow(FrameWindow):
         self._clipboard = gtk.Clipboard()
         self._clipboard.connect("owner-change", self._owner_change_cb)
 
-        self._clipboard_box = ClipboardBox()
-        self.append(self._clipboard_box, hippo.PACK_EXPAND)
+        self._clipboard_tray = ClipboardTray()
+        canvas_widget = hippo.CanvasWidget(widget=self._clipboard_tray)
+        self.append(canvas_widget, hippo.PACK_EXPAND)
 
         # Receiving dnd drops
         self.drag_dest_set(0, [], 0)
-        self.connect("drag_motion", self._clipboard_box.drag_motion_cb)
-        self.connect("drag_drop", self._clipboard_box.drag_drop_cb)
+        self.connect("drag_motion", self._clipboard_tray.drag_motion_cb)
+        self.connect("drag_drop", self._clipboard_tray.drag_drop_cb)
         self.connect("drag_data_received",
-                     self._clipboard_box.drag_data_received_cb)
+                     self._clipboard_tray.drag_data_received_cb)
 
     def _owner_change_cb(self, clipboard, event):
         logging.debug("owner_change_cb")
 
-        if self._clipboard_box.owns_clipboard():
+        if self._clipboard_tray.owns_clipboard():
             return
 
         cb_service = clipboardservice.get_instance()
diff --git a/src/view/frame/clipboardbox.py b/src/view/frame/clipboardtray.py
index 7702759..a9e6d34 100644
--- a/src/view/frame/clipboardbox.py
+++ b/src/view/frame/clipboardtray.py
@@ -18,7 +18,6 @@ import os
 import logging
 import tempfile
 
-import hippo
 import gtk
  
 from sugar import util
@@ -57,19 +56,15 @@ class _ContextMap:
     def has_context(self, context):
         return context in self._context_map
  
-class ClipboardBox(hippo.CanvasBox):
+class ClipboardTray(VTray):
     
     MAX_ITEMS = gtk.gdk.screen_height() / style.GRID_CELL_SIZE - 2
     
     def __init__(self):
-        hippo.CanvasBox.__init__(self)
+        VTray.__init__(self)
         self._icons = {}
         self._context_map = _ContextMap()
 
-        self._tray = VTray()
-        self.append(hippo.CanvasWidget(widget=self._tray), hippo.PACK_EXPAND)
-        self._tray.show()
-
         cb_service = clipboardservice.get_instance()
         cb_service.connect('object-added', self._object_added_cb)
         cb_service.connect('object-deleted', self._object_deleted_cb)
@@ -109,11 +104,11 @@ class ClipboardBox(hippo.CanvasBox):
             group = None
 
         icon = ClipboardIcon(object_id, name, group)
-        self._tray.add_item(icon, 0)
+        self.add_item(icon, 0)
         icon.show()
         self._icons[object_id] = icon
 
-        objects_to_delete = self._tray.get_children()[ClipboardBox.MAX_ITEMS:]
+        objects_to_delete = self.get_children()[ClipboardBox.MAX_ITEMS:]
         for icon in objects_to_delete:
             logging.debug('ClipboardBox: deleting surplus object')
             cb_service = clipboardservice.get_instance()
@@ -123,7 +118,7 @@ class ClipboardBox(hippo.CanvasBox):
 
     def _object_deleted_cb(self, cb_service, object_id):
         icon = self._icons[object_id]
-        self._tray.remove_item(icon)
+        self.remove_item(icon)
         del self._icons[object_id]
         logging.debug('ClipboardBox: ' + object_id + ' was deleted.')