Continued work on GEP008: move src/Mime to src/gen/mime.

svn: r14118

src/gui/editors/addmedia.py

@@ -53,7 +53,7 @@ import gtk
 import const
 import config
 import Utils
-import Mime
+import gen.mime
 import ThumbNails
 import GrampsDisplay
 import ManagedWindow
@@ -162,7 +162,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
             filename = Utils.relative_path(filename, pname)
 
 
-        mtype = Mime.get_type(full_file)
+        mtype = gen.mime.get_type(full_file)
         description = description or os.path.basename(filename)
 
         self.obj.set_description(description)
@@ -197,7 +197,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
         
         filename = Utils.find_file( filename)
         if filename:
-            mtype = Mime.get_type(filename)
+            mtype = gen.mime.get_type(filename)
             if mtype and mtype.startswith("image"):
                 image = scale_image(filename, const.THUMBSCALE)
             else:

src/gui/editors/displaytabs/gallerytab.py

@@ -52,7 +52,7 @@ import gen.lib
 import Utils
 import ThumbNails
 import Errors
-import Mime
+import gen.mime
 from DdTargets import DdTargets
 from buttontab import ButtonTab
 
@@ -458,8 +458,8 @@ class GalleryTab(ButtonTab, DbGUIElement):
                 protocol, site, mfile, j, k, l = urlparse.urlparse(d)
                 if protocol == "file":
                     name = Utils.fix_encoding(mfile)
-                    mime = Mime.get_type(name)
-                    if not Mime.is_valid_type(mime):
+                    mime = gen.mime.get_type(name)
+                    if not gen.mime.is_valid_type(mime):
                         return
                     photo = gen.lib.MediaObject()
                     photo.set_path(name)
@@ -477,28 +477,6 @@ class GalleryTab(ButtonTab, DbGUIElement):
                     self.dbstate.db.transaction_commit(trans,
                                                        _("Drag Media Object"))
                     self.rebuild()
-#                 elif protocol != "":
-#                     import urllib
-#                     u = urllib.URLopener()
-#                     try:
-#                         tfile, headers = u.retrieve(d)
-#                     except (IOError,OSError), msg:
-#                         t = _("Could not import %s") % d
-#                         ErrorDialog(t,str(msg))
-#                         return
-#                     tfile = Utils.fix_encoding(tfile)
-#                     mime = GrampsMime.get_type(tfile)
-#                     photo = gen.lib.MediaObject()
-#                     photo.set_mime_type(mime)
-#                     photo.set_description(d)
-#                     photo.set_path(tfile)
-#                     trans = self.db.transaction_begin()
-#                     self.db.add_object(photo,trans)
-#                     self.db.transaction_commit(trans,_("Drag Media Object"))
-#                     oref = gen.lib.MediaRef()
-#                     oref.set_reference_handle(photo.get_handle())
-#                     self.dataobj.add_media_reference(oref)
-#                     self.add_thumbnail(oref)
 
     def handle_extra_type(self, objtype, obj):
         pass

src/gui/editors/editmedia.py

@@ -42,7 +42,7 @@ import gtk
 #-------------------------------------------------------------------------
 from gui.utils import open_file_with_default_application
 import gen.lib
-import Mime
+import gen.mime
 import ThumbNails
 import Utils
 from editprimary import EditPrimary
@@ -138,7 +138,7 @@ class EditMedia(EditPrimary):
         self.draw_preview()
 
     def determine_mime(self):
-        descr = Mime.get_description(self.obj.get_mime_type())
+        descr = gen.mime.get_description(self.obj.get_mime_type())
         if descr:
             self.mimetext.set_text(descr)
 
@@ -146,9 +146,9 @@ class EditMedia(EditPrimary):
         path_full = Utils.media_path_full(self.db, path)
         if path != self.obj.get_path() and path_full != self.obj.get_path():
             #redetermine mime
-            mime = Mime.get_type(Utils.find_file(path_full))
+            mime = gen.mime.get_type(Utils.find_file(path_full))
             self.obj.set_mime_type(mime)
-            descr = Mime.get_description(mime)
+            descr = gen.mime.get_description(mime)
             if descr:
                 self.mimetext.set_text(descr)
             else:

src/gui/editors/editmediaref.py

@@ -43,7 +43,7 @@ import gtk
 #-------------------------------------------------------------------------
 from gui.utils import open_file_with_default_application
 import const
-import Mime
+import gen.mime
 import ThumbNails
 import Utils
 from gen.lib import NoteType
@@ -110,7 +110,7 @@ class EditMediaRef(EditReference):
                                                      self.rectangle)
         self.subpixmap.set_from_pixbuf(self.subpix)
 
-        mt = Mime.get_description(self.mtype)
+        mt = gen.mime.get_description(self.mtype)
         self.top.get_object("type").set_text(mt if mt else "")
         
     def _setup_fields(self):