Author: dmeyer
Date: Mon Mar 12 09:32:10 2007
New Revision: 9328

Modified:
   trunk/ui/src/image/config.cxml
   trunk/ui/src/image/viewer.py

Log:
fix image viewer blend mode

Modified: trunk/ui/src/image/config.cxml
==============================================================================
--- trunk/ui/src/image/config.cxml      (original)
+++ trunk/ui/src/image/config.cxml      Mon Mar 12 09:32:10 2007
@@ -32,12 +32,16 @@
         <var name="blend-mode" default="random">
             <desc>
                 Blend effect when switching from one image to another. Possible
-                values are random, alpha, wipe and none.
+                values are random, alpha blending, vertical wipe, horizonal 
wipe,
+                alpha vertical wipe, alpha horizonal wipe and none.
             </desc>
             <values>
                 <value>random</value>
-                <value>alpha</value>
-                <value>wipe</value>
+                <value>alpha blending</value>
+                <value>vertical wipe</value>
+                <value>horizonal wipe</value>
+                <value>alpha vertical wipe</value>
+                <value>alpha horizonal wipe</value>
                 <value>none</value>
             </values>
         </var>

Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py        (original)
+++ trunk/ui/src/image/viewer.py        Mon Mar 12 09:32:10 2007
@@ -276,12 +276,13 @@
             # position image at x/y value
             image = widgets.Image(image, (x, y))
 
+        blend_mode = config.blend_mode.upper().replace(' ', '_')
         if (self.last_image and self.last_item != item and
-            config.blend_mode != 'none'):
+            blend_mode != 'NONE'):
             # blend over to the new image
             gui.get_display().add_child(image)
             a = Transition([self.last_image], [image], 20,
-                           (gui_width, gui_height), config.blend_mode)
+                           (gui_width, gui_height), eval(blend_mode))
             # start the animation and wait until it's done
             a.start()
             a.wait()

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