diff options
author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-06 10:04:01 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-06 10:04:01 (GMT) |
commit | ae5b5a424e6e6523139dc2813cc4f915dfde6ea0 (patch) | |
tree | ec93e56243463e3739dfc5bd543316be41966bd9 /src | |
parent | c8310a085771ca12530c2a650854e34c9c4027e4 (diff) | |
parent | 5d1e582c6de0e27a55c8c08370090f13ce3627e3 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'src')
-rw-r--r-- | src/jarabe/desktop/Makefile.am | 4 | ||||
-rw-r--r-- | src/jarabe/desktop/groupbox.py (renamed from src/jarabe/desktop/friendsbox.py) | 4 | ||||
-rw-r--r-- | src/jarabe/desktop/homewindow.py | 14 | ||||
-rw-r--r-- | src/jarabe/frame/zoomtoolbar.py | 4 | ||||
-rw-r--r-- | src/jarabe/model/shell.py | 2 | ||||
-rw-r--r-- | src/jarabe/view/keyhandler.py | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/src/jarabe/desktop/Makefile.am b/src/jarabe/desktop/Makefile.am index c7f425c..044a943 100644 --- a/src/jarabe/desktop/Makefile.am +++ b/src/jarabe/desktop/Makefile.am @@ -4,9 +4,9 @@ sugar_PYTHON = \ activitieslist.py \ favoritesview.py \ favoriteslayout.py \ - grid.py \ friendview.py \ - friendsbox.py \ + grid.py \ + groupbox.py \ homebox.py \ homewindow.py \ meshbox.py \ diff --git a/src/jarabe/desktop/friendsbox.py b/src/jarabe/desktop/groupbox.py index 2053213..75173ff 100644 --- a/src/jarabe/desktop/friendsbox.py +++ b/src/jarabe/desktop/groupbox.py @@ -27,8 +27,8 @@ from jarabe.model import friends from jarabe.desktop.friendview import FriendView from jarabe.desktop.spreadlayout import SpreadLayout -class FriendsBox(hippo.Canvas): - __gtype_name__ = 'SugarFriendsBox' +class GroupBox(hippo.Canvas): + __gtype_name__ = 'SugarGroupBox' def __init__(self): gobject.GObject.__init__(self) diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py index aca5e8b..e673414 100644 --- a/src/jarabe/desktop/homewindow.py +++ b/src/jarabe/desktop/homewindow.py @@ -21,13 +21,13 @@ from sugar.graphics import palettegroup from jarabe.desktop.meshbox import MeshBox from jarabe.desktop.homebox import HomeBox -from jarabe.desktop.friendsbox import FriendsBox +from jarabe.desktop.groupbox import GroupBox from jarabe.desktop.transitionbox import TransitionBox from jarabe.model.shell import ShellModel from jarabe.model import shell _HOME_PAGE = 0 -_FRIENDS_PAGE = 1 +_GROUP_PAGE = 1 _MESH_PAGE = 2 _TRANSITION_PAGE = 3 @@ -58,7 +58,7 @@ class HomeWindow(gtk.Window): self._motion_notify_event_cb) self._home_box = HomeBox() - self._friends_box = FriendsBox() + self._group_box = GroupBox() self._mesh_box = MeshBox() self._transition_box = TransitionBox() @@ -127,7 +127,7 @@ class HomeWindow(gtk.Window): if self._level == ShellModel.ZOOM_HOME: size = style.XLARGE_ICON_SIZE - elif self._level == ShellModel.ZOOM_FRIENDS: + elif self._level == ShellModel.ZOOM_GROUP: size = style.LARGE_ICON_SIZE elif self._level == ShellModel.ZOOM_MESH: size = style.STANDARD_ICON_SIZE @@ -142,9 +142,9 @@ class HomeWindow(gtk.Window): self.add(self._home_box) self._home_box.show() self._home_box.focus_search_entry() - elif self._level == ShellModel.ZOOM_FRIENDS: - self.add(self._friends_box) - self._friends_box.show() + elif self._level == ShellModel.ZOOM_GROUP: + self.add(self._group_box) + self._group_box.show() elif self._level == ShellModel.ZOOM_MESH: self.add(self._mesh_box) self._mesh_box.show() diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py index 363f3de..a4c0b74 100644 --- a/src/jarabe/frame/zoomtoolbar.py +++ b/src/jarabe/frame/zoomtoolbar.py @@ -36,7 +36,7 @@ class ZoomToolbar(gtk.Toolbar): self._mesh_button = self._add_button('zoom-neighborhood', _('Neighborhood'), shell.ShellModel.ZOOM_MESH) self._groups_button = self._add_button('zoom-groups', - _('Group'), shell.ShellModel.ZOOM_FRIENDS) + _('Group'), shell.ShellModel.ZOOM_GROUP) self._home_button = self._add_button('zoom-home', _('Home'), shell.ShellModel.ZOOM_HOME) self._activity_button = self._add_button('zoom-activity', @@ -82,7 +82,7 @@ class ZoomToolbar(gtk.Toolbar): logging.debug('new zoom level: %r' % new_level) if new_level == shell.ShellModel.ZOOM_MESH: self._mesh_button.props.active = True - elif new_level == shell.ShellModel.ZOOM_FRIENDS: + elif new_level == shell.ShellModel.ZOOM_GROUP: self._groups_button.props.active = True elif new_level == shell.ShellModel.ZOOM_HOME: self._home_button.props.active = True diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index 9ee06f9..adc9d4c 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -295,7 +295,7 @@ class ShellModel(gobject.GObject): } ZOOM_MESH = 0 - ZOOM_FRIENDS = 1 + ZOOM_GROUP = 1 ZOOM_HOME = 2 ZOOM_ACTIVITY = 3 diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index b0fade5..48c7696 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -45,7 +45,7 @@ _TABBING_MODIFIER = gtk.gdk.MOD1_MASK _actions_table = { 'F1' : 'zoom_mesh', - 'F2' : 'zoom_friends', + 'F2' : 'zoom_group', 'F3' : 'zoom_home', 'F4' : 'zoom_activity', 'F9' : 'brightness_down', @@ -162,8 +162,8 @@ class KeyHandler(object): shell.get_model().set_zoom_level(ShellModel.ZOOM_MESH) wnck.screen_get_default().toggle_showing_desktop(True) - def handle_zoom_friends(self): - shell.get_model().set_zoom_level(ShellModel.ZOOM_FRIENDS) + def handle_zoom_group(self): + shell.get_model().set_zoom_level(ShellModel.ZOOM_GROUP) wnck.screen_get_default().toggle_showing_desktop(True) def handle_zoom_home(self): |