Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/ImageSelect.py: fix adding a new image that is actually

Browse Source 
already in the database.


svn: r5187
This commit is contained in:
Don Allingham 2005-09-11 03:08:49 +00:00
parent d117110b4c
commit 02d2c7cd73
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-09-10 Don Allingham <don@gramps-project.org>
* src/ImageSelect.py: fix adding a new image that is actually
already in the database.
2005-09-06 Don Allingham <don@gramps-project.org> 2005-09-06 Don Allingham <don@gramps-project.org>
* src/plugins/NavWebPage.py: suppress dates on list pages for restricted * src/plugins/NavWebPage.py: suppress dates on list pages for restricted
people people

6
gramps2/configure.in
View File

@ -4,11 +4,11 @@ dnl Process this file with autoconf to produce a configure script.
dnl May need to run automake && aclocal first dnl May need to run automake && aclocal first
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT(gramps, 2.0.8, gramps-bugs@lists.sourceforge.net) AC_INIT(gramps, 2.0.9, gramps-bugs@lists.sourceforge.net)
AC_CONFIG_SRCDIR(src/gramps.py) AC_CONFIG_SRCDIR(src/gramps.py)
AM_INIT_AUTOMAKE(1.6.3) AM_INIT_AUTOMAKE(1.6.3)
dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
RELEASE=1 dnl RELEASE=1
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

8
gramps2/src/ImageSelect.py
View File

@ -187,7 +187,6 @@ class ImageSelect:
already_imported = None already_imported = None
trans = self.db.transaction_begin()
for o_id in self.db.get_media_object_handles(): for o_id in self.db.get_media_object_handles():
o = self.db.get_object_from_handle(o_id) o = self.db.get_object_from_handle(o_id)
if o.get_path() == filename: if o.get_path() == filename:
@ -208,13 +207,14 @@ class ImageSelect:
mobj.set_mime_type(mtype) mobj.set_mime_type(mtype)
mobj.set_path(filename) mobj.set_path(filename)
else: else:
trans = self.db.transaction_begin()
mobj = RelLib.MediaObject() mobj = RelLib.MediaObject()
mobj.set_description(description) mobj.set_description(description)
mobj.set_mime_type(None) mobj.set_mime_type(None)
self.savephoto(mobj,trans) if not already_imported:
self.db.transaction_commit(trans,'Edit Media Objects') trans = self.db.transaction_begin()
self.savephoto(mobj,trans)
self.db.transaction_commit(trans,'Edit Media Objects')
self.parent.lists_changed = 1 self.parent.lists_changed = 1
self.load_images() self.load_images()

2
gramps2/src/PeopleView.py
View File

@ -134,8 +134,6 @@ class PeopleView:
column = gtk.TreeViewColumn(_('Name'), self.renderer,text=0) column = gtk.TreeViewColumn(_('Name'), self.renderer,text=0)
column.set_resizable(True) column.set_resizable(True)
#column.set_clickable(True)
#column.connect('clicked',self.sort_clicked)
column.set_min_width(225) column.set_min_width(225)
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
self.person_tree.append_column(column) self.person_tree.append_column(column)