Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write

2 files changed, 27 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 9643aef..ac4d56e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+* Fix 4871: the write save as entries of the journal come up uncolored (rwh)
+* Fix 4861: Incremental find cycles through words while typing (uwog)
+
 53
 
 * Use 'instance' instead of 'data' as a path prefix; part of 4850 (uwog)
diff --git a/toolbar.py b/toolbar.py
index 955b54f..ad56e16 100644
--- a/toolbar.py
+++ b/toolbar.py
@@ -35,6 +35,10 @@ from sugar.activity.activity import EditToolbar
 from sugar.graphics.menuitem import MenuItem
 from sugar.datastore import datastore
 
+import sugar.profile
+
+import dbus
+
 logger = logging.getLogger('write-activity')
 
 #ick
@@ -75,9 +79,24 @@ class WriteActivityToolbarExtension:
 
         # create a new journal item
         fileObject = datastore.create()
-        fileObject.metadata['title'] = self._activity.metadata['title'] + ' (' + jpostfix + ')';
+        act_meta = self._activity.metadata
+        fileObject.metadata['title'] = act_meta['title'] + ' (' + jpostfix + ')';
+        fileObject.metadata['title_set_by_user'] = act_meta['title_set_by_user']
         fileObject.metadata['mime_type'] = mimetype
-        fileObject.metadata['fulltext'] = self._abiword_canvas.get_content(extension_or_mimetype=".txt")[:3000]
+        fileObject.metadata['fulltext'] = \
+            self._abiword_canvas.get_content(extension_or_mimetype=".txt")[:3000]
+
+        fileObject.metadata['icon-color'] = act_meta['icon-color']
+        fileObject.metadata['activity'] = act_meta['activity']
+        fileObject.metadata['keep'] = act_meta['keep']
+
+# TODO: Activity class should provide support for preview, see #5119
+#        self._activity.take_screenshot()
+#        if self._activity._preview:
+#            preview = self._activity._get_preview()
+#            fileObject.metadata['preview'] = dbus.ByteArray(preview)
+
+        fileObject.metadata['share-scope'] = act_meta['share-scope']
 
         # write out the document contents in the requested format
         fileObject.file_path = os.path.join(self._activity.get_activity_root(), 'instance', '%i' % time.time())
@@ -170,7 +189,7 @@ class WriteEditToolbar(EditToolbar):
         # find the next entry
         id = self._text_toolbar.get_text_selected_handler();
         self._abiword_canvas.handler_block(id)
-        self._abiword_canvas.find_next()
+        self._abiword_canvas.find_next(False)
         self._abiword_canvas.handler_unblock(id)
 
     def _search_entry_changed_cb(self, entry):
@@ -192,7 +211,7 @@ class WriteEditToolbar(EditToolbar):
         # immediately start seaching
         id = self._text_toolbar.get_text_selected_handler();
         self._abiword_canvas.handler_block(id)
-        self._abiword_canvas.find_next()
+        self._abiword_canvas.find_next(True)
         self._abiword_canvas.handler_unblock(id)
 
     def _findprev_cb(self, button):
@@ -210,7 +229,7 @@ class WriteEditToolbar(EditToolbar):
         if self._search_entry.props.text:
             id = self._text_toolbar.get_text_selected_handler();
             self._abiword_canvas.handler_block(id)
-            self._abiword_canvas.find_next()
+            self._abiword_canvas.find_next(False)
             self._abiword_canvas.handler_unblock(id)
         else:
             logger.debug('nothing to search for!')