* src/MediaView.py: Pass parent to GlobalMediaProperties; typos.
* src/SelectObject.py: Typos. * src/ImageSelect.py (LocalMediaProperties.__init__, GlobalMediaProperties.__init__): Handle source tab. * src/EventEdit.py: Handle gallery tab. * src/WriteXML.py (dump_my_event): Write object references; * src/gramps.glade: Add gallery tab to Event Editor; add source tab to media property editor. * src/RelLib.py (Event): Add media_list and related methods; (ObjectRef): Inherit from SourceNote, remove unnecessary functions; (GrampsDB.get_media_attribute_types): Add method. * src/ReadXML.py (start_sourceref): Check for attribute before the object. Objects may have attributes; (start_objref): Parse media object references for Event records. svn: r3199
This commit is contained in:
@ -84,6 +84,7 @@ class MediaView:
|
||||
self.mpath = glade.get_widget("mpath")
|
||||
self.mdetails = glade.get_widget("mdetails")
|
||||
self.preview = glade.get_widget("preview")
|
||||
self.topWindow = glade.get_widget("gramps")
|
||||
self.renderer = gtk.CellRendererText()
|
||||
|
||||
if const.nosort_tree:
|
||||
@ -225,7 +226,7 @@ class MediaView:
|
||||
store,iter = self.selection.get_selected()
|
||||
if iter:
|
||||
id = store.get_value(iter,1)
|
||||
object = self.db.try_to_find_object_from_id(id,None)
|
||||
object = self.db.try_to_find_object_from_id(id)
|
||||
self.obj = object
|
||||
mime_type = object.get_mime_type()
|
||||
|
||||
@ -273,7 +274,8 @@ class MediaView:
|
||||
self.load_media()
|
||||
|
||||
def popup_change_description(self, obj):
|
||||
ImageSelect.GlobalMediaProperties(self.db,self.obj,self.load_media)
|
||||
ImageSelect.GlobalMediaProperties(self.db,self.obj,self.load_media,
|
||||
self,self.topWindow)
|
||||
|
||||
def load_media(self):
|
||||
pass
|
||||
@ -290,8 +292,9 @@ class MediaView:
|
||||
list_store, iter = self.selection.get_selected()
|
||||
if iter:
|
||||
id = list_store.get_value(iter,1)
|
||||
object = self.db.try_to_find_object_from_id(id,None)
|
||||
ImageSelect.GlobalMediaProperties(self.db,object,self.load_media)
|
||||
object = self.db.try_to_find_object_from_id(id)
|
||||
ImageSelect.GlobalMediaProperties(self.db,object,self.load_media,
|
||||
self,self.topWindow)
|
||||
|
||||
def on_delete_clicked(self,obj):
|
||||
store,iter = self.selection.get_selected()
|
||||
@ -299,7 +302,7 @@ class MediaView:
|
||||
return
|
||||
|
||||
id = store.get_value(iter,1)
|
||||
mobj = self.db.try_to_find_object_from_id(id,None)
|
||||
mobj = self.db.try_to_find_object_from_id(id)
|
||||
if self.is_object_used(mobj):
|
||||
ans = ImageSelect.DeleteMediaQuery(mobj,self.db,self.build_tree)
|
||||
QuestionDialog(_('Delete Media Object?'),
|
||||
@ -343,7 +346,7 @@ class MediaView:
|
||||
if not iter:
|
||||
return
|
||||
if (const.dnd_images):
|
||||
object = self.db.try_to_find_object_from_id(store.get_value(iter,1),None)
|
||||
object = self.db.try_to_find_object_from_id(store.get_value(iter,1))
|
||||
mtype = object.get_mime_type()
|
||||
name = Utils.thumb_path(self.db.get_save_path(),object)
|
||||
pix = gtk.gdk.pixbuf_new_from_file(name)
|
||||
@ -387,7 +390,8 @@ class MediaView:
|
||||
self.db.add_transaction(trans,_("Add Media Object"))
|
||||
|
||||
if GrampsCfg.globalprop:
|
||||
ImageSelect.GlobalMediaProperties(self.db,photo,self.load_media)
|
||||
ImageSelect.GlobalMediaProperties(self.db,photo,self.load_media,
|
||||
self,self.topWindow)
|
||||
elif protocol != "":
|
||||
import urllib
|
||||
u = urllib.URLopener()
|
||||
@ -419,6 +423,7 @@ class MediaView:
|
||||
self.db.add_transaction(trans,_("Add Media Object"))
|
||||
|
||||
if GrampsCfg.globalprop:
|
||||
ImageSelect.GlobalMediaProperties(self.db,photo,None)
|
||||
ImageSelect.GlobalMediaProperties(self.db,photo,None,
|
||||
self,self.topWindow)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user