[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30354] trunk/blender/source/blender: Logic UI: Changing Controllers names to follow Sensors and actuators ( back to have only the first latter capitalized) + change the controller state only when in expanded mode ( show the number otherwise).

[Nathan Letwory]

Revision: 30354
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30354
Author:   jesterking
Date:     2010-07-15 01:51:21 +0200 (Thu, 15 Jul 2010)

Log Message:
-----------
Logic UI: Changing Controllers names to follow Sensors and actuators (back to have only the first latter capitalized) + change the controller state only when in expanded mode (show the number otherwise).

Cosmetic commit, no structural/big code changes (patch by dfelinto).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_controller.c

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-07-14 23:39:23 UTC (rev 30353)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-07-14 23:51:21 UTC (rev 30354)
@@ -644,17 +644,17 @@
 {
 	switch (type) {
 	case CONT_LOGIC_AND:
-		return "AND";
+		return "And";
 	case CONT_LOGIC_OR:
-		return "OR";
+		return "Or";
 	case CONT_LOGIC_NAND:
-		return "NAND";
+		return "Nand";
 	case CONT_LOGIC_NOR:
-		return "NOR";
+		return "Nor";
 	case CONT_LOGIC_XOR:
-		return "XOR";
+		return "Xor";
 	case CONT_LOGIC_XNOR:
-		return "XNOR";
+		return "Xnor";
 	case CONT_EXPRESSION:
 		return "Expression";
 	case CONT_PYTHON:
@@ -3537,7 +3537,8 @@
 	uiLayout *box, *row, *subrow;
 	bController *cont= (bController *)ptr->data;
 
-	char name[3]; //XXX provisorly for state number
+	char state[3];
+	sprintf(state, "%d", RNA_int_get(ptr, "state"));
 	
 	box= uiLayoutBox(layout);
 	row= uiLayoutRow(box, 0);
@@ -3546,15 +3547,14 @@
 	if(RNA_boolean_get(ptr, "expanded")) {
 		uiItemR(row, ptr, "type", 0, "", 0);
 		uiItemR(row, ptr, "name", 0, "", 0);
+		/* XXX provisory for Blender 2.50Beta */
+		uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu, cont, state, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, "Set controller state index (from 1 to 30)");
 	} else {
 		uiItemL(row, controller_name(cont->type), 0);
 		uiItemL(row, cont->name, 0);
+		uiItemL(row, state, 0);
 	}
 
-	/* XXX provisory for Blender 2.50Beta */
-	sprintf(name, "%d", RNA_int_get(ptr, "state"));
-	uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu, cont, name, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, "Set controller state index (from 1 to 30)");
-
 	uiItemR(row, ptr, "priority", 0, "", 0);
 
 	if(RNA_boolean_get(ptr, "expanded")==0) {

Modified: trunk/blender/source/blender/makesrna/intern/rna_controller.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_controller.c	2010-07-14 23:39:23 UTC (rev 30353)
+++ trunk/blender/source/blender/makesrna/intern/rna_controller.c	2010-07-14 23:51:21 UTC (rev 30354)
@@ -32,12 +32,12 @@
 #include "DNA_controller_types.h"
 
 EnumPropertyItem controller_type_items[] ={
-	{CONT_LOGIC_AND, "LOGIC_AND", 0, "AND", "Logic And"},
-	{CONT_LOGIC_OR, "LOGIC_OR", 0, "OR", "Logic Or"},
-	{CONT_LOGIC_NAND, "LOGIC_NAND", 0, "NAND", "Logic Nand"},
-	{CONT_LOGIC_NOR, "LOGIC_NOR", 0, "NOR", "Logic Nor"},
-	{CONT_LOGIC_XOR, "LOGIC_XOR", 0, "XOR", "Logic Xor"},
-	{CONT_LOGIC_XNOR, "LOGIC_XNOR", 0, "XNOR", "Logic Xnor"},
+	{CONT_LOGIC_AND, "LOGIC_AND", 0, "And", "Logic And"},
+	{CONT_LOGIC_OR, "LOGIC_OR", 0, "Or", "Logic Or"},
+	{CONT_LOGIC_NAND, "LOGIC_NAND", 0, "Nand", "Logic Nand"},
+	{CONT_LOGIC_NOR, "LOGIC_NOR", 0, "Nor", "Logic Nor"},
+	{CONT_LOGIC_XOR, "LOGIC_XOR", 0, "Xor", "Logic Xor"},
+	{CONT_LOGIC_XNOR, "LOGIC_XNOR", 0, "Xnor", "Logic Xnor"},
 	{CONT_EXPRESSION, "EXPRESSION", 0, "Expression", ""},
 	{CONT_PYTHON, "PYTHON", 0, "Python Script", ""},
 	{0, NULL, 0, NULL, NULL}};