sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Winship
2007-08-08 09:30:50 -04:00
parent c85c89ce83 670eb981ac
commit 7b21f752ad
21 changed files with 208 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/view/BuddyMenu.py
+3 -2
View File
@@ -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):
shell/view/clipboardicon.py
+5 -5
View File
@@ -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()
shell/view/home/HomeBox.py
+1 -1
View File
@@ -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)
shell/view/home/activitiesdonut.py
+2 -2
View File
@@ -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):