Merge lp:~gtg-contributors/gtg/bug495246 into lp:~gtg/gtg/old-trunk

[Joao ascenso]

Fixed bug 495246

Changes the tag menu in the task editor for a check box menu. The bug also asked for ordered itens, but im my tests all itens were already ordered automatically.

[Izidor Matušov (izidor)]

Hi Joao,

Nobody reviews your code so far, I'll do it now :-) It looks great and also works great for adding new tags. There are just one problem which should be fixed:

Removing tags does not work well, mostly the task has more than one instance of that tag. You probably use iterators not in the way as it was meant: (I've got this error)

/home/iyo/downloads/bug495246/GTG/gtk/editor/taskview.py:743: GtkWarning: Invalid text buffer iterator: either the iterator is uninitialized, or the characters/pixbufs/widgets in the buffer have been modified since the iterator was created.
You must use marks, character numbers, or line numbers to preserve a position across buffer modifications.
You can apply tags and insert marks without invalidating your iterators,
but any mutation that affects 'indexable' buffer contents (contents that can be referred to by character offset)
will invalidate all outstanding iterators
  if start.get_offset() <= offset2 <= end.get_offset():

review: Needs Resubmitting (code + running the code)

[Joao ascenso (joaoricardoascenso)]

Changed the owner to gtg-contributors, fell free to change it. I did it some time ago and had some problems that are a connected to the way the editor works. Editor has some issues detecting tags in the text, Just try to write a log task with the same tag over-repeated and it only detects some instances of the tag.

With the revision of the editor, as stated by lionel, its a great time to look at it again

[lp:~gtg-contributors/gtg/bug495246]

936. By Izidor Matušov on 2011-11-06

Updating algorithm for removing tags

[Izidor Matušov (izidor)]

I played with the algorithm for removing today and updated it. Now it works in two steps:

1) remove highlighted tag
2) remove other occurrences of the tag as well, although they are not highlighted (yet)

Small testing:

I have a task with lot of '@money' tag: http://is.gd/VqlNkR

And I want to remove that tag and properly I get this window: http://is.gd/7hiTd2

Please, test it and see how it will work for you.

By the way: shouldn't be all occurrences of a tag highlighted?

[Joao ascenso (joaoricardoascenso)]

Sorry izidor, only saw this now.

Cumprimentos

João Ascenso

2011/11/6 Izidor Matušov <email address hidden>

> I played with the algorithm for removing today and updated it. Now it
> works in two steps:
>
> 1) remove highlighted tag
> 2) remove other occurrences of the tag as well, although they are not
> highlighted (yet)
>
> Small testing:
>
> I have a task with lot of '@money' tag: http://is.gd/VqlNkR
>
> And I want to remove that tag and properly I get this window:
> http://is.gd/7hiTd2
>
> Please, test it and see how it will work for you.
>

i'll try to check it tommorow, im busy has hell because im at the last days
of a project

>
> By the way: shouldn't be all occurrences of a tag highlighted?
>

there are a few issues with the task editor, when i was adding that feature
there was someone helping me (cant remember who, sorry) he told me that the
editor had that issues and suggested in a near future to be re-visioned and
optimized. It has some issues and sometimes only tags the last occurrence
of a tag. I believe it has to do with the way it iterates thought the text
and colors it. It may be a nice thing for me to focus on the hack metting

> --
> https://code.launchpad.net/~gtg-contributors/gtg/bug495246/+merge/56881<https://code.launchpad.net/%7Egtg-contributors/gtg/bug495246/+merge/56881>
> You proposed lp:~gtg-contributors/gtg/bug495246 for merging.
>

[Izidor Matušov (izidor)]

There wasn't activity for almost a year, closing this merge request as REJECTED. If you want to finish your patch, feel free to reopen it.

Unmerged revisions

936. By Izidor Matušov on 2011-11-06

Updating algorithm for removing tags

935. By joaoascenso <joaoascenso@seph-mint> on 2011-04-08

commit 2

934. By joaoascenso <joaoascenso@seph-mint> on 2011-04-08

coded a fix to bug#495246 and other possible related problems

=== modified file 'AUTHORS'
--- AUTHORS	2011-09-25 13:17:30 +0000
+++ AUTHORS	2011-11-06 13:05:27 +0000
@@ -75,6 +75,10 @@
 * Daniel Neel <[e-mail]>
 * Ivan Evtukhovich <[e-mail]>
 * Madhumitha Viswanathan <[e-mail]>
+<<<<<<< TREE
 * Fabio Prina <[e-mail]>
 * François <https://launchpad.net/~unpeudescience> (no email provided)
 * Marcos Lenharo <https://launchpad.net/~lenharo-h> (no email provided)
+=======
+* Joao Ascenso <[e-mail]>
+>>>>>>> MERGE-SOURCE

=== modified file 'CHANGELOG'
--- CHANGELOG	2011-08-12 14:11:35 +0000
+++ CHANGELOG	2011-11-06 13:05:27 +0000
@@ -1,4 +1,5 @@
 ????-??-?? Getting Things GNOME! ?.?.?
+    * Changed the tag menu list in task editing to be a list of checkboxes
     * Fixed crash traceback when pressing 'delete' key, by Jeff Oliver
     * Added link to web documentation in Help menu, by Ronan Jouchet
     * Fixed bug with data consistency #579189, by Marko Kevac

=== modified file 'GTG/gtk/editor/editor.py'
--- GTG/gtk/editor/editor.py	2011-10-30 09:30:17 +0000
+++ GTG/gtk/editor/editor.py	2011-11-06 13:05:27 +0000
@@ -158,6 +158,9 @@
         self.plugin_api = PluginAPI(self.req, self.vmanager, self)
         self.pengine.register_api(self.plugin_api)
         self.pengine.onTaskLoad(self.plugin_api)
+        
+        #menu itens for the checkboxmenu
+        self.menu = gtk.Menu()
 
         #Putting the refresh callback at the end make the start a lot faster
         self.textview.refresh_callback(self.refresh_editor)
@@ -323,26 +326,41 @@
         if startdate != prevdate or type(startdate) is not type(prevdate):
             zedate = str(startdate).replace("-",date_separator)
             self.startdate_widget.set_text(zedate) 
-        #Refreshing the tag list in the insert tag button
+        self.refresh_menu()
+        if refreshtext:
+            self.textview.modified(refresheditor=False)
+        if to_save:
+            self.light_save()
+    
+    #Refreshing the tag Checkboxlist in the insert tag button
+    def refresh_menu(self):
+        
+        menu = self.menu
+        menu = gtk.Menu()
         taglist = self.req.get_used_tags()
-        menu = gtk.Menu()
+        tasktaglist = self.task.get_tags()
         tag_count = 0
         for tagname in taglist:
             tag_object = self.req.get_tag(tagname)
-            if not tag_object.is_special() and \
-               not self.task.has_tags(tag_list=[tagname]):
+            if not tag_object.is_special():
                 tag_count += 1
-                mi = gtk.MenuItem(label = tagname, use_underline=False)
-                mi.connect("activate", self.inserttag, tagname)
+                #bug#495246 change to a checkbox
+                mi = gtk.CheckMenuItem(tagname)
+                #if its an active tag, check the checkbox
+                if self.task.has_tags(tag_list=[tagname]):
+					mi.set_active(True)
+                mi.connect("activate", self.inserttag, tagname, mi.get_active())
+                #save the label of the button
+                mi.set_data("label", tagname)
                 mi.show()
                 menu.append(mi)
         if tag_count > 0 :
             self.inserttag_button.set_menu(menu)
-
-        if refreshtext:
-            self.textview.modified(refresheditor=False)
-        if to_save:
-            self.light_save()
+        else:
+            menu=gtk.Menu()
+            #avoids a bug with the last tag allways showing, but shows an empty menu
+            #need the oposite of self.inserttag_button.set_menu(menu)
+            self.inserttag_button.set_menu(menu)
 
     def date_changed(self,widget,data):
         text = widget.get_text()
@@ -462,9 +480,23 @@
         else :
             self.textview.insert_text(" @",itera)
         self.textview.grab_focus()
+        
 
-    def inserttag(self,widget,tag) : #pylint: disable-msg=W0613
-        self.textview.insert_tags([tag])
+    #tag - name of the tag clicked @example
+    #state - boolean that represents the state of the checkbox
+    #missing automatic detecting of a previous same name tag after removing
+    #unless a tag is manualy changed, in that case it detects and adds
+    def inserttag(self,widget,tag,state) : #pylint: disable-msg=W0613
+        
+        #note that the boolean is inversed
+        #if its a tag that's not active, insert it
+        if not state:
+            self.textview.insert_tags([tag])
+        #if its active remove it
+        else:
+            self.textview.remove_tagbyname(tag)
+        
+        self.textview.refresh_callback(self.refresh_editor)
         self.textview.grab_focus()
 
     def save(self) :

=== modified file 'GTG/gtk/editor/taskview.py'
--- GTG/gtk/editor/taskview.py	2011-08-26 15:20:31 +0000
+++ GTG/gtk/editor/taskview.py	2011-11-06 13:05:27 +0000
@@ -37,6 +37,7 @@
 
 from GTG.gtk.editor import taskviewserial
 from GTG.tools      import openurl
+from GTG.tools.tags import extract_tags_from_text
 
 
 separators = [' ', '.', ',', '/', '\n', '\t', '!', '?', ';', '\0']
@@ -608,6 +609,7 @@
                 for ta in tags :
                     #removing deleted tags
                     if ta.get_data('is_tag') :
+                        
                         tagname = ta.get_data('tagname')
                         old_tags.append(tagname)
                         buff.remove_tag(ta,start,end)
@@ -680,7 +682,12 @@
         # we remove tags that are not in the description anymore
         for t in old_tags :
             if not t in new_tags :
+				#update window to update cheklist of tags
                 self.remove_tag_callback(t)
+        #refresh the window to update the taglistcheckbox
+        self.refresh(self.get_title())
+		    
+        
                 
     def is_at_title(self,buff,itera) :
         to_return = False
@@ -694,6 +701,71 @@
             to_return = True
         return to_return
         
+    # Remove tag object
+    # Have to be in a separate function because we need to break from two cycles
+    def _remove_tagobj_byname(self, tag_to_delete):
+        buff = self.get_buffer()
+        it = buff.get_start_iter()
+        table = buff.get_tag_table()
+        while not it.is_end():
+            if it.begins_tag():
+                tags = it.get_toggled_tags(True)
+                for tag in tags:
+                    if not tag.get_data('is_tag'):
+                        continue
+
+                    tagname = tag.get_data('tagname')
+                    if tag_to_delete != tagname:
+                        continue
+
+                    self.remove_tag_callback(tagname)
+                    buff.remove_tag(tag, buff.get_start_iter(), buff.get_end_iter())
+                    table.remove(tag)
+
+                    #Removing the marks if they exist
+                    mark1 = buff.get_mark(tagname)
+                    temp_it = it.copy();
+                    temp_it2 = it.copy();
+                    it.forward_cursor_positions(len(tagname))
+                    if mark1 :
+                        buff.delete(temp_it,buff.get_iter_at_mark(mark1))
+                        buff.delete_mark_by_name(tagname)
+                    mark2 = buff.get_mark("/%s"%tagname)
+                    if mark2 :
+                        buff.delete(temp_it2,buff.get_iter_at_mark(mark2))
+                        buff.delete_mark_by_name("/%s"%tagname)
+                    return
+            # Move forward
+            it.forward_char()
+
+    #remove a all ocurrences of the tag in the text
+    #used to remove the tags when you click the checkbox
+    def remove_tagbyname(self, tag_to_delete):
+
+        self._remove_tagobj_byname(tag_to_delete)
+
+        # Remove any other text
+        buff = self.get_buffer()
+        changed = True
+        while changed:
+            changed = False
+            it = buff.get_start_iter()
+            while not it.is_end():
+                if it.get_char() == '@':
+                    end_it = it.copy()
+                    end_it.forward_chars(len(tag_to_delete)+1)
+                    text = it.get_text(end_it)
+                    tags = extract_tags_from_text(text)
+    
+                    if tags[0] == tag_to_delete:
+                        # After deleting, iterators are not valid anymore
+                        # We have to start again
+                        buff.delete(it, end_it)
+                        changed = True
+                        break
+    
+                it.forward_char()
+
     #When the user removes a selection, we remove subtasks and @tags
     #from this selection
     def _delete_range(self,buff,start,end) :