Author: duncan
Date: Sun Feb 18 08:38:44 2007
New Revision: 9223

Modified:
   branches/rel-1/freevo/src/item.py
   branches/rel-1/freevo/src/plugins/file_ops.py

Log:
[ 1662491 ] EDL bug fix
Patch from Justin Wetherell applied


Modified: branches/rel-1/freevo/src/item.py
==============================================================================
--- branches/rel-1/freevo/src/item.py   (original)
+++ branches/rel-1/freevo/src/item.py   Sun Feb 18 08:38:44 2007
@@ -261,8 +261,10 @@
                edlBase=self.filename[:self.filename.rfind('.')]
                edlFile=edlBase+".edl"
                self.edl_file=edlFile
-               _debug_('EDL: %s'%(edlFile))
-               self.files.edl_file=edlFile
+               if os.path.exists(edlFile):
+                  self.files.edl_file=edlFile
+               else:
+                  self.files.edl_file=None
             self.mimetype = self.filename[self.filename.rfind('.')+1:].lower()
             if info:
                 self.info = mediainfo.get(self.filename)

Modified: branches/rel-1/freevo/src/plugins/file_ops.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/file_ops.py       (original)
+++ branches/rel-1/freevo/src/plugins/file_ops.py       Sun Feb 18 08:38:44 2007
@@ -61,14 +61,14 @@
         items = []
         
         if hasattr(item, 'files') and item.files:
-            if item.files.delete_possible():
-                items.append((self.confirm_delete, _('Delete'), 'delete'))
             if item.files.fxd_file and config.FILE_OPS_ALLOW_DELETE_INFO:
                 items.append((self.confirm_info_delete, _('Delete info'), 
'delete_info'))
             if item.files.edl_file and config.FILE_OPS_ALLOW_DELETE_EDL:
                 items.append((self.confirm_edl_delete, _('Delete edl'), 
'delete_edl'))
             if item.files.image and config.FILE_OPS_ALLOW_DELETE_IMAGE:
                 items.append((self.confirm_image_delete, _('Delete image'), 
'delete_image'))
+            if item.files.delete_possible():
+                items.append((self.confirm_delete, _('Delete'), 'delete'))
         return items
 
 

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to