Author: duncan
Date: Fri Dec 22 09:18:31 2006
New Revision: 8790

Modified:
   branches/rel-1-6/freevo/ChangeLog
   branches/rel-1-6/freevo/src/video/__init__.py
   branches/rel-1-6/freevo/src/video/videoitem.py

Log:
[ 1620452 ] Items with subitems don't show thumbnails menu entry
Patch from Gorka Olaizola applied


Modified: branches/rel-1-6/freevo/ChangeLog
==============================================================================
--- branches/rel-1-6/freevo/ChangeLog   (original)
+++ branches/rel-1-6/freevo/ChangeLog   Fri Dec 22 09:18:31 2006
@@ -15,6 +15,7 @@
 --------------------------------
 
  * Fixed shopping cart for items with two or more subitems (B#1620425)
+ * Fixed video thumbnails not being shown with subitems (B#1620452)
 
 == Release 1.6.2 (2006-12-22) ==
 --------------------------------
@@ -27,6 +28,7 @@
  * Updated autoshutdown to react to the return code and removed unused vars 
(B#1612257)
  * Updated osd forced fonts variables and freevo_config and local_conf 
(B#1608393)
  * Updated Spanish translation (B#1612612)
+ * Added the Russian translation (F#1602678)
 
 == Release 1.6.1 (2006-11-25) ==
 --------------------------------

Modified: branches/rel-1-6/freevo/src/video/__init__.py
==============================================================================
--- branches/rel-1-6/freevo/src/video/__init__.py       (original)
+++ branches/rel-1-6/freevo/src/video/__init__.py       Fri Dec 22 09:18:31 2006
@@ -8,30 +8,6 @@
 # Todo:        
 #
 # -----------------------------------------------------------------------
-# $Log$
-# Revision 1.34.2.2  2004/10/22 18:43:17  dischi
-# fix crash when item is no VideoItem
-#
-# Revision 1.34.2.1  2004/08/28 17:10:49  dischi
-# fix bug in auto join feature
-#
-# Revision 1.34  2004/07/11 10:26:49  dischi
-# sort items before checking because of auto-join
-#
-# Revision 1.33  2004/07/10 12:33:42  dischi
-# header cleanup
-#
-# Revision 1.32  2004/06/20 13:06:19  dischi
-# move freevo-rebuild-database to cache dir
-#
-# Revision 1.31  2004/06/02 21:36:49  dischi
-# auto detect movies with more than one file
-#
-# Revision 1.30  2004/03/27 00:46:23  outlyer
-# Fixed a crash. It occured when I used the "Configure Directory" option to
-# show "all types" in a music directory.
-#
-# -----------------------------------------------------------------------
 # Freevo - A Home Theater PC framework
 # Copyright (C) 2002 Krister Lagerstrom, et al. 
 # Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -50,7 +26,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
 
 
 import os
@@ -149,7 +125,7 @@
                         # create new name
                         name = file[:pos] + file[pos:].replace('1', '1-%s' % 
end, 1)
                         x = VideoItem(name, parent)
-                        x.files = FileInformation()
+                        x.files = []
                         for f in [ file ] + add_file:
                             x.files.append(f)
                             x.subitems.append(VideoItem(f, x))

Modified: branches/rel-1-6/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1-6/freevo/src/video/videoitem.py      (original)
+++ branches/rel-1-6/freevo/src/video/videoitem.py      Fri Dec 22 09:18:31 2006
@@ -288,7 +288,7 @@
         if self.variants and len(self.variants) > 1:
             items = [ (self.show_variants, _('Show variants')) ] + items
 
-        if self.mode == 'file' and not self.variants and not self.subitems and 
\
+        if self.mode == 'file' and not self.variants and \
                (not self.image or not self.image.endswith('raw')):
             items.append((self.create_thumbnail, _('Create Thumbnail'), 
'create_thumbnail'))
             

-------------------------------------------------------------------------
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