* src/ImageSelect.py: fix note media object added from a gallery
svn: r5142
This commit is contained in:
parent
c994f1dbf1
commit
61f74adc33
@ -1,4 +1,5 @@
|
|||||||
2005-08-29 Don Allingham <don@gramps-project.org>
|
2005-08-29 Don Allingham <don@gramps-project.org>
|
||||||
|
* src/ImageSelect.py: fix note media object added from a gallery
|
||||||
* src/po/template.po: updated translation template
|
* src/po/template.po: updated translation template
|
||||||
* src/Utils.py: fix probably_alive to handle year offset properly
|
* src/Utils.py: fix probably_alive to handle year offset properly
|
||||||
* src/plugins/NavWebPage.py: handle new probably_alive function
|
* src/plugins/NavWebPage.py: handle new probably_alive function
|
||||||
|
@ -102,6 +102,9 @@ class ImageSelect:
|
|||||||
"should be overrridden"
|
"should be overrridden"
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def internal_toggled(self, obj):
|
||||||
|
self.fname.set_sensitive(not obj.get_active())
|
||||||
|
|
||||||
def create_add_dialog(self):
|
def create_add_dialog(self):
|
||||||
"""Create the gnome dialog for selecting a new photo and entering
|
"""Create the gnome dialog for selecting a new photo and entering
|
||||||
its description."""
|
its description."""
|
||||||
@ -114,6 +117,8 @@ class ImageSelect:
|
|||||||
|
|
||||||
self.fname = self.glade.get_widget("fname")
|
self.fname = self.glade.get_widget("fname")
|
||||||
self.image = self.glade.get_widget("image")
|
self.image = self.glade.get_widget("image")
|
||||||
|
self.internal = self.glade.get_widget("internal")
|
||||||
|
self.internal.connect('toggled',self.internal_toggled)
|
||||||
self.description = self.glade.get_widget("photoDescription")
|
self.description = self.glade.get_widget("photoDescription")
|
||||||
self.temp_name = ""
|
self.temp_name = ""
|
||||||
|
|
||||||
@ -171,36 +176,44 @@ class ImageSelect:
|
|||||||
|
|
||||||
description = unicode(self.description.get_text())
|
description = unicode(self.description.get_text())
|
||||||
|
|
||||||
if os.path.exists(filename) == 0:
|
internal = self.internal.get_active()
|
||||||
msgstr = _("Cannot import %s")
|
|
||||||
msgstr2 = _("The filename supplied could not be found.")
|
|
||||||
ErrorDialog(msgstr % filename, msgstr2)
|
|
||||||
return
|
|
||||||
|
|
||||||
already_imported = None
|
if not internal:
|
||||||
|
if os.path.exists(filename) == 0:
|
||||||
|
msgstr = _("Cannot import %s")
|
||||||
|
msgstr2 = _("The filename supplied could not be found.")
|
||||||
|
ErrorDialog(msgstr % filename, msgstr2)
|
||||||
|
return
|
||||||
|
|
||||||
trans = self.db.transaction_begin()
|
already_imported = None
|
||||||
for o_id in self.db.get_media_object_handles():
|
|
||||||
o = self.db.get_object_from_handle(o_id)
|
|
||||||
if o.get_path() == filename:
|
|
||||||
already_imported = o
|
|
||||||
break
|
|
||||||
|
|
||||||
if (already_imported):
|
trans = self.db.transaction_begin()
|
||||||
oref = RelLib.MediaRef()
|
for o_id in self.db.get_media_object_handles():
|
||||||
oref.set_reference_handle(already_imported.get_handle())
|
o = self.db.get_object_from_handle(o_id)
|
||||||
self.dataobj.add_media_reference(oref)
|
if o.get_path() == filename:
|
||||||
self.add_thumbnail(oref)
|
already_imported = o
|
||||||
|
break
|
||||||
|
|
||||||
|
if already_imported:
|
||||||
|
oref = RelLib.MediaRef()
|
||||||
|
oref.set_reference_handle(already_imported.get_handle())
|
||||||
|
self.dataobj.add_media_reference(oref)
|
||||||
|
self.add_thumbnail(oref)
|
||||||
|
else:
|
||||||
|
mtype = GrampsMime.get_type(filename)
|
||||||
|
mobj = RelLib.MediaObject()
|
||||||
|
if description == "":
|
||||||
|
description = os.path.basename(filename)
|
||||||
|
mobj.set_description(description)
|
||||||
|
mobj.set_mime_type(mtype)
|
||||||
|
mobj.set_path(filename)
|
||||||
else:
|
else:
|
||||||
mtype = GrampsMime.get_type(filename)
|
trans = self.db.transaction_begin()
|
||||||
mobj = RelLib.MediaObject()
|
mobj = RelLib.MediaObject()
|
||||||
if description == "":
|
|
||||||
description = os.path.basename(filename)
|
|
||||||
mobj.set_description(description)
|
mobj.set_description(description)
|
||||||
mobj.set_mime_type(mtype)
|
mobj.set_mime_type(None)
|
||||||
mobj.set_path(filename)
|
|
||||||
self.savephoto(mobj,trans)
|
|
||||||
|
|
||||||
|
self.savephoto(mobj,trans)
|
||||||
self.db.transaction_commit(trans,'Edit Media Objects')
|
self.db.transaction_commit(trans,'Edit Media Objects')
|
||||||
|
|
||||||
self.parent.lists_changed = 1
|
self.parent.lists_changed = 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user