From dfa42c614fb49a32476a3c46cf800c5c90effd22 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 17 Apr 2023 11:40:14 +0200 Subject: [PATCH] Cleanup: UI messages fixes and tweaks. --- intern/cycles/blender/addon/__init__.py | 2 +- intern/cycles/bvh/build.cpp | 2 +- scripts/modules/bl_i18n_utils/settings.py | 5 +++++ scripts/modules/bl_i18n_utils/utils_spell_check.py | 8 +++++++- source/blender/editors/animation/anim_channels_edit.c | 4 ++-- source/blender/editors/interface/interface_handlers.cc | 2 +- source/blender/editors/object/object_remesh.cc | 2 +- source/blender/editors/space_graph/graph_slider_ops.c | 2 +- .../gpencil_modifiers_legacy/intern/lineart/lineart_ops.c | 2 +- source/blender/io/alembic/intern/alembic_capi.cc | 2 +- source/blender/io/ply/importer/ply_import.cc | 6 +++--- source/blender/io/usd/intern/usd_asset_utils.cc | 5 ++--- source/blender/io/usd/intern/usd_capi_import.cc | 2 +- source/blender/makesrna/intern/rna_userdef.c | 2 +- 14 files changed, 28 insertions(+), 18 deletions(-) diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 354c9c23a53..195547ad4c9 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -106,7 +106,7 @@ class CyclesRender(bpy.types.RenderEngine): from . import osl osl.update_script_node(node, self.report) else: - self.report({'ERROR'}, "OSL support disabled in this build.") + self.report({'ERROR'}, "OSL support disabled in this build") def update_render_passes(self, scene, srl): engine.register_passes(self, scene, srl) diff --git a/intern/cycles/bvh/build.cpp b/intern/cycles/bvh/build.cpp index 69fbb242bb6..dd3b7954e11 100644 --- a/intern/cycles/bvh/build.cpp +++ b/intern/cycles/bvh/build.cpp @@ -527,7 +527,7 @@ BVHNode *BVHBuild::run() if (progress.get_cancel()) { rootnode->deleteSubtree(); rootnode = NULL; - VLOG_WORK << "BVH build cancelled."; + VLOG_WORK << "BVH build canceled."; } else { /*rotate(rootnode, 4, 5);*/ diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py index b14c82cbbc0..336a34348d1 100644 --- a/scripts/modules/bl_i18n_utils/settings.py +++ b/scripts/modules/bl_i18n_utils/settings.py @@ -392,6 +392,9 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "image file not found", "image format is read-only", "image path can't be written to", + "in %i days", + "in %i hours", + "in %i minutes", "in memory to enable editing!", "insufficient content", "into", @@ -403,6 +406,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "name", "non-triangle face", "normal", + "on {:%Y-%m-%d}", "or AMD with macOS %s or newer", "performance impact!", "positions", "no positions", @@ -433,6 +437,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "view", "virtual parents", "which was replaced by the Asset Browser", + "within seconds", "write", } WARN_MSGID_NOT_CAPITALIZED_ALLOWED |= set(lng[2] for lng in LANGUAGES) diff --git a/scripts/modules/bl_i18n_utils/utils_spell_check.py b/scripts/modules/bl_i18n_utils/utils_spell_check.py index eb0dbc88006..f84de4e637a 100644 --- a/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -108,6 +108,7 @@ class SpellChecker: "dataset", "datasets", "de", "deadzone", + "decomposable", "deconstruct", "defocus", "denoise", "denoised", "denoising", "denoiser", @@ -196,7 +197,7 @@ class SpellChecker: "restpose", "resync", "resynced", "retarget", "retargets", "retargeting", "retargeted", - "retiming", + "retime", "retimed", "retiming", "rigidbody", "ringnoise", "rolloff", @@ -243,6 +244,7 @@ class SpellChecker: "undeformed", "undistort", "undistorted", "undistortion", "ungroup", "ungrouped", + "unhandled", "unhide", "unindent", "unitless", @@ -525,6 +527,7 @@ class SpellChecker: "refractions", "remesher", "remeshing", "remesh", "renderfarm", + "retopology", "scanfill", "shader", "shaders", "shadowmap", "shadowmaps", @@ -748,6 +751,7 @@ class SpellChecker: "rgb", "rgba", "rhs", "rv", + "sdf", "sdl", "sdls", "sl", @@ -805,10 +809,12 @@ class SpellChecker: "ffmpeg", "flac", "gltf", + "gprim", # From USD. "gzip", "ico", "jpg", "jpeg", "jpegs", "json", + "lightwave", "lzw", "matroska", "mdd", diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 4d0a2c2de42..9cb7a0b2421 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -3843,7 +3843,7 @@ static int graphkeys_view_selected_channels_exec(bContext *C, wmOperator *op) if (!valid_bounds) { ANIM_animdata_freelist(&anim_data); - WM_report(RPT_WARNING, "No keyframes to focus on."); + WM_report(RPT_WARNING, "No keyframes to focus on"); return OPERATOR_CANCELLED; } @@ -3931,7 +3931,7 @@ static int graphkeys_channel_view_pick_invoke(bContext *C, wmOperator *op, const if (!found_bounds) { ANIM_animdata_freelist(&anim_data); - WM_report(RPT_WARNING, "No keyframes to focus on."); + WM_report(RPT_WARNING, "No keyframes to focus on"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 2f74e538229..7bd46ccd9b2 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -8351,7 +8351,7 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s */ if (state != BUTTON_STATE_TEXT_EDITING) { WM_report(RPT_INFO, - "Can't edit driven number value, see driver editor for the driver setup."); + "Can't edit driven number value, see driver editor for the driver setup"); } } diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 896487ce1e1..184a4df8c14 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -934,7 +934,7 @@ static void quadriflow_end_job(void *customdata) WM_reportf(RPT_ERROR, "QuadriFlow: Remeshing failed"); break; case -1: - WM_report(RPT_WARNING, "QuadriFlow: Remeshing cancelled"); + WM_report(RPT_WARNING, "QuadriFlow: Remeshing canceled"); break; case -2: WM_report(RPT_WARNING, diff --git a/source/blender/editors/space_graph/graph_slider_ops.c b/source/blender/editors/space_graph/graph_slider_ops.c index 79a4ec95919..545e2d092b4 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.c +++ b/source/blender/editors/space_graph/graph_slider_ops.c @@ -319,7 +319,7 @@ static int graph_slider_invoke(bContext *C, wmOperator *op, const wmEvent *event ED_slider_init(gso->slider, event); if (gso->bezt_arr_list.first == NULL) { - WM_report(RPT_ERROR, "Cannot find keys to operate on."); + WM_report(RPT_ERROR, "Cannot find keys to operate on"); graph_slider_exit(C, op); return OPERATOR_CANCELLED; } diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.c index be7b4be61af..bac4b72b784 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.c +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.c @@ -286,7 +286,7 @@ static int lineart_gpencil_bake_common(bContext *C, if (!bake_all_targets) { Object *ob = CTX_data_active_object(C); if (!ob || ob->type != OB_GPENCIL_LEGACY) { - WM_report(RPT_ERROR, "No active object or active object isn't a GPencil object."); + WM_report(RPT_ERROR, "No active object or active object isn't a GPencil object"); return OPERATOR_FINISHED; } BLI_linklist_prepend(&bj->objects, ob); diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index c626d2aa3a9..1f281968eab 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -656,7 +656,7 @@ static void import_endjob(void *user_data) data->import_ok = !data->was_cancelled; break; case ABC_ARCHIVE_FAIL: - WM_report(RPT_ERROR, "Could not open Alembic archive for reading! See console for detail."); + WM_report(RPT_ERROR, "Could not open Alembic archive for reading, see console for detail"); break; } diff --git a/source/blender/io/ply/importer/ply_import.cc b/source/blender/io/ply/importer/ply_import.cc index 4fb306d39aa..6d7d2488f89 100644 --- a/source/blender/io/ply/importer/ply_import.cc +++ b/source/blender/io/ply/importer/ply_import.cc @@ -188,17 +188,17 @@ void importer_main(Main *bmain, std::unique_ptr data = import_ply_data(file, header); if (data == nullptr) { fprintf(stderr, "PLY Importer: failed importing %s, unknown error\n", ob_name); - BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error."); + BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error"); return; } if (!data->error.empty()) { fprintf(stderr, "PLY Importer: failed importing %s: %s\n", ob_name, data->error.c_str()); - BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error."); + BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error"); return; } if (data->vertices.is_empty()) { fprintf(stderr, "PLY Importer: file %s contains no vertices\n", ob_name); - BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, no vertices."); + BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, no vertices"); return; } diff --git a/source/blender/io/usd/intern/usd_asset_utils.cc b/source/blender/io/usd/intern/usd_asset_utils.cc index fe550c9d7ad..3e99a4e8c19 100644 --- a/source/blender/io/usd/intern/usd_asset_utils.cc +++ b/source/blender/io/usd/intern/usd_asset_utils.cc @@ -89,8 +89,7 @@ static std::string copy_asset_to_directory(const char *src_path, } if (!copy_asset(src_path, dest_file_path, name_collision_mode)) { - WM_reportf( - RPT_WARNING, "%s: Couldn't copy file %s to %s.", __func__, src_path, dest_file_path); + WM_reportf(RPT_WARNING, "%s: Couldn't copy file %s to %s", __func__, src_path, dest_file_path); return src_path; } @@ -179,7 +178,7 @@ bool copy_asset(const char *src, const char *dst, eUSDTexNameCollisionMode name_ std::string why_not; if (!ar.CanWriteAssetToPath(dst_path, &why_not)) { WM_reportf(RPT_ERROR, - "%s: Can't write to asset %s. %s.", + "%s: Can't write to asset %s: %s", __func__, dst_path.GetPathString().c_str(), why_not.c_str()); diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc index 9fa755b8f3f..61591211dd2 100644 --- a/source/blender/io/usd/intern/usd_capi_import.cc +++ b/source/blender/io/usd/intern/usd_capi_import.cc @@ -372,7 +372,7 @@ static void import_endjob(void *customdata) data->import_ok = !data->was_canceled; break; case USD_ARCHIVE_FAIL: - WM_report(RPT_ERROR, "Could not open USD archive for reading! See console for detail."); + WM_report(RPT_ERROR, "Could not open USD archive for reading, see console for detail"); break; } diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index b232e287ae4..af14bfe70a1 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4921,7 +4921,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Timecode Style", - "Format of timecodes displayed when not displaying timing in terms of frames"); + "Format of timecode displayed when not displaying timing in terms of frames"); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "view_frame_type", PROP_ENUM, PROP_NONE);