Fix save and restore opened session files

3 files changed, 10 insertions, 8 deletions

diff --git a/develop-activity/develop_app.py b/develop-activity/develop_app.py
index ba32794..1430930 100644
--- a/develop-activity/develop_app.py
+++ b/develop-activity/develop_app.py
@@ -69,8 +69,6 @@ REPLACE_ICONS = {False: "replace-and-find", True: "multi-replace"}
 
 TOOLBAR_SEARCH = 2
 
-OPENFILE_SEPARATOR = u"@ @"
-
 _EXCLUDE_EXTENSIONS = ('.pyc', '.pyo', '.so', '.o', '.a', '.la', '.mo', '~',
                        '.xo', '.tar', '.bz2', '.zip', '.gz')
 _EXCLUDE_NAMES = ['.deps', '.libs']
@@ -542,9 +540,9 @@ class DevelopActivity(activity.Activity):
             return
         if not self.save_unchanged:
             self.editor.save_all()
-        filenames = OPENFILE_SEPARATOR.join(self.editor.get_all_filenames())
+        filenames = self.editor.get_all_filenames()
         logging.debug('activity_dir %s, file_path %s, filenames %s' %
-                      (self.activity_dir, file_path, len(filenames)))
+                      (self.activity_dir, file_path, filenames))
         self._jobject = self.save_source_jobject(
             self.activity_dir, file_path, filenames)
         self.metadata['source'] = self.activity_dir
@@ -558,8 +556,8 @@ class DevelopActivity(activity.Activity):
         f = open(file_path, 'r')
         try:
             session_data = simplejson.load(f)
-            for filename in \
-                    session_data['open_filenames'].split(OPENFILE_SEPARATOR):
+            logging.error('read_file session_data %s', session_data)
+            for filename in session_data['open_filenames']:
                 if filename:
                     logging.info('opening : %s', filename)
                     self.load_file(filename)
@@ -708,6 +706,7 @@ class FileViewer(Gtk.ScrolledWindow):
                 self._add_dir_to_model(full_path, new_iter)
             else:
                 current_iter = self._model.append(parent, [f, full_path])
+                self._opened_files[full_path] = current_iter
                 if full_path == self._initial_filename:
                     selection = self._tree_view.get_selection()
                     selection.select_iter(current_iter)
@@ -718,7 +717,6 @@ class FileViewer(Gtk.ScrolledWindow):
             file_path = None
         else:
             file_path = model.get_value(tree_iter, 1)
-        self._opened_files[file_path] = tree_iter
         self.emit('file-selected', file_path)
 
     def __cursor_changed_cb(self, tree_view):
diff --git a/develop-activity/logviewer.py b/develop-activity/logviewer.py
index 2e67ba2..4e6c5a6 100644
--- a/develop-activity/logviewer.py
+++ b/develop-activity/logviewer.py
@@ -76,6 +76,9 @@ class LogMinder(Gtk.VBox):
         self._configure_watcher()
 
     def _configure_watcher(self):
+        # TODO
+        pass
+        """
         logging.error('Monitor directory %s', self._logs_path)
         directory = Gio.File.new_for_path(self._logs_path)
         dir_monitor = directory.monitor_directory(
@@ -92,6 +95,7 @@ class LogMinder(Gtk.VBox):
             file_monitor.set_rate_limit(2000)
             file_monitor.connect('changed', self._log_file_changed_cb)
             self._monitors.append(file_monitor)
+        """
 
     def _log_file_changed_cb(self, monitor, path1, path2, event):
         _directory, logfile = os.path.split(str(path1))
diff --git a/develop-activity/sourceview_editor.py b/develop-activity/sourceview_editor.py
index e105a02..fdfbf57 100644
--- a/develop-activity/sourceview_editor.py
+++ b/develop-activity/sourceview_editor.py
@@ -53,7 +53,7 @@ class GtkSourceview2Editor(Gtk.Notebook):
 
     def _switch_page_cb(self, __notebook, page_gptr, page_num):
         self.activity.update_sidebar_to_page(self._get_page(page_num))
-        self.activity.explore_code(None, switch_page=False)
+        #self.activity.explore_code(None, switch_page=False)
 
     def set_to_page_like(self, full_path):
         for n in range(self.get_n_pages()):