diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-14 23:29:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-14 23:29:35 +0300 |
commit | fc7c934cfc00bd58f5cb6114bc9ca1e2e07564e1 (patch) | |
tree | d6a07099a02f990726a684d80d72abffd61300d7 /source/blender | |
parent | 5a716701e8c769a9d24c5c0ff5056bf9f5dc3917 (diff) |
UI: rename manipulator to gizmo
This is a common, short, distinctive term often used for this purpose.
Changes to internal API's still needed.
Diffstat (limited to 'source/blender')
4 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 0c734a8e7c7..690c6d8e4c1 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2694,7 +2694,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "manipulator_flag"); RNA_def_property_enum_items(prop, rna_enum_manipulator_items); RNA_def_property_flag(prop, PROP_ENUM_FLAG); - RNA_def_property_ui_text(prop, "Manipulator", ""); + RNA_def_property_ui_text(prop, "Gizmo Mode", ""); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, "rna_ToolSettings_manipulator_flag_update"); /* Grease Pencil */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index b89a4f09d9f..4bdf7a09585 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2941,22 +2941,22 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "show_manipulator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mpr_flag", V3D_MANIPULATOR_HIDE); - RNA_def_property_ui_text(prop, "Manipulator", "Show manipulators of all types"); + RNA_def_property_ui_text(prop, "Show Gizmo", "Show gizmos of all types"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_manipulator_navigate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mpr_flag", V3D_MANIPULATOR_HIDE_NAVIGATE); - RNA_def_property_ui_text(prop, "Navigate Manipulator", ""); + RNA_def_property_ui_text(prop, "Navigate Gizmo", ""); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_manipulator_context", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mpr_flag", V3D_MANIPULATOR_HIDE_CONTEXT); - RNA_def_property_ui_text(prop, "Context Manipulator", "Context sensitive manipulators for the active item"); + RNA_def_property_ui_text(prop, "Context Gizmo", "Context sensitive manipulators for the active item"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_manipulator_tool", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mpr_flag", V3D_MANIPULATOR_HIDE_TOOL); - RNA_def_property_ui_text(prop, "Tool Manipulator", "Active tool manipulator"); + RNA_def_property_ui_text(prop, "Tool Gizmo", "Active tool manipulator"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "lock_camera_and_layers", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 3d116482656..d8941e303d9 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1205,31 +1205,31 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna) prop = RNA_def_property(srna, "manipulator_hi", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "manipulator_hi"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Manipulator Highlight", ""); + RNA_def_property_ui_text(prop, "Gizmo Highlight", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "manipulator_primary", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "manipulator_primary"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Manipulator Primary", ""); + RNA_def_property_ui_text(prop, "Gizmo Primary", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "manipulator_secondary", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "manipulator_secondary"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Manipulator Secondary", ""); + RNA_def_property_ui_text(prop, "Gizmo Secondary", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "manipulator_a", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "manipulator_a"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Manipulator A", ""); + RNA_def_property_ui_text(prop, "Gizmo A", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "manipulator_b", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "manipulator_b"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Manipulator B", ""); + RNA_def_property_ui_text(prop, "Gizmo B", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); } diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c index f9b55865bf0..8bda9e91db7 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c @@ -303,7 +303,7 @@ static int manipulator_select_invoke(bContext *C, wmOperator *op, const wmEvent void MANIPULATORGROUP_OT_manipulator_select(wmOperatorType *ot) { /* identifiers */ - ot->name = "Manipulator Select"; + ot->name = "Gizmo Select"; ot->description = "Select the currently highlighted manipulator"; ot->idname = "MANIPULATORGROUP_OT_manipulator_select"; @@ -585,8 +585,8 @@ static int manipulator_tweak_invoke(bContext *C, wmOperator *op, const wmEvent * void MANIPULATORGROUP_OT_manipulator_tweak(wmOperatorType *ot) { /* identifiers */ - ot->name = "Manipulator Tweak"; - ot->description = "Tweak the active manipulator"; + ot->name = "Gizmo Tweak"; + ot->description = "Tweak the active gizmo"; ot->idname = "MANIPULATORGROUP_OT_manipulator_tweak"; /* api callbacks */ @@ -600,7 +600,7 @@ void MANIPULATORGROUP_OT_manipulator_tweak(wmOperatorType *ot) #endif } -/** \} */ // Manipulator operators +/** \} */ static wmKeyMap *manipulatorgroup_tweak_modal_keymap(wmKeyConfig *keyconf, const char *mgroupname) |