Add support for setting the tab icon.

3 files changed, 183 insertions, 1 deletions

diff --git a/shell/example-activity/activity.py b/shell/example-activity/activity.py
new file mode 100644
index 0000000..230dcb4
--- /dev/null
+++ b/shell/example-activity/activity.py
@@ -0,0 +1,154 @@
+# -*- tab-width: 4; indent-tabs-mode: t -*- 
+
+import string
+
+import gc
+import dbus
+import dbus.service
+import dbus.glib
+import gobject
+import pygtk
+pygtk.require('2.0')
+import gtk,sys
+
+
+class Activity(dbus.service.Object):
+	""" Base Sugar activity object from which all other Activities should inherit """
+
+	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_ellipsize_tab(self, ellipsize):
+		self.__activity_object.set_ellipsize_tab(ellipsize)
+
+	def activity_set_can_close(self, can_close):
+		self.__activity_object.set_can_close(can_close)
+
+	def activity_show_icon(self, show_icon):
+		self.__activity_object.set_tab_show_icon(show_icon)
+
+	def activity_set_icon(self, pixbuf):
+		pixarray = []
+		pixstr = pixbuf.get_pixels();
+		for c in pixstr:
+				pixarray.append(c)
+		self.__activity_object.set_tab_icon(pixarray, \
+											pixbuf.get_colorspace(), \
+											pixbuf.get_has_alpha(),  \
+											pixbuf.get_bits_per_sample(), \
+											pixbuf.get_width(), \
+											pixbuf.get_height(), \
+											pixbuf.get_rowstride())
+						 
+	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
+
+
+	def __shutdown_reply_cb(self):
+		print "in __reply_cb"
+
+		self.__plug.destroy()
+		self.__plug = None
+
+		self.__bus = None
+		self.__activity_container_object = None
+		self.__activity_container = None
+		self.__activity_object = None
+		self.__service = None
+
+		self.__bus.remove_signal_receiver(self.name_owner_changed, dbus_interface = "org.freedesktop.DBus", signal_name = "NameOwnerChanged")
+
+		self.activity_on_disconnected_from_shell()
+
+
+		del self
+
+
+
+	def __shutdown_error_cb(self, error):
+		print "in __error_cb"
+
+	def activity_shutdown(self):
+		self.__activity_object.shutdown(reply_handler = self.__shutdown_reply_cb, error_handler = self.__shutdown_error_cb)
+
+	# 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_from_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()
diff --git a/shell/example-activity/example-activity.py b/shell/example-activity/example-activity.py
index cb9eff9..05ce55a 100755
--- a/shell/example-activity/example-activity.py
+++ b/shell/example-activity/example-activity.py
@@ -42,6 +42,11 @@ class ExampleActivity(activity.Activity):
 		plug.add(self.entry)
 		plug.show_all()
 
+	    icon_theme = gtk.icon_theme_get_default()
+		pixbuf = icon_theme.load_icon("gnome-dev-cdrom", gtk.ICON_SIZE_MENU, gtk.ICON_LOOKUP_USE_BUILTIN)
+		self.activity_set_icon(pixbuf)
+		self.activity_show_icon(True)
+
 	def activity_on_disconnected_from_shell(self):
 		print "act %d: in activity_on_disconnected_from_shell"%self.activity_get_id()
 		print "act %d: Shell disappeared..."%self.activity_get_id()
diff --git a/shell/src/shell.py b/shell/src/shell.py
index c1b0362..9230c11 100755
--- a/shell/src/shell.py
+++ b/shell/src/shell.py
@@ -40,7 +40,7 @@ class ActivityHost(dbus.service.Object):
 		self.tab_activity_image = gtk.Image()
 		self.tab_activity_image.set_from_stock(gtk.STOCK_CONVERT, gtk.ICON_SIZE_MENU)
 		hbox.pack_start(self.tab_activity_image)
-		self.tab_activity_image.show()		
+		#self.tab_activity_image.show()		
 		
 		self.label_hbox = gtk.HBox(False, 4);
 		self.label_hbox.connect("style-set", self.__tab_label_style_set_cb)
@@ -121,12 +121,35 @@ class ActivityHost(dbus.service.Object):
 			self.tab_close_button.hide()
 
 	@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
+			 in_signature="b", \
+			 out_signature="")
+	def set_tab_show_icon(self, show_icon):
+		if show_icon:
+			self.tab_activity_image.show()
+		else:
+			self.tab_activity_image.hide()
+
+	@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
 			 in_signature="s", \
 			 out_signature="")
 	def set_tab_text(self, text):
 		self.tab_label.set_text(text)
 
 	@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
+			 in_signature="ayibiiii", \
+			 out_signature="")
+	def set_tab_icon(self, data, colorspace, has_alpha, bits_per_sample, width, height, rowstride):
+	    print "width=%d, height=%d"%(width, height)
+		print "  data = ", data
+		pixstr = ""
+		for c in data:
+		    pixstr += chr(c)
+
+		pixbuf = gtk.gdk.pixbuf_new_from_data(pixstr, colorspace, has_alpha, bits_per_sample, width, height, rowstride)
+		print pixbuf
+		self.tab_activity_image.set_from_pixbuf(pixbuf)
+
+	@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
 						 in_signature="", \
 						 out_signature="")
 	def shutdown(self):