Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal/model.py
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-08-12 17:58:02 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-08-15 17:34:41 (GMT)
commit2148b47c2a5910eeb14fe827059585bef09fc111 (patch)
treeac18555ae984bd5fce78f07cccbe39b6e131eeed /src/jarabe/journal/model.py
parentdca42c10d1ddf4c7e79ab18bbf742305925bde2c (diff)
Add duplicate functionality to the Journal and enhance copy functionality
This patch adds a duplicate option to the Journal entry palette and the entry detail view. This will replace the keep button functionality from the activity toolbar. The keep button will be deprecated in another patch for the toolkit. The copy option which copied previously to the clipboard by default has been enhanced to allow: copying to the clipboard, copying to an external device, copying from an external device to the Journal and copying between external devices. Copying to the clipboard is now a visible option in the menu. In the detail view the palette pops up when doing a left click and showing the available options instead of copying directly to the clipboard. The design discussion has been taking place at: http://lists.sugarlabs.org/archive/sugar-devel/2011-May/031316.html Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-By: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'src/jarabe/journal/model.py')
-rw-r--r--src/jarabe/journal/model.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 4ea6b7e..ddf9c07 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -621,6 +621,8 @@ def copy(metadata, mount_point):
client = gconf.client_get_default()
metadata['icon-color'] = client.get_string('/desktop/sugar/user/color')
file_path = get_file(metadata['uid'])
+ if file_path is None:
+ file_path = ''
metadata['mountpoint'] = mount_point
del metadata['uid']