Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

6 files changed, 96 insertions, 15 deletions

diff --git a/sugar/chat/ActivityChat.py b/sugar/chat/ActivityChat.py
index 971b87d..1892672 100644
--- a/sugar/chat/ActivityChat.py
+++ b/sugar/chat/ActivityChat.py
@@ -26,6 +26,8 @@ class ActivityChat(GroupChat):
 		GroupChat.__init__(self)
 		self._chat_service = None
 
+		self.connect('destroy', self._destroy_cb)
+
 		self._activity = activity
 		self._pservice.register_service_type(ActivityChat.SERVICE_TYPE)
 		self._pservice.connect('service-appeared', self._service_appeared_cb)
@@ -59,3 +61,7 @@ class ActivityChat(GroupChat):
 		self._chat_service = self._pservice.share_activity(self._activity,
 				stype=ActivityChat.SERVICE_TYPE)
 		self._setup_stream(self._chat_service)
+
+	def _destroy_cb(self, widget):
+		if self._chat_service:
+			self._pservice.unregister_service(self._chat_service)
diff --git a/sugar/graphics/__init__.py b/sugar/graphics/__init__.py
index e69de29..420e0e5 100644
--- a/sugar/graphics/__init__.py
+++ b/sugar/graphics/__init__.py
@@ -0,0 +1,4 @@
+from sugar.graphics import style
+from sugar.graphics import stylesheet
+
+style.load_stylesheet(stylesheet)
diff --git a/sugar/graphics/canvasicon.py b/sugar/graphics/canvasicon.py
index 01e4c0b..2d983ae 100644
--- a/sugar/graphics/canvasicon.py
+++ b/sugar/graphics/canvasicon.py
@@ -143,7 +143,11 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
 					icon_name, self._color, self._size)
 		buf = self._get_buffer(cr, handle, self._size)
 
-		cr.set_source_surface(buf, 0.0, 0.0)
+		[width, height] = self.get_allocation()
+		x = (width - self._size) / 2
+		y = (height - self._size) / 2
+		
+		cr.set_source_surface(buf, x, y)
 		cr.paint()
 
 	def do_get_width_request(self):
diff --git a/sugar/graphics/menushell.py b/sugar/graphics/menushell.py
index bb25f9c..48183e1 100644
--- a/sugar/graphics/menushell.py
+++ b/sugar/graphics/menushell.py
@@ -16,6 +16,7 @@
 # Boston, MA 02111-1307, USA.
 
 import gobject
+import gtk
 
 class MenuShell(gobject.GObject):
 	__gsignals__ = {
@@ -25,11 +26,21 @@ class MenuShell(gobject.GObject):
 				        gobject.TYPE_NONE, ([])),
 	}
 
+	AUTO = 0
+	LEFT = 1
+	RIGHT = 2
+	TOP = 3
+	BOTTOM = 4
+
 	def __init__(self, parent_canvas):
 		gobject.GObject.__init__(self)
 
 		self._parent_canvas = parent_canvas
 		self._menu_controller = None
+		self._position = MenuShell.AUTO
+
+	def set_position(self, position):
+		self._position = position
 
 	def is_active(self):
 		return (self._menu_controller != None)
@@ -44,29 +55,47 @@ class MenuShell(gobject.GObject):
 			self._menu_controller.popdown()
 		self._menu_controller = controller
 
-	def _get_item_origin(self, item):
+	def _get_item_rect(self, item):
 		[x, y] = item.get_context().translate_to_widget(item)
 
 		[origin_x, origin_y] = self._parent_canvas.window.get_origin()
 		x += origin_x
 		y += origin_y
 
-		return [x, y]
+		[w, h] = item.get_allocation()
 
-	def get_position(self, menu, item):
-		[x, y] = self._get_item_origin(item)
-		[width, height] = item.get_allocation()
+		return [x, y, w, h]
 
-		[canvas_x, canvas_y] = self._parent_canvas.window.get_origin()
-		canvas_rect = self._parent_canvas.get_allocation()
+	def get_position(self, menu, item):
+		[item_x, item_y, item_w, item_h] = self._get_item_rect(item)
 		[menu_w, menu_h] = menu.size_request()
 
-		menu_x = x
-		menu_y = y + height
+		left_x = item_x - menu_w
+		left_y = item_y
+		right_x = item_x + item_w
+		right_y = item_y
+		top_x = item_x
+		top_y = item_y - menu_h
+		bottom_x = item_x
+		bottom_y = item_y + item_h
+
+		if self._position == MenuShell.LEFT:
+			[x, y] = [left_x, left_y]
+		elif self._position == MenuShell.RIGHT:
+			[x, y] = [right_x, right_y]
+		elif self._position == MenuShell.TOP:
+			[x, y] = [top_x, top_y]
+		elif self._position == MenuShell.BOTTOM:
+			[x, y] = [bottom_x, bottom_y]
+		elif self._position == MenuShell.AUTO:
+			[x, y] = [right_x, right_y]
+			if x + menu_w > gtk.gdk.screen_width():
+				[x, y] = [left_x, left_y]
 
-		if (menu_x + menu_w > canvas_x) and \
-		   (menu_y < canvas_y + canvas_rect.height):
-			menu_x = x - menu_w
-			menu_y = y
+		x = min(x, gtk.gdk.screen_width() - menu_w)
+		x = max(0, x)
 
-		return [menu_x, menu_y]
+		y = min(y, gtk.gdk.screen_height() - menu_h)
+		y = max(0, y)
+
+		return [x, y]
diff --git a/sugar/graphics/style.py b/sugar/graphics/style.py
index c211e07..f0ab3e8 100644
--- a/sugar/graphics/style.py
+++ b/sugar/graphics/style.py
@@ -15,8 +15,21 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
+import gtk
+
 _styles = {}
 
+_screen_factor = gtk.gdk.screen_width() / 1200.0
+
+space_unit = 9 * _screen_factor
+separator_thickness = 3 * _screen_factor
+
+standard_icon_size = int(75.0 * _screen_factor)
+small_icon_size = standard_icon_size * 0.5
+medium_icon_size = standard_icon_size * 1.5
+large_icon_size = standard_icon_size * 2.0
+xlarge_icon_size = standard_icon_size * 3.0
+
 def load_stylesheet(module):
 	for objname in dir(module):
 		if not objname.startswith('_'):
@@ -32,3 +45,7 @@ def apply_stylesheet(item, stylesheet_name):
 		style_sheet = _styles[stylesheet_name]
 		for name in style_sheet.keys():
 			item.set_property(name, style_sheet[name])
+
+def get_font_description(style, relative_size):
+	base_size = 18 * _screen_factor
+	return '%s %dpx' % (style, int(base_size * relative_size))
diff --git a/sugar/graphics/stylesheet.py b/sugar/graphics/stylesheet.py
new file mode 100644
index 0000000..c387a25
--- /dev/null
+++ b/sugar/graphics/stylesheet.py
@@ -0,0 +1,21 @@
+from sugar.graphics import style
+
+menu = {
+	'background_color' : 0x000000FF,
+	'spacing'		   : style.space_unit,
+	'padding'		   : style.space_unit
+}
+
+menu_Title = {
+	'color'	: 0xFFFFFFFF,
+	'font'	: style.get_font_description('Bold', 1.2)
+}
+
+menu_Separator = {
+	'background_color' : 0xFFFFFFFF,
+	'box_height'       : style.separator_thickness
+}
+
+menu_ActionIcon = {
+	'size' : style.standard_icon_size
+}