Move window management keybindings inside sugar.

Add a TakeScreenshot dbus method and have the shell
call it when the activity can safely take a screenshot
to use as a preview.

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/sugar/activity/activity.py b/lib/sugar/activity/activity.py
index a632fb8..3dc5f30 100644
--- a/lib/sugar/activity/activity.py
+++ b/lib/sugar/activity/activity.py
@@ -128,6 +128,7 @@ class ActivityToolbar(gtk.Toolbar):
         self._activity.copy()
 
     def __stop_clicked_cb(self, button):
+        self._activity.take_screenshot()
         self._activity.close()
 
     def __jobject_updated_cb(self, jobject):
@@ -461,6 +462,9 @@ class Activity(Window, gtk.Container):
         else:
             return {}
 
+    def take_screenshot(self):
+        self._preview = self._get_preview()
+
     def save(self):
         """Request that the activity is saved to the Journal."""
 
@@ -594,8 +598,6 @@ class Activity(Window, gtk.Container):
         self._pservice.share_activity(self, private=private)
 
     def close(self):
-        self._preview = self._get_preview()
-
         self.save()
 
         if self._shared_activity:
diff --git a/lib/sugar/activity/activityservice.py b/lib/sugar/activity/activityservice.py
index b2f7e15..c884fcb 100644
--- a/lib/sugar/activity/activityservice.py
+++ b/lib/sugar/activity/activityservice.py
@@ -64,3 +64,7 @@ class ActivityService(dbus.service.Object):
     def Invite(self, buddy_key):
         self._activity.invite(buddy_key)
 
+    @dbus.service.method(_ACTIVITY_INTERFACE)
+    def TakeScreenshot(self):
+        self._activity.take_screenshot()
+