[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51318] trunk/blender/source/blender: More UI messages and BKE_reportf->BKE_report fixes...

Bastien Montagne montagne29 at wanadoo.fr
Sun Oct 14 17:29:10 CEST 2012


Revision: 51318
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51318
Author:   mont29
Date:     2012-10-14 15:29:09 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
More UI messages and BKE_reportf->BKE_report fixes...

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_ops.c
    trunk/blender/source/blender/editors/mesh/editmesh_rip.c
    trunk/blender/source/blender/editors/object/object_bake.c
    trunk/blender/source/blender/editors/object/object_hook.c
    trunk/blender/source/blender/editors/object/object_transform.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    trunk/blender/source/blender/python/intern/bpy_util.c

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -807,8 +807,7 @@
 	}
 
 	if (text == NULL) {
-		BKE_reportf(op->reports, RPT_WARNING,
-		            "File: '%s' can't be opened", filepath);
+		BKE_reportf(op->reports, RPT_WARNING, "File: '%s' can't be opened", filepath);
 		return OPERATOR_CANCELLED;
 	}
 	else {
@@ -820,8 +819,7 @@
 			st->text = text;
 		}
 		else {
-			BKE_reportf(op->reports, RPT_INFO,
-			            "See '%s' in the text editor", text->id.name + 2);
+			BKE_reportf(op->reports, RPT_INFO, "See '%s' in the text editor", text->id.name + 2);
 		}
 
 		txt_move_toline(text, line - 1, FALSE);
@@ -872,14 +870,12 @@
 				                           but_store->py_dbg_ln);
 			}
 			else {
-				BKE_report(op->reports, RPT_ERROR,
-				           "Active button isn't from a script, cant edit source.");
+				BKE_report(op->reports, RPT_ERROR, "Active button isn't from a script, cant edit source");
 				ret = OPERATOR_CANCELLED;
 			}
 		}
 		else {
-			BKE_report(op->reports, RPT_ERROR,
-			           "Active button match can't be found.");
+			BKE_report(op->reports, RPT_ERROR, "Active button match can't be found");
 			ret = OPERATOR_CANCELLED;
 		}
 
@@ -978,19 +974,19 @@
 
 		if (!BLI_is_dir(root)) {
 			BKE_report(op->reports, RPT_ERROR, "Please set your User Preferences' \"Translation Branches "
-			                                   "Directory\" path to a valid directory.");
+			                                   "Directory\" path to a valid directory");
 			return OPERATOR_CANCELLED;
 		}
 		if (!WM_operatortype_find(EDTSRC_I18N_OP_NAME, 0)) {
 			BKE_reportf(op->reports, RPT_ERROR, "Could not find operator \"%s\"! Please enable ui_translate addon "
-			                                    "in the User Preferences.", EDTSRC_I18N_OP_NAME);
+			                                    "in the User Preferences", EDTSRC_I18N_OP_NAME);
 			return OPERATOR_CANCELLED;
 		}
 		/* Try to find a valid po file for current language... */
 		edittranslation_find_po_file(root, uilng, popath, FILE_MAX);
 /*		printf("po path: %s\n", popath);*/
 		if (popath[0] == '\0') {
-			BKE_reportf(op->reports, RPT_ERROR, "No valid po found for language '%s' under %s.", uilng, root);
+			BKE_reportf(op->reports, RPT_ERROR, "No valid po found for language '%s' under %s", uilng, root);
 			return OPERATOR_CANCELLED;
 		}
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -1062,5 +1062,5 @@
 	/* to give to transform */
 	Transform_Properties(ot, P_PROPORTIONAL);
 	RNA_def_boolean(ot->srna, "mirror", FALSE, "Mirror Editing", "");
-	RNA_def_boolean(ot->srna, "use_fill", FALSE, "Fill", "Fille the ripped region");
+	RNA_def_boolean(ot->srna, "use_fill", FALSE, "Fill", "Fill the ripped region");
 }

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -937,7 +937,7 @@
 		ob = base->object;
 
 		if (ob->type != OB_MESH) {
-			BKE_report(op->reports, RPT_ERROR, "Basking of multires data only works with active object which is a mesh");
+			BKE_report(op->reports, RPT_ERROR, "Baking of multires data only works with an active mesh object");
 
 			ok = 0;
 			break;

Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/object/object_hook.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -442,7 +442,7 @@
 	ok = object_hook_index_array(scene, obedit, &tot, &indexar, name, cent);
 
 	if (!ok) {
-		BKE_report(reports, RPT_ERROR, "Requires selected vertices or active Vertex Group");
+		BKE_report(reports, RPT_ERROR, "Requires selected vertices or active vertex group");
 		return FALSE;
 	}
 

Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/object/object_transform.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -417,7 +417,8 @@
 			cu = ob->data;
 
 			if (!(cu->flag & CU_3D) && (apply_rot || apply_loc)) {
-				BKE_report(reports, RPT_ERROR, "Neither rotation nor location could be applied to a 2d curve, doing nothing");
+				BKE_report(reports, RPT_ERROR,
+				           "Neither rotation nor location could be applied to a 2D curve, doing nothing");
 				change = 0;
 			}
 			if (cu->key) {
@@ -961,9 +962,9 @@
 
 	/* Warn if any errors occurred */
 	if (tot_lib_error + tot_multiuser_arm_error) {
-		BKE_reportf(op->reports, RPT_WARNING, "%i Object(s) Not Centered, %i Changed:", tot_lib_error + tot_multiuser_arm_error, tot_change);
+		BKE_reportf(op->reports, RPT_WARNING, "%i object(s) not centered, %i changed:", tot_lib_error + tot_multiuser_arm_error, tot_change);
 		if (tot_lib_error)
-			BKE_reportf(op->reports, RPT_WARNING, "|%i linked library objects", tot_lib_error);
+			BKE_reportf(op->reports, RPT_WARNING, "|%i linked library object(s)", tot_lib_error);
 		if (tot_multiuser_arm_error)
 			BKE_reportf(op->reports, RPT_WARNING, "|%i multiuser armature object(s)", tot_multiuser_arm_error);
 	}

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -482,7 +482,7 @@
 
 	/* sanity check */
 	if (!me_src->dvert) {
-		BKE_reportf(op->reports, RPT_ERROR, "Transfer failed. Source mesh does not have any vertex groups");
+		BKE_report(op->reports, RPT_ERROR, "Transfer failed (source mesh does not have any vertex groups)");
 		return 0;
 	}
 
@@ -528,7 +528,7 @@
 				if (dv_array_src) MEM_freeN(dv_array_src);
 				if (dv_array_dst) MEM_freeN(dv_array_dst);
 				dmesh_src->release(dmesh_src);
-				BKE_reportf(op->reports, RPT_ERROR, "Transfer failed. Indices are not matching");
+				BKE_report(op->reports, RPT_ERROR, "Transfer failed (indices are not matching)");
 				return 0;
 			}
 
@@ -3126,7 +3126,7 @@
 		return OPERATOR_FINISHED;
 	}
 	else {
-		BKE_reportf(op->reports, RPT_WARNING, "No vertex groups limited");
+		BKE_report(op->reports, RPT_WARNING, "No vertex groups limited");
 
 		/* note, would normally return cancelled, except we want the redo
 		 * UI to show up for users to change */
@@ -3248,7 +3248,7 @@
 
 	if ((change == 0 && fail == 0) || fail) {
 		BKE_reportf(op->reports, RPT_ERROR,
-		            "Copy to VGroups to Selected warning done %d, failed %d, object data must have matching indices",
+		            "Copy VGroups to Selected warning, %d done, %d failed (object data must have matching indices)",
 		            change, fail);
 	}
 

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -1558,7 +1558,7 @@
 	BLI_strncpy(di, ibuf->name, FILE_MAX);
 	BLI_splitdirstring(di, fi);
 	
-	BKE_reportf(op->reports, RPT_INFO, "%d Image(s) will be saved in %s", tot, di);
+	BKE_reportf(op->reports, RPT_INFO, "%d image(s) will be saved in %s", tot, di);
 
 	for (ibuf = sima->image->ibufs.first; ibuf; ibuf = ibuf->next) {
 		if (ibuf->userflags & IB_BITMAPDIRTY) {

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -2742,7 +2742,7 @@
 	const char *error_msg;
 
 	if (BKE_sequencer_active_get_pair(scene, &seq_act, &seq_other) == 0) {
-		BKE_report(op->reports, RPT_ERROR, "Must select 2 strips");
+		BKE_report(op->reports, RPT_ERROR, "Please select two strips");
 		return OPERATOR_CANCELLED;
 	}
 

Modified: trunk/blender/source/blender/python/intern/bpy_util.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_util.c	2012-10-14 14:18:30 UTC (rev 51317)
+++ trunk/blender/source/blender/python/intern/bpy_util.c	2012-10-14 15:29:09 UTC (rev 51318)
@@ -35,6 +35,8 @@
 #include "BKE_report.h"
 #include "BKE_context.h"
 
+#include "BLF_translation.h"
+
 #include "../generic/py_capi_utils.h"
 
 static bContext *__py_context = NULL;
@@ -98,7 +100,7 @@
 	pystring = PyC_ExceptionBuffer();
 	
 	if (pystring == NULL) {
-		BKE_report(reports, RPT_ERROR, "unknown py-exception, couldn't convert");
+		BKE_report(reports, RPT_ERROR, "Unknown py-exception, couldn't convert");
 		return 0;
 	}
 	
@@ -111,12 +113,12 @@
 #if 0 // ARG!. workaround for a bug in blenders use of vsnprintf
 	BKE_reportf(reports, RPT_ERROR, "%s\nlocation:%s:%d\n", cstring, filename, lineno);
 #else
-	pystring_format = PyUnicode_FromFormat("%s\nlocation:%s:%d\n", cstring, filename, lineno);
+	pystring_format = PyUnicode_FromFormat(TIP_("%s\nlocation:%s:%d\n"), cstring, filename, lineno);
 	cstring = _PyUnicode_AsString(pystring_format);
 	BKE_report(reports, RPT_ERROR, cstring);
 #endif
 	
-	fprintf(stderr, "%s\nlocation:%s:%d\n", cstring, filename, lineno); // not exactly needed. just for testing

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list