2.5 Buttons:
authorThomas Dinges <blender@dingto.org>
Sun, 17 May 2009 09:25:30 +0000 (09:25 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 17 May 2009 09:25:30 +0000 (09:25 +0000)
* New scene buttons layout.
* Minor changes in object buttons and scene RNA.

release/ui/buttons_objects.py
release/ui/buttons_scene.py
source/blender/makesrna/intern/rna_scene.c

index 816995be224d464b744e42397eb57c8a39f6e258..8ce0b4bf57d71e0e8dae7548071869852fa0b97e 100644 (file)
@@ -81,11 +81,15 @@ class OBJECT_PT_duplication(ObjectButtonsPanel):
                row.itemR(ob, "dupli_type", text="", expand=True)
 
                if ob.dupli_type == "FRAMES":
-                       col = layout.column_flow()
-                       col.itemR(ob, "dupli_frames_start", text="Start")
-                       col.itemR(ob, "dupli_frames_end", text="End")
-                       col.itemR(ob, "dupli_frames_on", text="On")
-                       col.itemR(ob, "dupli_frames_off", text="Off")
+                       split = layout.split()
+                       
+                       sub = split.column(align=True)
+                       sub.itemR(ob, "dupli_frames_start", text="Start")
+                       sub.itemR(ob, "dupli_frames_end", text="End")
+                       
+                       sub = split.column(align=True)
+                       sub.itemR(ob, "dupli_frames_on", text="On")
+                       sub.itemR(ob, "dupli_frames_off", text="Off")
 
 class OBJECT_PT_animation(ObjectButtonsPanel):
        __idname__ = "OBJECT_PT_animation"
index 7644ad39f23d5a09013362e15a969555ca27bf46..981e4f0b325378080fc32bba78b5b1e93e7b8a68 100644 (file)
@@ -21,17 +21,15 @@ class RENDER_PT_shading(RenderButtonsPanel):
                sub.itemR(rd, "render_shadows", text="Shadows")
                sub.itemR(rd, "render_sss", text="SSS")
                sub.itemR(rd, "render_envmaps", text="EnvMap")
-               sub.itemR(rd, "render_radiosity", text="Radio")
+               #       sub.itemR(rd, "render_radiosity", text="Radio")
+               
+               sub = split.column()
                sub.itemR(rd, "render_raytracing", text="Ray Tracing")
                if (rd.render_raytracing):
                        sub.itemR(rd, "octree_resolution", text="Octree")
                
-               sub = split.column()
-               sub.itemL(text="Alpha Mode:")
-               sub.itemR(rd, "alpha_mode", expand=True)
-               
-class RENDER_PT_image(RenderButtonsPanel):
-       __label__ = "Image"
+class RENDER_PT_output(RenderButtonsPanel):
+       __label__ = "Output"
 
        def draw(self, context):
                scene = context.scene
@@ -39,25 +37,35 @@ class RENDER_PT_image(RenderButtonsPanel):
 
                rd = scene.render_data
                
-               split = layout.split()
+               col = layout.column()
+               col.itemR(rd, "output_path")
                
-               sub = split.column(align=True)
-               sub.itemR(rd, "resolution_x", text="SizeX")
-               sub.itemR(rd, "resolution_y", text="SizeY")
+               split = layout.split()
                
-               sub = split.column(align=True)
-               sub.itemR(rd, "pixel_aspect_x", text="AspX")
-               sub.itemR(rd, "pixel_aspect_y", text="AspY")
-
-               box = layout.box()
-               box.itemR(rd, "output_path")
-               box.itemR(rd, "image_type")
-               row = box.row()
-               row.itemR(rd, "file_extensions")
-               row.itemR(rd, "color_mode")
+               sub = split.column()
+               sub.itemR(rd, "image_type")
                if rd.image_type in ("AVIJPEG", "JPEG"):
-                       row = box.row()
-                       row.itemR(rd, "quality")
+                       sub.itemR(rd, "quality")
+               
+               sub = split.column()
+               sub.itemR(rd, "color_mode")
+               sub.itemR(rd, "alpha_mode")
+               
+               split = layout.split()
+               
+               sub = split.column()
+               sub.itemL(text="Distributed Rendering:")
+               sub.itemR(rd, "placeholders")
+               sub.itemR(rd, "no_overwrite")
+               
+               sub = split.column()
+               sub.itemL(text="Settings:")
+               sub.itemR(rd, "file_extensions")
+               sub.itemR(rd, "fields", text="Fields")
+               if rd.fields:
+                       sub.itemR(rd, "fields_still", text="Still")
+                       sub.row().itemR(rd, "field_order", expand=True)
+               
        
 class RENDER_PT_antialiasing(RenderButtonsPanel):
        __label__ = "Anti-Aliasing"
@@ -114,49 +122,62 @@ class RENDER_PT_render(RenderButtonsPanel):
                row = layout.row()
                row.itemR(rd, "do_composite")
                row.itemR(rd, "do_sequence")
-
+               if rd.do_composite:
+                       row = layout.row()
+                       row.itemR(rd, "free_image_textures")
+               
                row = layout.row()
-               row.itemL(text="General:")
+               row.itemL(text="Threads:")
+               row.itemL(text="Tiles:")
                
                split = layout.split()
                
-               sub = split.column()
-               sub.itemR(rd, "resolution_percentage", text="Size")
-
                sub = split.column(align=True)
-               sub.itemR(rd, "parts_x")
-               sub.itemR(rd, "parts_y")
-               
-               split = layout.split()
-               
-               sub = split.column()
-               sub.itemL(text="Threads Mode:")
                sub.itemR(rd, "threads_mode", expand=True)
                if rd.threads_mode == 'THREADS_FIXED':
                        sub.itemR(rd, "threads")
                
-               sub.itemL(text="Distributed Rendering:")
-               sub.itemR(rd, "placeholders")
-               sub.itemR(rd, "no_overwrite")
+               sub = split.column(align=True)
+               sub.itemR(rd, "parts_x", text="X")
+               sub.itemR(rd, "parts_y", text="Y")
+               
+               row = layout.row()
+               row.itemR(rd, "panorama")
+               row.itemR(rd, "dither_intensity")
+               #       row.itemR(rd, "backbuf")
+                       
+class RENDER_PT_dimensions(RenderButtonsPanel):
+       __label__ = "Dimensions"
 
-               sub.itemR(rd, "fields", text="Fields")
-               if rd.fields:
-                       sub.itemR(rd, "fields_still", text="Still")
-                       sub.itemR(rd, "field_order", text="Order")
+       def draw(self, context):
+               scene = context.scene
+               layout = self.layout
+
+               rd = scene.render_data
                
-               sub = split.column()
-               sub.itemL(text="Extra:")
-               sub.itemR(rd, "panorama")
-               sub.itemR(rd, "backbuf")
-               sub.itemR(rd, "free_image_textures")
-               sub.itemR(rd, "dither_intensity")
-               
-               sub.itemL(text="Border:")
-               sub.itemR(rd, "border", text="Border Render")
+               row = layout.row()
+               row.itemL(text="Resolution:")
+               row.itemL(text="Aspect Ratio:")
+               
+               split = layout.split()
+
+               col = split.column(align=True)
+               col.itemR(rd, "resolution_x", text="X")
+               col.itemR(rd, "resolution_y", text="Y")
+               col.itemR(rd, "resolution_percentage", text="")
+               
+               col = split.column()
+               sub = col.column(align=True)
+               sub.itemR(rd, "pixel_aspect_x", text="X")
+               sub.itemR(rd, "pixel_aspect_y", text="Y")
+               
+               sub = col.column()
+               sub.itemR(rd, "border", text="Border")
                if rd.border:
                        sub.itemR(rd, "crop_to_border")
 
 bpy.types.register(RENDER_PT_render)
+bpy.types.register(RENDER_PT_dimensions)
 bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_shading)
-bpy.types.register(RENDER_PT_image)
\ No newline at end of file
+bpy.types.register(RENDER_PT_output)
\ No newline at end of file
index e387dd680f33be570dcebbc00dea857bc3696507..78f0b156eb2f617592aa0174ea5e98618832e576 100644 (file)
@@ -202,8 +202,8 @@ void rna_def_scene_render_data(BlenderRNA *brna)
                {0, NULL, NULL, NULL}};
                
        static EnumPropertyItem field_order_items[] = {
-               {0, "FIELDS_EVENFIRST", "Even Fields First", ""},
-               {R_ODDFIELD, "FIELDS_ODDFIRST", "Odd Fields First", ""},
+               {0, "FIELDS_EVENFIRST", "Even", "Even Fields First"},
+               {R_ODDFIELD, "FIELDS_ODDFIRST", "Odd", "Odd Fields First"},
                {0, NULL, NULL, NULL}};
                
        static EnumPropertyItem threads_mode_items[] = {