#7015 Add proper alignment support to the "tray" control

2 files changed, 6 insertions, 7 deletions

diff --git a/src/view/frame/clipboardtray.py b/src/view/frame/clipboardtray.py
index 0a2e8b4..b5ba093 100644
--- a/src/view/frame/clipboardtray.py
+++ b/src/view/frame/clipboardtray.py
@@ -22,7 +22,7 @@ import gtk
  
 from sugar import util
 from sugar.clipboard import clipboardservice
-from sugar.graphics.tray import VTray
+from sugar.graphics import tray
 from sugar.graphics import style
 
 from view.clipboardicon import ClipboardIcon
@@ -56,12 +56,12 @@ class _ContextMap:
     def has_context(self, context):
         return context in self._context_map
  
-class ClipboardTray(VTray):
+class ClipboardTray(tray.VTray):
     
     MAX_ITEMS = gtk.gdk.screen_height() / style.GRID_CELL_SIZE - 2
     
     def __init__(self):
-        VTray.__init__(self)
+        tray.VTray.__init__(self, align=tray.ALIGN_TO_END)
         self._icons = {}
         self._context_map = _ContextMap()
 
diff --git a/src/view/frame/devicestray.py b/src/view/frame/devicestray.py
index 7e6e797..f180cba 100644
--- a/src/view/frame/devicestray.py
+++ b/src/view/frame/devicestray.py
@@ -16,16 +16,16 @@
 
 import logging
 
-from sugar.graphics.tray import HTray
+from sugar.graphics import tray
 
 from view.devices import deviceview
 from model import shellmodel
 
 _logger = logging.getLogger('DevicesTray')
 
-class DevicesTray(HTray):
+class DevicesTray(tray.HTray):
     def __init__(self):
-        HTray.__init__(self)
+        tray.HTray.__init__(self, align=tray.ALIGN_TO_END)
         self._device_icons = {}
 
         devices_model = shellmodel.get_instance().get_devices()
@@ -41,7 +41,6 @@ class DevicesTray(HTray):
     def _add_device(self, device):
         try:
             view = deviceview.create(device)
-            # TODO: *Tray classes don't allow yet to set the alignment.
             self.add_item(view)
             view.show()
             self._device_icons[device.get_id()] = view