Merge branch 'maintenance/gramps34' of ssh://kulath@git.code.sf.net/p/gramps/source into maintenance/gramps34

po/POTFILES.skip

@@ -234,6 +234,7 @@ src/gui/editors/displaytabs/grampstab.py
 src/gui/editors/displaytabs/groupembeddedlist.py
 src/gui/editors/displaytabs/ldsmodel.py
 src/gui/editors/displaytabs/locationmodel.py
+src/gui/editors/displaytabs/mediaattrembedlist.py
 src/gui/editors/displaytabs/mediabackreflist.py
 src/gui/editors/displaytabs/notebackreflist.py
 src/gui/editors/displaytabs/personrefmodel.py

src/gui/editors/displaytabs/__init__.py

@@ -47,6 +47,7 @@ from familyldsembedlist import FamilyLdsEmbedList
 from gallerytab import GalleryTab
 from ldsembedlist import LdsEmbedList
 from locationembedlist import LocationEmbedList
+from mediaattrembedlist import MediaAttrEmbedList
 from mediabackreflist import MediaBackRefList
 from nameembedlist import NameEmbedList
 from notebackreflist import NoteBackRefList

src/gui/editors/displaytabs/mediaattrembedlist.py

@@ -0,0 +1,43 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2014  Nick Hall
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+#-------------------------------------------------------------------------
+#
+# Gramps classes
+#
+#-------------------------------------------------------------------------
+from attrembedlist import AttrEmbedList
+
+#-------------------------------------------------------------------------
+#
+# MediaAttrEmbedList
+#
+#-------------------------------------------------------------------------
+class MediaAttrEmbedList(AttrEmbedList):
+
+    def __init__(self, dbstate, uistate, track, data):
+        AttrEmbedList.__init__(self, dbstate, uistate, track, data)
+
+    def get_editor(self):
+        from .. import EditAttribute
+        return EditAttribute
+
+    def get_user_values(self):
+        return self.dbstate.db.get_media_attribute_types()

src/gui/editors/editmedia.py

@@ -51,7 +51,7 @@ import Utils
 from editprimary import EditPrimary
 from gui.widgets import (MonitoredDate, MonitoredEntry, PrivacyButton,
                          MonitoredTagList)
-from displaytabs import (CitationEmbedList, AttrEmbedList, NoteTab, 
+from displaytabs import (CitationEmbedList, MediaAttrEmbedList, NoteTab,
                          MediaBackRefList)
 from addmedia import AddMediaObject
 from QuestionDialog import ErrorDialog
@@ -200,7 +200,7 @@ class EditMedia(EditPrimary):
         self._add_tab(notebook, self.citation_tab)
         self.track_ref_for_deletion("citation_tab")
 
-        self.attr_tab = AttrEmbedList(self.dbstate,
+        self.attr_tab = MediaAttrEmbedList(self.dbstate,
                                       self.uistate,
                                       self.track,
                                       self.obj.get_attribute_list())

src/gui/editors/editmediaref.py

@@ -51,7 +51,7 @@ import Utils
 from gen.lib import NoteType
 from gen.db import DbTxn
 from glade import Glade
-from displaytabs import (CitationEmbedList, AttrEmbedList, MediaBackRefList, 
+from displaytabs import (CitationEmbedList, MediaAttrEmbedList, MediaBackRefList,
                          NoteTab)
 from gui.widgets import (MonitoredSpinButton, MonitoredEntry, PrivacyButton,
                          MonitoredDate, MonitoredTagList)
@@ -615,7 +615,7 @@ class EditMediaRef(EditReference):
         self._add_tab(notebook_ref, self.srcref_list)
         self.track_ref_for_deletion("srcref_list")
 
-        self.attr_list = AttrEmbedList(self.dbstate,self.uistate,self.track,
+        self.attr_list = MediaAttrEmbedList(self.dbstate,self.uistate,self.track,
                                        self.source_ref.get_attribute_list())
         self._add_tab(notebook_ref, self.attr_list)
         self.track_ref_for_deletion("attr_list")
@@ -640,7 +640,7 @@ class EditMediaRef(EditReference):
         self._add_tab(notebook_src, self.src_srcref_list)
         self.track_ref_for_deletion("src_srcref_list")
 
-        self.src_attr_list = AttrEmbedList(self.dbstate,self.uistate,self.track,
+        self.src_attr_list = MediaAttrEmbedList(self.dbstate,self.uistate,self.track,
                                            self.source.get_attribute_list())
         self._add_tab(notebook_src, self.src_attr_list)
         self.track_ref_for_deletion("src_attr_list")