updates for IDs
svn: r2840
This commit is contained in:
Don Allingham
parent
3fef3dd32e
commit
5ec7809000
@ -1,3 +1,8 @@
|
||||
2004-02-15 Don Allingham <dallingham@users.sourceforge.net>
|
||||
* src/plugins/RelCalc.py: Handle IDs properly
|
||||
* src/Relationship.py: Handle IDs properly
|
||||
* src/home.png: added new default person icon
|
||||
|
||||
2004-02-14 Alex Roitman <shura@alex.neuro.umn.edu>
|
||||
* src/plugins/DetDescendantReport.py: Add style descriptions
|
||||
for the paragraphs. Add first entry style. Change defaults to be
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.6.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.7.8 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -75,73 +75,75 @@
|
||||
# http://scrollkeeper.sourceforge.net/
|
||||
# Version: 0.1.2 (last updated: March 20, 2002)
|
||||
#
|
||||
SHELL = @SHELL@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
bindir = @bindir@
|
||||
sbindir = @sbindir@
|
||||
libexecdir = @libexecdir@
|
||||
datadir = @datadir@
|
||||
sysconfdir = @sysconfdir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
mandir = @mandir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = /usr/include
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ../../..
|
||||
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = @program_transform_name@
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
PRE_INSTALL = :
|
||||
POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
|
||||
EXEEXT = @EXEEXT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BINSH = @BINSH@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
GNOMEHELP = @GNOMEHELP@
|
||||
GNOMEINC = @GNOMEINC@
|
||||
GNOMELIB = @GNOMELIB@
|
||||
GPREFIX = @GPREFIX@
|
||||
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
|
||||
ICONV = @ICONV@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LANGUAGES = @LANGUAGES@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MOFILES = @MOFILES@
|
||||
MSGCONV = @MSGCONV@
|
||||
MSGFMT = @MSGFMT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
PACKAGE_STRING = @PACKAGE_STRING@
|
||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
POFILES = @POFILES@
|
||||
PYTHON = @PYTHON@
|
||||
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||
@ -151,18 +153,43 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||
PYTHON_VERSION = @PYTHON_VERSION@
|
||||
RELEASE = @RELEASE@
|
||||
SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SK_CONFIG = @SK_CONFIG@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
VERSIONSTRING = @VERSIONSTRING@
|
||||
ZIP = @ZIP@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
bindir = @bindir@
|
||||
build_alias = @build_alias@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host_alias = @host_alias@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pkgpyexecdir = @pkgpyexecdir@
|
||||
pkgpythondir = @pkgpythondir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
pyexecdir = @pyexecdir@
|
||||
pythondir = @pythondir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
figdir = figures
|
||||
docname = gramps-manual
|
||||
lang = C
|
||||
@ -194,10 +221,12 @@ CLEANFILES = omf_timestamp *.out
|
||||
omf_dest_dir = $(datadir)/omf/@PACKAGE@
|
||||
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
|
||||
subdir = doc/gramps-manual/C
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
DIST_SOURCES =
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/doc/omf.make \
|
||||
$(top_srcdir)/doc/xmldocs.make Makefile.am
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -210,13 +239,23 @@ uninstall-info-am:
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
top_distdir = ../../..
|
||||
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@list='$(DISTFILES)'; for file in $$list; do \
|
||||
$(mkinstalldirs) $(distdir)/../../../doc
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
case $$file in \
|
||||
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
||||
esac; \
|
||||
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
||||
@ -237,14 +276,13 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="${top_distdir}" distdir="$(distdir)" \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile
|
||||
|
||||
installdirs:
|
||||
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
install-data: install-data-am
|
||||
@ -265,7 +303,7 @@ clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-rm -f Makefile $(CONFIG_CLEAN_FILES)
|
||||
-rm -f $(CONFIG_CLEAN_FILES)
|
||||
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@ -275,7 +313,7 @@ clean: clean-am
|
||||
clean-am: clean-generic mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-generic
|
||||
|
||||
dvi: dvi-am
|
||||
@ -299,13 +337,21 @@ install-man:
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
mostlyclean-am: mostlyclean-generic
|
||||
|
||||
pdf: pdf-am
|
||||
|
||||
pdf-am:
|
||||
|
||||
ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-local
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic distclean \
|
||||
@ -314,8 +360,8 @@ uninstall-am: uninstall-info-am uninstall-local
|
||||
install-exec install-exec-am install-info install-info-am \
|
||||
install-man install-strip installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-generic uninstall uninstall-am \
|
||||
uninstall-info-am uninstall-local
|
||||
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
|
||||
uninstall-am uninstall-info-am uninstall-local
|
||||
|
||||
|
||||
omf: omf_timestamp
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.6.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.7.8 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -75,73 +75,75 @@
|
||||
# http://scrollkeeper.sourceforge.net/
|
||||
# Version: 0.1.2 (last updated: March 20, 2002)
|
||||
#
|
||||
SHELL = @SHELL@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
bindir = @bindir@
|
||||
sbindir = @sbindir@
|
||||
libexecdir = @libexecdir@
|
||||
datadir = @datadir@
|
||||
sysconfdir = @sysconfdir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
mandir = @mandir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = /usr/include
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ../../..
|
||||
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = @program_transform_name@
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
PRE_INSTALL = :
|
||||
POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
|
||||
EXEEXT = @EXEEXT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BINSH = @BINSH@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
GNOMEHELP = @GNOMEHELP@
|
||||
GNOMEINC = @GNOMEINC@
|
||||
GNOMELIB = @GNOMELIB@
|
||||
GPREFIX = @GPREFIX@
|
||||
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
|
||||
ICONV = @ICONV@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LANGUAGES = @LANGUAGES@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MOFILES = @MOFILES@
|
||||
MSGCONV = @MSGCONV@
|
||||
MSGFMT = @MSGFMT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
PACKAGE_STRING = @PACKAGE_STRING@
|
||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
POFILES = @POFILES@
|
||||
PYTHON = @PYTHON@
|
||||
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||
@ -151,18 +153,43 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||
PYTHON_VERSION = @PYTHON_VERSION@
|
||||
RELEASE = @RELEASE@
|
||||
SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SK_CONFIG = @SK_CONFIG@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
VERSIONSTRING = @VERSIONSTRING@
|
||||
ZIP = @ZIP@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
bindir = @bindir@
|
||||
build_alias = @build_alias@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host_alias = @host_alias@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pkgpyexecdir = @pkgpyexecdir@
|
||||
pkgpythondir = @pkgpythondir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
pyexecdir = @pyexecdir@
|
||||
pythondir = @pythondir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
figdir = figures
|
||||
docname = gramps-manual
|
||||
lang = fr
|
||||
@ -194,10 +221,12 @@ CLEANFILES = omf_timestamp *.out
|
||||
omf_dest_dir = $(datadir)/omf/@PACKAGE@
|
||||
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
|
||||
subdir = doc/gramps-manual/fr
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
DIST_SOURCES =
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/doc/omf.make \
|
||||
$(top_srcdir)/doc/xmldocs.make Makefile.am
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -210,13 +239,23 @@ uninstall-info-am:
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
top_distdir = ../../..
|
||||
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@list='$(DISTFILES)'; for file in $$list; do \
|
||||
$(mkinstalldirs) $(distdir)/../../../doc
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
case $$file in \
|
||||
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
||||
esac; \
|
||||
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
||||
@ -237,14 +276,13 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="${top_distdir}" distdir="$(distdir)" \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile
|
||||
|
||||
installdirs:
|
||||
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
install-data: install-data-am
|
||||
@ -265,7 +303,7 @@ clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-rm -f Makefile $(CONFIG_CLEAN_FILES)
|
||||
-rm -f $(CONFIG_CLEAN_FILES)
|
||||
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@ -275,7 +313,7 @@ clean: clean-am
|
||||
clean-am: clean-generic mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-generic
|
||||
|
||||
dvi: dvi-am
|
||||
@ -299,13 +337,21 @@ install-man:
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
mostlyclean-am: mostlyclean-generic
|
||||
|
||||
pdf: pdf-am
|
||||
|
||||
pdf-am:
|
||||
|
||||
ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-local
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic distclean \
|
||||
@ -314,8 +360,8 @@ uninstall-am: uninstall-info-am uninstall-local
|
||||
install-exec install-exec-am install-info install-info-am \
|
||||
install-man install-strip installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-generic uninstall uninstall-am \
|
||||
uninstall-info-am uninstall-local
|
||||
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
|
||||
uninstall-am uninstall-info-am uninstall-local
|
||||
|
||||
|
||||
omf: omf_timestamp
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.6.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.7.8 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -75,73 +75,75 @@
|
||||
# http://scrollkeeper.sourceforge.net/
|
||||
# Version: 0.1.2 (last updated: March 20, 2002)
|
||||
#
|
||||
SHELL = @SHELL@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
bindir = @bindir@
|
||||
sbindir = @sbindir@
|
||||
libexecdir = @libexecdir@
|
||||
datadir = @datadir@
|
||||
sysconfdir = @sysconfdir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
mandir = @mandir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = /usr/include
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ../../..
|
||||
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
install_sh_DATA = $(install_sh) -c -m 644
|
||||
install_sh_PROGRAM = $(install_sh) -c
|
||||
install_sh_SCRIPT = $(install_sh) -c
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_HEADER = $(INSTALL_DATA)
|
||||
transform = @program_transform_name@
|
||||
transform = $(program_transform_name)
|
||||
NORMAL_INSTALL = :
|
||||
PRE_INSTALL = :
|
||||
POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
|
||||
EXEEXT = @EXEEXT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BINSH = @BINSH@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EXEEXT = @EXEEXT@
|
||||
GNOMEHELP = @GNOMEHELP@
|
||||
GNOMEINC = @GNOMEINC@
|
||||
GNOMELIB = @GNOMELIB@
|
||||
GPREFIX = @GPREFIX@
|
||||
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
|
||||
ICONV = @ICONV@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LANGUAGES = @LANGUAGES@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MOFILES = @MOFILES@
|
||||
MSGCONV = @MSGCONV@
|
||||
MSGFMT = @MSGFMT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
PACKAGE_STRING = @PACKAGE_STRING@
|
||||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
POFILES = @POFILES@
|
||||
PYTHON = @PYTHON@
|
||||
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||
@ -151,18 +153,43 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||
PYTHON_VERSION = @PYTHON_VERSION@
|
||||
RELEASE = @RELEASE@
|
||||
SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SK_CONFIG = @SK_CONFIG@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
VERSIONSTRING = @VERSIONSTRING@
|
||||
ZIP = @ZIP@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
bindir = @bindir@
|
||||
build_alias = @build_alias@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host_alias = @host_alias@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pkgpyexecdir = @pkgpyexecdir@
|
||||
pkgpythondir = @pkgpythondir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
pyexecdir = @pyexecdir@
|
||||
pythondir = @pythondir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
figdir = figures
|
||||
docname = gramps-manual
|
||||
lang = ru
|
||||
@ -194,10 +221,12 @@ CLEANFILES = omf_timestamp *.out
|
||||
omf_dest_dir = $(datadir)/omf/@PACKAGE@
|
||||
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
|
||||
subdir = doc/gramps-manual/ru
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
DIST_SOURCES =
|
||||
DIST_COMMON = Makefile.am Makefile.in
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/doc/omf.make \
|
||||
$(top_srcdir)/doc/xmldocs.make Makefile.am
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -210,13 +239,23 @@ uninstall-info-am:
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
top_distdir = ../../..
|
||||
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@list='$(DISTFILES)'; for file in $$list; do \
|
||||
$(mkinstalldirs) $(distdir)/../../../doc
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
case $$file in \
|
||||
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
|
||||
esac; \
|
||||
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
|
||||
@ -237,14 +276,13 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="${top_distdir}" distdir="$(distdir)" \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile
|
||||
|
||||
installdirs:
|
||||
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
install-data: install-data-am
|
||||
@ -265,7 +303,7 @@ clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-rm -f Makefile $(CONFIG_CLEAN_FILES)
|
||||
-rm -f $(CONFIG_CLEAN_FILES)
|
||||
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@ -275,7 +313,7 @@ clean: clean-am
|
||||
clean-am: clean-generic mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-generic
|
||||
|
||||
dvi: dvi-am
|
||||
@ -299,13 +337,21 @@ install-man:
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
mostlyclean-am: mostlyclean-generic
|
||||
|
||||
pdf: pdf-am
|
||||
|
||||
pdf-am:
|
||||
|
||||
ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-local
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic distclean \
|
||||
@ -314,8 +360,8 @@ uninstall-am: uninstall-info-am uninstall-local
|
||||
install-exec install-exec-am install-info install-info-am \
|
||||
install-man install-strip installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-generic uninstall uninstall-am \
|
||||
uninstall-info-am uninstall-local
|
||||
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
|
||||
uninstall-am uninstall-info-am uninstall-local
|
||||
|
||||
|
||||
omf: omf_timestamp
|
||||
|
||||
@ -159,23 +159,23 @@ class ChooseParents:
|
||||
self.fmodel.clear()
|
||||
self.fmodel.new_model()
|
||||
|
||||
pkey = self.person.get_id()
|
||||
person_id = self.person.get_id()
|
||||
|
||||
if self.father:
|
||||
fid = self.father.get_id()
|
||||
father_id = self.father.get_id()
|
||||
else:
|
||||
fid = None
|
||||
father_id = None
|
||||
|
||||
bday = self.person.get_birth().get_date_object()
|
||||
dday = self.person.get_death().get_date_object()
|
||||
|
||||
person_list = []
|
||||
for key in self.db.sort_person_keys():
|
||||
if pkey == key:
|
||||
if person_id == key:
|
||||
continue
|
||||
|
||||
person = self.db.get_person(key)
|
||||
if person.get_gender() != person.male:
|
||||
if person.get_gender() != RelLib.Person.male:
|
||||
continue
|
||||
|
||||
if not self.showallf.get_active():
|
||||
@ -215,9 +215,9 @@ class ChooseParents:
|
||||
d = self.db.get_person_display(idval)
|
||||
info = [d[0],d[1],d[3],d[5],d[6]]
|
||||
if self.type == "Partners":
|
||||
self.fmodel.add(info,d[1],fid==d[1])
|
||||
self.fmodel.add(info,d[1],father_id==d[1])
|
||||
elif d[2] == const.male:
|
||||
self.fmodel.add(info,d[1],fid==d[1])
|
||||
self.fmodel.add(info,d[1],father_id==d[1])
|
||||
|
||||
if self.type == "Partners":
|
||||
self.flabel.set_label("<b>%s</b>" % _("Par_ent"))
|
||||
@ -233,7 +233,7 @@ class ChooseParents:
|
||||
self.mmodel.clear()
|
||||
self.mmodel.new_model()
|
||||
|
||||
pkey = self.person.get_id()
|
||||
person_id = self.person.get_id()
|
||||
|
||||
if self.mother:
|
||||
mid = self.mother.get_id()
|
||||
@ -245,11 +245,11 @@ class ChooseParents:
|
||||
|
||||
person_list = []
|
||||
for key in self.db.sort_person_keys():
|
||||
if pkey == key:
|
||||
if person_id == key:
|
||||
continue
|
||||
|
||||
person = self.db.get_person(key)
|
||||
if person.get_gender() != person.female:
|
||||
if person.get_gender() != RelLib.Person.female:
|
||||
continue
|
||||
|
||||
person = self.db.get_person(key)
|
||||
@ -315,30 +315,33 @@ class ChooseParents:
|
||||
def showallm_toggled(self,obj):
|
||||
self.redrawm()
|
||||
|
||||
def find_family(self,father,mother):
|
||||
def find_family(self,father_id,mother_id):
|
||||
"""
|
||||
Finds the family associated with the father and mother.
|
||||
If one does not exist, it is created.
|
||||
"""
|
||||
if not father and not mother:
|
||||
if not father_id and not mother_id:
|
||||
return None
|
||||
|
||||
families = self.db.get_family_id_map().values()
|
||||
for family in families:
|
||||
if family.get_father_id() == father and family.get_mother_id() == mother:
|
||||
if family.get_father_id() == father_id and family.get_mother_id() == mother_id:
|
||||
return family
|
||||
elif family.get_father_id() == mother and family.get_mother_id() == father:
|
||||
elif family.get_father_id() == mother_id and family.get_mother_id() == father_id:
|
||||
return family
|
||||
|
||||
family = self.db.new_family()
|
||||
family.set_father_id(father)
|
||||
family.set_mother_id(mother)
|
||||
family.add_child_id(self.person)
|
||||
family.set_father_id(father_id)
|
||||
family.set_mother_id(mother_id)
|
||||
family.add_child_id(self.person.get_id())
|
||||
|
||||
if father:
|
||||
if father_id:
|
||||
father = self.db.find_person_from_id(father_id)
|
||||
father.add_family_id(family.get_id())
|
||||
if mother:
|
||||
mother = self.db.find_person_from_id(mother_id)
|
||||
mother.add_family_id(family.get_id())
|
||||
|
||||
return family
|
||||
|
||||
def mother_list_select_row(self,obj):
|
||||
@ -354,10 +357,11 @@ class ChooseParents:
|
||||
|
||||
if not self.parent_selected and self.mother:
|
||||
self.parent_selected = 1
|
||||
list = self.mother.get_family_id_list()
|
||||
if len(list) >= 1:
|
||||
father = list[0].get_father_id()
|
||||
self.fmodel.find(father.get_id())
|
||||
family_id_list = self.mother.get_family_id_list()
|
||||
if len(family_id_list) >= 1:
|
||||
family = self.db.find_family_from_id(family_id_list[0])
|
||||
father_id = family.get_father_id()
|
||||
self.fmodel.find(father_id)
|
||||
self.fmodel.center_selected()
|
||||
|
||||
def father_list_select_row(self,obj):
|
||||
@ -372,10 +376,11 @@ class ChooseParents:
|
||||
|
||||
if not self.parent_selected and self.father:
|
||||
self.parent_selected = 1
|
||||
list = self.father.get_family_id_list()
|
||||
if len(list) >= 1:
|
||||
mother = list[0].get_mother_id()
|
||||
self.mmodel.find(mother.get_id())
|
||||
family_id_list = self.father.get_family_id_list()
|
||||
if len(family_id_list) >= 1:
|
||||
family = self.db.find_family_from_id(family_id_list[0])
|
||||
mother_id = family.get_mother_id()
|
||||
self.mmodel.find(mother_id)
|
||||
self.mmodel.center_selected()
|
||||
|
||||
def save_parents_clicked(self,obj):
|
||||
@ -398,23 +403,21 @@ class ChooseParents:
|
||||
if self.mother.get_gender() == RelLib.Person.male:
|
||||
self.father = self.mother
|
||||
self.mother = None
|
||||
self.family = self.find_family(self.father,self.mother)
|
||||
self.family = self.find_family(self.father.get_id(),self.mother.get_id())
|
||||
elif self.father and not self.mother:
|
||||
if self.father.get_gender() == RelLib.Person.female:
|
||||
self.mother = self.father
|
||||
self.father = None
|
||||
self.family = self.find_family(self.father,self.mother)
|
||||
self.family = self.find_family(self.father.get_id(),self.mother.get_id())
|
||||
elif self.mother.get_gender() != self.father.get_gender():
|
||||
if self.type == "Partners":
|
||||
self.type = "Unknown"
|
||||
if self.father.get_gender() == RelLib.Person.female:
|
||||
x = self.father
|
||||
self.father = self.mother
|
||||
self.mother = x
|
||||
self.family = self.find_family(self.father,self.mother)
|
||||
self.father, self.mother = self.mother, self.father
|
||||
self.family = self.find_family(self.father.get_id(),self.mother.get_id())
|
||||
else:
|
||||
self.type = "Partners"
|
||||
self.family = self.find_family(self.father,self.mother)
|
||||
self.family = self.find_family(self.father.get_id(),self.mother.get_id())
|
||||
else:
|
||||
self.family = None
|
||||
|
||||
@ -471,7 +474,7 @@ class ChooseParents:
|
||||
is None, the the relationship type shoud be deleted.
|
||||
"""
|
||||
if self.person not in family.get_child_id_list():
|
||||
family.add_child_id(self.person)
|
||||
family.add_child_id(self.person.get_id())
|
||||
for fam in self.person.get_parent_family_id_list():
|
||||
if family == fam[0]:
|
||||
if mother_rel == fam[1] and father_rel == fam[2]:
|
||||
|
||||
@ -603,10 +603,12 @@ class FamilyView:
|
||||
self.load_family(self.family)
|
||||
|
||||
def new_spouse_after_edit(self,epo):
|
||||
|
||||
if epo.person.get_id() == "":
|
||||
self.parent.db.add_person(epo.person)
|
||||
else:
|
||||
self.parent.db.add_person_no_map(epo.person,epo.person.get_id())
|
||||
|
||||
self.parent.db.build_person_display(epo.person.get_id())
|
||||
self.parent.people_view.add_to_person_list(epo.person,0)
|
||||
|
||||
@ -615,11 +617,11 @@ class FamilyView:
|
||||
epo.person.add_family_id(self.family.get_id())
|
||||
|
||||
if self.person.get_gender() == RelLib.Person.male:
|
||||
self.family.set_mother_id(epo.person)
|
||||
self.family.set_father_id(self.person)
|
||||
self.family.set_mother_id(epo.person.get_id())
|
||||
self.family.set_father_id(self.person.get_id())
|
||||
else:
|
||||
self.family.set_father_id(epo.person)
|
||||
self.family.set_mother_id(self.person)
|
||||
self.family.set_father_id(epo.person.get_id())
|
||||
self.family.set_mother_id(self.person.get_id())
|
||||
|
||||
self.load_family(self.family)
|
||||
|
||||
|
||||
@ -83,10 +83,14 @@ class PeopleView:
|
||||
self.clearing_tabs = 0
|
||||
|
||||
def row_changed(self,obj):
|
||||
mlist = self.person_tree.get_selected_objects()
|
||||
if mlist and mlist[0]:
|
||||
"""Called with a row is changed. Check the selected objects from the person_tree
|
||||
to get the IDs of the selected objects. Set the active person to the first person
|
||||
in the list. If no one is selected, set the active person to None"""
|
||||
selected_id_list = self.person_tree.get_selected_objects()
|
||||
if selected_id_list:
|
||||
assert(selected_id_list[0])
|
||||
try:
|
||||
self.parent.change_active_person(self.parent.db.get_person(mlist[0]))
|
||||
self.parent.change_active_person(self.parent.db.get_person(selected_id_list[0]))
|
||||
except:
|
||||
self.parent.change_active_person(None)
|
||||
self.person_tree.unselect()
|
||||
@ -141,11 +145,14 @@ class PeopleView:
|
||||
model.clear()
|
||||
|
||||
def remove_from_person_list(self,person,old_id=None):
|
||||
pid = person.get_id()
|
||||
"""Remove the selected person from the list. A person object is expected,
|
||||
not an ID"""
|
||||
|
||||
person_id = person.get_id()
|
||||
if old_id:
|
||||
del_id = old_id
|
||||
else:
|
||||
del_id = pid
|
||||
del_id = person_id
|
||||
|
||||
if self.id2col.has_key(del_id):
|
||||
(model,iter) = self.id2col[del_id]
|
||||
@ -157,11 +164,13 @@ class PeopleView:
|
||||
self.parent.active_person = None
|
||||
|
||||
def remove_from_history(self,person,old_id=None):
|
||||
pid = person.get_id()
|
||||
"""Removes a person from the history list"""
|
||||
|
||||
person_id = person.get_id()
|
||||
if old_id:
|
||||
del_id = old_id
|
||||
else:
|
||||
del_id = pid
|
||||
del_id = person_id
|
||||
|
||||
hc = self.parent.history.count(del_id)
|
||||
for c in range(hc):
|
||||
|
||||
@ -1788,7 +1788,7 @@ class Family(SourceNote):
|
||||
|
||||
def set_father_id(self,person_id):
|
||||
"""sets the father of the Family to the specfied Person"""
|
||||
update = self.some_child_is_ancestor()
|
||||
# update = self.some_child_is_ancestor()
|
||||
# if update and father_id:
|
||||
# father_id.set_ancestor(0)
|
||||
self.father_id = person_id
|
||||
@ -1801,7 +1801,7 @@ class Family(SourceNote):
|
||||
|
||||
def set_mother_id(self,person):
|
||||
"""sets the mother of the Family to the specfied Person"""
|
||||
update = self.some_child_is_ancestor()
|
||||
# update = self.some_child_is_ancestor()
|
||||
# if self.mother_id and update:
|
||||
# self.mother_id.set_ancestor(0)
|
||||
self.mother_id = person
|
||||
|
||||
@ -1326,7 +1326,7 @@ class Gramps:
|
||||
|
||||
self.people_view.remove_from_history(self.active_person)
|
||||
self.db.remove_person_id(self.active_person.get_id())
|
||||
self.people_view.remove_from_person_list(self.active_person.get_id())
|
||||
self.people_view.remove_from_person_list(self.active_person)
|
||||
self.people_view.person_model.sort_column_changed()
|
||||
|
||||
if self.hindex >= 0:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user