Commit: f8d19ec5a3d8c14d0c71464867ad1af10ee50eb5 Author: Ethan-Hall Date: Mon Mar 21 18:07:39 2022 +0100 Branches: master https://developer.blender.org/rBf8d19ec5a3d8c14d0c71464867ad1af10ee50eb5
UI: improve names and tooltips in viewport preferences Rename OpenGL to GPU, Show to Text Info Overlay, and various other tweaks. Differential Revision: https://developer.blender.org/D14344 =================================================================== M release/scripts/startup/bl_ui/space_userpref.py M source/blender/makesrna/intern/rna_userdef.c =================================================================== diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index cffcc9ee236..29106b25a1a 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -685,10 +685,10 @@ class USERPREF_PT_viewport_display(ViewportPanel, CenterAlignMixIn, Panel): prefs = context.preferences view = prefs.view - col = layout.column(heading="Show") + col = layout.column(heading="Text Info Overlay") col.prop(view, "show_object_info", text="Object Info") col.prop(view, "show_view_name", text="View Name") - col.prop(view, "show_playback_fps", text="Playback FPS") + col.prop(view, "show_playback_fps", text="Playback Frame Rate (FPS)") layout.separator() diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 7d5cd350514..1a962981413 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2198,7 +2198,7 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna) srna = RNA_def_struct(brna, "ThemeView3D", NULL); RNA_def_struct_sdna(srna, "ThemeSpace"); RNA_def_struct_clear_flag(srna, STRUCT_UNDO); - RNA_def_struct_ui_text(srna, "Theme 3D View", "Theme settings for the 3D View"); + RNA_def_struct_ui_text(srna, "Theme 3D Viewport", "Theme settings for the 3D viewport"); rna_def_userdef_theme_spaces_gradient(srna); @@ -3959,7 +3959,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "space_view3d"); RNA_def_property_struct_type(prop, "ThemeView3D"); - RNA_def_property_ui_text(prop, "3D View", ""); + RNA_def_property_ui_text(prop, "3D Viewport", ""); prop = RNA_def_property(srna, "graph_editor", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); @@ -4571,7 +4571,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) prop = RNA_def_property(srna, "show_tooltips", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TOOLTIPS); RNA_def_property_ui_text( - prop, "Tooltips", "Display tooltips (when off hold Alt to force display)"); + prop, "Tooltips", "Display tooltips (when disabled, hold Alt to force display)"); prop = RNA_def_property(srna, "show_tooltips_python", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TOOLTIPS_PYTHON); @@ -4587,14 +4587,17 @@ static void rna_def_userdef_view(BlenderRNA *brna) prop = RNA_def_property(srna, "show_object_info", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_DRAWVIEWINFO); - RNA_def_property_ui_text( - prop, "Display Object Info", "Display objects name and frame number in 3D view"); + RNA_def_property_ui_text(prop, + "Display Object Info", + "Include the name of the active object and the current frame number in " + "the text info overlay"); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "show_view_name", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_VIEWPORTNAME); - RNA_def_property_ui_text( - prop, "Show View Name", "Show the name of the view's direction in each 3D View"); + RNA_def_property_ui_text(prop, + "Display View Name", + "Include the name of the view orientation in the text info overlay"); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "show_splash", PROP_BOOLEAN, PROP_NONE); @@ -4603,10 +4606,10 @@ static void rna_def_userdef_view(BlenderRNA *brna) prop = RNA_def_property(srna, "show_playback_fps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_FPS); - RNA_def_property_ui_text( - prop, - "Show Playback FPS", - "Show the frames per second screen refresh rate, while animation is played back"); + RNA_def_property_ui_text(prop, + "Display Playback Frame Rate (FPS)", + "Include the number of frames displayed per second in the text info " + "overlay while animation is played back"); RNA_def_property_update(prop, 0, "rna_userdef_update"); USERDEF_TAG_DIRTY_PROPERTY_UPDATE_DISABLE; @@ -4786,9 +4789,10 @@ static void rna_def_userdef_view(BlenderRNA *brna) prop = RNA_def_property(srna, "mini_axis_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, mini_axis_type_items); - RNA_def_property_ui_text(prop, - "Mini Axes Type", - "Show a small rotating 3D axes in the top right corner of the 3D View"); + RNA_def_property_ui_text( + prop, + "Mini Axes Type", + "Show a small rotating 3D axes in the top right corner of the 3D viewport"); RNA_def_property_update(prop, 0, "rna_userdef_gizmo_update"); prop = RNA_def_property(srna, "mini_axis_size", PROP_INT, PROP_PIXEL); @@ -4987,7 +4991,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna) "VIEW", 0, "View", - "Align newly added objects to the active 3D View direction"}, + "Align newly added objects to the active 3D view orientation"}, {USER_ADD_CURSORALIGNED, "CURSOR", 0, @@ -5016,15 +5020,12 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, object_align_items); RNA_def_property_ui_text( - prop, - "Align Object To", - "When adding objects from a 3D View menu, either align them with that view or " - "with the world"); + prop, "Align Object To", "The default alignment for objects added from a 3D viewport menu"); prop = RNA_def_property(srna, "use_enter_edit_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_ADD_EDITMODE); RNA_def_property_ui_text( - prop, "Enter Edit Mode", "Enter Edit Mode automatically after adding a new object"); + prop, "Enter Edit Mode", "Enter edit mode automatically after adding a new object"); prop = RNA_def_property(srna, "collection_instance_empty_size", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.001f, FLT_MAX); @@ -5037,7 +5038,9 @@ static void rna_def_userdef_edit(BlenderRNA *brna) prop = RNA_def_property(srna, "use_text_edit_auto_close", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "text_flag", USER_TEXT_EDIT_AUTO_CLOSE); RNA_def_property_ui_text( - prop, "Auto Close", "Auto close relevant characters inside the text editor"); + prop, + "Auto Close Character Pairs", + "Automatically close relevant character pairs when typing in the text editor"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TEXT, NULL); /* Undo */ @@ -5539,9 +5542,10 @@ static void rna_def_userdef_system(BlenderRNA *brna) prop = RNA_def_property(srna, "use_edit_mode_smooth_wire", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna( prop, NULL, "gpu_flag", USER_GPU_FLAG_NO_EDIT_MODE_SMOOTH_WIRE); - RNA_def_property_ui_text(prop, - "Edit-Mode Smooth Wires", - "Enable Edit-Mode edge smoothing, reducing aliasing, requires restart"); + RNA_def_property_ui_text( + prop, + "Edit Mode Smooth Wires", + "Enable edit mode edge smoothing, reducing aliasing (requires restart)"); RNA_def_property_update(prop, 0, "rna_userdef_dpi_update"); prop = RNA_def_property(srna, "use_region_overlap", PROP_BOOLEAN, PROP_NONE); @@ -5596,11 +5600,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "anisotropic_filter"); RNA_def_property_enum_items(prop, anisotropic_items); RNA_def_property_enum_default(prop, 1); - RNA_def_property_ui_text( - prop, - "Anisotropic Filter", - "Quality of the anisotropic filtering (values greater than 1.0 enable anisotropic " - "filtering)"); + RNA_def_property_ui_text(prop, "Anisotropic Filtering", "Quality of anisotropic filtering"); RNA_def_property_update(prop, 0, "rna_userdef_anisotropic_update"); prop = RNA_def_property(srna, "gl_texture_limit", PROP_ENUM, PROP_NONE); @@ -5649,9 +5649,9 @@ static void rna_def_userdef_system(BlenderRNA *brna) prop = RNA_def_property(srna, "use_select_pick_depth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "gpu_flag", USER_GPU_FLAG_NO_DEPT_PICK); RNA_def_property_ui_text(prop, - "OpenGL Depth Picking", - "Use the depth buffer for picking 3D View selection " - "(without this the front most object may not be selected first)"); + "GPU Depth Picking", + "When making a selection in 3D View, use the GPU depth buffer to " + "ensure the frontmost object is selected first"); /* GPU subdivision evaluation. */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
