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

* src/AddMedia.py: Handle the new file selector

Browse Source 
* src/MediaView.py: redraw list properly


svn: r3258
This commit is contained in:
Don Allingham 2004-07-10 04:49:53 +00:00
parent e8e2333f72
commit c5787e9e4e
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2004-07-09 Don Allingham <dallingham@users.sourceforge.net>
* src/AddMedia.py: Handle the new file selector
* src/MediaView.py: redraw list properly
2004-07-09 Alex Roitman <shura@alex.neuro.umn.edu> 2004-07-09 Alex Roitman <shura@alex.neuro.umn.edu>
* src/gramps_main.py (on_export_activate): Switch to new Exporter. * src/gramps_main.py (on_export_activate): Switch to new Exporter.
* src/WriteXML.py: Change registration. Return 1 on success and * src/WriteXML.py: Change registration. Return 1 on success and

21
gramps2/src/AddMedia.py
View File

@ -91,21 +91,23 @@ class AddMediaObject:
_('Select a media object')) _('Select a media object'))
self.glade.signal_autoconnect({ self.glade.signal_autoconnect({
"on_name_changed" : self.on_name_changed, "on_fname_update_preview" : self.on_name_changed,
"on_help_imagesel_clicked" : self.on_help_imagesel_clicked,
}) })
self.window.show() self.window.show()
def on_help_imagesel_clicked(self): def on_help_imagesel_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """Display the relevant portion of GRAMPS manual"""
gnome.help_display('gramps-manual','gramps-edit-quick') gnome.help_display('gramps-manual','gramps-edit-quick')
self.val = self.window.run()
def on_savephoto_clicked(self): def on_savephoto_clicked(self):
""" """
Callback function called with the save button is pressed. Callback function called with the save button is pressed.
A new media object is created, and added to the database. A new media object is created, and added to the database.
""" """
filename = self.glade.get_widget("photosel").get_full_path(0) filename = self.file_text.get_filename()
description = unicode(self.description.get_text()) description = unicode(self.description.get_text())
if os.path.exists(filename) == 0: if os.path.exists(filename) == 0:
@ -121,17 +123,18 @@ class AddMediaObject:
mobj = RelLib.MediaObject() mobj = RelLib.MediaObject()
mobj.set_description(description) mobj.set_description(description)
mobj.set_mime_type(mtype) mobj.set_mime_type(mtype)
self.db.add_object(mobj)
trans = self.db.start_transaction()
self.db.add_object(mobj,trans)
name = filename name = filename
mobj.set_path(name) mobj.set_path(name)
if self.update:
self.update()
self.object = mobj self.object = mobj
trans = self.db.start_transaction()
self.db.commit_media_object(mobj,trans) self.db.commit_media_object(mobj,trans)
self.db.add_transaction(trans,_("Add Media Object")) self.db.add_transaction(trans,_("Add Media Object"))
if self.update:
self.update()
def on_name_changed(self,*obj): def on_name_changed(self,*obj):
""" """
@ -139,7 +142,7 @@ class AddMediaObject:
see if the file exists. If it does, the imgae is loaded into see if the file exists. If it does, the imgae is loaded into
the preview window. the preview window.
""" """
filename = unicode(self.file_text.get_text()) filename = unicode(self.file_text.get_filename())
basename = os.path.basename(filename) basename = os.path.basename(filename)
(root,ext) = os.path.splitext(basename) (root,ext) = os.path.splitext(basename)
old_title = unicode(self.description.get_text()) old_title = unicode(self.description.get_text())
@ -154,7 +157,7 @@ class AddMediaObject:
if mtype[0:5] == "image": if mtype[0:5] == "image":
image = RelImage.scale_image(filename,const.thumbScale) image = RelImage.scale_image(filename,const.thumbScale)
else: else:
image = gtk.gdk.pixbuf_new_from_file(Utils.find_icon(type)) image = gtk.gdk.pixbuf_new_from_file(Utils.find_icon(mtype))
self.image.set_from_pixbuf(image) self.image.set_from_pixbuf(image)
def run(self): def run(self):

2
gramps2/src/MediaView.py
View File

@ -283,7 +283,7 @@ class MediaView:
def on_add_clicked(self,obj): def on_add_clicked(self,obj):
"""Add a new media object to the media list""" """Add a new media object to the media list"""
import AddMedia import AddMedia
am = AddMedia.AddMediaObject(self.db,self.load_media) am = AddMedia.AddMediaObject(self.db,self.build_tree)
am.run() am.run()
def on_edit_clicked(self,obj): def on_edit_clicked(self,obj):