From 69d98c478e72d32751a2a4f3a63a5747a1cf5369 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
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 <shura@alex.neuro.umn.edu>
+ * 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 <shura@alex.neuro.umn.edu>
* 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 <dallingham@users.sourceforge.net>
+ * Version 0.9.5: the "Fix me up" release.
+
2003-10-06 Alex Roitman <shura@alex.neuro.umn.edu>
- * 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 <twaugh@redhat.com>
* 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 <gramps-bugs@lists.sourceforge.net>.
#
@@ -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 <stdlib.h>' \
+ '' \
'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 <stdlib.h>
$ac_declaration
+#include <stdlib.h>
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 @@
<resource>
<creator>Alex Roitman shura@alex.neuro.umn.edu</creator>
<title>GRAMPS Manual</title>
- <date>2003-07-10</date>
- <version identifier="2.2" date="2003-07-10" description="GNOME2 Compliant GRAMPS Manual"/>
+ <date>2003-10-06</date>
+ <version identifier="2.3" date="2003-10-06" description="GNOME2 Compliant GRAMPS Manual"/>
<subject category="GNOME|Applications"/>
<description>User Manual for GRAMPS.</description>
<type>User Manual</type>
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 @@
<!ENTITY custom SYSTEM "custom.xml">
<!ENTITY filtref SYSTEM "filtref.xml">
<!ENTITY cmdline SYSTEM "cmdline.xml">
- <!ENTITY appversion "0.9.4">
+ <!ENTITY appversion "0.9.5">
<!ENTITY manrevision "2.3">
<!ENTITY date "September 2003">
<!ENTITY app "<application>GRAMPS</application>">
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 @@
<accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1230">
+ <widget class="GtkImage" id="image1512">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -73,7 +73,7 @@
<accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1231">
+ <widget class="GtkImage" id="image1513">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -95,7 +95,7 @@
<accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1232">
+ <widget class="GtkImage" id="image1514">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -116,7 +116,7 @@
<signal name="activate" handler="on_save_as_activate" last_modification_time="Tue, 01 Apr 2003 03:50:28 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1233">
+ <widget class="GtkImage" id="image1515">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
@@ -150,7 +150,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image1234">
+ <widget class="GtkImage" id="image1516">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon_size">1</property>
@@ -171,7 +171,7 @@
<signal name="activate" handler="on_revert_activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1235">
+ <widget class="GtkImage" id="image1517">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -192,7 +192,7 @@
<signal name="activate" handler="on_reload_plugins_activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1236">
+ <widget class="GtkImage" id="image1518">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -220,7 +220,7 @@
<accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1237">
+ <widget class="GtkImage" id="image1519">
<property name="visible">True</property>
<property name="stock">gtk-quit</property>
<property name="icon_size">1</property>
@@ -246,6 +246,68 @@
<child>
<widget class="GtkMenu" id="edit1_menu">
+ <child>
+ <widget class="GtkImageMenuItem" id="add_item">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add a new item</property>
+ <property name="label" translatable="yes">_Add...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_addbtn_clicked" last_modification_time="Fri, 10 Oct 2003 03:03:48 GMT"/>
+ <accelerator key="Insert" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1520">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="remove_item">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Remove the currently selected item</property>
+ <property name="label" translatable="yes">_Remove</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_removebtn_clicked" last_modification_time="Fri, 10 Oct 2003 03:05:36 GMT"/>
+ <accelerator key="Delete" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1521">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="edit_item">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Edit the selected item</property>
+ <property name="label" translatable="yes">E_dit...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_editbtn_clicked" last_modification_time="Fri, 10 Oct 2003 03:07:52 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="separator10">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
<child>
<widget class="GtkImageMenuItem" id="find">
<property name="visible">True</property>
@@ -255,7 +317,7 @@
<accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1238">
+ <widget class="GtkImage" id="image1522">
<property name="visible">True</property>
<property name="stock">gtk-find</property>
<property name="icon_size">1</property>
@@ -274,9 +336,10 @@
<property name="label" translatable="yes">_Merge...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_merge_activate"/>
+ <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1239">
+ <widget class="GtkImage" id="image1523">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon_size">1</property>
@@ -352,7 +415,7 @@
<accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1240">
+ <widget class="GtkImage" id="image1524">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">1</property>
@@ -374,7 +437,7 @@
<accelerator key="B" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1241">
+ <widget class="GtkImage" id="image1525">
<property name="visible">True</property>
<property name="stock">gnome-stock-book-open</property>
<property name="icon_size">1</property>
@@ -438,7 +501,7 @@
<signal name="activate" handler="on_preferences1_activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1242">
+ <widget class="GtkImage" id="image1526">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -459,7 +522,7 @@
<signal name="activate" handler="on_default_person_activate" last_modification_time="Sat, 16 Aug 2003 01:58:26 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1243">
+ <widget class="GtkImage" id="image1527">
<property name="visible">True</property>
<property name="stock">gtk-home</property>
<property name="icon_size">1</property>
@@ -494,7 +557,7 @@
<accelerator key="F1" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1244">
+ <widget class="GtkImage" id="image1528">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@@ -521,7 +584,7 @@
<signal name="activate" handler="on_gramps_home_page_activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1245">
+ <widget class="GtkImage" id="image1529">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@@ -542,7 +605,7 @@
<signal name="activate" handler="on_gramps_mailing_lists_activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1246">
+ <widget class="GtkImage" id="image1530">
<property name="visible">True</property>
<property name="stock">gnome-stock-mail</property>
<property name="icon_size">1</property>
@@ -596,7 +659,7 @@
<signal name="activate" handler="on_about_activate" last_modification_time="Tue, 01 Apr 2003 03:44:24 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1247">
+ <widget class="GtkImage" id="image1531">
<property name="visible">True</property>
<property name="stock">gnome-stock-about</property>
<property name="icon_size">1</property>
@@ -641,8 +704,9 @@
<widget class="button" id="button2">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Open file</property>
- <property name="label">gtk-open</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Open</property>
+ <property name="use_underline">True</property>
+ <property name="stock_pixmap">gtk-open</property>
<signal name="clicked" handler="on_open_activate"/>
</widget>
</child>
@@ -651,8 +715,9 @@
<widget class="button" id="button3">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save file</property>
- <property name="label">gtk-save</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Save</property>
+ <property name="use_underline">True</property>
+ <property name="stock_pixmap">gtk-save</property>
<signal name="clicked" handler="on_save_activate"/>
</widget>
</child>
@@ -660,8 +725,9 @@
<child>
<widget class="button" id="back_btn">
<property name="visible">True</property>
- <property name="label">gtk-go-back</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Back</property>
+ <property name="use_underline">True</property>
+ <property name="stock_pixmap">gtk-go-back</property>
<property name="new_group">True</property>
<signal name="clicked" handler="on_back_clicked" last_modification_time="Thu, 14 Aug 2003 02:19:55 GMT"/>
<signal name="button_press_event" handler="on_back_pressed" last_modification_time="Tue, 19 Aug 2003 00:07:23 GMT"/>
@@ -674,8 +740,9 @@
<child>
<widget class="button" id="fwd_btn">
<property name="visible">True</property>
- <property name="label">gtk-go-forward</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Forward</property>
+ <property name="use_underline">True</property>
+ <property name="stock_pixmap">gtk-go-forward</property>
<signal name="clicked" handler="on_fwd_clicked" last_modification_time="Thu, 14 Aug 2003 02:20:17 GMT"/>
<signal name="button_press_event" handler="on_fwd_pressed" last_modification_time="Tue, 19 Aug 2003 00:27:51 GMT"/>
</widget>
@@ -685,7 +752,7 @@
<widget class="button" id="button97">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Make the Home Person the active person</property>
- <property name="label" translatable="yes">_Home</property>
+ <property name="label" translatable="yes">Home</property>
<property name="use_underline">True</property>
<property name="stock_pixmap">gtk-home</property>
<signal name="clicked" handler="on_home_clicked"/>
@@ -722,8 +789,9 @@
<widget class="button" id="addbtn">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Add a new item</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="use_underline">True</property>
+ <property name="stock_pixmap">gtk-add</property>
<property name="new_group">True</property>
<signal name="clicked" handler="on_addbtn_clicked" last_modification_time="Sun, 22 Sep 2002 04:17:19 GMT"/>
</widget>
@@ -736,8 +804,9 @@
<widget class="button" id="removebtn">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Remove the currently selected item</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="use_underline">True</property>
+ <property name="stock_pixmap">gtk-remove</property>
<signal name="clicked" handler="on_removebtn_clicked" last_modification_time="Sun, 22 Sep 2002 04:17:33 GMT"/>
</widget>
</child>
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()