Lots of changes, still work in progress, but good enough to commit for now.

1 files changed, 141 insertions, 13 deletions

diff --git a/shell/example-activity/example-activity.py b/shell/example-activity/example-activity.py
index 56b1a73..619f04d 100755
--- a/shell/example-activity/example-activity.py
+++ b/shell/example-activity/example-activity.py
@@ -10,24 +10,152 @@ import pygtk
 pygtk.require('2.0')
 import gtk,sys
 
+################################################################################
+# Code below will be moved to a module someday
+
+class Activity(dbus.service.Object):
+
+    def __init__(self):
+	pass
+
+    def name_owner_changed(self, service_name, old_service_name, new_service_name):
+        #print "in name_owner_changed: svc=%s oldsvc=%s newsvc=%s"%(service_name, old_service_name, new_service_name)
+	if service_name == "com.redhat.Sugar.Shell" and new_service_name == "":
+	    self.activity_on_disconnected_from_shell()
+	#elif service_name == "com.redhat.Sugar.Shell" and old_service_name == "":
+	#    self.activity_on_shell_reappeared()
+
+    def activity_connect_to_shell(self):
+	self.__bus = dbus.SessionBus()
+
+	self.__bus.add_signal_receiver(self.name_owner_changed, dbus_interface = "org.freedesktop.DBus", signal_name = "NameOwnerChanged")
+
+	self.__activity_container_object = self.__bus.get_object("com.redhat.Sugar.Shell", \
+							       "/com/redhat/Sugar/Shell/ActivityContainer")
+	self.__activity_container = dbus.Interface(self.__activity_container_object, \
+						   "com.redhat.Sugar.Shell.ActivityContainer")
+
+	self.__activity_id = self.__activity_container.add_activity("")
+	self.__object_path = "/com/redhat/Sugar/Shell/Activities/%d"%self.__activity_id
+
+	print "object_path = %s"%self.__object_path
+
+	self.__activity_object = dbus.Interface(self.__bus.get_object("com.redhat.Sugar.Shell", self.__object_path), \
+					      "com.redhat.Sugar.Shell.ActivityHost")
+	self.__window_id = self.__activity_object.get_host_xembed_id()
+
+	print "XEMBED window_id = %d"%self.__window_id
+
+	self.__plug = gtk.Plug(self.__window_id)
+
+	# Now let the Activity register a peer service so the Shell can poke it
+	self.__peer_service_name = "com.redhat.Sugar.Activity%d"%self.__activity_id
+	self.__peer_object_name = "/com/redhat/Sugar/Activity/%d"%self.__activity_id
+	self.__service = dbus.service.BusName(self.__peer_service_name, bus=self.__bus)
+        dbus.service.Object.__init__(self, self.__service, self.__peer_object_name)
+
+	self.__activity_object.set_peer_service_name(self.__peer_service_name, self.__peer_object_name)
+
+	self.activity_on_connected_to_shell()
+
+    def activity_get_gtk_plug(self):
+	return self.__plug
+
+    def activity_set_tab_text(self, text):
+	self.__activity_object.set_tab_text(text)
+
+    @dbus.service.method("com.redhat.Sugar.Activity", \
+			 in_signature="", \
+			 out_signature="")
+    def lost_focus(self):
+	self.activity_on_lost_focus()
+
+    @dbus.service.method("com.redhat.Sugar.Activity", \
+			 in_signature="", \
+			 out_signature="")
+    def got_focus(self):
+	self.activity_on_got_focus()
+
+
+    @dbus.service.method("com.redhat.Sugar.Activity", \
+			 in_signature="", \
+			 out_signature="")
+    def close_from_user(self):
+	self.activity_on_close_from_user()
+
+    def activity_get_id(self):
+	return self.__activity_id
+
+    # pure virtual methods
+
+    def activity_on_connected_to_shell(self):
+	print "act %d: you need to override activity_on_connected_to_shell"%self.activity_get_id()
+
+    def activity_on_disconnected_from_shell(self):
+	print "act %d: you need to override activity_on_disconnected_to_shell"%self.activity_get_id()
+
+    def activity_on_close_from_user(self):
+	print "act %d: you need to override activity_on_close_from_user"%self.activity_get_id()
+
+    def activity_on_lost_focus(self):
+	print "act %d: you need to override activity_on_lost_focus"%self.activity_get_id()
+
+    def activity_on_got_focus(self):
+	print "act %d: you need to override activity_on_got_focus"%self.activity_get_id()
+
+def my_exit():
+    sys.exit(0)
+
+def deferred_exit():
+    gobject.timeout_add(0, my_exit)
+
+################################################################################
+
+class ExampleActivity(Activity):
+
+    def __init__(self, name):
+	self.name = name
+
+    def entry_changed(self, entry):
+	self.activity_set_tab_text(entry.get_text())
+    
+    def activity_on_connected_to_shell(self):
+	print "act %d: in activity_on_connected_to_shell"%self.activity_get_id()
+
+	self.activity_set_tab_text(self.name)
+
+	plug = self.activity_get_gtk_plug()
+	self.entry = gtk.Entry()
+	self.entry.set_text(self.name)
+	self.entry.connect("changed", self.entry_changed)
+	plug.add(self.entry)
+	plug.show_all()
+
+    def activity_on_disconnected_from_shell(self):
+	print "act %d: in activity_on_disconnected_to_shell"%self.activity_get_id()
+	print "act %d: Shell disappeared..."%self.activity_get_id()
+	deferred_exit()
+
+    def activity_on_close_from_user(self):
+	print "act %d: in activity_on_close_from_user"%self.activity_get_id()
+	deferred_exit()
+
+    def activity_on_lost_focus(self):
+	print "act %d: in activity_on_lost_focus"%self.activity_get_id()
+
+    def activity_on_got_focus(self):
+	print "act %d: in activity_on_got_focus"%self.activity_get_id()
+
+
 if len(sys.argv) != 2:
     print "usage: example-activity.py <name_of_activity>"
     sys.exit(1)
 
-bus = dbus.SessionBus()
-activity_container_object = bus.get_object("com.redhat.Sugar.Shell", \
-					   "/com/redhat/Sugar/Shell/ActivityContainer")
-activity_container = dbus.Interface(activity_container_object, \
-				    "com.redhat.Sugar.Shell.ActivityContainer")
-
-window_id = activity_container.add_activity(sys.argv[1])
-print "got XEMBED window_id = %d"%window_id
+example_activity = ExampleActivity(sys.argv[1])
+example_activity.activity_connect_to_shell()
 
-plug = gtk.Plug(window_id)
-entry = gtk.Entry()
-entry.set_text(sys.argv[1])
-plug.add(entry)
-plug.show_all()
+example_activity2 = ExampleActivity(sys.argv[1] + " (2nd)")
+example_activity2.activity_connect_to_shell()
 
 gtk.main()