From 89690a2b287a69cdbfb388cb97634f8e6eee9e2f Mon Sep 17 00:00:00 2001 From: joshua-maros <60271685+joshua-maros@users.noreply.github.com> Date: Wed, 8 Feb 2023 16:40:50 -0800 Subject: [PATCH 1/3] Make text nomenclature and ordering consistent "Center" -> "Middle" when describing vertical alignment. "Align X" -> "Text Horizontal Align" "Align Y" -> "Text Vertical Align" Vertical alignment options rearranged to be consistently top-most to bottom-most. --- source/blender/makesrna/intern/rna_curve.c | 6 +++--- source/blender/makesrna/intern/rna_nodetree.c | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index d6ec43ba39d..31a4b90b2ce 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1073,19 +1073,19 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) }; static const EnumPropertyItem prop_align_y_items[] = { + {CU_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", "Align text to the top"}, {CU_ALIGN_Y_TOP_BASELINE, "TOP_BASELINE", ICON_ALIGN_TOP, "Top Base-Line", "Align to top but use the base-line of the text"}, - {CU_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", "Align text to the top"}, - {CU_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Center", "Align text to the middle"}, - {CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"}, + {CU_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Middle", "Align text to the middle"}, {CU_ALIGN_Y_BOTTOM_BASELINE, "BOTTOM_BASELINE", ICON_ALIGN_BOTTOM, "Bottom Base-Line", "Align text to the bottom but use the base-line of the text"}, + {CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 7ba3971b4ea..e73c26e5980 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -10706,16 +10706,16 @@ static void def_geo_string_to_curves(StructRNA *srna) }; static const EnumPropertyItem rna_node_geometry_string_to_curves_align_y_items[] = { - {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE, - "TOP_BASELINE", - ICON_ALIGN_TOP, - "Top Baseline", - "Align text to the top baseline"}, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", "Align text to the top"}, + {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE, + "TOP_BASELINE", + ICON_ALIGN_TOP, + "Top Baseline", + "Align text to the top baseline"}, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_MIDDLE, "MIDDLE", ICON_ALIGN_MIDDLE, @@ -10777,21 +10777,23 @@ static void def_geo_string_to_curves(StructRNA *srna) RNA_def_property_enum_sdna(prop, NULL, "overflow"); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_overflow_items); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW); - RNA_def_property_ui_text(prop, "Overflow", ""); + RNA_def_property_ui_text(prop, "Textbox Overflow", "Handle the text behavior when it doesn't fit in the text boxes"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); prop = RNA_def_property(srna, "align_x", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "align_x"); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_x_items); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_X_LEFT); - RNA_def_property_ui_text(prop, "Align X", ""); + RNA_def_property_ui_text( + prop, "Text Horizontal Align", "Text horizontal align from the object center"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "align_y"); RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_y_items); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE); - RNA_def_property_ui_text(prop, "Align Y", ""); + RNA_def_property_ui_text( + prop, "Text Vertical Align", "Text vertical align from the object center"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "pivot_mode", PROP_ENUM, PROP_NONE); -- 2.30.2 From 542129b4744854ea4bd0b71c59d5c0cf2550d913 Mon Sep 17 00:00:00 2001 From: joshua-maros <60271685+joshua-maros@users.noreply.github.com> Date: Thu, 9 Feb 2023 18:56:07 -0800 Subject: [PATCH 2/3] Remove "Text", replace "Align" -> "Alignment" --- source/blender/makesrna/intern/rna_curve.c | 4 ++-- source/blender/makesrna/intern/rna_nodetree.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 31a4b90b2ce..9d224659e39 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1109,14 +1109,14 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) RNA_def_property_enum_sdna(prop, NULL, "spacemode"); RNA_def_property_enum_items(prop, prop_align_items); RNA_def_property_ui_text( - prop, "Text Horizontal Align", "Text horizontal align from the object center"); + prop, "Horizontal Alignment", "Text horizontal alignment from the object center"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "align_y"); RNA_def_property_enum_items(prop, prop_align_y_items); RNA_def_property_ui_text( - prop, "Text Vertical Align", "Text vertical align from the object center"); + prop, "Vertical Alignment", "Text vertical alignment from the object center"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "overflow", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index e73c26e5980..7acf238d572 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -10785,7 +10785,7 @@ static void def_geo_string_to_curves(StructRNA *srna) RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_x_items); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_X_LEFT); RNA_def_property_ui_text( - prop, "Text Horizontal Align", "Text horizontal align from the object center"); + prop, "Horizontal Alignment", "Text horizontal alignment from the object center"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "align_y", PROP_ENUM, PROP_NONE); @@ -10793,7 +10793,7 @@ static void def_geo_string_to_curves(StructRNA *srna) RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_align_y_items); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_ALIGN_Y_TOP_BASELINE); RNA_def_property_ui_text( - prop, "Text Vertical Align", "Text vertical align from the object center"); + prop, "Vertical Alignment", "Text vertical alignment from the object center"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "pivot_mode", PROP_ENUM, PROP_NONE); -- 2.30.2 From a7c290d0665855dcf92229bf6ab78c9244bf9a53 Mon Sep 17 00:00:00 2001 From: joshua-maros <60271685+joshua-maros@users.noreply.github.com> Date: Thu, 9 Feb 2023 23:47:01 -0800 Subject: [PATCH 3/3] Remove inconsistent hyphen, rephrase tooltips. --- source/blender/makesrna/intern/rna_curve.c | 8 ++++---- source/blender/makesrna/intern/rna_nodetree.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 9d224659e39..ab58f9ae884 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1077,14 +1077,14 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) {CU_ALIGN_Y_TOP_BASELINE, "TOP_BASELINE", ICON_ALIGN_TOP, - "Top Base-Line", - "Align to top but use the base-line of the text"}, + "Top Baseline", + "Align text to the top line's baseline"}, {CU_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Middle", "Align text to the middle"}, {CU_ALIGN_Y_BOTTOM_BASELINE, "BOTTOM_BASELINE", ICON_ALIGN_BOTTOM, - "Bottom Base-Line", - "Align text to the bottom but use the base-line of the text"}, + "Bottom Baseline", + "Align text to the bottom line's baseline"}, {CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 7acf238d572..575e697af50 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -10715,7 +10715,7 @@ static void def_geo_string_to_curves(StructRNA *srna) "TOP_BASELINE", ICON_ALIGN_TOP, "Top Baseline", - "Align text to the top baseline"}, + "Align text to the top line's baseline"}, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_MIDDLE, "MIDDLE", ICON_ALIGN_MIDDLE, @@ -10725,7 +10725,7 @@ static void def_geo_string_to_curves(StructRNA *srna) "BOTTOM_BASELINE", ICON_ALIGN_BOTTOM, "Bottom Baseline", - "Align text to the bottom baseline"}, + "Align text to the bottom line's baseline"}, {GEO_NODE_STRING_TO_CURVES_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, -- 2.30.2