Revision: 20314
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20314
Author: dingto
Date: 2009-05-21 13:10:34 +0200 (Thu, 21 May 2009)
Log Message:
-----------
2.5 Buttons:
* Some minor layout cleanup.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_lamp.py
branches/blender2.5/blender/release/ui/buttons_material.py
branches/blender2.5/blender/release/ui/buttons_scene.py
Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-05-21
10:25:40 UTC (rev 20313)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-05-21
11:10:34 UTC (rev 20314)
@@ -200,16 +200,16 @@
split = layout.split()
sub = split.column()
+ sub.itemR(lamp, "spot_size", text="Size")
+ sub.itemR(lamp, "spot_blend", text="Blend")
sub.itemR(lamp, "square")
- sub.itemR(lamp, "spot_size")
- sub.itemR(lamp, "spot_blend")
sub = split.column()
sub.itemR(lamp, "halo")
if lamp.halo:
- sub.itemR(lamp, "halo_intensity")
+ sub.itemR(lamp, "halo_intensity", text="Intensity")
if lamp.shadow_method == 'BUFFER_SHADOW':
- sub.itemR(lamp, "halo_step")
+ sub.itemR(lamp, "halo_step", text="Step")
bpy.types.register(DATA_PT_lamp)
bpy.types.register(DATA_PT_shadow)
Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-21
10:25:40 UTC (rev 20313)
+++ branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-21
11:10:34 UTC (rev 20314)
@@ -150,30 +150,28 @@
split = layout.split()
- sub = split.column()
- sub.itemL(text="General Settings:")
- sub.itemR(halo, "size")
- sub.itemR(halo, "hardness")
- sub.itemR(halo, "add", slider=True)
+ col = split.column(align=True)
+ col.itemL(text="General Settings:")
+ col.itemR(halo, "size")
+ col.itemR(halo, "hardness")
+ col.itemR(halo, "add", slider=True)
- sub = split.column()
+ col.itemL(text="Options:")
+ col.itemR(halo, "use_texture", text="Texture")
+ col.itemR(halo, "use_vertex_normal", text="Vertex Normal")
+ col.itemR(halo, "xalpha")
+ col.itemR(halo, "shaded")
+ col.itemR(halo, "soft")
+
+ col = split.column()
+ sub = col.column(align=True)
sub.itemL(text="Elements:")
sub.itemR(halo, "ring")
sub.itemR(halo, "lines")
sub.itemR(halo, "star")
sub.itemR(halo, "flare_mode")
-
- row = layout.row()
- sub = row.column()
- sub.itemL(text="Options:")
- sub.itemR(halo, "use_texture", text="Texture")
- sub.itemR(halo, "use_vertex_normal", text="Vertex Normal")
- sub.itemR(halo, "xalpha")
- sub.itemR(halo, "shaded")
- sub.itemR(halo, "soft")
-
- sub = row.column()
+ sub = col.column()
if (halo.ring):
sub.itemR(halo, "rings")
if (halo.lines):
@@ -183,6 +181,7 @@
if (halo.star):
sub.itemR(halo, "star_tips")
if (halo.flare_mode):
+ sub = col.column(align=True)
sub.itemL(text="Flare:")
sub.itemR(halo, "flare_size", text="Size")
sub.itemR(halo, "flare_subsize", text="Subsize")
Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py 2009-05-21
10:25:40 UTC (rev 20313)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py 2009-05-21
11:10:34 UTC (rev 20314)
@@ -114,19 +114,17 @@
if rd.do_composite:
row = layout.row()
row.itemR(rd, "free_image_textures")
-
- row = layout.row()
- row.itemL(text="Threads:")
- row.itemL(text="Tiles:")
-
+
split = layout.split()
sub = split.column(align=True)
+ sub.itemL(text="Threads:")
sub.row().itemR(rd, "threads_mode", expand=True)
if rd.threads_mode == 'THREADS_FIXED':
sub.itemR(rd, "threads")
sub = split.column(align=True)
+ sub.itemL(text="Tiles:")
sub.itemR(rd, "parts_x", text="X")
sub.itemR(rd, "parts_y", text="Y")
@@ -146,19 +144,21 @@
split = layout.split()
- col = split.column(align=True)
- col.itemL(text="Resolution:")
- 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.itemL(text="Resolution:")
+ sub.itemR(rd, "resolution_x", text="X")
+ sub.itemR(rd, "resolution_y", text="Y")
+ sub.itemR(rd, "resolution_percentage", text="")
- col.itemL(text="Aspect Ratio:")
- col.itemR(rd, "pixel_aspect_x", text="X")
- col.itemR(rd, "pixel_aspect_y", text="Y")
+ sub.itemL(text="Aspect Ratio:")
+ sub.itemR(rd, "pixel_aspect_x", text="X")
+ sub.itemR(rd, "pixel_aspect_y", text="Y")
- col.itemR(rd, "border", text="Border")
+ sub = col.column()
+ sub.itemR(rd, "border", text="Border")
if rd.border:
- col.itemR(rd, "crop_to_border")
+ sub.itemR(rd, "crop_to_border")
col = split.column(align=True)
col.itemL(text="Frame Range:")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
