From 9987c8a7d7fac57e746f2051f3f2a73aef5b7ddb Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Mar 2007 16:10:32 -0400 Subject: [PATCH 1/3] Fix traceback on zoom level update --- shell/view/Shell.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/view/Shell.py b/shell/view/Shell.py index f4ba70cd..6f2dac68 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -139,7 +139,7 @@ class Shell(gobject.GObject): self._update_zoom_level() def _update_zoom_level(self): - if level == sugar.ZOOM_ACTIVITY: + if self._zoom_level == sugar.ZOOM_ACTIVITY: self._screen.toggle_showing_desktop(False) else: self._screen.toggle_showing_desktop(True) From 521dd501126f8e3c99fa345aa63ef40840e9b355 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Mar 2007 16:39:25 -0400 Subject: [PATCH 2/3] Further zoom level set traceback fix --- shell/view/Shell.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 6f2dac68..17b3ce4e 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -143,7 +143,7 @@ class Shell(gobject.GObject): self._screen.toggle_showing_desktop(False) else: self._screen.toggle_showing_desktop(True) - self._home_window.set_zoom_level(level) + self._home_window.set_zoom_level(self._zoom_level) def get_current_activity(self): return self._current_host From 78fef2a48e9153fd5ca53c3e993f919e4431cbd5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 12 Mar 2007 16:52:11 -0400 Subject: [PATCH 3/3] Implement set_title --- sugar/graphics/menu.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sugar/graphics/menu.py b/sugar/graphics/menu.py index 766ed72a..371aab58 100644 --- a/sugar/graphics/menu.py +++ b/sugar/graphics/menu.py @@ -96,11 +96,12 @@ class Menu(Popup): self.props.padding = units.points_to_pixels(3) self.props.spacing = units.points_to_pixels(3) + self._title_item = None if title: - title_item = hippo.CanvasText(text=title) - title_item.props.color = color.LABEL_TEXT.get_int() - title_item.props.font_desc = font.DEFAULT.get_pango_desc() - self.append(title_item) + self._title_item = hippo.CanvasText(text=title) + self._title_item.props.color = color.LABEL_TEXT.get_int() + self._title_item.props.font_desc = font.DEFAULT.get_pango_desc() + self.append(self._title_item) self.add_separator() def add_item(self, item): @@ -118,3 +119,8 @@ class Menu(Popup): def _item_button_press_event_cb(self, menu_item, event): self.emit('action', menu_item) + + def set_title(self, title): + # FIXME: allow adding a title after __init__ when hippo support is complete + if self._title_item: + self._title_item.props.text = title