2007-07-17 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

* src/Spell.py:
	* src/Editors/_EditNote.py:
	* src/glade/gramps.glade:
	Improved spell check support.



svn: r8726

ChangeLog

@@ -1,3 +1,9 @@
+2007-07-17  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
+	* src/Spell.py:
+	* src/Editors/_EditNote.py:
+	* src/glade/gramps.glade:
+	Improved spell check support.
+
 2007-07-16  Alex Roitman  <shura@gramps-project.org>
 	* ChangeLog.old: Add pre-2007 logs.
 	* ChangeLog: Remove pre-2007 logs (move to ChangeLog.old).

src/Editors/_EditNote.py

@@ -230,7 +230,24 @@ class EditNote(EditPrimary):
         self.text.connect('populate-popup',
                           self.on_textview_populate_popup)
         
-        self.spellcheck = Spell.Spell(self.text)
+        # setup spell checking interface
+        spellcheck = Spell.Spell(self.text)
+        liststore = gtk.ListStore(gobject.TYPE_STRING)
+        cell = gtk.CellRendererText()
+        lang_selector = self.top.get_widget('spell')
+        lang_selector.set_model(liststore)
+        lang_selector.pack_start(cell, True)
+        lang_selector.add_attribute(cell, 'text', 0)
+        act_lang = spellcheck.get_active_language()
+        idx = 0
+        for lang in spellcheck.get_all_languages():
+            lang_selector.append_text(lang)
+            if lang == act_lang:
+                act_idx = idx
+            idx = idx + 1
+        lang_selector.set_active(act_idx)
+        lang_selector.connect('changed', self.on_spell_change, spellcheck)
+        #lang_selector.set_sensitive(Config.get(Config.SPELLCHECK))
 
         # create a formatting toolbar
         if not self.dbstate.db.readonly:
@@ -242,7 +259,7 @@ class EditNote(EditPrimary):
             toolbar = uimanager.get_widget('/ToolBar')      
             toolbar.set_style(gtk.TOOLBAR_ICONS)
             vbox = self.top.get_widget('container')
-            vbox.pack_start(toolbar, False)
+            vbox.pack_start(toolbar)
                 
         # setup initial values for textview and buffer
         if self.obj:
@@ -327,6 +344,11 @@ class EditNote(EditPrimary):
             open_menu.show()
             menu.prepend(open_menu)
 
+    def on_spell_change(self, combobox, spell):
+        """Set spell checker language according to user selection."""
+        lang = combobox.get_active_text()
+        spell.set_active_language(lang)
+        
     def open_url_cb(self, menuitem, url, flavor):
         if not url:
             return

src/Spell.py

@@ -27,50 +27,141 @@ present, we default to no spell checking.
 
 """
 
-import Config
+#-------------------------------------------------------------------------
-
+#
+# Python classes
+#
+#-------------------------------------------------------------------------
 from gettext import gettext as _
-
-#-----------------------------------------------------------
-#
-# Attempt to instantiate a gtkspell instance to check for
-# any errors. If it succeeds, set a success flag so that we
-# know to use the spelling check in the future
-#
-#------------------------------------------------------------
-
-success = False
-try:
-    import gtk
-    import gtkspell
 import locale
 
-    lang = locale.getlocale()[0]
+#-------------------------------------------------------------------------
-    if lang == None:
+#
-        print _("Spelling checker cannot be used without language set.")
+# Set up logging
-        print _("Set your locale appropriately to use spelling checker.")
+#
-    else:
+#-------------------------------------------------------------------------
-        gtkspell.Spell(gtk.TextView()).set_language(lang)
+import logging
-        success = True
+log = logging.getLogger(".Spell")
-except ImportError, msg:
-    print _("Spelling checker is not installed")
-except TypeError,msg:
-    print "Spell.py: ", msg
-except RuntimeError,msg:
-    print "Spell.py: ", msg
-except SystemError,msg:
-    msg = _("Spelling checker is not available for %s") % lang
-    print "Spell.py: %s" % msg
 
-#-----------------------------------------------------------
+#-------------------------------------------------------------------------
 #
-# Spell - if the initial test succeeded, attach a gtkspell
+# GTK libraries
-#         instance to the passed TextView instance
 #
-#------------------------------------------------------------
+#-------------------------------------------------------------------------
+import gtk
+try:
+    import gtkspell
+    HAVE_GTKSPELL = True
+except ImportError:
+    log.warn(_("Spelling checker is not installed"))
+    HAVE_GTKSPELL = False
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS classes
+#
+#-------------------------------------------------------------------------
+import Config
+
+#-------------------------------------------------------------------------
+#
+# Constants
+#
+#-------------------------------------------------------------------------
+LANGUAGES = {
+    'da': _('Danish'),
+    'de': _('German'),
+    'en': _('English'),
+    'es': _('Spanish'),
+    'fi': _('Finnish'),
+    'fr': _('French'),
+    'it': _('Italian'),
+    'la': _('Latin'),
+    'nl': _('Dutch'),
+    'nn': _('Norwegian'),
+    'ru': _('Russian'),
+    'sv': _('Swedish'),
+}
+
 class Spell:
+    """Attach a gtkspell instance to the passed TextView instance.
+    """
+    _LANG = locale.getlocale()[0]
     
-    def __init__(self,obj):
+    _installed_languages = {'off': _('None')}
-        if success and Config.get(Config.SPELLCHECK):
+
-            self.spell = gtkspell.Spell(obj)
+    if HAVE_GTKSPELL:
-            self.spell.set_language(locale.getlocale()[0])
+        for lang_code, lang_name in LANGUAGES.items():
+            try:
+                gtkspell.Spell(gtk.TextView()).set_language(lang_code)
+                _installed_languages[lang_code] = lang_name
+            except RuntimeError:
+                pass
+
+    def __init__(self, textview):
+        self.textview = textview
+        
+        if self._LANG and Config.get(Config.SPELLCHECK):
+            # if LANG is not a correct key (pt_BR or pt_PT),
+            #  try only the language part of LANG
+            if self._LANG not in self._installed_languages.keys():
+                self._LANG = self._LANG.split('_')[0]
+            # if this still doesn't work we fall back to 'off'
+            if self._LANG not in self._installed_languages.keys():
+                self._LANG = 'off'
+        else:
+            self._LANG = 'off'
+
+        self._active_language = 'off'
+        self._real_set_active_language(self._LANG)
+
+    def _real_set_active_language(self, lang_code):
+        """Set the active language by it's code."""
+        if self._active_language == 'off':
+            if lang_code == 'off':
+                return
+            else:
+                gtkspell_spell = gtkspell.Spell(self.textview)
+        else:
+            gtkspell_spell = gtkspell.get_from_text_view(self.textview)
+            if lang_code == 'off':
+                gtkspell_spell.detach()
+                self._active_language = lang_code
+                return
+                
+        gtkspell_spell.set_language(lang_code)
+        self._active_language = lang_code
+        
+    def _sort_languages(self, lang_a, lang_b):
+        """Put language names in alphabetical order.
+        
+        Except 'None', which should be always the first.
+        
+        """
+        if lang_a == _('None'):
+            return -1
+        if lang_b == _('None'):
+            return 1
+        if lang_a < lang_b:
+            return -1
+        if lang_a > lang_b:
+            return 1
+        return 0
+            
+        
+    def get_all_languages(self):
+        """Get the list of installed language names."""
+        langs = self._installed_languages.values()
+        langs.sort(self._sort_languages)
+        return langs
+    
+    def set_active_language(self, language):
+        """Set active language by it's name."""
+        for code, name in self._installed_languages.items():
+            if name == language:
+                self._real_set_active_language(code)
+                return
+        
+    def get_active_language(self):
+        """Get the name of the active language."""
+        return self._installed_languages[self._active_language]

src/glade/gramps.glade

@@ -15201,7 +15201,7 @@ Very High</property>
 	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="container">
+	    <widget class="GtkVBox" id="vbox141">
 	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
@@ -15243,6 +15243,75 @@ Very High</property>
 		  <property name="pack_type">GTK_PACK_END</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkHBox" id="container">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <placeholder/>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox143">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label715">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Spelling:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkComboBox" id="spell">
+			  <property name="visible">True</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		      <property name="pack_type">GTK_PACK_END</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>