From 69d98c478e72d32751a2a4f3a63a5747a1cf5369 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Fri, 10 Oct 2003 03:56:19 +0000 Subject: [PATCH] * src/gramps.glade: Remove hot keys from toolbar buttons. Add editing items under Edit menu. * src/gramps_main.py: Enable/disable new menu items. * NEWS, configure, configure.in, gramps.spec, doc/gramps.1, doc/gramps-manual/C/gramps-manual-C.omf, doc/gramps-manual/C/gramps-manual.xml: merge with 0.9.5 branch. * Version 0.9.5: the "Fix me up" release. * src/gramps_main.py (delete_person_response, merge_update): Add remove_from_history and redraw_histmenu() calls before deleting the person. * doc/gramps.1.in, doc/gramps.1, doc/gramps-manual/C/gramps-manual.xml, doc/gramps-manual/C/gramps-manual.omf, gramps.spec: New version. * configure.in: Fix version and release numbers for 0.9.5-1. * NEWS: Update for a 0.9.5 release. svn: r2222 --- ChangeLog | 20 +++- NEWS | 3 + configure | 65 +++++------- configure.in | 3 +- doc/gramps-manual/C/gramps-manual-C.omf | 4 +- doc/gramps-manual/C/gramps-manual.xml | 2 +- doc/gramps.1 | 2 +- gramps.spec | 4 +- src/gramps.glade | 131 ++++++++++++++++++------ src/gramps_main.py | 10 ++ 10 files changed, 162 insertions(+), 82 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f9f74299..64ed63e82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-10-09 Alex Roitman + * src/gramps.glade: Remove hot keys from toolbar buttons. + Add editing items under Edit menu. + * src/gramps_main.py: Enable/disable new menu items. + * NEWS, configure, configure.in, gramps.spec, doc/gramps.1, + doc/gramps-manual/C/gramps-manual-C.omf, + doc/gramps-manual/C/gramps-manual.xml: merge with 0.9.5 branch. + 2003-10-08 Alex Roitman * src/po/sv.po: Typo in keyword. Fixes 820054. * src/gramps_main.py (init_interface, redraw_histmenu): Add @@ -22,11 +30,19 @@ not converted to < and > * src/plugins/WriteGedcom.py: Fixed undefined reference to ref_text +2003-10-07 Don Allingham + * Version 0.9.5: the "Fix me up" release. + 2003-10-06 Alex Roitman - * src/gramps_main.py (delete_person_response): Add remove_from_history - call before deleting the person. + * src/gramps_main.py (delete_person_response, merge_update): + Add remove_from_history and redraw_histmenu() calls before deleting + the person. * src/PeopleView.py (remove_from_history): Add function; (row_changed) Remove extra change_active_person() call. + * doc/gramps.1.in, doc/gramps.1, doc/gramps-manual/C/gramps-manual.xml, + doc/gramps-manual/C/gramps-manual.omf, gramps.spec: New version. + * configure.in: Fix version and release numbers for 0.9.5-1. + * NEWS: Update for a 0.9.5 release. 2003-10-06 Tim Waugh * src/Makefile.am: Ship PeopleView.py and PeopleStore.py. diff --git a/NEWS b/NEWS index 3853650d6..c4f86ef33 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Version 0.9.5 -- the "Fix me up" release +* Fixed problem with deleting/merging people. + Version 0.9.4 -- the "This used to bug me..." release * More compliance with GNOME HIG. * Fixed style problems for book items. diff --git a/configure b/configure index 9af2f9871..fb15f24df 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for gramps 0.9.4. +# Generated by GNU Autoconf 2.57 for gramps 0.9.5. # # Report bugs to . # @@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gramps' PACKAGE_TARNAME='gramps' -PACKAGE_VERSION='0.9.4' -PACKAGE_STRING='gramps 0.9.4' +PACKAGE_VERSION='0.9.5' +PACKAGE_STRING='gramps 0.9.5' PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net' ac_unique_file="src/gramps.py" @@ -738,7 +738,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gramps 0.9.4 to adapt to many kinds of systems. +\`configure' configures gramps 0.9.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -800,7 +800,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gramps 0.9.4:";; + short | recursive ) echo "Configuration of gramps 0.9.5:";; esac cat <<\_ACEOF @@ -877,14 +877,14 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -gramps configure 0.9.4 +gramps configure 0.9.5 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -899,7 +899,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gramps $as_me 0.9.4, which was +It was created by gramps $as_me 0.9.5, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1076,7 +1076,7 @@ _ASBOX echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1490,7 +1490,7 @@ fi # Define the identity of the package. PACKAGE=gramps - VERSION=0.9.4 + VERSION=0.9.5 cat >>confdefs.h <<_ACEOF @@ -1616,7 +1616,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -RELEASE=0.CVS$(head -c 10 ChangeLog | tr -d '-') +RELEASE=1.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" @@ -1821,12 +1821,13 @@ else echo "${ECHO_T}no" >&6 fi + am_display_PYTHON=$am_cv_pathless_PYTHON fi - echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON version" >&5 -echo $ECHO_N "checking for $am_cv_pathless_PYTHON version... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1844,8 +1845,8 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_cv_pathless_PYTHON platform... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1859,34 +1860,15 @@ echo "${ECHO_T}$am_cv_python_platform" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 -if test "${am_cv_python_pythondir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -fi -echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -echo "${ECHO_T}$am_cv_python_pythondir" >&6 - pythondir=$am_cv_python_pythondir + pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages pkgpythondir=\${pythondir}/$PACKAGE - echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 -if test "${am_cv_python_pyexecdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` -fi -echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 - pyexecdir=$am_cv_python_pyexecdir + + pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages @@ -2786,8 +2768,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2801,8 +2782,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -3694,7 +3675,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by gramps $as_me 0.9.4, which was +This file was extended by gramps $as_me 0.9.5, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3752,7 +3733,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gramps config.status 0.9.4 +gramps config.status 0.9.5 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index a38348357..5e621940a 100644 --- a/configure.in +++ b/configure.in @@ -2,10 +2,11 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 0.9.4, gramps-bugs@lists.sourceforge.net) +AC_INIT(gramps, 0.9.5, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) RELEASE=1.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +dnl RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/doc/gramps-manual/C/gramps-manual-C.omf b/doc/gramps-manual/C/gramps-manual-C.omf index 6043ab466..be3d620ba 100644 --- a/doc/gramps-manual/C/gramps-manual-C.omf +++ b/doc/gramps-manual/C/gramps-manual-C.omf @@ -3,8 +3,8 @@ Alex Roitman shura@alex.neuro.umn.edu GRAMPS Manual - 2003-07-10 - + 2003-10-06 + User Manual for GRAMPS. User Manual diff --git a/doc/gramps-manual/C/gramps-manual.xml b/doc/gramps-manual/C/gramps-manual.xml index eb2980903..78184db97 100644 --- a/doc/gramps-manual/C/gramps-manual.xml +++ b/doc/gramps-manual/C/gramps-manual.xml @@ -8,7 +8,7 @@ - + GRAMPS"> diff --git a/doc/gramps.1 b/doc/gramps.1 index 91897754a..7c2be20f1 100644 --- a/doc/gramps.1 +++ b/doc/gramps.1 @@ -1,4 +1,4 @@ -.TH gramps 1 "0.9.4" "September 2003" "0.9.4" +.TH gramps 1 "0.9.5" "September 2003" "0.9.5" .SH NAME gramps \- Genealogical Research and Analysis Management Programming System. diff --git a/gramps.spec b/gramps.spec index 04f4c3ed2..a97aa6389 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ -%define ver 0.9.4 -%define rel 0.CVS20030922 +%define ver 0.9.5 +%define rel 1.CVS20031009 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/src/gramps.glade b/src/gramps.glade index 4592c7418..aa0d19da6 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -51,7 +51,7 @@ - + True gtk-new 1 @@ -73,7 +73,7 @@ - + True gtk-open 1 @@ -95,7 +95,7 @@ - + True gtk-save 1 @@ -116,7 +116,7 @@ - + True gtk-save-as 1 @@ -150,7 +150,7 @@ True - + True gtk-convert 1 @@ -171,7 +171,7 @@ - + True gtk-revert-to-saved 1 @@ -192,7 +192,7 @@ - + True gtk-refresh 1 @@ -220,7 +220,7 @@ - + True gtk-quit 1 @@ -246,6 +246,68 @@ + + + True + Add a new item + _Add... + True + + + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Remove the currently selected item + _Remove + True + + + + + + True + gtk-remove + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Edit the selected item + E_dit... + True + + + + + + + True + + + True @@ -255,7 +317,7 @@ - + True gtk-find 1 @@ -274,9 +336,10 @@ _Merge... True + - + True gtk-convert 1 @@ -352,7 +415,7 @@ - + True gtk-index 1 @@ -374,7 +437,7 @@ - + True gnome-stock-book-open 1 @@ -438,7 +501,7 @@ - + True gtk-preferences 1 @@ -459,7 +522,7 @@ - + True gtk-home 1 @@ -494,7 +557,7 @@ - + True gtk-help 1 @@ -521,7 +584,7 @@ - + True gtk-jump-to 1 @@ -542,7 +605,7 @@ - + True gnome-stock-mail 1 @@ -596,7 +659,7 @@ - + True gnome-stock-about 1 @@ -641,8 +704,9 @@ True Open file - gtk-open - True + Open + True + gtk-open @@ -651,8 +715,9 @@ True Save file - gtk-save - True + Save + True + gtk-save @@ -660,8 +725,9 @@ True - gtk-go-back - True + Back + True + gtk-go-back True @@ -674,8 +740,9 @@ True - gtk-go-forward - True + Forward + True + gtk-go-forward @@ -685,7 +752,7 @@ True Make the Home Person the active person - _Home + Home True gtk-home @@ -722,8 +789,9 @@ True Add a new item - gtk-add - True + Add + True + gtk-add True @@ -736,8 +804,9 @@ True Remove the currently selected item - gtk-remove - True + Remove + True + gtk-remove diff --git a/src/gramps_main.py b/src/gramps_main.py index 7a5998bf0..d84f57917 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -181,6 +181,8 @@ class Gramps: self.tool_button = self.gtop.get_widget("tools") self.remove_button = self.gtop.get_widget("removebtn") self.edit_button = self.gtop.get_widget("editbtn") + self.remove_item = self.gtop.get_widget("remove_item") + self.edit_item = self.gtop.get_widget("edit_item") self.sidebar = self.gtop.get_widget('side_event') self.filterbar = self.gtop.get_widget('filterbar') @@ -188,6 +190,8 @@ class Gramps: self.report_button.set_sensitive(0) self.remove_button.set_sensitive(0) self.edit_button.set_sensitive(0) + self.remove_item.set_sensitive(0) + self.edit_item.set_sensitive(0) set_panel(self.sidebar) set_panel(self.gtop.get_widget('side_people')) @@ -250,6 +254,7 @@ class Gramps: self.media_view = MediaView.MediaView(self.db,self.gtop,self.update_display) self.add_button = self.gtop.get_widget('addbtn') + self.add_item = self.gtop.get_widget('add_item') self.backbtn = self.gtop.get_widget('back_btn') self.fwdbtn = self.gtop.get_widget('fwd_btn') self.gomenuitem = self.gtop.get_widget("go1") @@ -474,6 +479,8 @@ class Gramps: if self.views.get_current_page() == PERSON_VIEW: self.remove_button.set_sensitive(val) self.edit_button.set_sensitive(val) + self.remove_item.set_sensitive(val) + self.edit_item.set_sensitive(val) def back_clicked(self,obj,step=1): if self.hindex > 0: @@ -566,6 +573,9 @@ class Gramps: self.add_button.set_sensitive(val) self.remove_button.set_sensitive(val) self.edit_button.set_sensitive(val) + self.add_item.set_sensitive(val) + self.remove_item.set_sensitive(val) + self.edit_item.set_sensitive(val) def on_show_plugin_status(self,obj): Plugins.PluginStatus()