Merge lp:~gtg-user/gtg/gmail-like-ui into lp:~gtg/gtg/old-trunk

[myfreeweb]

[Luca Invernizzi (invernizzi)]

Hello,
this branch is just a coded mockup, is not ready for merging (I know, I've coded it with Kevin! :-D).
Besides, there is still an ongoing discussion on whether this feature is wanted or not (#384049).
If it's dropped but many people want this, maybe I can figure out to provide this as a plugin.

review: Disapprove

Unmerged revisions

=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2010-01-08 20:51:01 +0000
+++ GTG/core/task.py	2010-01-26 11:36:18 +0000
@@ -249,7 +249,10 @@
         """
         #defensive programmtion to avoid returning None
         if self.content:
-            element = xml.dom.minidom.parseString(self.content)
+            txt = self.content
+            for tag in self.get_tags_name():
+        	    txt = self._strip_tag(txt, tag)
+            element = xml.dom.minidom.parseString(txt)
             txt = self.__strip_content(element)
             txt = txt.strip()
             #We keep the desired number of lines
@@ -272,7 +275,8 @@
         if element:
             for n in element.childNodes:
                 if n.nodeType == n.ELEMENT_NODE:
-                    txt += self.__strip_content(n)
+                    if n.tagName!='subtask':
+                        txt += self.__strip_content(n)
                 elif n.nodeType == n.TEXT_NODE:
                     txt += n.nodeValue
         return txt
@@ -558,11 +562,19 @@
             for child in self.get_subtasks():
                 if child.can_be_deleted:
                     child.remove_tag(tagname)
-        self.content = (self.content
-                        .replace('<tag>%s</tag>\n\n'%(tagname), '') #trail \n
-                        .replace('<tag>%s</tag>, '%(tagname), '') #trail comma
-                        .replace('<tag>%s</tag>'%(tagname), '')
-                       )
+        self.content = self._strip_tag(self.content, tagname)
+                       
+    def _strip_tag(self, text, tagname):
+        return (text
+                    .replace('<tag>%s</tag>\n\n'%(tagname), '') #trail \n
+                    .replace('<tag>%s</tag>, '%(tagname), '') #trail comma
+                    .replace('<tag>%s</tag>'%(tagname), '')
+                    #in case XML is missing (bug #504899)
+                    .replace('%s\n\n'%(tagname), '') 
+                    .replace('%s, '%(tagname), '') 
+                    .replace(tagname, '')
+               )
+     
 
     #tag_list is a list of tags object
     #return true if at least one of the list is in the task

=== modified file 'GTG/taskbrowser/tasktree.py'
--- GTG/taskbrowser/tasktree.py	2009-12-21 00:05:04 +0000
+++ GTG/taskbrowser/tasktree.py	2010-01-26 11:36:18 +0000
@@ -21,6 +21,7 @@
 import gobject
 import pango
 import xml.sax.saxutils as saxutils
+import re
 
 from GTG import _
 from GTG.core.tree import Tree, TreeNode
@@ -130,10 +131,14 @@
         elif column == COL_LABEL:
             if task.get_status() == Task.STA_ACTIVE:
                 count = self._count_active_subtasks_rec(task)
+                text_first_line = task.get_excerpt(lines=1)
                 if count != 0:
                     title = saxutils.escape(task.get_title()) + " (%s)" % count
+                    title += "<small>  <span color='#BBBBBB'>" + \
+                            saxutils.escape(text_first_line) + "</span></small>"
                 else:
-                    title = saxutils.escape(task.get_title())
+                    title = saxutils.escape(task.get_title()) + "<small>  <span color='#BBBBBB'>" + \
+                            saxutils.escape(text_first_line) + "</span></small>" 
             elif task.get_status() == Task.STA_DISMISSED:
                     title = "<span color='#AAAAAA'>"\
                         + saxutils.escape(task.get_title()) + "</span>"
@@ -405,7 +410,7 @@
         render_text = gtk.CellRendererText()
         render_text.set_property("ellipsize", pango.ELLIPSIZE_END)
         title_col.set_title(_("Title"))
-        title_col.pack_start(render_text, expand=True)
+        title_col.pack_start(render_text, expand = True)
         title_col.add_attribute(render_text, "markup", COL_LABEL)
         title_col.set_resizable(True)
         title_col.set_expand(True)