Load log & python files, monitoring don't work

4 files changed, 29 insertions, 27 deletions

diff --git a/develop-activity/develop_app.py b/develop-activity/develop_app.py
index d0ce432..07ee850 100644
--- a/develop-activity/develop_app.py
+++ b/develop-activity/develop_app.py
@@ -420,7 +420,8 @@ class DevelopActivity(activity.Activity):
         self.metadata['title'] = 'Develop %s' % name
         self.refresh_files()
 
-        #self.treeview.get_selection().connect("changed", self.selection_cb)
+        self.activity_tree_view.connect('file_selected',
+                                        self.__file_selected_cb)
         return name
 
     def first_open_activity(self, activity_dir):
@@ -452,14 +453,13 @@ class DevelopActivity(activity.Activity):
         logging.error('load_file filename %s', filename)
         self.editor.load_object(full_path, filename)
 
-    def selection_cb(self, column):
+    def __file_selected_cb(self, file_viewer, path):
         """User selected an item in the treeview. Load it.
         """
         if self.numb:
             #Choosing in the notebook selects in the list, and vice versa.
             #Avoid infinite recursion.
             return
-        path = activity_model.get_selected_file_path(self.treeview)
         if path and not os.path.isdir(path):
             self.numb = True
             self.load_file(path)
@@ -658,7 +658,7 @@ class DevelopActivity(activity.Activity):
 
 
 class FileViewer(Gtk.ScrolledWindow):
-    __gtype_name__ = 'SugarFileViewer'
+    __gtype_name__ = 'ActivityFileViewer'
 
     __gsignals__ = {
         'file-selected': (GObject.SignalFlags.RUN_FIRST,
diff --git a/develop-activity/logviewer.py b/develop-activity/logviewer.py
index 50406d7..2164029 100644
--- a/develop-activity/logviewer.py
+++ b/develop-activity/logviewer.py
@@ -106,7 +106,7 @@ class LogMinder(Gtk.VBox):
             #If the log is open, just leave it that way
 
     # Load the log information in View (text_view)
-    def _load_log(self, path):
+    def _load_log(self, file_viewer, path):
         if os.path.isdir(path):
             #do not try to open folders
             logging.debug("Cannot open a folder as text :)")
@@ -126,7 +126,8 @@ class LogMinder(Gtk.VBox):
                              Gtk.PolicyType.AUTOMATIC)
         scrollwnd.add(newlogview)
         scrollwnd.page = newlogview
-        tablabel = TabLabel(newlogview, label=node["name"])
+        file_name = os.path.basename(path)
+        tablabel = TabLabel(newlogview, file_name)
         tablabel.connect(
             'tab-close',
             lambda widget, child: self.activity.editor.remove_page(
@@ -231,8 +232,8 @@ class FileViewer(Gtk.ScrolledWindow):
 
 
 class LogBuffer(Gtk.TextBuffer):
-    def __init__(self, logfile, tagtable):
-        GObject.GObject.__init__(self, table=tagtable)
+    def __init__(self, logfile):
+        Gtk.TextBuffer.__init__(self)
 
         self._logfile = logfile
         self._pos = 0
@@ -266,16 +267,7 @@ class LogView(Gtk.TextView):
 
         self.set_wrap_mode(Gtk.WrapMode.WORD)
 
-        # Tags for search
-        tagtable = Gtk.TextTagTable()
-        hilite_tag = Gtk.TextTag('search-hilite')
-        hilite_tag.props.background = '#FFFFB0'
-        tagtable.add(hilite_tag)
-        select_tag = Gtk.TextTag('search-select')
-        select_tag.props.background = '#B0B0FF'
-        tagtable.add(select_tag)
-
-        newbuffer = self._create_log_buffer(full_path, tagtable)
+        newbuffer = self._create_log_buffer(full_path)
         if newbuffer:
             self.set_buffer(newbuffer)
             self.text_buffer = newbuffer
@@ -291,7 +283,7 @@ class LogView(Gtk.TextView):
     def remove(self):
         self.logminder._remove_logview(self)
 
-    def _create_log_buffer(self, path, tagtable):
+    def _create_log_buffer(self, path):
         self._written = False
         if os.path.isdir(path):
             return False
@@ -306,11 +298,20 @@ class LogView(Gtk.TextView):
 
         self.filename = _get_filename_from_path(path)
 
-        self._logbuffer = logbuffer = LogBuffer(path, tagtable)
+        self._logbuffer = LogBuffer(path)
+
+        # Tags for search
+        tagtable = self._logbuffer.get_tag_table()
+        hilite_tag = Gtk.TextTag.new('search-hilite')
+        hilite_tag.props.background = '#FFFFB0'
+        tagtable.add(hilite_tag)
+        select_tag = Gtk.TextTag.new('search-select')
+        select_tag.props.background = '#B0B0FF'
+        tagtable.add(select_tag)
 
-        self._written = logbuffer._written
+        self._written = self._logbuffer._written
 
-        return logbuffer
+        return self._logbuffer
 
     def replace(self, *args, **kw):
         return (False, False)
diff --git a/develop-activity/sourceview_editor.py b/develop-activity/sourceview_editor.py
index 5cbe828..e3c26b1 100644
--- a/develop-activity/sourceview_editor.py
+++ b/develop-activity/sourceview_editor.py
@@ -237,16 +237,17 @@ class GtkSourceview2Page(GtkSource.View):
         self.set_show_line_numbers(True)
         self.set_insert_spaces_instead_of_tabs(True)
 
+        self.text_buffer = GtkSource.Buffer()
+
         # Tags for search
-        tagtable = Gtk.TextTagTable()
-        hilite_tag = Gtk.TextTag('search-hilite')
+        tagtable = self.text_buffer.get_tag_table()
+        hilite_tag = Gtk.TextTag.new('search-hilite')
         hilite_tag.props.background = '#FFFFB0'
         tagtable.add(hilite_tag)
-        select_tag = Gtk.TextTag('search-select')
+        select_tag = Gtk.TextTag.new('search-select')
         select_tag.props.background = '#B0B0FF'
         tagtable.add(select_tag)
 
-        self.text_buffer = GtkSource.Buffer(tag_table=tagtable)
         self.set_buffer(self.text_buffer)
 
         self.set_tab_width(4)
diff --git a/develop-activity/widgets.py b/develop-activity/widgets.py
index f7556c8..27382c4 100644
--- a/develop-activity/widgets.py
+++ b/develop-activity/widgets.py
@@ -41,7 +41,7 @@ class TabLabel(Gtk.HBox):
         self.pack_start(self._label, True, True, 0)
         self._label.show()
 
-        self.modify_base(Gtk.StateType.NORMAL, Gdk.Color(0, 0, 0, 1))
+        #self.modify_base(Gtk.StateType.NORMAL, Gdk.Color(0, 0, 0, 1))
 
         close_tab_icon = Icon(icon_name='close-tab')
         button = Gtk.Button()