diff options
| author | Dan Winship <dwinship@redhat.com> | 2007-08-08 13:30:50 (GMT) |
|---|---|---|
| committer | Dan Winship <dwinship@redhat.com> | 2007-08-08 13:30:50 (GMT) |
| commit | 7b21f752adc2e619b7aec504108c8f8eb73ded39 (patch) | |
| tree | a17c41a0ac8cd9b9546129f561e044352d298af5 /shell | |
| parent | c85c89ce839e952b05b20853b715abbf1b268ca5 (diff) | |
| parent | 670eb981acf958437a50569009f45b162cd77060 (diff) | |
Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/view/BuddyMenu.py | 5 | ||||
| -rw-r--r-- | shell/view/clipboardicon.py | 10 | ||||
| -rw-r--r-- | shell/view/home/HomeBox.py | 2 | ||||
| -rw-r--r-- | shell/view/home/activitiesdonut.py | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/shell/view/BuddyMenu.py b/shell/view/BuddyMenu.py index e986e03..e3efb5c 100644 --- a/shell/view/BuddyMenu.py +++ b/shell/view/BuddyMenu.py @@ -85,7 +85,8 @@ class BuddyMenu(Palette): else: menu_item = MenuItem(_('Make friend'), 'stock-add') menu_item.connect('activate', self._make_friend_cb) - self.append_menu_item(menu_item) + + self.menu.append(menu_item) menu_item.show() activity = self._shell.get_current_activity() @@ -96,7 +97,7 @@ class BuddyMenu(Palette): menu_item = MenuItem(_('Invite'), 'stock-invite') menu_item.connect('activate', self._invite_friend_cb) - self.append_menu_item(menu_item) + self.menu.append(menu_item) menu_item.show() def _buddy_icon_changed_cb(self, buddy): diff --git a/shell/view/clipboardicon.py b/shell/view/clipboardicon.py index a47104d..2e60e36 100644 --- a/shell/view/clipboardicon.py +++ b/shell/view/clipboardicon.py @@ -73,9 +73,9 @@ class ClipboardIcon(CanvasIcon): self._selected = selected if selected: if not self._hover: - self.props.background_color = style.COLOR_PANEL_GREY.get_int() + self.props.background_color = style.COLOR_SELECTION_GREY.get_int() else: - self.props.background_color = style.COLOR_TOOLBAR_GREY.get_int() + self.props.background_color = style.COLOR_PANEL_GREY.get_int() def set_state(self, name, percent, icon_name, preview, activity): cb_service = clipboardservice.get_instance() @@ -107,11 +107,11 @@ class ClipboardIcon(CanvasIcon): def prelight(self, enter): if enter: self._hover = True - self.props.background_color = color.BLACK.get_int() + self.props.background_color = style.COLOR_BLACK.get_int() else: self._hover = False if self._selected: - self.props.background_color = color.DESKTOP_BACKGROUND.get_int() + self.props.background_color = style.COLOR_SELECTION_GREY.get_int() else: - self.props.background_color = color.TOOLBAR_BACKGROUND.get_int() + self.props.background_color = style.COLOR_PANEL_GREY.get_int() diff --git a/shell/view/home/HomeBox.py b/shell/view/home/HomeBox.py index bfb4265..2fa2183 100644 --- a/shell/view/home/HomeBox.py +++ b/shell/view/home/HomeBox.py @@ -130,7 +130,7 @@ class HomeMyIcon(MyIcon): shutdown_menu_item = gtk.MenuItem(_('Shutdown')) shutdown_menu_item.connect('activate', self._shutdown_activate_cb) - palette.append_menu_item(shutdown_menu_item) + palette.menu.append(shutdown_menu_item) shutdown_menu_item.show() self.set_palette(palette) diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py index f629fe9..3b12a09 100644 --- a/shell/view/home/activitiesdonut.py +++ b/shell/view/home/activitiesdonut.py @@ -88,14 +88,14 @@ class ActivityIcon(CanvasIcon): resume_menu_item = gtk.MenuItem(_('Resume')) resume_menu_item.connect('activate', self._resume_activate_cb) - palette.append_menu_item(resume_menu_item) + palette.menu.append(resume_menu_item) resume_menu_item.show() # FIXME: kludge if self._activity.get_type() != "org.laptop.JournalActivity": stop_menu_item = gtk.MenuItem(_('Stop')) stop_menu_item.connect('activate', self._stop_activate_cb) - palette.append_menu_item(stop_menu_item) + palette.menu.append(stop_menu_item) stop_menu_item.show() def _launching_changed_cb(self, activity, pspec): |