diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index b4c574b13..2d44055c2 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -4,8 +4,11 @@ * src/AddrEdit.py: Add phone number * src/EditPlace.py: Add phone number and postal code * src/LocEdit.py: Add phone number and postal code - * src/edit_person.glade: Add address fields - * src/dialog.glade: Add address and phone fields + * src/edit_person.glade: Add postal code fields + * src/dialog.glade: Add postal code and phone fields + * src/places.glade: Add postal code + * src/WriteXML.py: Add support for new place and postal code fields + * src/GrampsParser.py: Add support for new place and postal code fields 2003-12-08 Richard Bos * configure.in: catch the SUSE usage of "gnome.gconf" instead of diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in index ec6fa52de..d037f6ef7 100644 --- a/gramps2/Makefile.in +++ b/gramps2/Makefile.in @@ -134,7 +134,7 @@ target_alias = @target_alias@ SUBDIRS = src doc example -EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS FAQ +EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec COPYING-DOCS FAQ bin_SCRIPTS = gramps @@ -382,9 +382,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -557,9 +554,6 @@ uninstall-info: uninstall-info-recursive gramps: gramps.sh cp gramps.sh gramps -dist-hook: gramps.spec - cp gramps.spec $(distdir) - .PHONY: pycheck trans pycheck: diff --git a/gramps2/configure b/gramps2/configure index 6cf8b8d9f..7598925f2 100755 --- a/gramps2/configure +++ b/gramps2/configure @@ -1635,7 +1635,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" @@ -1764,7 +1764,7 @@ echo "${ECHO_T}no" >&6 fi -LANGUAGES="hu zh_CN cs da_DK de es fr it nb nl no pl pt_BR ro ru sv" +LANGUAGES="hu zh_CN cs da_DK de es fr it nb nl no pl pt_BR ro ru sv eo" DISTLANGS= @@ -3227,6 +3227,9 @@ $pygtk_require try: import gconf out("YES") +except ImportError: + import gnome.gconf + out("YES") except ImportError: out("NO") EOF diff --git a/gramps2/doc/gramps-manual/C/Makefile.in b/gramps2/doc/gramps-manual/C/Makefile.in index 56bd3dcc7..45db6bcf5 100644 --- a/gramps2/doc/gramps-manual/C/Makefile.in +++ b/gramps2/doc/gramps-manual/C/Makefile.in @@ -200,6 +200,8 @@ entities = legal.xml\ mainwin.xml\ usage.xml\ custom.xml\ + faq.xml\ + keybind.xml\ filtref.xml\ cmdline.xml @@ -393,6 +395,14 @@ $(docname).xml: $(entities) cd $(srcdir); \ cp $(entities) $$ourdir +.PHONY: distclean-hook +distclean: distclean-hook +distclean-hook: + if [ $(top_srcdir) != $(top_builddir) ]; \ + then \ + rm -f $(entities); \ + fi + app-dist-hook: if test "$(figdir)"; then \ $(mkinstalldirs) $(distdir)/$(figdir); \ diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec index 3b21189a6..a7ae4dc18 100644 --- a/gramps2/gramps.spec +++ b/gramps2/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.98.0 -%define rel 0.CVS20031126 +%define rel 1 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall @@ -11,7 +11,7 @@ Summary: Genealogical Research and Analysis Management Programming System. Name: gramps Version: %ver Release: %rel -Copyright: GPL +License: GPL Group: Applications/Genealogy Source: http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz BuildRoot: /var/tmp/%{name}-%{version}-root @@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT %files -f gramps.lang %defattr(-, root, root) -%doc README COPYING TODO INSTALL COPYING-DOCS +%doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO %doc %{_mandir}/man1/* %{prefix}/bin/gramps @@ -89,6 +89,10 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Tue Dec 2 2003 Tim Waugh +- More docs. +- Change Copyright: to License:. + * Fri Sep 19 2003 Tim Waugh - Own %%{_datadir/gramps directory. - Ship %%{_libdir}/gramps. diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 0c6ab1e6a..c458c2670 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -146,6 +146,7 @@ class EditPerson: self.addr_state = self.get_widget("state") self.addr_country = self.get_widget("country") self.addr_postal = self.get_widget("postal") + self.addr_phone = self.get_widget("phone") self.event_list = self.get_widget("eventList") self.edit_person = self.get_widget("editPerson") self.name_list = self.get_widget("nameList") @@ -1205,6 +1206,7 @@ class EditPerson: self.addr_state.set_text(addr.getState()) self.addr_country.set_text(addr.getCountry()) self.addr_postal.set_text(addr.getPostal()) + self.addr_phone.set_text(addr.getPhone()) if len(addr.getSourceRefList()) > 0: psrc = addr.getSourceRefList()[0] self.addr_conf_field.set_text(const.confidence[psrc.getConfidence()]) @@ -1221,6 +1223,7 @@ class EditPerson: self.addr_state.set_text('') self.addr_country.set_text('') self.addr_postal.set_text('') + self.addr_phone.set_text('') self.addr_conf_field.set_text('') self.addr_src_field.set_text('') self.addr_delete_btn.set_sensitive(0) diff --git a/gramps2/src/GrampsParser.py b/gramps2/src/GrampsParser.py index 071ef2a0d..09f786fc1 100644 --- a/gramps2/src/GrampsParser.py +++ b/gramps2/src/GrampsParser.py @@ -124,6 +124,7 @@ class GrampsParser: "created" : (self.start_created, None), "ref" : (None, self.stop_ref), "database" : (None, None), + "phone" : (None, self.stop_phone), "date" : (None, self.stop_date), "cause" : (None, self.stop_cause), "description": (None, self.stop_description), @@ -256,6 +257,10 @@ class GrampsParser: take up quite a bit of time""" loc = RelLib.Location() + if attrs.has_key('phone'): + loc.phone = attrs['phone'] + if attrs.has_key('postal'): + loc.postal = attrs['postal'] if attrs.has_key('city'): loc.city = attrs['city'] if attrs.has_key('parish'): @@ -736,6 +741,9 @@ class GrampsParser: date.set(tag) self.source_ref.setDate(date) + def stop_phone(self,tag): + self.address.setPhone(tag) + def stop_street(self,tag): self.address.setStreet(tag) diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py index 7ecf98597..d4b634f38 100644 --- a/gramps2/src/WriteXML.py +++ b/gramps2/src/WriteXML.py @@ -255,6 +255,7 @@ class XmlWriter: self.write_line("state",address.getState(),4) self.write_line("country",address.getCountry(),4) self.write_line("postal",address.getPostal(),4) + self.write_line("phone",address.getPhone(),4) if address.getNote() != "": self.write_note("note",address.getNote(),4) for s in address.getSourceRefList(): @@ -604,6 +605,8 @@ class XmlWriter: state = self.fix(loc.get_state()) country = self.fix(loc.get_country()) county = self.fix(loc.get_county()) + zip = self.fix(loc.get_postal_code()) + phone = self.fix(loc.get_phone()) if not city and not state and not parish and not county and not country: return @@ -619,6 +622,10 @@ class XmlWriter: self.g.write(' state="%s"' % state) if country: self.g.write(' country="%s"' % country) + if zip: + self.g.write(' postal="%s"' % zip) + if phone: + self.g.write(' phone="%s"' % phone) self.g.write('/>\n') def write_attribute_list(self, list, indent=3): diff --git a/gramps2/src/places.glade b/gramps2/src/places.glade index 9885ea6f5..f84f76d94 100644 --- a/gramps2/src/places.glade +++ b/gramps2/src/places.glade @@ -119,7 +119,7 @@ 6 True - 9 + 11 4 False 6 @@ -258,8 +258,8 @@ 1 2 - 6 - 7 + 7 + 8 fill @@ -286,8 +286,8 @@ 1 2 - 7 - 8 + 9 + 10 fill @@ -314,8 +314,8 @@ 1 2 - 8 - 9 + 10 + 11 fill @@ -471,8 +471,8 @@ 2 4 - 6 - 7 + 7 + 8 @@ -492,8 +492,8 @@ 2 4 - 7 - 8 + 9 + 10 @@ -513,8 +513,8 @@ 2 4 - 8 - 9 + 10 + 11 @@ -542,6 +542,98 @@ + + + + True + _ZIP/Postal code: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + postal + + + 1 + 2 + 6 + 7 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 4 + 6 + 7 + + + + + + + True + P_hone: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + phone + + + 1 + 2 + 8 + 9 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 4 + 8 + 9 + + + False @@ -579,7 +671,7 @@ 6 True 6 - 3 + 5 False 3 12 @@ -632,32 +724,6 @@ - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 3 - 4 - 3 - 3 - fill - - - - True @@ -706,6 +772,131 @@ + + + True + Church parish: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 5 + 1 + 2 + 3 + 3 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 5 + 2 + 3 + 3 + 3 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 5 + 3 + 4 + 3 + 3 + fill + + + + + + + True + Zip/Postal code: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 4 + 4 + 5 + fill + + + + True @@ -727,6 +918,52 @@ 5 3 3 + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 4 + 5 + 4 + 5 + + + + + + + True + <b>Other names</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 5 + 0 + 1 fill @@ -759,7 +996,31 @@ - + + True + Phone: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 4 + 5 + 6 + fill + + + + + + True False @@ -773,85 +1034,10 @@ 0 - 2 - 3 - 1 - 2 - 3 - 3 - - - - - - - True - Church parish: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 2 - 3 - 3 - 3 - fill - - - - - - - True - <b>Other names</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 0 - 1 + 4 + 5 + 5 + 6 fill