[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58316] trunk/blender: Style cleanup of UI messages.

Bastien Montagne montagne29 at wanadoo.fr
Tue Jul 16 15:12:58 CEST 2013


Revision: 58316
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58316
Author:   mont29
Date:     2013-07-16 13:12:58 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Style cleanup of UI messages.
Mostly, "weight groups" -> "vertex groups", and usual case/endpoints/typos/etc.

As a remainder, please read http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#UI_Messages before writing UI messages!

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c

Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py	2013-07-16 12:22:31 UTC (rev 58315)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py	2013-07-16 13:12:58 UTC (rev 58316)
@@ -40,6 +40,7 @@
         "derivate",
         "doesn",  # doesn't
         "fader",
+        "globbing",
         "hasn",  # hasn't
         "hoc",  # ad-hoc
         "indices",
@@ -59,6 +60,7 @@
         "autoclip",
         "autocomplete",
         "autoexec",
+        "autoexecution",
         "autoname",
         "autosave",
         "autoscale",

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2013-07-16 12:22:31 UTC (rev 58315)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-07-16 13:12:58 UTC (rev 58316)
@@ -3073,7 +3073,7 @@
 	/* identifiers */
 	ot->name = "Remove Vertex Group";
 	ot->idname = "OBJECT_OT_vertex_group_remove";
-	ot->description = "Delete the active vertex group";
+	ot->description = "Delete the active or all vertex groups from the active object";
 	
 	/* api callbacks */
 	ot->poll = vertex_group_poll;
@@ -3457,7 +3457,8 @@
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_enum(ot->srna, "action", vgroup_lock_actions, VGROUP_TOGGLE, "Action", "Lock action to execute on vertex groups");
+	RNA_def_enum(ot->srna, "action", vgroup_lock_actions, VGROUP_TOGGLE, "Action",
+	             "Lock action to execute on vertex groups");
 }
 
 static int vertex_group_invert_exec(bContext *C, wmOperator *op)
@@ -3593,7 +3594,7 @@
 	/* identifiers */
 	ot->name = "Clean Vertex Group";
 	ot->idname = "OBJECT_OT_vertex_group_clean";
-	ot->description = "Remove Vertex Group assignments which aren't required";
+	ot->description = "Remove vertex group assignments which are not required";
 
 	/* api callbacks */
 	ot->poll = vertex_group_poll;
@@ -3730,7 +3731,7 @@
 	/* identifiers */
 	ot->name = "Copy Vertex Groups to Linked";
 	ot->idname = "OBJECT_OT_vertex_group_copy_to_linked";
-	ot->description = "Copy Vertex Groups to all users of the same Geometry data";
+	ot->description = "Copy vertex groups to all users of the same geometry data";
 
 	/* api callbacks */
 	ot->poll = vertex_group_poll;
@@ -3757,7 +3758,7 @@
 
 	if ((change == 0 && fail == 0) || fail) {
 		BKE_reportf(op->reports, RPT_ERROR,
-		            "Copy VGroups to Selected warning, %d done, %d failed (object data must have matching indices)",
+		            "Copy vertex groups to selected: %d done, %d failed (object data must have matching indices)",
 		            change, fail);
 	}
 
@@ -3769,7 +3770,7 @@
 	/* identifiers */
 	ot->name = "Copy Vertex Group to Selected";
 	ot->idname = "OBJECT_OT_vertex_group_copy_to_selected";
-	ot->description = "Copy Vertex Groups to other selected objects with matching indices";
+	ot->description = "Copy vertex groups to other selected objects with matching indices";
 
 	/* api callbacks */
 	ot->poll = vertex_group_poll;
@@ -3887,7 +3888,7 @@
 	}
 	else {
 		if (op->reports->list.first == NULL) {
-			BKE_report(op->reports, RPT_WARNING, "Failed, no other selected objects with vertex groups found.");
+			BKE_report(op->reports, RPT_WARNING, "Failed, no other selected objects with vertex groups found");
 		}
 
 		return OPERATOR_FINISHED; /* to get the chance to make changes in the redo panel */
@@ -4107,7 +4108,7 @@
 {
 	ot->name = "Sort Vertex Groups";
 	ot->idname = "OBJECT_OT_vertex_group_sort";
-	ot->description = "Sorts vertex groups alphabetically";
+	ot->description = "Sort vertex groups alphabetically";
 
 	/* api callbacks */
 	ot->poll = vertex_group_poll;
@@ -4251,12 +4252,12 @@
 	bDeformGroup *dg = BLI_findlink(&ob->defbase, def_nr);
 
 	if (!dg) {
-		BKE_report(op->reports, RPT_ERROR, "Invalid Weight Group Index");
+		BKE_report(op->reports, RPT_ERROR, "Invalid vertex group index");
 		return false;
 	}
 
 	if (dg->flag & DG_LOCK_WEIGHT) {
-		BKE_report(op->reports, RPT_ERROR, "Weight Group is locked");
+		BKE_report(op->reports, RPT_ERROR, "Vertex group is locked");
 		return false;
 	}
 
@@ -4284,9 +4285,9 @@
 {
 	PropertyRNA *prop;
 
-	ot->name = "Paste weight to Selected";
+	ot->name = "Paste Weight to Selected";
 	ot->idname = "OBJECT_OT_vertex_weight_paste";
-	ot->description = "Copy this group's weight to other selected verts (disabled if vertex Group is locked)";
+	ot->description = "Copy this group's weight to other selected verts (disabled if vertex group is locked)";
 
 	/* api callbacks */
 	ot->poll = vertex_group_vert_select_mesh_poll;
@@ -4296,7 +4297,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	prop = RNA_def_int(ot->srna, "weight_group", -1, -1, INT_MAX, "Weight Index",
-	                   "Index of source weight in active Weight Group", -1, INT_MAX);
+	                   "Index of source weight in active vertex group", -1, INT_MAX);
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
 }
 
@@ -4323,7 +4324,7 @@
 
 	ot->name = "Delete Weight";
 	ot->idname = "OBJECT_OT_vertex_weight_delete";
-	ot->description = "Delete this weight from the vertex (disabled if vertex Group is locked)";
+	ot->description = "Delete this weight from the vertex (disabled if vertex group is locked)";
 
 	/* api callbacks */
 	ot->poll = vertex_group_vert_select_mesh_poll;
@@ -4333,7 +4334,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	prop = RNA_def_int(ot->srna, "weight_group", -1, -1, INT_MAX, "Weight Index",
-	                   "Index of source weight in active Weight Group", -1, INT_MAX);
+	                   "Index of source weight in active vertex group", -1, INT_MAX);
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
 }
 
@@ -4357,7 +4358,7 @@
 
 	ot->name = "Set Active Group";
 	ot->idname = "OBJECT_OT_vertex_weight_set_active";
-	ot->description = "Set as active Vertex Group";
+	ot->description = "Set as active vertex group";
 
 	/* api callbacks */
 	ot->poll = vertex_group_vert_select_mesh_poll;
@@ -4367,7 +4368,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	prop = RNA_def_int(ot->srna, "weight_group", -1, -1, INT_MAX, "Weight Index",
-	                   "Index of source weight in active Weight Group", -1, INT_MAX);
+	                   "Index of source weight in active vertex group", -1, INT_MAX);
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
 }
 
@@ -4390,7 +4391,7 @@
 
 	ot->name = "Normalize Active";
 	ot->idname = "OBJECT_OT_vertex_weight_normalize_active_vertex";
-	ot->description = "Normalize Active Vert Weights";
+	ot->description = "Normalize active vertex's weights";
 
 	/* api callbacks */
 	ot->poll = vertex_group_vert_select_mesh_poll;
@@ -4419,7 +4420,7 @@
 
 	ot->name = "Copy Active";
 	ot->idname = "OBJECT_OT_vertex_weight_copy";
-	ot->description = "Copy weights from Active to selected";
+	ot->description = "Copy weights from active to selected";
 
 	/* api callbacks */
 	ot->poll = vertex_group_vert_select_mesh_poll;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c	2013-07-16 12:22:31 UTC (rev 58315)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c	2013-07-16 13:12:58 UTC (rev 58316)
@@ -915,7 +915,7 @@
 		ot = WM_operatortype_find("OBJECT_OT_vertex_weight_normalize_active_vertex", 1);
 		but = uiDefButO_ptr(block, BUT, ot, WM_OP_EXEC_DEFAULT, "Normalize",
 		                    0, yco, UI_UNIT_X * 5, UI_UNIT_Y,
-		                    TIP_("Normalize weights of active vertex (if affected groups are unlocked"));
+		                    TIP_("Normalize weights of active vertex (if affected groups are unlocked)"));
 		if (lock_count) {
 			uiButSetFlag(but, UI_BUT_DISABLED);
 		}
@@ -923,7 +923,7 @@
 		ot = WM_operatortype_find("OBJECT_OT_vertex_weight_copy", 1);
 		but = uiDefButO_ptr(block, BUT, ot, WM_OP_EXEC_DEFAULT, "Copy",
 		                    UI_UNIT_X * 5, yco, UI_UNIT_X * 5, UI_UNIT_Y,
-		                    TIP_("Copy active vertex to other selected verts (if affected groups are unlocked)"));
+		                    TIP_("Copy active vertex to other selected vertices (if affected groups are unlocked)"));
 		if (lock_count) {
 			uiButSetFlag(but, UI_BUT_DISABLED);
 		}




More information about the Bf-blender-cvs mailing list