From 494ffd2f9551b756e782e07d17748063eea04c45 Mon Sep 17 00:00:00 2001 From: Yevgeny Makarov Date: Wed, 7 Oct 2020 08:04:53 -0500 Subject: UI: Fix capitalization in various places Follow the MLA style, agreed upon in T79589. This means "from" within UI labels should be lowercase. Differential Revision: https://developer.blender.org/D8345 --- release/scripts/startup/bl_operators/object.py | 2 +- release/scripts/startup/bl_operators/sequencer.py | 4 ++-- release/scripts/startup/bl_operators/userpref.py | 2 +- release/scripts/startup/bl_operators/view3d.py | 2 ++ .../scripts/startup/bl_ui/properties_data_mesh.py | 2 +- release/scripts/startup/bl_ui/space_clip.py | 2 +- release/scripts/startup/bl_ui/space_text.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 16 ++++++++-------- release/scripts/startup/keyingsets_builtins.py | 2 +- source/blender/editors/curve/editfont.c | 2 +- .../blender/editors/mesh/editmesh_select_similar.c | 2 +- source/blender/editors/mesh/editmesh_tools.c | 8 ++++---- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/object/object_facemap_ops.c | 2 +- .../blender/editors/physics/physics_pointcache.c | 2 +- .../blender/editors/sculpt_paint/sculpt_face_set.c | 22 +++++++++++----------- source/blender/editors/space_view3d/view3d_edit.c | 12 ++++++------ source/blender/editors/transform/transform_ops.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 2 +- source/blender/editors/uvedit/uvedit_unwrap_ops.c | 2 +- 20 files changed, 47 insertions(+), 45 deletions(-) diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 73212d6641a..87973ac2c45 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -861,7 +861,7 @@ class TransformsToDeltasAnim(Operator): class DupliOffsetFromCursor(Operator): """Set offset used for collection instances based on cursor position""" bl_idname = "object.instance_offset_from_cursor" - bl_label = "Set Offset From Cursor" + bl_label = "Set Offset from Cursor" bl_options = {'INTERNAL', 'UNDO'} @classmethod diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index 9b15ccf167b..6b420d20e14 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -188,7 +188,7 @@ class SequencerFadesAdd(Operator): min=0.01) type: EnumProperty( items=( - ('IN_OUT', 'Fade In And Out', 'Fade selected strips in and out'), + ('IN_OUT', 'Fade In and Out', 'Fade selected strips in and out'), ('IN', 'Fade In', 'Fade in selected strips'), ('OUT', 'Fade Out', 'Fade out selected strips'), ('CURSOR_FROM', 'From Current Frame', @@ -196,7 +196,7 @@ class SequencerFadesAdd(Operator): ('CURSOR_TO', 'To Current Frame', 'Fade from the start of sequences under the time cursor to the current frame'), ), - name="Fade type", + name="Fade Type", description="Fade in, out, both in and out, to, or from the current frame. Default is both in and out", default='IN_OUT') diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index 113e6b06153..31d601debba 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -228,7 +228,7 @@ class PREFERENCES_OT_keyconfig_import(Operator): options={'HIDDEN'}, ) keep_original: BoolProperty( - name="Keep original", + name="Keep Original", description="Keep original file after copying to configuration folder", default=True, ) diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index 968dc8e5dba..3442e189d14 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -193,9 +193,11 @@ class VIEW3D_OT_transform_gizmo_set(Operator): bl_idname = "view3d.transform_gizmo_set" extend: BoolProperty( + name="Extend", default=False, ) type: EnumProperty( + name="Type", items=( ('TRANSLATE', "Move", ""), ('ROTATE', "Rotate", ""), diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index ee41cfc28a5..2ea439a7e89 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -69,7 +69,7 @@ class MESH_MT_shape_key_context_menu(Menu): def draw(self, _context): layout = self.layout - layout.operator("object.shape_key_add", icon='ADD', text="New Shape From Mix").from_mix = True + layout.operator("object.shape_key_add", icon='ADD', text="New Shape from Mix").from_mix = True layout.separator() layout.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT').use_topology = False layout.operator("object.shape_key_mirror", text="Mirror Shape Key (Topology)").use_topology = True diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 59588124bf1..93bc0c7b535 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -423,7 +423,7 @@ class CLIP_PT_tracking_settings(CLIP_PT_tracking_panel, Panel): col.separator() col.operator("clip.track_settings_as_default", - text="Copy From Active Track") + text="Copy from Active Track") class CLIP_PT_tracking_settings_extras(CLIP_PT_tracking_panel, Panel): diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 9e588acd50f..8a45069470b 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -362,7 +362,7 @@ class TEXT_MT_format(Menu): class TEXT_MT_edit_to3d(Menu): - bl_label = "Text To 3D Object" + bl_label = "Text to 3D Object" def draw(self, _context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 6612572f987..24a74390773 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2916,8 +2916,8 @@ class VIEW3D_MT_paint_weight(Menu): if not is_editmode: - layout.operator("paint.weight_from_bones", text="Assign Automatic From Bones").type = 'AUTOMATIC' - layout.operator("paint.weight_from_bones", text="Assign From Bone Envelopes").type = 'ENVELOPES' + layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type = 'AUTOMATIC' + layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type = 'ENVELOPES' layout.separator() @@ -3072,13 +3072,13 @@ class VIEW3D_MT_face_sets(Menu): def draw(self, _context): layout = self.layout - op = layout.operator("sculpt.face_sets_create", text='Face Set From Masked') + op = layout.operator("sculpt.face_sets_create", text='Face Set from Masked') op.mode = 'MASKED' - op = layout.operator("sculpt.face_sets_create", text='Face Set From Visible') + op = layout.operator("sculpt.face_sets_create", text='Face Set from Visible') op.mode = 'VISIBLE' - op = layout.operator("sculpt.face_sets_create", text='Face Set From Edit Mode Selection') + op = layout.operator("sculpt.face_sets_create", text='Face Set from Edit Mode Selection') op.mode = 'SELECTION' layout.separator() @@ -4150,7 +4150,7 @@ class VIEW3D_MT_edit_mesh_normals(Menu): layout.separator() - layout.operator("mesh.set_normals_from_faces", text="Set From Faces") + layout.operator("mesh.set_normals_from_faces", text="Set from Faces") layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("transform.rotate_normal", text="Rotate...") @@ -5293,10 +5293,10 @@ class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu): layout = self.layout pie = layout.menu_pie() - op = pie.operator("sculpt.face_sets_create", text='Face Set From Masked') + op = pie.operator("sculpt.face_sets_create", text='Face Set from Masked') op.mode = 'MASKED' - op = pie.operator("sculpt.face_sets_create", text='Face Set From Visible') + op = pie.operator("sculpt.face_sets_create", text='Face Set from Visible') op.mode = 'VISIBLE' op = pie.operator("sculpt.face_set_change_visibility", text='Invert Visible') diff --git a/release/scripts/startup/keyingsets_builtins.py b/release/scripts/startup/keyingsets_builtins.py index 19d565d10b6..6dffeac35ce 100644 --- a/release/scripts/startup/keyingsets_builtins.py +++ b/release/scripts/startup/keyingsets_builtins.py @@ -539,7 +539,7 @@ class BUILTIN_KSI_WholeCharacterSelected(KeyingSetInfo): """Insert a keyframe for all properties that are likely to get animated in a character rig """ \ """(only selected bones)""" bl_idname = ANIM_KS_WHOLE_CHARACTER_SELECTED_ID - bl_label = "Whole Character (Selected bones only)" + bl_label = "Whole Character (Selected Bones Only)" # iterator - all bones regardless of selection def iterator(ksi, context, ks): diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 551916ec57d..2a880c11afb 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1766,7 +1766,7 @@ void FONT_OT_text_insert(wmOperatorType *ot) ot->srna, "accent", 0, - "Accent mode", + "Accent Mode", "Next typed character will strike through previous, for special character input"); } diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index b3fb9747070..f94d3ba5a70 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -64,7 +64,7 @@ static const EnumPropertyItem prop_similar_types[] = { {SIMVERT_NORMAL, "NORMAL", 0, "Normal", ""}, {SIMVERT_FACE, "FACE", 0, "Amount of Adjacent Faces", ""}, {SIMVERT_VGROUP, "VGROUP", 0, "Vertex Groups", ""}, - {SIMVERT_EDGE, "EDGE", 0, "Amount of connecting edges", ""}, + {SIMVERT_EDGE, "EDGE", 0, "Amount of Connecting Edges", ""}, {SIMEDGE_LENGTH, "LENGTH", 0, "Length", ""}, {SIMEDGE_DIR, "DIR", 0, "Direction", ""}, diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 6f4320df365..01e25d5281c 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3700,7 +3700,7 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = "Blend From Shape"; + ot->name = "Blend from Shape"; ot->description = "Blend in shape from a shape key"; ot->idname = "MESH_OT_blend_from_shape"; @@ -7254,7 +7254,7 @@ void MESH_OT_wireframe(wmOperatorType *ot) "Crease", "Crease hub edges for an improved subdivision surface"); prop = RNA_def_float( - ot->srna, "crease_weight", 0.01f, 0.0f, 1e3f, "Crease weight", "", 0.0f, 1.0f); + ot->srna, "crease_weight", 0.01f, 0.0f, 1e3f, "Crease Weight", "", 0.0f, 1.0f); RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 2); } @@ -9276,7 +9276,7 @@ static int edbm_set_normals_from_faces_exec(bContext *C, wmOperator *op) void MESH_OT_set_normals_from_faces(struct wmOperatorType *ot) { /* identifiers */ - ot->name = "Set Normals From Faces"; + ot->name = "Set Normals from Faces"; ot->description = "Set the custom normals from the selected faces ones"; ot->idname = "MESH_OT_set_normals_from_faces"; @@ -9491,7 +9491,7 @@ void MESH_OT_mod_weighted_strength(struct wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - ot->prop = RNA_def_boolean(ot->srna, "set", 0, "Set value", "Set Value of faces"); + ot->prop = RNA_def_boolean(ot->srna, "set", 0, "Set Value", "Set value of faces"); ot->prop = RNA_def_enum( ot->srna, diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index bf41aee7d8b..dfad69e7c25 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2998,7 +2998,7 @@ void OBJECT_OT_convert(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = "Convert to"; + ot->name = "Convert To"; ot->description = "Convert selected objects to another type"; ot->idname = "OBJECT_OT_convert"; diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 4e2b1eb21b6..acd04b4aabd 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -319,7 +319,7 @@ static int face_map_remove_from_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_face_map_remove_from(struct wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove From Face Map"; + ot->name = "Remove from Face Map"; ot->idname = "OBJECT_OT_face_map_remove_from"; ot->description = "Remove faces from a face map"; diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 5bd56baf41e..4934a3d10cd 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -356,7 +356,7 @@ void PTCACHE_OT_free_bake(wmOperatorType *ot) void PTCACHE_OT_bake_from_cache(wmOperatorType *ot) { /* identifiers */ - ot->name = "Bake From Cache"; + ot->name = "Bake from Cache"; ot->description = "Bake from cache"; ot->idname = "PTCACHE_OT_bake_from_cache"; diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c index 22d3cc215b7..dae4b068e93 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.c +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c @@ -272,14 +272,14 @@ static EnumPropertyItem prop_sculpt_face_set_create_types[] = { SCULPT_FACE_SET_MASKED, "MASKED", 0, - "Face Set From Masked", + "Face Set from Masked", "Create a new Face Set from the masked faces", }, { SCULPT_FACE_SET_VISIBLE, "VISIBLE", 0, - "Face Set From Visible", + "Face Set from Visible", "Create a new Face Set from the visible vertices", }, { @@ -293,7 +293,7 @@ static EnumPropertyItem prop_sculpt_face_set_create_types[] = { SCULPT_FACE_SET_SELECTION, "SELECTION", 0, - "Face Set From Edit Mode Selection", + "Face Set from Edit Mode Selection", "Create an Face Set corresponding to the Edit Mode face selection", }, {0, NULL, 0, NULL, NULL}, @@ -445,56 +445,56 @@ static EnumPropertyItem prop_sculpt_face_sets_init_types[] = { SCULPT_FACE_SETS_FROM_LOOSE_PARTS, "LOOSE_PARTS", 0, - "Face Sets From Loose Parts", + "Face Sets from Loose Parts", "Create a Face Set per loose part in the mesh", }, { SCULPT_FACE_SETS_FROM_MATERIALS, "MATERIALS", 0, - "Face Sets From Material Slots", + "Face Sets from Material Slots", "Create a Face Set per Material Slot", }, { SCULPT_FACE_SETS_FROM_NORMALS, "NORMALS", 0, - "Face Sets From Mesh Normals", + "Face Sets from Mesh Normals", "Create Face Sets for Faces that have similar normal", }, { SCULPT_FACE_SETS_FROM_UV_SEAMS, "UV_SEAMS", 0, - "Face Sets From UV Seams", + "Face Sets from UV Seams", "Create Face Sets using UV Seams as boundaries", }, { SCULPT_FACE_SETS_FROM_CREASES, "CREASES", 0, - "Face Sets From Edge Creases", + "Face Sets from Edge Creases", "Create Face Sets using Edge Creases as boundaries", }, { SCULPT_FACE_SETS_FROM_BEVEL_WEIGHT, "BEVEL_WEIGHT", 0, - "Face Sets From Bevel Weight", + "Face Sets from Bevel Weight", "Create Face Sets using Bevel Weights as boundaries", }, { SCULPT_FACE_SETS_FROM_SHARP_EDGES, "SHARP_EDGES", 0, - "Face Sets From Sharp Edges", + "Face Sets from Sharp Edges", "Create Face Sets using Sharp Edges as boundaries", }, { SCULPT_FACE_SETS_FROM_FACE_MAPS, "FACE_MAPS", 0, - "Face Sets From Face Maps", + "Face Sets from Face Maps", "Create a Face Set per Face Map", }, {0, NULL, 0, NULL, NULL}, diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 935d986497e..65e4a8765bb 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3814,12 +3814,12 @@ void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot) * \{ */ static const EnumPropertyItem prop_view_items[] = { - {RV3D_VIEW_LEFT, "LEFT", ICON_TRIA_LEFT, "Left", "View From the Left"}, - {RV3D_VIEW_RIGHT, "RIGHT", ICON_TRIA_RIGHT, "Right", "View From the Right"}, - {RV3D_VIEW_BOTTOM, "BOTTOM", ICON_TRIA_DOWN, "Bottom", "View From the Bottom"}, - {RV3D_VIEW_TOP, "TOP", ICON_TRIA_UP, "Top", "View From the Top"}, - {RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"}, - {RV3D_VIEW_BACK, "BACK", 0, "Back", "View From the Back"}, + {RV3D_VIEW_LEFT, "LEFT", ICON_TRIA_LEFT, "Left", "View from the Left"}, + {RV3D_VIEW_RIGHT, "RIGHT", ICON_TRIA_RIGHT, "Right", "View from the Right"}, + {RV3D_VIEW_BOTTOM, "BOTTOM", ICON_TRIA_DOWN, "Bottom", "View from the Bottom"}, + {RV3D_VIEW_TOP, "TOP", ICON_TRIA_UP, "Top", "View from the Top"}, + {RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View from the Front"}, + {RV3D_VIEW_BACK, "BACK", 0, "Back", "View from the Back"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index d35c2f07482..6b6cab5c2a4 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -1301,7 +1301,7 @@ static int transform_from_gizmo_invoke(bContext *C, static void TRANSFORM_OT_from_gizmo(struct wmOperatorType *ot) { /* identifiers */ - ot->name = "Transform From Gizmo"; + ot->name = "Transform from Gizmo"; ot->description = "Transform selected items by mode type"; ot->idname = "TRANSFORM_OT_from_gizmo"; ot->flag = 0; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index d3d8c58829b..5b3d858329a 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1902,7 +1902,7 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op) static void UV_OT_seams_from_islands(wmOperatorType *ot) { /* identifiers */ - ot->name = "Seams From Islands"; + ot->name = "Seams from Islands"; ot->description = "Set mesh seams according to island setup in the UV editor"; ot->idname = "UV_OT_seams_from_islands"; diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index e4c0fd86377..cfcef0ebcb9 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -2384,7 +2384,7 @@ static bool uv_from_view_poll(bContext *C) void UV_OT_project_from_view(wmOperatorType *ot) { /* identifiers */ - ot->name = "Project From View"; + ot->name = "Project from View"; ot->idname = "UV_OT_project_from_view"; ot->description = "Project the UV vertices of the mesh as seen in current 3D view"; -- cgit v1.2.3