Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2010-03-15 18:58:29 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2010-03-22 13:58:45 (GMT)
commitf37b9c31f4e492d6612bf42d32173de3dba98d4a (patch)
tree0919454c8037369e8ce71a6d11a05405789e9c97 /src/jarabe
parent0fa56f2741db2d268e653c71c64b229ca1b1db2d (diff)
Revert copy to "Journal" palette item in journal details view #1831
Diffstat (limited to 'src/jarabe')
-rw-r--r--src/jarabe/journal/journaltoolbox.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index fe05657..61671bc 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -37,6 +37,7 @@ from sugar.graphics.xocolor import XoColor
from sugar.graphics import iconentry
from sugar.graphics import style
from sugar import mime
+from sugar import profile
from jarabe.model import bundleregistry
from jarabe.journal import misc
@@ -396,8 +397,8 @@ class EntryToolbar(gtk.Toolbar):
def _resume_menu_item_activate_cb(self, menu_item, service_name):
misc.resume(self._metadata, service_name)
- def _copy_menu_item_activate_cb(self, menu_item, mount):
- model.copy(self._metadata, mount.get_root().get_path())
+ def _copy_menu_item_activate_cb(self, menu_item, mount_point):
+ model.copy(self._metadata, mount_point)
def _refresh_copy_palette(self):
palette = self._copy.get_palette()
@@ -406,6 +407,17 @@ class EntryToolbar(gtk.Toolbar):
palette.menu.remove(menu_item)
menu_item.destroy()
+ if self._metadata['mountpoint'] != '/':
+ journal_item = MenuItem(_('Journal'))
+ journal_item.set_image(Icon(
+ icon_name='activity-journal',
+ xo_color=profile.get_color(),
+ icon_size=gtk.ICON_SIZE_MENU))
+ journal_item.connect('activate',
+ self._copy_menu_item_activate_cb, '/')
+ journal_item.show()
+ palette.menu.append(journal_item)
+
volume_monitor = gio.volume_monitor_get()
for mount in volume_monitor.get_mounts():
if self._metadata['mountpoint'] == mount.get_root().get_path():
@@ -418,7 +430,7 @@ class EntryToolbar(gtk.Toolbar):
menu_item.connect('activate',
self._copy_menu_item_activate_cb,
- mount)
+ mount.get_root().get_path())
palette.menu.append(menu_item)
menu_item.show()