From abf7019a6331f4ea0aa507fa35e4835fd4b19a46 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 22 Jul 2007 21:03:52 +0000 Subject: [PATCH] 2007-07-22 Don Allingham * configure.in: remove gconf requirement * src/Config/_GrampsConfigKeys.py: pylint * src/Config/__init__.py: drop gconf, provide upgrade to .ini * src/Config/_GrampsGconfKeys.py: pylint * src/Config/_GrampsIniKeys.py: pylint * src/plugins/ExtractCity.py: fix name * src/plugins/EventNames.py: fix name * src/Spell.py: pylint * data/Makefile.am: remove gconf schema installation svn: r8755 --- ChangeLog | 11 + config.guess | 32 +-- config.sub | 16 +- configure.in | 33 +-- data/Makefile.am | 26 +-- src/Config/_GrampsConfigKeys.py | 398 ++++++++++++++++---------------- src/Config/_GrampsGconfKeys.py | 52 ++--- src/Config/_GrampsIniKeys.py | 4 +- src/Config/__init__.py | 26 ++- src/Spell.py | 55 ++--- src/plugins/EventNames.py | 4 +- src/plugins/ExtractCity.py | 4 +- 12 files changed, 305 insertions(+), 356 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0cec6cb9..a763f0a8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-07-22 Don Allingham + * configure.in: remove gconf requirement + * src/Config/_GrampsConfigKeys.py: pylint + * src/Config/__init__.py: drop gconf, provide upgrade to .ini + * src/Config/_GrampsGconfKeys.py: pylint + * src/Config/_GrampsIniKeys.py: pylint + * src/plugins/ExtractCity.py: fix name + * src/plugins/EventNames.py: fix name + * src/Spell.py: pylint + * data/Makefile.am: remove gconf schema installation + 2007-07-21 Don Allingham * src/plugins/ExtractCity.py: improved extraction, fix registration * src/plugins/EventNames.py: fix registration diff --git a/config.guess b/config.guess index 0f0fe712a..396482d6c 100644 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -781,7 +780,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -791,15 +790,12 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -954,9 +950,6 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1215,15 +1208,6 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/config.sub b/config.sub index 5defff65a..fab0aa355 100644 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ case $basic_machine in | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ case $basic_machine in | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,9 +925,6 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1222,7 +1219,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1417,9 +1414,6 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; diff --git a/configure.in b/configure.in index 2bcd6edcc..ad42c380d 100644 --- a/configure.in +++ b/configure.in @@ -25,13 +25,6 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" AC_PROG_INTLTOOL -dnl Checking for gconftool-2 -AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -if test "x$GCONFTOOL" = xno; then - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -fi - -AM_GCONF2_REPLACEMENT AM_SHARED_MIME AM_PACKAGER dnl This is a hack to disable scrollkeeper update when in the packager mode. @@ -52,9 +45,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext pa AM_GLIB_GNU_GETTEXT dnl Checks for programs. -dnl We first only check for python >= 2.3 +dnl We first only check for python >= 2.4 -AM_PATH_PYTHON(2.3) +AM_PATH_PYTHON(2.4) AC_PATH_PROG(BINSH, sh) pygtk_require=" @@ -120,28 +113,6 @@ then fi AC_MSG_RESULT($has_pygnome) -AC_MSG_CHECKING(Python bindings for gconf) -cat > conftest.py < conftest.py < 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) + langs.sort(sort_languages) return langs def set_active_language(self, language): @@ -240,3 +224,20 @@ class Spell: def get_active_language(self): """Get the name of the active language.""" return self._installed_languages[self._active_language] + +def sort_languages(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 + diff --git a/src/plugins/EventNames.py b/src/plugins/EventNames.py index c2ee76c57..6fa94e382 100644 --- a/src/plugins/EventNames.py +++ b/src/plugins/EventNames.py @@ -159,9 +159,9 @@ register_tool( tool_class = EventNames, options_class = EventNamesOptions, modes = Tool.MODE_GUI, - translated_name = _("Extract event names from data"), + translated_name = _("Extract event descriptions from event data"), status = _("Stable"), author_name = "Donald N. Allingham", author_email = "don@gramps-project.org", - description = _("Extracts event names from the event data") + description = _("Extracts event descriptions from the event data") ) diff --git a/src/plugins/ExtractCity.py b/src/plugins/ExtractCity.py index 79d9deabc..0332f663c 100644 --- a/src/plugins/ExtractCity.py +++ b/src/plugins/ExtractCity.py @@ -377,10 +377,10 @@ register_tool( tool_class = ExtractCity, options_class = ExtractCityOptions, modes = Tool.MODE_GUI, - translated_name = _("Extract city and state information from a place"), + translated_name = _("Extract place data from a place title"), status = _("Stable"), author_name = "Donald N. Allingham", author_email = "don@gramps-project.org", description = _("Attempts to extract city and state/province " - "from a place name") + "from a place title") )