Revision: 51360
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51360
Author: mont29
Date: 2012-10-16 07:53:10 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
More UI messages and BKE_reportf<->BKE_report fixes...
Modified Paths:
--------------
trunk/blender/source/blender/editors/io/io_collada.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_info/info_ops.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c 2012-10-16
03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/io/io_collada.c 2012-10-16
07:53:10 UTC (rev 51360)
@@ -143,7 +143,7 @@
return OPERATOR_FINISHED;
}
else {
- BKE_report(op->reports, RPT_WARNING, "Export file not
created.");
+ BKE_report(op->reports, RPT_WARNING, "Export file not created");
return OPERATOR_CANCELLED;
}
}
@@ -307,7 +307,7 @@
RNA_string_get(op->ptr, "filepath", filename);
if (collada_import(C, filename)) return OPERATOR_FINISHED;
- BKE_report(op->reports, RPT_ERROR, "Errors found during parsing COLLADA
document. Please see console for error log.");
+ BKE_report(op->reports, RPT_ERROR, "Errors found during parsing COLLADA
document (see console for details)");
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c
2012-10-16 03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/object/object_modifier.c
2012-10-16 07:53:10 UTC (rev 51360)
@@ -1242,7 +1242,7 @@
CTX_DATA_END;
if (!secondob) {
- BKE_report(op->reports, RPT_ERROR, "Second selected mesh object
require to copy shape from");
+ BKE_report(op->reports, RPT_ERROR, "Second selected mesh object
required to copy shape from");
return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
2012-10-16 03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
2012-10-16 07:53:10 UTC (rev 51360)
@@ -346,7 +346,6 @@
Object *ob = ED_object_context(C);
int status = 0;
double timer = PIL_check_seconds_timer();
- char result_str[80];
DynamicPaintSurface *surface;
/*
@@ -354,14 +353,14 @@
*/
pmd = (DynamicPaintModifierData *)modifiers_findByType(ob,
eModifierType_DynamicPaint);
if (!pmd) {
- BKE_report(op->reports, RPT_ERROR, "Bake Failed: No Dynamic
Paint modifier found.");
+ BKE_report(op->reports, RPT_ERROR, "Bake failed: no Dynamic
Paint modifier found");
return 0;
}
/* Make sure we're dealing with a canvas */
canvas = pmd->canvas;
if (!canvas) {
- BKE_report(op->reports, RPT_ERROR, "Bake Failed: Invalid
Canvas.");
+ BKE_report(op->reports, RPT_ERROR, "Bake failed: invalid
canvas");
return 0;
}
surface = get_activeSurface(canvas);
@@ -387,17 +386,14 @@
BLI_timestr(time, time_str);
/* Show bake info */
- BLI_snprintf(result_str, sizeof(result_str), "Bake Complete!
(%s)", time_str);
- BKE_report(op->reports, RPT_INFO, result_str);
+ BKE_reportf(op->reports, RPT_INFO, "Bake complete! (%s)",
time_str);
}
else {
if (strlen(canvas->error)) { /* If an error occured */
- BLI_snprintf(result_str, sizeof(result_str), "Bake
Failed: %s", canvas->error);
- BKE_report(op->reports, RPT_ERROR, result_str);
+ BKE_reportf(op->reports, RPT_ERROR, "Bake failed: %s",
canvas->error);
}
- else { /* User canceled the bake */
- BLI_strncpy(result_str, "Baking Cancelled!",
sizeof(result_str));
- BKE_report(op->reports, RPT_WARNING, result_str);
+ else { /* User canceled the bake */
+ BKE_report(op->reports, RPT_WARNING, "Baking
cancelled!");
}
}
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c
2012-10-16 03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c
2012-10-16 07:53:10 UTC (rev 51360)
@@ -2414,7 +2414,7 @@
if (totremoved == 0)
return OPERATOR_CANCELLED;
- BKE_reportf(op->reports, RPT_INFO, "Remove %d double particles",
totremoved);
+ BKE_reportf(op->reports, RPT_INFO, "Removed %d double particles",
totremoved);
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-10-16
03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-10-16
07:53:10 UTC (rev 51360)
@@ -41,6 +41,8 @@
#include "BLI_math.h"
#include "BLI_rect.h"
+#include "BLF_translation.h"
+
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_report.h"
@@ -180,7 +182,7 @@
BLI_join_dirfile(str, sizeof(str), dir_only, file_only);
}
else {
- BKE_reportf(op->reports, RPT_ERROR, "No files selected to be
opened");
+ BKE_report(op->reports, RPT_ERROR, "No files selected to be
opened");
return OPERATOR_CANCELLED;
}
@@ -195,8 +197,8 @@
if (op->customdata)
MEM_freeN(op->customdata);
- BKE_reportf(op->reports, RPT_ERROR, "Can't read: \"%s\", %s.",
str,
- errno ? strerror(errno) : "Unsupported movie clip
format");
+ BKE_reportf(op->reports, RPT_ERROR, "Can't read \"%s\": %s",
str,
+ errno ? strerror(errno) : TIP_("Unsupported movie
clip format"));
return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c
2012-10-16 03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c
2012-10-16 07:53:10 UTC (rev 51360)
@@ -1400,7 +1400,7 @@
if (!solved)
BKE_report(scj->reports, RPT_WARNING, "Some data failed to
reconstruct, see console for details");
else
- BKE_reportf(scj->reports, RPT_INFO, "Average re-projection
error %.3f", tracking->reconstruction.error);
+ BKE_reportf(scj->reports, RPT_INFO, "Average re-projection
error: %.3f", tracking->reconstruction.error);
/* set currently solved clip as active for scene */
if (scene->clip)
Modified: trunk/blender/source/blender/editors/space_info/info_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_ops.c 2012-10-16
03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/space_info/info_ops.c 2012-10-16
07:53:10 UTC (rev 51360)
@@ -150,7 +150,7 @@
count = countPackedFiles(bmain);
if (!count) {
- BKE_report(op->reports, RPT_WARNING, "No packed files.
Auto-pack disabled");
+ BKE_report(op->reports, RPT_WARNING, "No packed files
(auto-pack disabled)");
G.fileflags &= ~G_AUTOPACK;
return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c 2012-10-16
03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c 2012-10-16
07:53:10 UTC (rev 51360)
@@ -405,7 +405,9 @@
else if (act->idroot == 0) {
/* hopefully in this case (i.e. library of userless actions),
the user knows what they're doing... */
BKE_reportf(op->reports, RPT_WARNING,
- "Action '%s' does not specify what datablocks it
can be used on. Try setting the 'ID Root Type' setting from the Datablocks
Editor for this Action to avoid future problems",
+ "Action '%s' does not specify what datablocks it
can be used on "
+ "(try setting the 'ID Root Type' setting from the
Datablocks Editor "
+ "for this Action to avoid future problems)",
act->id.name + 2);
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
2012-10-16 03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
2012-10-16 07:53:10 UTC (rev 51360)
@@ -811,7 +811,7 @@
ED_undo_push(C, "Unlink world");
break;
default:
- BKE_report(op->reports, RPT_WARNING,
"Not Yet");
+ BKE_report(op->reports, RPT_WARNING,
"Not yet");
break;
}
}
@@ -844,7 +844,7 @@
break;
default:
- BKE_report(op->reports, RPT_WARNING,
"Not Yet");
+ BKE_report(op->reports, RPT_WARNING,
"Not yet");
break;
}
}
@@ -980,9 +980,9 @@
else if (act->idroot == 0) {
/* hopefully in this case (i.e. library of userless actions),
the user knows what they're doing... */
BKE_reportf(op->reports, RPT_WARNING,
- "Action '%s' does not specify what datablocks it
can be used on. "
- "Try setting the 'ID Root Type' setting from the
Datablocks Editor "
- "for this Action to avoid future problems",
+ "Action '%s' does not specify what datablocks it
can be used on "
+ "(try setting the 'ID Root Type' setting from the
Datablocks Editor "
+ "for this Action to avoid future problems)",
act->id.name + 2);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2012-10-16 03:21:22 UTC (rev 51359)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2012-10-16 07:53:10 UTC (rev 51360)
@@ -451,7 +451,7 @@
but = uiDefButF(block, NUM, B_OBJECTPANELMEDIAN,
IFACE_("Mean Tilt:"),
0, yi -= buth + but_margin, 200, buth,
&(tfp->ve_median[C_TILT]), -M_PI *
2.0f, M_PI * 2.0f, 1, 3,
- TIP_("Tilt (inclination) of curve
control points"));
+ TIP_("Tilt of curve control points"));
uiButSetUnitType(but, PROP_UNIT_ROTATION);
}
/* Lattice... */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2012-10-16 03:21:22 UTC (rev 51359)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
