Split model/view in the activities donut.

Provide some infrastructure for Alt+Tab implementation.

3 files changed, 39 insertions, 14 deletions

diff --git a/shell/view/home/HomeBox.py b/shell/view/home/HomeBox.py
index a24402d..48069ea 100644
--- a/shell/view/home/HomeBox.py
+++ b/shell/view/home/HomeBox.py
@@ -25,13 +25,12 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
     __gtype_name__ = 'SugarHomeBox'
 
     def __init__(self, shell):
-        hippo.CanvasBox.__init__(self, background_color=0xe2e2e2ff,
-                                 yalign=2)
+        hippo.CanvasBox.__init__(self, background_color=0xe2e2e2ff, yalign=2)
 
         grid = Grid()
-        donut = ActivitiesDonut(shell, box_width=grid.dimension(7),
-                                box_height=grid.dimension(7))
-        self.append(donut)
+        self._donut = ActivitiesDonut(shell, box_width=grid.dimension(7),
+                                      box_height=grid.dimension(7))
+        self.append(self._donut)
 
         self._my_icon = MyIcon()
         style.apply_stylesheet(self._my_icon, 'home.MyIcon')
@@ -43,3 +42,15 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
         [icon_width, icon_height] = self._my_icon.get_allocation()
         self.move(self._my_icon, (width - icon_width) / 2,
                   (height - icon_height) / 2)
+                  
+    def has_activities(self):
+        return self._donut.has_activities()
+
+    def grab_and_rotate(self):
+        pass
+            
+    def rotate(self):
+        pass
+
+    def release(self):
+        pass
diff --git a/shell/view/home/HomeWindow.py b/shell/view/home/HomeWindow.py
index b450b8c..73d29c5 100644
--- a/shell/view/home/HomeWindow.py
+++ b/shell/view/home/HomeWindow.py
@@ -34,6 +34,7 @@ class HomeWindow(gtk.Window):
 
         self.realize()
         self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DESKTOP)
+        self.connect("key-release-event", self._key_release_cb)
 
         self._nb = gtk.Notebook()
         self._nb.set_show_border(False)
@@ -43,8 +44,8 @@ class HomeWindow(gtk.Window):
         self._nb.show()
 
         canvas = hippo.Canvas()
-        box = HomeBox(shell)
-        canvas.set_root(box)
+        self._home_box = HomeBox(shell)
+        canvas.set_root(self._home_box)
         self._nb.append_page(canvas)
         canvas.show()
 
@@ -60,6 +61,11 @@ class HomeWindow(gtk.Window):
         self._nb.append_page(canvas)
         canvas.show()
 
+    def _key_release_cb(self, widget, event): 
+        keyname = gtk.gdk.keyval_name(event.keyval)
+        if keyname == "Alt_L":
+            self._home_box.release()
+            
     def set_zoom_level(self, level):
         if level == sugar.ZOOM_HOME:
             self._nb.set_current_page(0)
@@ -67,3 +73,6 @@ class HomeWindow(gtk.Window):
             self._nb.set_current_page(1)
         elif level == sugar.ZOOM_MESH:
             self._nb.set_current_page(2)
+        
+    def get_home_box(self):
+        return self._home_box   
diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py
index 74f3bbb..7d1c3e5 100644
--- a/shell/view/home/activitiesdonut.py
+++ b/shell/view/home/activitiesdonut.py
@@ -19,6 +19,7 @@ import math
 
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import style
+from model.homemodel import HomeModel
 
 class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
     __gtype_name__ = 'SugarActivitiesDonut'
@@ -26,14 +27,16 @@ class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
         hippo.CanvasBox.__init__(self, **kwargs)
 
         self._activities = {}
+        self._shell = shell
 
-        shell.connect('activity_opened', self.__activity_opened_cb)
-        shell.connect('activity_closed', self.__activity_closed_cb)
+        self._model = HomeModel(shell)
+        self._model.connect('activity-added', self._activity_added_cb)
+        self._model.connect('activity-removed', self._activity_removed_cb) 
 
-    def __activity_opened_cb(self, model, activity):
+    def _activity_added_cb(self, model, activity):
         self._add_activity(activity)
 
-    def __activity_closed_cb(self, model, activity):
+    def _activity_removed_cb(self, model, activity):
         self._remove_activity(activity)
     
     def _remove_activity(self, activity):
@@ -47,15 +50,17 @@ class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
 
         icon = CanvasIcon(icon_name=icon_name, color=icon_color)
         style.apply_stylesheet(icon, 'ring.ActivityIcon')
-        icon.connect('activated', self.__activity_icon_clicked_cb, activity)
+        icon.connect('activated', self._activity_icon_clicked_cb, activity)
         self.append(icon, hippo.PACK_FIXED)
 
         self._activities[activity.get_id()] = icon
 
         self.emit_paint_needed(0, 0, -1, -1)
 
-    def __activity_icon_clicked_cb(self, item, activity):
-        activity.present()
+    def _activity_icon_clicked_cb(self, item, activity):
+        activity_host = self._shell.get_activity(activity.get_id())
+        if activity_host:
+            activity_host.present()
 
     def _get_angles(self, index):
         angle = 2 * math.pi / 8