[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22027] branches/blender2.5/blender: Even more metaball layout changes.

[William Reynish]

Revision: 22027
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22027
Author:   billrey
Date:     2009-07-29 22:56:22 +0200 (Wed, 29 Jul 2009)

Log Message:
-----------
Even more metaball layout changes.

Added icons in menu, moved type setting at top of panel. Need to make the size widgets only show the relevant options.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_metaball.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c

Modified: branches/blender2.5/blender/release/ui/buttons_data_metaball.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_metaball.py	2009-07-29 20:51:05 UTC (rev 22026)
+++ branches/blender2.5/blender/release/ui/buttons_data_metaball.py	2009-07-29 20:56:22 UTC (rev 22027)
@@ -51,7 +51,7 @@
 		layout.itemR(mball, "flag", expand=True)
 
 class DATA_PT_metaball_element(DataButtonsPanel):
-	__label__ = "Meta Element"
+	__label__ = "Active Element"
 	
 	def poll(self, context):
 		return (context.meta_ball and context.meta_ball.last_selected_element)
@@ -61,6 +61,10 @@
 		
 		metaelem = context.meta_ball.last_selected_element
 		
+		split = layout.split(percentage=0.3)
+		split.itemL(text="Type:")	
+		split.itemR(metaelem, "type", text="")
+		
 		split = layout.split()
 		
 		col = split.column()
@@ -70,13 +74,9 @@
 		col = split.column()
 		col.itemL(text="Settings:")
 		col.itemR(metaelem, "stiffness", text="Stiffness")
+		col.itemR(metaelem, "negative", text="Negative")
+		col.itemR(metaelem, "hide", text="Hide")
 		
-		layout.itemL(text="Type:")
-		layout.itemR(metaelem, "type", expand=True)
-		
-		flow = layout.column_flow()
-		flow.itemR(metaelem, "negative", text="Negative")
-		flow.itemR(metaelem, "hide", text="Hide")
 	
 bpy.types.register(DATA_PT_context_metaball)
 bpy.types.register(DATA_PT_metaball)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c	2009-07-29 20:51:05 UTC (rev 22026)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c	2009-07-29 20:56:22 UTC (rev 22027)
@@ -64,11 +64,11 @@
 	StructRNA *srna;
 	PropertyRNA *prop;
 	static EnumPropertyItem prop_type_items[] = {
-		{MB_BALL, "BALL", 0, "Ball", ""},
-		{MB_TUBE, "TUBE", 0, "Tube", ""},
-		{MB_PLANE, "PLANE", 0, "Plane", ""},
-		{MB_ELIPSOID, "ELLIPSOID", 0, "Ellipsoid", ""}, // NOTE: typo at original definition!
-		{MB_CUBE, "CUBE", 0, "Cube", ""},
+		{MB_BALL, "BALL", ICON_META_BALL, "Ball", ""},
+		{MB_TUBE, "TUBE", ICON_META_TUBE, "Tube", ""},
+		{MB_PLANE, "PLANE", ICON_META_PLANE, "Plane", ""},
+		{MB_ELIPSOID, "ELLIPSOID", ICON_META_ELLIPSOID, "Ellipsoid", ""}, // NOTE: typo at original definition!
+		{MB_CUBE, "CUBE", ICON_META_CUBE, "Cube", ""},
 		{0, NULL, 0, NULL, NULL}};
 	
 	srna= RNA_def_struct(brna, "MetaElement", NULL);