diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 5ea44e5e2..a44808855 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -7,6 +7,14 @@ * src/MergePeople.py: correctly handle selection of first person * src/MediaView.py: add mediaobj to DND types * src/plugins/ScratchPad.py: fill out rest of media details (type,value) + * src/EditPerson.py: hide LDS if not requested + * src/Marriage.py: hide LDS if not requested + * src/Spell.py: re-enable + * src/GrampsCfg.py: add support for spell checker + * src/GrampsGconfKeys.py: add support for spell checker + * src/GrampsIniKeys.py: add support for spell checker + * src/gramps.glade: add support for spell checker + * src/data/gramps.schemas: add support for spell checker 2005-08-15 Alex Roitman * NEWS: Update. diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index cf71ef767..e93a25860 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -380,6 +380,9 @@ class EditPerson: or (not self.lds_endowment.is_empty()) \ or (not self.lds_sealing.is_empty()): Utils.bold_label(self.lds_tab) + else: + self.get_widget("lds_tab").hide() + self.get_widget("lds_page").hide() types = const.NameTypesMap.get_values() types.sort() diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index 75fa359d8..d12b6aa81 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -187,6 +187,11 @@ class GrampsPreferences: auto.connect('toggled', lambda obj: GrampsKeys.save_autoload(obj.get_active())) + spell = self.top.get_widget("spellcheck") + spell.set_active(GrampsKeys.get_spellcheck()) + spell.connect('toggled', + lambda obj: GrampsKeys.save_spellcheck(obj.get_active())) + lds = self.top.get_widget("uselds") lds.set_active(GrampsKeys.get_uselds()) lds.connect('toggled', diff --git a/gramps2/src/GrampsGconfKeys.py b/gramps2/src/GrampsGconfKeys.py index 3ca8da4df..cb687f082 100644 --- a/gramps2/src/GrampsGconfKeys.py +++ b/gramps2/src/GrampsGconfKeys.py @@ -155,9 +155,15 @@ def save_screen_size_checked(val): def get_autoload(): return get_bool("/apps/gramps/behavior/autoload") +def get_spellcheck(): + return get_bool("/apps/gramps/behavior/spellcheck") + def save_autoload(val): set_bool("/apps/gramps/behavior/autoload",val) +def save_spellcheck(val): + set_bool("/apps/gramps/behavior/spellcheck",val) + def get_betawarn(): return get_bool("/apps/gramps/behavior/betawarn") diff --git a/gramps2/src/GrampsIniKeys.py b/gramps2/src/GrampsIniKeys.py index 9fd777a1f..934a5b206 100644 --- a/gramps2/src/GrampsIniKeys.py +++ b/gramps2/src/GrampsIniKeys.py @@ -34,6 +34,7 @@ NL = "\n" # FIX: newlines on Mac/Windows, if different? _ini_schema = { 'behavior/autoload' : '0', + 'behavior/spellcheck' : '1', 'behavior/betawarn' : '0', 'behavior/welcome' : '100', 'preferences/date-format' : '0', @@ -304,9 +305,15 @@ def save_screen_size_checked(val): def get_autoload(): return get_bool("behavior", "autoload") +def get_spellcheck(): + return get_bool("behavior", "spellcheck") + def save_autoload(val): set_bool("behavior", "autoload",val) +def save_spellcheck(val): + set_bool("behavior", "spellcheck",val) + def get_betawarn(): return get_bool("behavior", "betawarn") diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index 34e0a53b2..202126bc7 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -244,19 +244,26 @@ class Marriage: AutoComp.fill_combo(self.lds_place, place_list) lds_ord = self.family.get_lds_sealing() - if lds_ord: - place_handle = lds_ord.get_place_handle() - if place_handle: - place = self.db.get_place_from_handle( place_handle) - if place: - self.lds_place.child.set_text( place.get_title()) - self.lds_date.set_text(lds_ord.get_date()) - self.seal_stat = lds_ord.get_status() - self.lds_date_object = lds_ord.get_date_object() + + if GrampsKeys.get_uselds() or lds_ord: + if lds_ord: + place_handle = lds_ord.get_place_handle() + if place_handle: + place = self.db.get_place_from_handle( place_handle) + if place: + self.lds_place.child.set_text( place.get_title()) + self.lds_date.set_text(lds_ord.get_date()) + self.seal_stat = lds_ord.get_status() + self.lds_date_object = lds_ord.get_date_object() + else: + self.lds_place.child.set_text("") + self.seal_stat = 0 + self.lds_date_object = Date.Date() + self.lds_label.show() + self.get_widget('lds_page').show() else: - self.lds_place.child.set_text("") - self.seal_stat = 0 - self.lds_date_object = Date.Date() + self.lds_label.hide() + self.get_widget('lds_page').hide() self.lds_date_check = DateEdit.DateEdit( self.lds_date_object, self.lds_date, diff --git a/gramps2/src/Spell.py b/gramps2/src/Spell.py index 2f19ec76e..289cbcd4c 100644 --- a/gramps2/src/Spell.py +++ b/gramps2/src/Spell.py @@ -27,34 +27,30 @@ present, we default to no spell checking. """ -#### FIXME: Uncomment after 2.0.6 is released. +import GrampsKeys -## success = False -## try: -## import gtk -## import gtkspell -## import locale +success = False +try: + import gtk + import gtkspell + import locale -## text_view = gtk.TextView() -## spell = gtkspell.Spell(text_view) -## lang = locale.getlocale()[0] -## spell.set_language(lang) -## success = True + text_view = gtk.TextView() + spell = gtkspell.Spell(text_view) + lang = locale.getlocale()[0] + spell.set_language(lang) + success = True -## except ImportError, msg: -## print "Spell.py:", msg -## except RuntimeError,msg: -## print "Spell.py:", msg -## except SystemError,msg: -## print "Spell.py:", msg +except ImportError, msg: + print "Spell.py:", msg +except RuntimeError,msg: + print "Spell.py:", msg +except SystemError,msg: + print "Spell.py:", msg -if False: - class Spell: - def __init__(self,obj): +class Spell: + def __init__(self,obj): + if success and GrampsKeys.get_spellcheck(): self.spell = gtkspell.Spell(obj) lang = locale.getlocale()[0] self.spell.set_language(lang) -else: - class Spell: - def __init__(self,obj): - pass diff --git a/gramps2/src/data/gramps.schemas b/gramps2/src/data/gramps.schemas index e0a2058a2..e7cb609d7 100644 --- a/gramps2/src/data/gramps.schemas +++ b/gramps2/src/data/gramps.schemas @@ -15,6 +15,18 @@ + + /schemas/apps/gramps/behavior/spellcheck + /apps/gramps/behavior/spellcheck + gramps + bool + 0 + + Enable the spelling checker, if available + If set to 1, the spelling checker will be enabled if it is available on the system. + + + /schemas/apps/gramps/behavior/betawarn /apps/gramps/behavior/betawarn diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 0b89563d6..4237ecfb5 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -14652,7 +14652,7 @@ Other - + True False 0 @@ -17652,7 +17652,7 @@ Other 12 True - 5 + 8 2 False 6 @@ -17752,6 +17752,56 @@ Other fill + + + + True + <b>Spelling checker</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 2 + 6 + 7 + fill + + + + + + + True + True + Enable spelling checker + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 1 + 2 + 7 + 8 + fill + + + 0