diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-03 22:25:03 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-03 22:25:03 (GMT) |
| commit | 717bdd66f45e31074952bbf49c78e14153f92c57 (patch) | |
| tree | e0b49f87de5d724932cd3f458efaeb34692a329f /shell | |
| parent | 6f337e0b14f022e942c723ddcad89279f727a099 (diff) | |
Get rid of the old Grid and CanvasBox
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/view/Shell.py | 5 | ||||
| -rw-r--r-- | shell/view/frame/Frame.py | 2 | ||||
| -rw-r--r-- | shell/view/frame/ZoomBox.py | 4 | ||||
| -rw-r--r-- | shell/view/home/HomeWindow.py | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/shell/view/Shell.py b/shell/view/Shell.py index c9a2c4d..b4f6974 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -2,7 +2,6 @@ import gtk import gobject import wnck -from sugar.canvas.Grid import Grid from view.home.HomeWindow import HomeWindow from sugar.presence import PresenceService from view.ActivityHost import ActivityHost @@ -28,7 +27,6 @@ class Shell(gobject.GObject): self._model = model self._hosts = {} self._screen = wnck.screen_get_default() - self._grid = Grid() self._key_grabber = KeyGrabber() self._key_grabber.connect('key-pressed', @@ -108,9 +106,6 @@ class Shell(gobject.GObject): def get_model(self): return self._model - def get_grid(self): - return self._grid - def join_activity(self, bundle_id, activity_id): pservice = PresenceService.get_instance() diff --git a/shell/view/frame/Frame.py b/shell/view/frame/Frame.py index bd7e51f..1c82b49 100644 --- a/shell/view/frame/Frame.py +++ b/shell/view/frame/Frame.py @@ -123,7 +123,7 @@ class Frame: grid = Grid() - self._menu_shell = MenuShell(grid) + self._menu_shell = MenuShell() self._menu_shell.connect('activated', self._menu_shell_activated_cb) self._menu_shell.connect('deactivated', self._menu_shell_deactivated_cb) diff --git a/shell/view/frame/ZoomBox.py b/shell/view/frame/ZoomBox.py index 26fda37..9dabf8b 100644 --- a/shell/view/frame/ZoomBox.py +++ b/shell/view/frame/ZoomBox.py @@ -12,7 +12,7 @@ class ActivityMenu(Menu): ACTION_SHARE = 1 ACTION_CLOSE = 2 - def __init__(self, grid, activity_host): + def __init__(self, activity_host): Menu.__init__(self, activity_host.get_title()) icon = CanvasIcon(icon_name='stock-share-mesh') @@ -37,7 +37,7 @@ class ActivityIcon(MenuIcon): self.set_menu_strategy(MenuStrategy()) def create_menu(self): - menu = ActivityMenu(self._shell.get_grid(), self._activity_host) + menu = ActivityMenu(self._activity_host) menu.connect('action', self._action_cb) return menu diff --git a/shell/view/home/HomeWindow.py b/shell/view/home/HomeWindow.py index 163ddb7..fad4476 100644 --- a/shell/view/home/HomeWindow.py +++ b/shell/view/home/HomeWindow.py @@ -25,7 +25,7 @@ class HomeWindow(gtk.Window): self.add(self._nb) self._nb.show() - menu_shell = MenuShell(shell.get_grid()) + menu_shell = MenuShell() self._add_page(HomeGroup(shell)) |