diff --git a/ChangeLog b/ChangeLog index da2df0019..469accfab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-08-15 Don Allingham + * src/gramps.glade: New tool icon + * src/gramps_main.py: handle back/fwd buttons, disabling when + not appropriate + * src/people48.png: new image + * src/family48.png: new image + * src/tools.png: new image + * src/Makefile.am: added tools.png for installation + 2003-08-15 Alex Roitman * src/gramps.glade: Add Go menu with navigation items. Still have to work out the history menu being built at runtime. Add few shortcuts. diff --git a/Makefile.in b/Makefile.in index df565ac0c..d8f7ac903 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,11 +80,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/configure b/configure index a4ef95c19..a41eda84d 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG PYTHON22 ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP HAVE_PKG_CONFIG SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX P22_INCLUDES GNOMEINC GNOMELIB INTLLIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB INTLLIBS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1981,51 +1981,6 @@ echo "${ECHO_T}no" >&6 fi -if test "$PYTHON_VERSION" != "2.2" -then - # Extract the first word of "python2.2", so it can be a program name with args. -set dummy python2.2; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PYTHON22+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PYTHON22 in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON22="$PYTHON22" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON22="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -PYTHON22=$ac_cv_path_PYTHON22 - -if test -n "$PYTHON22"; then - echo "$as_me:$LINENO: result: $PYTHON22" >&5 -echo "${ECHO_T}$PYTHON22" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -else - PYTHON22=$PYTHON -fi - # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3996,24 +3951,17 @@ echo "${ECHO_T}ok" >&6 -echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 -echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6 - -if test "$PYTHON22" != ""; then - py_prefix=`$PYTHON22 -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON22 -c "import sys; print sys.exec_prefix"` - P22_INCLUDES="-I${py_prefix}/include/python2.2" - if test "$py_prefix" != "$py_exec_prefix"; then - P22_INCLUDES="$P22_INCLUDES -I${py_exec_prefix}/include/python2.2" - fi - if test -f "${py_exec_prefix}/include/python2.2/Python.h" - then - INTLLIBS="${INTLLIBS}intl22.so " - fi +echo "$as_me:$LINENO: checking for Python include directory" >&5 +echo $ECHO_N "checking for Python include directory... $ECHO_C" >&6 +if test "${gramps_cv_python_inc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + gramps_cv_python_inc=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null` fi +echo "$as_me:$LINENO: result: $gramps_cv_python_inc" >&5 +echo "${ECHO_T}$gramps_cv_python_inc" >&6 +PYTHON_CPPFLAGS="-I$gramps_cv_python_inc" -echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 # Extract the first word of "scrollkeeper-config", so it can be a program name with args. set dummy scrollkeeper-config; ac_word=$2 @@ -4079,7 +4027,6 @@ SCROLLKEEPER_BUILD_REQUIRED=0.3.5 - ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile gramps.spec gramps.sh" cat >confcache <<\_ACEOF @@ -4785,7 +4732,6 @@ s,@pyexecdir@,$pyexecdir,;t t s,@pkgpyexecdir@,$pkgpyexecdir,;t t s,@BINSH@,$BINSH,;t t s,@SWIG@,$SWIG,;t t -s,@PYTHON22@,$PYTHON22,;t t s,@ZIP@,$ZIP,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -4804,11 +4750,11 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t +s,@PYTHON_CPPFLAGS@,$PYTHON_CPPFLAGS,;t t s,@SK_CONFIG@,$SK_CONFIG,;t t s,@SCROLLKEEPER_BUILD_REQUIRED@,$SCROLLKEEPER_BUILD_REQUIRED,;t t s,@GNOMEHELP@,$GNOMEHELP,;t t s,@GPREFIX@,$GPREFIX,;t t -s,@P22_INCLUDES@,$P22_INCLUDES,;t t s,@GNOMEINC@,$GNOMEINC,;t t s,@GNOMELIB@,$GNOMELIB,;t t s,@INTLLIBS@,$INTLLIBS,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index 8c2d729e5..46fcfaf71 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -80,11 +80,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in index f91f36287..1c7ecb28f 100644 --- a/doc/gramps-manual/C/Makefile.in +++ b/doc/gramps-manual/C/Makefile.in @@ -140,11 +140,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/doc/gramps-manual/Makefile.in b/doc/gramps-manual/Makefile.in index 1ddcad2d9..1f699ce7f 100644 --- a/doc/gramps-manual/Makefile.in +++ b/doc/gramps-manual/Makefile.in @@ -80,11 +80,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/example/Makefile.in b/example/Makefile.in index 4fe40653e..65ebb2b4a 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/example/gramps/Makefile.in b/example/gramps/Makefile.in index b3187b9aa..baddb7eef 100644 --- a/example/gramps/Makefile.in +++ b/example/gramps/Makefile.in @@ -79,11 +79,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/gramps.spec b/gramps.spec index 572793959..16cb419ba 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.9.3 -%define rel 0.CVS20030813 +%define rel 0.CVS20030815 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/src/Makefile.in b/src/Makefile.in index c74d431df..add8b1492 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -78,11 +78,10 @@ INTLLIBS = intl22.so LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ @@ -107,7 +106,6 @@ pythondir = @pythondir@ SUBDIRS = docgen filters plugins data po calendars # For intl. support, how do we compile? -GVFSINC = @GPREF@ CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@ LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ CLEANFILES = $(INTLLIBS) grampslib.so @@ -235,7 +233,8 @@ GRAPHICS = \ people.xpm\ place.png\ sources.png\ - splash.jpg + splash.jpg\ + tools.png # Other stuff that we need to install @@ -561,10 +560,10 @@ all-local: $(INTLLIBS) grampslib.so # These can probably be done in a better or more elegant/generic way # eventually (libtool?), but this works. intl22.so: $(srcdir)/intl.c - $(CC) $(CFLAGS) $(LDFLAGS) @P22_INCLUDES@ -DVER22 -o $@ $(srcdir)/intl.c + $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_CPPFLAGS) -DVER22 -o $@ $(srcdir)/intl.c grampslib.so: $(srcdir)/grampslib_wrap.c - $(CC) $(CFLAGS) @P22_INCLUDES@ -o $@ $(srcdir)/grampslib_wrap.c $(LDFLAGS) + $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -o $@ $(srcdir)/grampslib_wrap.c $(LDFLAGS) # In principle the following rule slightly violates the automake/autoconf # spirit of keeping each subdirectory as a separate entity unto itself. diff --git a/src/calendars/Makefile.in b/src/calendars/Makefile.in index 521da9548..9b8d0a179 100644 --- a/src/calendars/Makefile.in +++ b/src/calendars/Makefile.in @@ -83,11 +83,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/src/data/Makefile.in b/src/data/Makefile.in index 58ba8b925..508b80bdb 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/src/data/templates/Makefile.in b/src/data/templates/Makefile.in index dc7ee294f..0d64301ec 100644 --- a/src/data/templates/Makefile.in +++ b/src/data/templates/Makefile.in @@ -79,11 +79,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index 818cfa671..e6646f20f 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -82,11 +82,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index 74a285a6c..f52b6858c 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 7481adcfe..22d81da05 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -79,11 +79,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index 7d26c830d..0e04391cb 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ -P22_INCLUDES = @P22_INCLUDES@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@