Merge lp:~gtg/gtg/viewcount into lp:~gtg/gtg/old-trunk

[Lionel Dricot]

This branch solves the @t @ta @tag problem by using a new liblarch feature : the viewcount (which is a simpler viewtree).

It also removes any use of the "transparent" concept, which has been removed from liblarch.

Thing to test : performance regression and tag counting regressions.

[Izidor Matušov (izidor)]

I played with your patch.

First to say, you updated "trunk" of liblarch immediately and it was distributed into PPA and made people to report bug #1069963.

Another thing is, that you should have increased LIBLARCH_API number both in GTG & liblarch.

About performance. I measured it on my real tasks (220+):

Current GTG & liblarch:
real 0m4.775s
user 0m4.384s
sys 0m0.244s

Viewcount:
real 0m6.155s
user 0m5.808s
sys 0m0.260s

It is a little bit slower, UI is slower a little bit too. It is not an order of magnitude, it is bearable.

Please, get rid of commented code. Look at your diff and get rid of those print statetements or just commented code.

I get an error message when I start GTG: "There's no filter called gtg-tags-sep" --> Please, solve it.

I found a regression:

Make a tag @a child of tag @b by drag-and-drop. While you do it, the main pane is refreshed two times - it is slow and the user can see it. In the trunk, the main pane is not refreshed.

Same thing happens when you delete the last task in the tag -> the main pane is refreshed and it is so slow.

Another regression is that the tags are not expanded by default. When you have a tag tree @a -> @b, tag @a should be expanded by default during the boot time.

Another regression + performance issue: Try to search for "!not @gtg". I get 189 out of 213 results in trunk (althought initialy the count is 0). In your branch it is slow (I guess the refreshing something) but more important, it put there count 238 out of 213!!! Switching back and forth into workview and back doesn't help. (Workview shows correct count though) I would say it counts closed tasks as well.

Another regression: Strat GTG with the firstboot tasks. Look at the "Tasks without tags" count -> 7. Now mark some tasks without tags as done. The count doesn't change although the count of all tasks does -> you can have 7 of 6 tasks if you want. I guess it would be similar regression.

There are quite much work to do, it is not completed yet :) However, it looks promising!

review: Needs Fixing (code, run)

[Lionel Dricot (ploum-deactivatedaccount)]

Izidor > Regarding performances, I agree that the startup time is a bit slower but, on my tasks, use is *way* better. Normal GTG make it impossible for me to add a task with the quick add (there's a 4-5 seconds delay) while, with my branch, it just works.

Regarding liblarch, I merged it by mistake. Maybe you can revert it.

[lp:~gtg/gtg/viewcount]

1225. By Lionel Dricot on 2012-10-23

no viewcount for gtg-tags-sep

1226. By Lionel Dricot on 2012-10-23

solve the notag counting bug

[Lionel Dricot (ploum-deactivatedaccount)]

1) increased LIBLARCH_API number both in GTG & liblarch : TODO
2) get rid of commented code : TODO
3) There's no filter called gtg-tags-sep : FIXED
4) the main pane is refreshed two times : TODO
5) tags are not expanded by default : TODO
6) !not @gtg : TODO
7) Tasks without tags : FIXED

[Lionel Dricot (ploum-deactivatedaccount)]

1) increased LIBLARCH_API number both in GTG & liblarch : TODO
2) get rid of commented code : TODO
4) the main pane is refreshed two times : TODO
5) tags are not expanded by default : TODO
6) !not @gtg : TODO (in fact, viewcount for search is not yet implemented)
8) Crash on tag drag-n-drop : TODO

[lp:~gtg/gtg/viewcount]

1227. By Lionel Dricot on 2012-10-23

removing some commented lines

1228. By Lionel Dricot on 2012-10-23

update liblarch requirement

[Lionel Dricot (ploum-deactivatedaccount)]

1) increased LIBLARCH_API number both in GTG & liblarch : FIXED
2) get rid of commented code : FIXED
4) the main pane is refreshed two times : TODO
5) tags are not expanded by default : TODO
6) !not @gtg : TODO (in fact, viewcount for search is not yet implemented)
8) Crash on tag drag-n-drop : TODO

[lp:~gtg/gtg/viewcount]

1229. By Lionel Dricot on 2012-10-23

solve the counting bug for search tags and remove useless filter settings

[Lionel Dricot (ploum-deactivatedaccount)]

4) the main pane is refreshed two times : TODO
5) tags are not expanded by default : TODO
6) !not @gtg : FIXED
8) Crash on tag drag-n-drop : TODO

[lp:~gtg/gtg/viewcount]

1230. By Lionel Dricot on 2012-10-23

remove the deprecated has_parents in task

1231. By Lionel Dricot on 2012-10-23

take benefit from viewcount refresh

[Lionel Dricot (ploum-deactivatedaccount)]

I improved quite a lot the startup performance (went from 12s to 9s on my machine with my tasks).

[Izidor Matušov (izidor)]

I can confirm that the regressions you fixed are fixed. The performance on my tasks went down to 4 seconds and effectively there is no performance lost on boot. I haven't found any other regression.

[lp:~gtg/gtg/viewcount]

1232. By Lionel Dricot on 2012-10-28

The collapsed status of tags is now saved. Requires liblarch 2.1

[Lionel Dricot (ploum-deactivatedaccount)]

4) the main pane is refreshed two times : TODO
5) tags are not expanded by default : IMPLEMENTED

By default, tags are indeed not expanded. I have no idea why. But I have implemented the fact that the expanded/collapsed status is remembered (which was not the case previously).

8) Crash on tag drag-n-drop : TODO

[Lionel Dricot (ploum-deactivatedaccount)]

Should we fix 8) before merging? Not sure I've the time to fix it this week (I already spent some time on it without success).

I can confirm that this branch solves a lot of the performances issues.

[Bertrand Rousseau (bertrand-rousseau)]

Could you tell a bit more about this bug? Is there a related bug
report? When does it happen?

On Mon 29 Oct 2012 02:09:17 PM CET, Lionel Dricot wrote:
> Should we fix 8) before merging? Not sure I've the time to fix it this week (I already spent some time on it without success).
>
> I can confirm that this branch solves a lot of the performances issues.

--
Bertrand Rousseau
<email address hidden>

[Lionel Dricot (ploum-deactivatedaccount)]

No reported.

1. Launch GTG with default tasks
2. Display sidebar (F9)
3. Drag a tag and drop it on another

That's all.

[Bertrand Rousseau (bertrand-rousseau)]

Then we should either disable tag DnD or solve it, but we can't let it
crash GTG for such a common feature.

I'd like to release GTG 0.3 asap, so let's disable it if it require
advanced fix/testing. I'll let you judge about that.

Bertrand

On Mon 29 Oct 2012 03:13:25 PM CET, Lionel Dricot wrote:
> No reported.
>
> 1. Launch GTG with default tasks
> 2. Display sidebar (F9)
> 3. Drag a tag and drop it on another
>
> That's all.

--
Bertrand Rousseau
<email address hidden>

[Lionel Dricot (ploum-deactivatedaccount)]

Le 29/10/2012 15:29, Bertrand Rousseau a écrit :
> Then we should either disable tag DnD or solve it, but we can't let it
> crash GTG for such a common feature.

It crashes only in that very specific configuration. I've been unable to
reproduce this bug in any other circumstances. I'm really wondering what
this bug is.

>
> I'd like to release GTG 0.3 asap, so let's disable it if it require
> advanced fix/testing. I'll let you judge about that.

We cannot disable tag drag-n-drop, that's a major feature.

>
> Bertrand
>
> On Mon 29 Oct 2012 03:13:25 PM CET, Lionel Dricot wrote:
>> No reported.
>>
>> 1. Launch GTG with default tasks
>> 2. Display sidebar (F9)
>> 3. Drag a tag and drop it on another
>>
>> That's all.
> --
> Bertrand Rousseau
> <email address hidden>
>

[Bertrand Rousseau (bertrand-rousseau)]

On Mon 29 Oct 2012 03:34:31 PM CET, Lionel Dricot wrote:
> Le 29/10/2012 15:29, Bertrand Rousseau a écrit :
>> Then we should either disable tag DnD or solve it, but we can't let it
>> crash GTG for such a common feature.
>
> It crashes only in that very specific configuration. I've been unable to
> reproduce this bug in any other circumstances. I'm really wondering what
> this bug is.

The (very) annoying thing is that those default tasks invite the new
user to try and test tag DnD. What is your estimation of the required
work to fix this bug?

>>
>> I'd like to release GTG 0.3 asap, so let's disable it if it require
>> advanced fix/testing. I'll let you judge about that.
>
> We cannot disable tag drag-n-drop, that's a major feature.
>
>>
>> Bertrand
>>
>> On Mon 29 Oct 2012 03:13:25 PM CET, Lionel Dricot wrote:
>>> No reported.
>>>
>>> 1. Launch GTG with default tasks
>>> 2. Display sidebar (F9)
>>> 3. Drag a tag and drop it on another
>>>
>>> That's all.
>> --
>> Bertrand Rousseau
>> <email address hidden>
>>
>
>

--
Bertrand Rousseau
<email address hidden>

[Bertrand Rousseau (bertrand-rousseau)]

Btw, it doesn't crash on my computer, but leave the following trace
(after dropping "money" on "errands"):

Traceback (most recent call last):
  File
"/home/rousseau/workspace/personal/gtg/viewcount/GTG/gtk/browser/browser.py",
line 1152, in on_select_tag
    self.apply_filter_on_panes(tagname)
  File
"/home/rousseau/workspace/personal/gtg/viewcount/GTG/gtk/browser/browser.py",
line 1122, in apply_filter_on_panes
    vtree.apply_filter(filter_name, refresh=refresh)
  File "../liblarch/liblarch/viewtree.py", line 276, in apply_filter
    self.__ft.apply_filter(filter_name, parameters, reset, refresh)
  File "../liblarch/liblarch/filteredtree.py", line 635, in apply_filter
    self.refilter()
  File "../liblarch/liblarch/filteredtree.py", line 313, in refilter
    self.send_remove_tree(node_id, self.root_id)
  File "../liblarch/liblarch/filteredtree.py", line 287, in
send_remove_tree
    self.callback('deleted', node_id, path)
  File "../liblarch/liblarch/filteredtree.py", line 124, in callback
    func(node_id,path)
  File "../liblarch/liblarch/viewtree.py", line 115, in __emit
    func(node_id,path)
  File
"/home/rousseau/workspace/personal/gtg/viewcount/GTG/gtk/browser/treeview_factory.py",
line 346, in _update_tags
    tree.refresh_node(t.get_name())
  File "../liblarch/liblarch/__init__.py", line 87, in refresh_node
    self.__tree.modify_node(node_id, priority)
  File "../liblarch/liblarch/tree.py", line 88, in modify_node
    self._queue.push(self._modify_node, node_id, priority=priority)
  File "../liblarch/liblarch/processqueue.py", line 65, in push
    func(*element[1:])
  File "../liblarch/liblarch/tree.py", line 269, in _modify_node
    self._callback('node-modified', node_id)
  File "../liblarch/liblarch/tree.py", line 78, in _callback
    func(node_id)
  File "../liblarch/liblarch/filteredtree.py", line 129, in
__external_modify
    return self.__update_node(node_id,direction="both")
  File "../liblarch/liblarch/filteredtree.py", line 219, in
__update_node
    for path in self.get_paths_for_node(node_id):
  File "../liblarch/liblarch/filteredtree.py", line 440, in
get_paths_for_node
    raise Exception("%s is not children of %s\n%s" % (node_id,
parent_id, s))
Exception: @money is not children of @errands

On Wed 31 Oct 2012 02:35:27 PM CET, Bertrand Rousseau wrote:
>
>
> On Mon 29 Oct 2012 03:34:31 PM CET, Lionel Dricot wrote:
>> Le 29/10/2012 15:29, Bertrand Rousseau a écrit :
>>> Then we should either disable tag DnD or solve it, but we can't let it
>>> crash GTG for such a common feature.
>>
>> It crashes only in that very specific configuration. I've been unable to
>> reproduce this bug in any other circumstances. I'm really wondering what
>> this bug is.
>
> The (very) annoying thing is that those default tasks invite the new
> user to try and test tag DnD. What is your estimation of the required
> work to fix this bug?
>
>>>
>>> I'd like to release GTG 0.3 asap, so let's disable it if it require
>>> advanced fix/testing. I'll let you judge about that.
>>
>> We cannot disable tag drag-n-drop, that's a major feature.
>>
>>>
>>> Bertrand
>>>
>>> On Mon 29 Oct 2012 03:13:25 PM CET, Lionel Dricot wrote:
>>>> No repor...

[Lionel Dricot (ploum-deactivatedaccount)]

Le 31/10/2012 14:40, Bertrand Rousseau a écrit :
> Btw, it doesn't crash on my computer, but leave the following trace
> (after dropping "money" on "errands"):
>

This is what I call "the crash". Indeed, it doesn't seem to have any
impact other than making a trace. *any* hint on what could explain this
trace is very welcome. I would like to fix this.

[Izidor Matušov (izidor)]

I found a reason for the bug: There are still active hacks for counting in GTG -> enable/disable_update_tags() and _update_tags() in GTG/gtk/browser/treeview_factory.py (If you put a "return" statement at the beginning of _update_tags(), i.e. comment out the method body, it works perfect)

[Izidor Matušov (izidor)]

Please get rid of commented AutoExpandTreeView class.

review: Needs Fixing

[lp:~gtg/gtg/viewcount]

1233. By Lionel Dricot on 2012-10-31

Removed loft of things now useless thanks to viewcount. Fixed the crash.

[Lionel Dricot (ploum-deactivatedaccount)]

I've solved the crash. Thanks Izidor. I've removed an incredible amount of useless refresh everywhere. It should make the performance a lot better. And now, it can be merged once you test it :-)

[Bertrand Rousseau (bertrand-rousseau)]

I spent some time playing with tasks and tags with your branch (even with the infamous "bryce" data set), I haven't spot any bugs. It seems for me that it can be merged (that would also enabled broader testing).

review: Approve (run)

[lp:~gtg/gtg/viewcount]

1234. By Bertrand Rousseau on 2012-11-01

Update CHANGELOG

1235. By Bertrand Rousseau on 2012-11-01

Merge trunk

[Izidor Matušov (izidor)]

review: Approve

=== modified file 'CHANGELOG'
--- CHANGELOG	2012-09-08 08:10:51 +0000
+++ CHANGELOG	2012-11-01 10:11:21 +0000
@@ -53,6 +53,7 @@
     * Fix for bug-1037051 (Due date is not set for a new subtask), by Nimit Shah
     * Fix for bug #1036955: Due date is not preselected when start date is filled, by Steve Scheel
     * Fix for bug #1045036: Slovak Translation Updated by Slavko
+    * Remove use of liblarch's "transparent" concept (since it's been removed from liblarch), fixes bugs #1001962, #1001962, #1069257, #1069963: intermediary tags, counter initialization, and regressions caused by initial versions of the patch
 
 2012-02-13 Getting Things GNOME! 0.2.9
     * Big refractorization of code, now using liblarch
 
=== modified file 'GTG/core/__init__.py'
--- GTG/core/__init__.py	2012-08-08 18:16:38 +0000
+++ GTG/core/__init__.py	2012-11-01 10:11:21 +0000
@@ -55,7 +55,7 @@
             'toolbar': True,
             'quick_add': True,
             'collapsed_tasks': [],
-            'collapsed_tags': [],
+            'expanded_tags': [],
             'view': 'default',
             "opened_tasks": [],
             'width': 400,
 
=== modified file 'GTG/core/datastore.py'
--- GTG/core/datastore.py	2012-08-12 22:32:09 +0000
+++ GTG/core/datastore.py	2012-11-01 10:11:21 +0000
@@ -114,8 +114,6 @@
         if self.__tagstore.has_node(name):
             raise IndexError('tag %s was already in the datastore' % name)
 
-        parameters['transparent'] = True
-
         self.__tasks.add_filter(name, filter_func, parameters=parameters)
         self.__tagstore.add_node(tag, parent_id=parent_id)
         tag.set_save_callback(self.save)
 
=== modified file 'GTG/core/requester.py'
--- GTG/core/requester.py	2012-07-13 17:24:28 +0000
+++ GTG/core/requester.py	2012-11-01 10:11:21 +0000
@@ -54,6 +54,23 @@
 
     def is_displayed(self, task):
         return self.__basetree.get_viewtree(name='active').is_displayed(task)
+        
+    def get_basetree(self):
+        return self.__basetree
+        
+    #this method also update the viewcount of tags
+    def apply_global_filter(self,tree,filtername):
+        tree.apply_filter(filtername)
+        for t in self.get_all_tags():
+            ta = self.get_tag(t)
+            ta.apply_filter(filtername)
+    
+    def unapply_global_filter(self,tree,filtername):
+        tree.unapply_filter(filtername)
+        for t in self.get_all_tags():
+            ta = self.get_tag(t)
+            ta.unapply_filter(filtername)
+    
 
     ######### Filters bank #######################
     # List, by name, all available filters
 
=== modified file 'GTG/core/tag.py'
--- GTG/core/tag.py	2012-07-23 14:43:13 +0000
+++ GTG/core/tag.py	2012-11-01 10:11:21 +0000
@@ -56,6 +56,39 @@
         self._attributes = {'name': self._name}
         for key, value in attributes.iteritems():
             self.set_attribute(key, value)
+        
+        self.viewcount = None
+        
+    def __get_viewcount(self):
+        if not self.viewcount and self.get_name() != "gtg-tags-sep":
+            self.viewcount = self.req.get_basetree().get_viewcount\
+                                        (name=self.get_name(),refresh=False)
+            
+            sp_id = self.get_attribute("special")        
+            if sp_id == "all":
+                pass
+            if sp_id == "notag":
+                self.viewcount.apply_filter('notag',refresh=False)
+            #No special means a normal tag
+            else:
+                self.viewcount.apply_filter(self.get_name(),refresh=False)
+            self.viewcount.apply_filter('active')
+            self.viewcount.register_cllbck(self.modified)
+        return self.viewcount
+    
+    def apply_filter(self,filtername):
+        if self.viewcount:
+            self.viewcount.apply_filter(filtername)
+            
+    def unapply_filter(self,filtername):
+        if self.viewcount:
+            self.viewcount.unapply_filter(filtername)
+            
+    #When a task change a tag, we may want to manually update
+    #To ensure that the task is well counted/uncounted for that tag
+    def update_task(self,nid):
+        vc = self.__get_viewcount()
+        vc.modify(nid)
 
     #overiding some functions to not allow dnd of special tags
     def add_parent(self, parent_id):
@@ -163,22 +196,11 @@
         # this method purposefully doesn't rely on get_related_tasks()
         # which does a similar job, in order to benefit from liblarch
         # optimizations
-        if not tasktree:
-            tasktree = self.req.get_tasks_tree()
-        sp_id = self.get_attribute("special")
-        if sp_id == "all":
-            toreturn = tasktree.get_n_nodes(\
-                    withfilters=['active'], include_transparent=False)
-        elif sp_id == "notag":
-            toreturn = tasktree.get_n_nodes(\
-                            withfilters=['notag'], include_transparent=False)
-        elif sp_id == "sep":
-            toreturn = 0
+        vc = self.__get_viewcount()
+        if vc:
+            return vc.get_n_nodes()
         else:
-            tname = self.get_name()
-            toreturn = tasktree.get_n_nodes(\
-                                withfilters=[tname], include_transparent=False)
-        return toreturn
+            return 0
 
     def get_related_tasks(self, tasktree=None):
         """Returns all related tasks node ids"""
@@ -187,16 +209,16 @@
         sp_id = self.get_attribute("special")
         if sp_id == "all":
             toreturn = tasktree.get_nodes(\
-                    withfilters=['active'], include_transparent=False)
+                    withfilters=['active'])
         elif sp_id == "notag":
             toreturn = tasktree.get_nodes(\
-                            withfilters=['notag'], include_transparent=False)
+                            withfilters=['notag'])
         elif sp_id == "sep" :
             toreturn = []
         else:
             tname = self.get_name()
             toreturn = tasktree.get_nodes(\
-                                withfilters=[tname], include_transparent=False)
+                                withfilters=[tname])
         return toreturn
 
     def notify_related_tasks(self):
 
=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2012-08-15 15:23:45 +0000
+++ GTG/core/task.py	2012-11-01 10:11:21 +0000
@@ -208,7 +208,7 @@
             # (old_status check is necessary to avoid false positive a start)
             elif status in [self.STA_ACTIVE] and\
                  old_status in [self.STA_DONE, self.STA_DISMISSED]:
-                if self.has_parents():
+                if self.has_parent():
                     for p_tid in self.get_parents():
                         par = self.req.get_task(p_tid)
                         if par.is_loaded() and par.get_status() in\
@@ -476,24 +476,6 @@
         """
         return self.req.get_task(tid)
 
-    #Return true is the task has parent
-    #If tag is provided, return True only
-    #if the parent has this particular tag
-    #FIXME : this function should be removed. Use the liblarch instead !
-    def has_parents(self, tag=None):
-        print "DEPRECATED: has_parent"
-        has_par = TreeNode.has_parent(self)
-        #The "all tag" argument
-        if tag and has_par:
-            a = 0
-            for tid in self.get_parents():
-                p = self.req.get_task(tid)
-                a += p.has_tags(tag)
-            to_return = a
-        else:
-            to_return = has_par
-        return to_return
-
     def set_attribute(self, att_name, att_value, namespace=""):
         """Set an arbitrary attribute.
 
@@ -601,6 +583,7 @@
 
     #remove by tagname
     def remove_tag(self, tagname):
+#        print "remove tag %s" %tagname
         modified = False
         if tagname in self.tags:
             self.tags.remove(tagname)
@@ -611,8 +594,12 @@
         self.content = self._strip_tag(self.content, tagname)
         if modified:
             tag = self.req.get_tag(tagname)
+            # The ViewCount of the tag still doesn't know that
+            # the task was removed. We need to update manually
+            tag.update_task(self.get_id())
             if tag:
                 tag.modified()
+#            print "removing now %s and tag is %s - %s" %(tagname,tag, tag.get_active_tasks_count())
 
     def set_only_these_tags(self, tags_list):
         '''
 
=== modified file 'GTG/core/treefactory.py'
--- GTG/core/treefactory.py	2012-07-13 17:24:28 +0000
+++ GTG/core/treefactory.py	2012-11-01 10:11:21 +0000
@@ -45,14 +45,14 @@
           'workview': [self.workview],
           'active': [self.active],
           'closed': [self.closed, {'flat': True}],
-          'notag': [self.notag, {'transparent': True}],
+          'notag': [self.notag],
           'workable': [self.is_workable],
           'started': [self.is_started],
           'workdue': [self.workdue],
           'workstarted': [self.workstarted],
           'worktostart': [self.worktostart],
           'worklate': [self.worklate],
-          'no_disabled_tag': [self.no_disabled_tag, {'transparent': True}],
+          'no_disabled_tag': [self.no_disabled_tag],
           }
 
         for f in f_dic:
@@ -80,7 +80,7 @@
         alltag.set_attribute("icon", "gtg-tags-all")
         alltag.set_attribute("order", 0)
         tagtree.add_node(alltag)
-        p = {'transparent': True}
+        p = {}
         self.tasktree.add_filter(CoreConfig.ALLTASKS_TAG,\
                                     self.alltag, parameters=p)
         # Build the "without tag tag"
@@ -91,7 +91,7 @@
         notag_tag.set_attribute("icon", "gtg-tags-none")
         notag_tag.set_attribute("order", 2)
         tagtree.add_node(notag_tag)
-        p = {'transparent': True}
+        p = {}
         self.tasktree.add_filter(CoreConfig.NOTAG_TAG,\
                                     self.notag, parameters=p)
 
@@ -103,7 +103,7 @@
         search_tag.set_attribute("icon", "search")
         search_tag.set_attribute("order", 1)
         tagtree.add_node(search_tag)
-        p = {'transparent': True}
+        p = {}
         self.tasktree.add_filter(CoreConfig.SEARCH_TAG,
                                    search_filter, parameters=p)
 
 
=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2012-08-12 23:01:10 +0000
+++ GTG/gtk/browser/browser.py	2012-11-01 10:11:21 +0000
@@ -79,6 +79,7 @@
         self.vmanager = vmanager
         self.config = self.req.get_config('browser')
         self.tag_active = False
+        self.applied_tags = []
 
         #treeviews handlers
         self.vtree_panes = {}
@@ -95,7 +96,7 @@
 
         # Set up models
         # Active Tasks
-        self.activetree.apply_filter('active')
+        self.req.apply_global_filter(self.activetree,'active')
         # Tags
         self.tagtree = None
         self.tagtreeview = None
@@ -201,19 +202,18 @@
         self.tagtree = self.req.get_tag_tree()
         self.tagtreeview = self.tv_factory.tags_treeview(self.tagtree)
         #Tags treeview
-        self.tagtreeview.connect('cursor-changed', \
-            self.on_select_tag)
-        self.tagtreeview.connect('row-activated', \
+        self.tagtreeview.get_selection().connect('changed', \
             self.on_select_tag)
         self.tagtreeview.connect('button-press-event', \
             self.on_tag_treeview_button_press_event)
         self.tagtreeview.connect('key-press-event', \
             self.on_tag_treeview_key_press_event)
+        self.tagtreeview.connect('node-expanded', \
+            self.on_tag_expanded)
+        self.tagtreeview.connect('node-collapsed', \
+            self.on_tag_collapsed)
         self.sidebar_container.add(self.tagtreeview)
 
-        # Refresh tree
-        self.tagtree.reset_filters(transparent_only=True)
-
         # expanding search tag does not work automatically, request it
         self.expand_search_tag()
 
@@ -510,10 +510,15 @@
                 path = path[:-1]
             self.vtree_panes['active'].collapse_node(path)
 
-        for t in self.config.get("collapsed_tags"):
-            #FIXME
-            print "Collapsing tag %s not implememted in browser.py" %t
-#            self.tagtreeview.set_collapsed_tags(toset)
+        for path_t in self.config.get("expanded_tags"):
+            #the tuple was stored as a string. we have to reconstruct it
+            path = ()
+            for p in path_t[1:-1].split(","):
+                p = p.strip(" '")
+                path += (p, )
+            if path[-1] == '':
+                path = path[:-1]
+            self.tagtreeview.expand_node(path)
 
         self.set_view(self.config.get("view"))
 
@@ -550,25 +555,20 @@
             return
 
         self.in_toggle_workview = True
-        self.tv_factory.disable_update_tags()
 
         if self.config.get('view') == 'workview':
             self.set_view('default')
         else:
             self.set_view('workview')
 
-        if self.tagtree is not None:
-            self.tv_factory.enable_update_tags()
-            self.tagtree.refresh_all()
-
         self.in_toggle_workview = False
 
     def set_view(self, viewname):
         if viewname == 'default':
-            self.activetree.unapply_filter('workview')
+            self.req.unapply_global_filter(self.activetree,'workview')
             workview = False
         elif viewname == 'workview':
-            self.activetree.apply_filter('workview')
+            self.req.apply_global_filter(self.activetree,'workview')
             workview = True
         else:
             raise Exception('Cannot set the view %s' %viewname)
@@ -613,13 +613,6 @@
 ### SIGNAL CALLBACKS ##########################################################
 # Typically, reaction to user input & interactions with the GUI
 #
-    def register_filter_callback(self, cb):
-        print "DEPRECATED function register_filter_callback."
-        print "It is only dummy funnction now, ready for removing"
-
-    def unregister_filter_callback(self, cb):
-        print "DEPRECATED function unregister_filter_callback."
-        print "It is only dummy funnction now, ready for removing"
 
     def on_sort_column_changed(self, model):
         sort_column, sort_order = model.get_sort_column_id()
@@ -762,6 +755,16 @@
         colt = self.config.get("collapsed_tasks")
         if tid not in colt:
             colt.append(str(tid))
+    
+    def on_tag_expanded(self, sender, tag):
+        colt = self.config.get("expanded_tags")
+        if tag not in colt:
+            colt.append(tag)
+
+    def on_tag_collapsed(self, sender, tag):
+        colt = self.config.get("expanded_tags")
+        if tag in colt:
+            colt.remove(str(tag))
 
     def on_quickadd_activate(self, widget):
         """ Add a new task from quickadd toolbar """
@@ -1107,12 +1110,17 @@
                 task.set_status(Task.STA_DISMISSED)
                 self.close_all_task_editors(uid)
 
-    def apply_filter_on_panes(self, filter_name):
-        """ Apply filters for every pane: active tasks, closed tasks """
-        for pane in self.vtree_panes:
-            vtree = self.req.get_tasks_tree(name=pane, refresh=False)
-            vtree.reset_filters(refresh=False, transparent_only=True)
-            vtree.apply_filter(filter_name, refresh=True)
+    def apply_filter_on_panes(self, filter_name,refresh=True):
+        """ Apply filters for every pane: active tasks, closed tasks """
+        for pane in self.vtree_panes:
+            vtree = self.req.get_tasks_tree(name=pane, refresh=False)
+            vtree.apply_filter(filter_name, refresh=refresh)
+            
+    def unapply_filter_on_panes(self, filter_name,refresh=True):
+        """ Apply filters for every pane: active tasks, closed tasks """
+        for pane in self.vtree_panes:
+            vtree = self.req.get_tasks_tree(name=pane, refresh=False)
+            vtree.unapply_filter(filter_name, refresh=refresh)
 
     def on_select_tag(self, widget=None, row=None, col=None):
         """
@@ -1120,26 +1128,23 @@
         """
         # FIXME add support for multiple selection of tags in future
 
-        # When enable_update_tags we should update all tags to match
-        # the current state. However, applying tag filter does not influence
-        # other tags, because of transparent filter. Therefore there is no
-        # self.tagree.refresh_all() => a significant optimization!
-        # See do_toggle_workview()
-        self.tv_factory.disable_update_tags()
-
         #When you click on a tag, you want to unselect the tasks
-        taglist = self.get_selected_tags()
-        if len(taglist) > 0:
-            tagname = taglist[0]
-            self.apply_filter_on_panes(tagname)
-
-            # In case of search tag, set query in quickadd for
-            # refining search query
-            tag = self.req.get_tag(tagname)
-            if tag.is_search_tag():
-                self.quickadd_entry.set_text(tag.get_attribute("query"))
-
-        self.tv_factory.enable_update_tags()
+        new_taglist = self.get_selected_tags()
+        
+        for tagname in self.applied_tags:
+            if tagname not in new_taglist:
+                self.unapply_filter_on_panes(tagname,refresh=False)
+        
+        for tagname in new_taglist:
+            if tagname not in self.applied_tags:
+                self.apply_filter_on_panes(tagname)
+                # In case of search tag, set query in quickadd for
+                # refining search query
+                tag = self.req.get_tag(tagname)
+                if tag.is_search_tag():
+                    self.quickadd_entry.set_text(tag.get_attribute("query"))
+        
+        self.applied_tags = new_taglist
 
     def on_taskdone_cursor_changed(self, selection=None):
         """Called when selection changes in closed task view.
 
=== modified file 'GTG/gtk/browser/treeview_factory.py'
--- GTG/gtk/browser/treeview_factory.py	2012-07-13 17:24:28 +0000
+++ GTG/gtk/browser/treeview_factory.py	2012-11-01 10:11:21 +0000
@@ -31,26 +31,6 @@
 from GTG.gtk                          import colors
 from GTG.tools.dates                  import Date
 
-
-class AutoExpandTreeView(TreeView):
-    """TreeView which hide the expander column when not needed"""
-
-    def __init__(self, tree, desc):
-        TreeView.__init__(self, tree, desc)
-        self.show_expander = False
-        self.treemodel.connect("row-has-child-toggled", self.__show_expander_col)
-        self.__show_expander_col(self.treemodel, None, None)
-
-    def __has_child(self, model, path, iter):
-        if model.iter_has_child(iter):
-            self.show_expander = True
-            return True
-
-    def __show_expander_col(self, treemodel, path, iter):
-        self.show_expander = False
-        treemodel.foreach(self.__has_child)
-        self.set_show_expanders(self.show_expander)
-
 class TreeviewFactory():
 
     def __init__(self,requester,config):
@@ -311,37 +291,7 @@
         col['order'] = 3
         desc[col_name] = col
 
-        self.enable_update_tags()
-
         return self.build_tag_treeview(tree,desc)
-
-    def enable_update_tags(self):
-        self.tag_cllbcks = []
-
-        tasks = self.req.get_tasks_tree()
-        for event in 'node-added-inview', 'node-modified-inview', 'node-deleted-inview':
-            handle = tasks.register_cllbck(event, self._update_tags)
-            self.tag_cllbcks.append((event, handle))
-
-    def disable_update_tags(self):
-        tasks = self.req.get_tasks_tree()
-        for event, handle in self.tag_cllbcks:
-            tasks.deregister_cllbck(event, handle)
-        self.tag_cllbcks = []
-
-    def _update_tags(self, node_id, path):
-        tree = self.req.get_tag_tree().get_basetree()
-        tree.refresh_node('gtg-tags-all')
-        tree.refresh_node('gtg-tags-none')
-
-        search_parent = self.req.get_tag(CoreConfig.SEARCH_TAG)
-        for search_tag in search_parent.get_children():
-            tree.refresh_node(search_tag)
-
-        task = self.req.get_task(node_id)
-        if task:
-            for t in self.req.get_task(node_id).get_tags():
-                tree.refresh_node(t.get_name())
     
     def active_tasks_treeview(self,tree):
         #Build the title/label/tags columns
@@ -457,7 +407,7 @@
         
     
     def build_task_treeview(self,tree,desc):
-        treeview = AutoExpandTreeView(tree,desc)
+        treeview = TreeView(tree,desc)
         #Now that the treeview is done, we can polish
         treeview.set_main_search_column('label')
         treeview.set_expander_column('label')
@@ -474,7 +424,7 @@
         return treeview
         
     def build_tag_treeview(self,tree,desc):
-        treeview = AutoExpandTreeView(tree,desc)
+        treeview = TreeView(tree,desc)
         # Global treeview properties
         treeview.set_property("enable-tree-lines", False)
         treeview.set_rules_hint(False)
 
=== modified file 'GTG/tools/import_liblarch.py'
--- GTG/tools/import_liblarch.py	2012-07-23 14:31:44 +0000
+++ GTG/tools/import_liblarch.py	2012-11-01 10:11:21 +0000
@@ -22,7 +22,7 @@
 
 import sys
 
-REQUIRED_LIBLARCH_API = "1.2"
+REQUIRED_LIBLARCH_API = "2.1"
 GIT_CMD = "git clone https://github.com/liblarch/liblarch ../liblarch"
 
 def import_liblarch(use_local=False):