[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24854] trunk/blender/release/scripts/ui/ properties_render.py: quicktime : small ui update to include the two qt import options in the output panel

[Damien Plisson]

Revision: 24854
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24854
Author:   damien78
Date:     2009-11-24 10:46:53 +0100 (Tue, 24 Nov 2009)

Log Message:
-----------
quicktime : small ui update to include the two qt import options in the output panel
+ pep8 fixes

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_render.py

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2009-11-24 09:24:32 UTC (rev 24853)
+++ trunk/blender/release/scripts/ui/properties_render.py	2009-11-24 09:46:53 UTC (rev 24854)
@@ -344,32 +344,13 @@
             split = layout.split()
             split.prop(rd, "tiff_bit")
 
+        elif rd.file_format == 'QUICKTIME_QTKIT':
+            split = layout.split()
+            col = split.column()
+            col.prop(rd, "quicktime_codec_type")
+            col.prop(rd, "quicktime_codec_spatial_quality", text="Quality", slider=True)
 
-class RENDER_PT_QTencoding(RenderButtonsPanel):
-    bl_label = "Encoding"
-    bl_default_closed = True
-    COMPAT_ENGINES = set(['BLENDER_RENDER'])
 
-    def poll(self, context):
-        rd = context.scene.render_data
-        return rd.file_format in ('QUICKTIME_QTKIT') # QUICKTIME will be added later
-
-    def draw(self, context):
-        layout = self.layout
-
-        rd = context.scene.render_data
-        wide_ui = context.region.width > narrowui
-
-        split = layout.split()
-
-        split.prop(rd, "quicktime_codec_type")
-
-        split = layout.split()
-
-        if rd.file_format == 'QUICKTIME_QTKIT':
-            split.prop(rd, "quicktime_codec_spatial_quality", text="Quality", slider=True)
-
-
 class RENDER_PT_encoding(RenderButtonsPanel):
     bl_label = "Encoding"
     bl_default_closed = True
@@ -476,7 +457,7 @@
         scene = context.scene
         rd = scene.render_data
         wide_ui = context.region.width > narrowui
-        
+
         row = layout.row().split()
         sub = row.row(align=True).split(percentage=0.75)
         sub.menu("RENDER_MT_presets", text="Presets")
@@ -511,7 +492,7 @@
 
         sub.label(text="Frame Rate:")
         sub.prop(rd, "fps")
-        sub.prop(rd, "fps_base", text="/")  
+        sub.prop(rd, "fps_base", text="/")
 
 
 class RENDER_PT_stamp(RenderButtonsPanel):
@@ -568,7 +549,6 @@
 bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_shading)
 bpy.types.register(RENDER_PT_output)
-bpy.types.register(RENDER_PT_QTencoding)
 bpy.types.register(RENDER_PT_encoding)
 bpy.types.register(RENDER_PT_performance)
 bpy.types.register(RENDER_PT_post_processing)