Merge lp:~jonathan-barnoud/gtg/spellcheck into lp:~gtg/gtg/old-trunk

[Pititjo]

[Lionel Dricot (ploum-deactivatedaccount)]

Hello Jonathan,

I've reviewed your work and I'm impressed by your work. It's really
good, thanks you a lot for this :-)

I still have a few comments and stuffs I would prefer to see fixed
before merging your code.

0) It's a general rule we will apply to everybody submitting patches :
please be in sync with the tree before submitting your branch.
It means that you have to merge the trunk into your branch before asking
for a merge. It's more pain for you but less for us and we might have
multiple merge requests.
To be done : in your branch, type "bzr merge lp;gtg" and see it's still
working fine (fixe conflicts if any)

1) I don't like passing too much options when building the TaskEditor.
It's not your fault and you had no choice but I want to say that
publicly ;-)
To be done : nothing

2) As you stated in your statement, manually removing the
<gtk-misspelled> is ugly and I don't want that.
The right way of doing that is to ignore this specifics tag in
taskviewserial, around line 127.
if tag.props.name = gtk-misspelled :
(we still add the text in the tag)
parent.appendChild(doc.createTextNode(text))
You will see that in the new revision, unknown tags are automatically
dismissed (or should be). Maybe you will not have anything to do
To be done :
- remove the 2 ugly lines
- test extensively and add an exception if needed

3) The button. I'm not convinced about a button to enable/disable spell
check as you don't do it often. I think that a right clic would be more
appropriate. I'm not sure and this is not a blocking point for the
merge.
To be done : nothing really. Maybe investigate the right clic option for
later but I will merge your work anyway.

Don't get me wrong : your work is really really good. The fact that you
contributed to taskview.py makes you a superhero :-)

Do you plan to continue contributing to GTG after that ? Have you
anything you would want to do ?

Also, is there anything you think we can improve in the development
process ? We are beginner so don't hesitate to tell us about anything,
any suggestion you might have for the small GTG community.

Thanks Jonathan :-)

Lionel

Le vendredi 13 mars 2009 à 21:25 +0000, Pititjo a écrit :
> Pititjo has proposed merging lp:~jonathan-barnoud/gtg/spellcheck into lp:gtg.
>
> Requested reviews:
> Gtg developers (gtg)

[lp:~jonathan-barnoud/gtg/spellcheck]

192. By Lionel Dricot on 2009-03-13

fixes two small and rare bugs

[Pititjo (jonathan-barnoud)]

Le vendredi 13 mars 2009 à 22:15 +0000, Lionel Dricot a écrit :
> Hello Jonathan,
>
> I've reviewed your work and I'm impressed by your work. It's really
> good, thanks you a lot for this :-)
>
> I still have a few comments and stuffs I would prefer to see fixed
> before merging your code.
>

I will work on what you ask. I agree whith the button and I understand a
part of the serializer.

>
> Don't get me wrong : your work is really really good. The fact that you
> contributed to taskview.py makes you a superhero :-)
>
> Do you plan to continue contributing to GTG after that ? Have you
> anything you would want to do ?

I plan to continue contributing to GTG but I don't know how. Perhaps in
the integration with Gnome and other applications.

>
> Also, is there anything you think we can improve in the development
> process ? We are beginner so don't hesitate to tell us about anything,
> any suggestion you might have for the small GTG community.

Documentation would be great. But that will come.

I'm a beginner too. It's my first contribution in a software. I love to
be a superhero ^^.
>
> Thanks Jonathan :-)

Mais de rien.

>
>
> Lionel
>

Jonathan

[lp:~jonathan-barnoud/gtg/spellcheck]

193. By Lionel Dricot on 2009-03-14

Ctrl+N and Ctrl+Shift+N (fixes bug #341549 ).
Patch by Antons Rebguns. Thanks Antons, you rock :-)

194. By Lionel Dricot on 2009-03-14

Refactorized the serializer to better handle recursion.

[Bertrand Rousseau (bertrand-rousseau)]

On Fri, Mar 13, 2009 at 11:14 PM, Lionel Dricot <email address hidden> wrote:
> Hello Jonathan,
>
> I've reviewed your work and I'm impressed by your work. It's really
> good, thanks you a lot for this :-)
>
> I still have a few comments and stuffs I would prefer to see fixed
> before merging your code.
>
> 0) It's a general rule we will apply to everybody submitting patches :
> please be in sync with the tree before submitting your branch.
> It means that you have to merge the trunk into your branch before asking
> for a merge. It's more pain for you but less for us and we might have
> multiple merge requests.
> To be done : in your branch, type "bzr merge lp;gtg" and see it's still
> working fine (fixe conflicts if any)
>
> 1) I don't like passing too much options when building the TaskEditor.
> It's not your fault and you had no choice but I want to say that
> publicly ;-)
> To be done : nothing
>
> 2) As you stated in your statement, manually removing the
> <gtk-misspelled> is ugly and I don't want that.
> The right way of doing that is to ignore this specifics tag in
> taskviewserial, around line 127.
> if tag.props.name = gtk-misspelled :
> (we still add the text in the tag)
> parent.appendChild(doc.createTextNode(text))
> You will see that in the new revision, unknown tags are automatically
> dismissed (or should be). Maybe you will not have anything to do
> To be done :
> - remove the 2 ugly lines
> - test extensively and add an exception if needed
>
> 3) The button. I'm not convinced about a button to enable/disable spell
> check as you don't do it often. I think that a right clic would be more
> appropriate. I'm not sure and this is not a blocking point for the
> merge.
> To be done : nothing really. Maybe investigate the right clic option for
> later but I will merge your work anyway.

Yes, I too think that this button is useless. Many apps
have this kind of settings in their "Preferences". I guess we should
do this too. I'll open a bug about this. When the preferences editor
will OK, then this button should be removed and an option placed
there.

>
> Don't get me wrong : your work is really really good. The fact that you
> contributed to taskview.py makes you a superhero :-)

I confirm ;-), thanks a lot for your work!

> Do you plan to continue contributing to GTG after that ? Have you
> anything you would want to do ?
>
> Also, is there anything you think we can improve in the development
> process ? We are beginner so don't hesitate to tell us about anything,
> any suggestion you might have for the small GTG community.
>
> Thanks Jonathan :-)
>
>
> Lionel
>
> Le vendredi 13 mars 2009 à 21:25 +0000, Pititjo a écrit :
>> Pititjo has proposed merging lp:~jonathan-barnoud/gtg/spellcheck into lp:gtg.
>>
>> Requested reviews:
>>     Gtg developers (gtg)
>
>

--
Bertrand Rousseau
Place communale 1, 1450 Chastre, Belgium
e-mail : <email address hidden>
tel : [phone]

[lp:~jonathan-barnoud/gtg/spellcheck]

195. By Pititjo on 2009-03-17

Refactoring taswviewserial.Serializer.parse_buffer

196. By Pititjo on 2009-03-17

Provide spell check with gtkspell

197. By Pititjo on 2009-03-18

Prepare merge with trunk in pre-replacing test/xdg

198. By Pititjo on 2009-03-18

Merge with trunk

[Bertrand Rousseau (bertrand-rousseau)]

This branch needs to be fixed regarding the remarks in the comments. It should probably be updated as well with the latest changes in the trunk.

review: Needs Fixing

[Pititjo (jonathan-barnoud)]

Le jeudi 30 juillet 2009 à 09:02 +0000, Bertrand Rousseau a écrit :
> Review: Needs Fixing
> This branch needs to be fixed regarding the remarks in the comments. It should probably be updated as well with the latest changes in the trunk.

Arrghh !

I haven't test this branch for a while ! I don't know how it works with
new revision of GTG. I don't know if it's a good idea to merge it now.

Pititjo

[Bertrand Rousseau (bertrand-rousseau)]

> Le jeudi 30 juillet 2009 à 09:02 +0000, Bertrand Rousseau a écrit :
> > Review: Needs Fixing
> > This branch needs to be fixed regarding the remarks in the comments. It
> should probably be updated as well with the latest changes in the trunk.
>
> Arrghh !
>
> I haven't test this branch for a while ! I don't know how it works with
> new revision of GTG. I don't know if it's a good idea to merge it now.
>
> Pititjo

Fortunately, the editor hasn't changed much. However browser.py has (and will even more soon). SO I guess it's still possible to update it. As you want.

I'll mark this as "Resubmit" since it's actually more just some small fixes. This will give you the time to work on this on your own pace.

Bertrand

review: Needs Resubmitting

[Luca Invernizzi (invernizzi)]

Is there still activity on this branch? Otherwise someone could take it over, or we could just drop the merge request.

[Pititjo (jonathan-barnoud)]

Le 02/02/2010 22:52, Luca Invernizzi a écrit :
> Is there still activity on this branch? Otherwise someone could take it over, or we could just drop the merge request.
>
I will drop the whole branch.

[Luca Invernizzi (invernizzi)]

Ok. This branch is free for anyone to fork from. Closing merge request.

review: Disapprove

Unmerged revisions

198. By Pititjo on 2009-03-18

Merge with trunk

197. By Pititjo on 2009-03-18

Prepare merge with trunk in pre-replacing test/xdg

196. By Pititjo on 2009-03-17

Provide spell check with gtkspell

195. By Pititjo on 2009-03-17

Refactoring taswviewserial.Serializer.parse_buffer

=== modified file 'GTG/taskbrowser/browser.py'
--- GTG/taskbrowser/browser.py	2009-03-10 21:10:55 +0000
+++ GTG/taskbrowser/browser.py	2009-03-13 21:18:10 +0000
@@ -49,6 +49,7 @@
 QUICKADD_PANE = True
 
 EXPERIMENTAL_NOTES = False
+EXPERIMENTAL_SPELL = False
 
 class TaskBrowser:
 
@@ -62,6 +63,7 @@
         # Set the configuration dictionary
         self.config = config
         self.notes = EXPERIMENTAL_NOTES
+        self.spell = EXPERIMENTAL_SPELL
         
         # Setup default values for view
         self.priv["collapsed_tid"]            = []
@@ -236,7 +238,7 @@
         self.req.connect("refresh",self.do_refresh)
 
     def __restore_state_from_conf(self):
-        
+
         # Extract state from configuration dictionary
         if not self.config.has_key("browser"): return
         
@@ -314,7 +316,30 @@
             else :
                 self.note_toggle.hide()
                 self.new_note_button.hide()
-            
+        
+        #Read the config about spell checking
+        self.spell_check = False
+        self.spell_language = None
+        if "spell" in self.config :
+            #Must we display the spell checking button ?
+            if "experimental_spell" in self.config["spell"] :
+                if self.config["spell"]["experimental_spell"] == "True" :
+                    self.spell = True
+                else :
+                    self.spell = False
+            #Must the check run ?
+            if "spell_check" in self.config["spell"] and\
+              self.config["spell"]["spell_check"] == "True" :
+                self.spell_check = True
+            else :
+                self.spell_check = False
+            #Is a language defined ?
+            if "spell_language" in self.config["spell"] :
+                self.spell_language = self.config["spell"]["spell_language"]
+            else :
+                self.spell_language = None
+            #TODO : control the validity of the language argument.
+            #If language is None, gtkspell use the system language define in $LANG
 
     def on_move(self, widget, data): #pylint: disable-msg=W0613
         xpos, ypos = self.window.get_position()
@@ -868,7 +893,9 @@
         else :
             tv = TaskEditor(self.req,t,self.do_refresh,self.on_delete_task,
                             self.close_task,self.open_task,self.get_tasktitle,
-                            notes=self.notes)
+                            notes=self.notes,
+                            spell=self.spell, spell_check=self.spell_check,
+                            spell_language=self.spell_language)
             #registering as opened
             self.opened_task[uid] = tv
             

=== modified file 'GTG/taskeditor/editor.py'
--- GTG/taskeditor/editor.py	2009-03-08 19:08:30 +0000
+++ GTG/taskeditor/editor.py	2009-03-12 21:26:06 +0000
@@ -44,7 +44,7 @@
 class TaskEditor :
     def __init__(self, requester, task, refresh_callback=None,delete_callback=None,
                 close_callback=None,opentask_callback=None, tasktitle_callback=None,
-                notes=False) :
+                notes=False, spell=False, spell_check=None, spell_language=None) :
         self.req = requester
         self.time = time.time()
         self.gladefile = GnomeConfig.GLADE_FILE
@@ -65,6 +65,7 @@
                 "duedate_changed" : (self.date_changed,"due"),
                 "on_insert_subtask_clicked" : self.insert_subtask,
                 "on_inserttag_clicked" : self.inserttag_clicked,
+                "on_checkspell_toggled" : self.spell_toggle,
               }
         self.wTree.signal_autoconnect(dic)
         cal_dic = {
@@ -99,10 +100,22 @@
         self.inserttag_button = self.wTree.get_widget("inserttag")
         self.tasksidebar = self.wTree.get_widget("tasksidebar")
         self.keepnote_button = self.wTree.get_widget("keepnote")
+        self.checkspell_button = self.wTree.get_widget("checkspell")
+        
         if not notes :
             self.keepnote_button.hide()
             separator = self.wTree.get_widget("separator_note")
             separator.hide()
+        if not spell :
+            self.checkspell_button.hide()
+            separator_spell = self.wTree.get_widget("separator_note")
+            separator_spell.hide()
+        else :
+            self.spell_language = spell_language
+            if spell_check :
+                self.checkspell_button.set_active(True)
+                self.textview.spell_start(self.spell_language)
+
         #We will keep the name of the opened calendar
         #Empty means that no calendar is opened
         self.__opened_date = ''
@@ -409,6 +422,10 @@
         #Save should be also called when buffer is modified
         self.save()
         self.closing(self.task.get_id())
+    
+    def spell_toggle(self, widget) :
+        """Toggle the spell check status in the TextView"""
+        self.textview.spell_toggle(self.spell_language)
         
         
 ############# Private functions #################

=== modified file 'GTG/taskeditor/taskeditor.glade'
--- GTG/taskeditor/taskeditor.glade	2009-02-27 13:32:21 +0000
+++ GTG/taskeditor/taskeditor.glade	2009-03-12 16:03:25 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Feb 27 14:30:40 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Mar 12 16:59:07 2009 -->
 <glade-interface>
   <widget class="GtkWindow" id="TaskEditor">
     <property name="title" translatable="yes">Task</property>
@@ -99,6 +99,24 @@
                 <property name="homogeneous">True</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="separator_spell">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkToggleToolButton" id="checkspell">
+                <property name="visible">True</property>
+                <property name="stock_id">gtk-spell-check</property>
+                <signal name="toggled" handler="on_checkspell_toggled"/>
+              </widget>
+              <packing>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="expand">False</property>

=== modified file 'GTG/taskeditor/taskview.py'
--- GTG/taskeditor/taskview.py	2009-03-01 14:09:12 +0000
+++ GTG/taskeditor/taskview.py	2009-03-12 23:35:38 +0000
@@ -32,6 +32,9 @@
 import gobject
 import pango
 
+#For spell checking. Need python-gnome2-extra.
+import gtkspell
+
 from GTG.taskeditor import taskviewserial
 
 separators = [' ','.',',','/','\n','\t','!','?',';']
@@ -136,8 +139,12 @@
         self.modified_sigid = self.buff.connect("changed" , self.modified)
         self.connect("backspace",self.backspace)
         self.tobe_refreshed = False
-
-    
+        
+        #Spell checking :
+        #self.spell is None if we don't check spell.
+        #Else it is a gtkspell.Spell object.
+        self.spell = None
+            
     #This function is called to refresh the editor 
     #Specially when we change the title
     def refresh(self,title) :
@@ -338,6 +345,12 @@
         end = self.buff.get_end_iter()
         texte = self.buff.serialize(self.buff, self.mime_type, start, end)
         
+        #Remove the gtkspell tags wich cause bugs.
+        #They must not be store.
+        #There is perhaps an better place to di this.
+        texte = texte.replace("<gtkspell-misspelled>", "")
+        texte = texte.replace("</gtkspell-misspelled>", "")
+        
         return texte
     #Get the title of the task (aka the first line of the buffer)
     def get_title(self) :
@@ -754,7 +767,23 @@
         indenttag = self.create_indent_tag(buff,level)
         self.__apply_tag_to_mark(start,end,tag=indenttag)
         return end
-
+    
+    #About spell checking
+    def spell_start(self, language=None) :
+        if self.spell is None :
+            #Loading spell checking with system default local ($LANG)
+            self.spell = gtkspell.Spell(self, language)
+    def spell_stop(self) :
+        if not self.spell is None :
+            self.spell.detach()
+        self.spell = None
+    def spell_toggle(self, language=None) :
+        if self.spell is None :
+            self.spell_start(language)
+        else :
+            self.spell_stop()
+    def spell_set_language(self, local) :
+        self.spell.set_language(local)
         
     def __apply_tag_to_mark(self,start,end,tag=None,name=None) :
         start_i = self.buff.get_iter_at_mark(start)