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

7258: MediaEditor: Ensure that pathnames are always Unicode.

Browse Source
This commit is contained in:
John Ralls 2014-04-19 17:09:53 -07:00
parent 7962403216
commit 94518f2577
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/gui/editors/editmedia.py
View File

@ -42,6 +42,7 @@ from gi.repository import Gdk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext _ = glocale.translation.gettext
from gramps.gen.constfunc import conv_to_unicode
from ..utils import open_file_with_default_application from ..utils import open_file_with_default_application
from gramps.gen.lib import MediaObject, NoteType from gramps.gen.lib import MediaObject, NoteType
from gramps.gen.db import DbTxn from gramps.gen.db import DbTxn
@ -246,7 +247,7 @@ class EditMedia(EditPrimary):
def select_file(self, val): def select_file(self, val):
self.determine_mime() self.determine_mime()
path = self.file_path.get_text() path = self.file_path.get_text()
self.obj.set_path(get_unicode_path_from_file_chooser(path)) self.obj.set_path(conv_to_unicode(path))
AddMediaObject(self.dbstate, self.uistate, self.track, self.obj, AddMediaObject(self.dbstate, self.uistate, self.track, self.obj,
self._update_addmedia) self._update_addmedia)
@ -294,7 +295,7 @@ class EditMedia(EditPrimary):
self.ok_button.set_sensitive(True) self.ok_button.set_sensitive(True)
return return
path = self.file_path.get_text() path = conv_to_unicode(self.file_path.get_text())
ref_obj = self.dbstate.db.get_object_from_handle(self.obj.handle) ref_obj = self.dbstate.db.get_object_from_handle(self.obj.handle)
if ref_obj: if ref_obj:
media_path = media_path_full(self.dbstate.db, media_path = media_path_full(self.dbstate.db,