From e0a4dc6a794670429dc12cd78ae9d19e50ac2a8e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 3 Sep 2018 18:58:41 +0200 Subject: UI / Python: rename X-Ray to In Front, Draw to Display. See T56648. --- .../startup/bl_ui/properties_data_armature.py | 4 ++-- .../scripts/startup/bl_ui/properties_data_camera.py | 4 ++-- .../scripts/startup/bl_ui/properties_data_empty.py | 6 +++--- .../scripts/startup/bl_ui/properties_data_gpencil.py | 2 +- .../startup/bl_ui/properties_data_lightprobe.py | 2 +- .../scripts/startup/bl_ui/properties_mask_common.py | 2 +- release/scripts/startup/bl_ui/properties_object.py | 12 ++++++------ release/scripts/startup/bl_ui/properties_particle.py | 20 ++++++++++---------- .../startup/bl_ui/properties_physics_smoke.py | 6 +++--- release/scripts/startup/bl_ui/properties_render.py | 4 ++-- release/scripts/startup/bl_ui/space_image.py | 6 +++--- release/scripts/startup/bl_ui/space_sequencer.py | 6 +++--- release/scripts/startup/bl_ui/space_view3d.py | 10 +++++----- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 4 ++-- 14 files changed, 44 insertions(+), 44 deletions(-) (limited to 'release/scripts/startup/bl_ui') diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index d29b2d88d98..4f0f18889fc 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -75,7 +75,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel): ob = context.object arm = context.armature - layout.row().prop(arm, "draw_type", expand=True) + layout.row().prop(arm, "display_type", expand=True) layout.use_property_split = True @@ -85,7 +85,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel): col.prop(arm, "show_bone_custom_shapes", text="Shapes") col.prop(arm, "show_group_colors", text="Group Colors") if ob: - col.prop(ob, "show_x_ray", text="In Front") + col.prop(ob, "show_in_front", text="In Front") col.prop(arm, "use_deform_delay", text="Delay Refresh") diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 0ecce3b2f78..e097cd269f3 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -345,7 +345,7 @@ class DATA_PT_camera_background_image(CameraButtonsPanel, Panel): if has_bg: col = box.column() col.prop(bg, "alpha", slider=True) - col.row().prop(bg, "draw_depth", expand=True) + col.row().prop(bg, "display_depth", expand=True) col.row().prop(bg, "frame_method", expand=True) @@ -380,7 +380,7 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel): col = layout.column(align=True) col.separator() - col.prop(cam, "draw_size", text="Size") + col.prop(cam, "display_size", text="Size") col.separator() col.prop(cam, "show_passepartout", text="Passepartout") sub = col.column() diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index ab12d0f5c5f..013921584f1 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -40,9 +40,9 @@ class DATA_PT_empty(DataButtonsPanel, Panel): ob = context.object - layout.prop(ob, "empty_draw_type", text="Display As") + layout.prop(ob, "empty_display_type", text="Display As") - if ob.empty_draw_type == 'IMAGE': + if ob.empty_display_type == 'IMAGE': layout.template_ID(ob, "data", open="image.open", unlink="object.unlink_data") layout.template_image(ob, "data", ob.image_user, compact=True) @@ -56,7 +56,7 @@ class DATA_PT_empty(DataButtonsPanel, Panel): layout.separator() - layout.prop(ob, "empty_draw_size", text="Size") + layout.prop(ob, "empty_display_size", text="Size") classes = ( diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index 3eec80ad802..81c9d93fce3 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -366,7 +366,7 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel): gpl = context.active_gpencil_layer layout.prop(gpd, "xray_mode", text="Depth Ordering") - layout.prop(ob, "empty_draw_size", text="Marker Size") + layout.prop(ob, "empty_display_size", text="Marker Size") col = layout.column(align=True) col.prop(gpd, "show_constant_thickness") diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py index 2de9a85e507..b1e91d298c8 100644 --- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py +++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py @@ -155,7 +155,7 @@ class DATA_PT_lightprobe_display(DataButtonsPanel, Panel): col = layout.column() if probe.type == 'PLANAR': - col.prop(ob, "empty_draw_size", text="Arrow Size") + col.prop(ob, "empty_display_size", text="Arrow Size") col.prop(probe, "show_data") if probe.type in {'GRID', 'CUBEMAP'}: diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index bf32ebfc55a..8f19d36f6b2 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -219,7 +219,7 @@ class MASK_PT_display: space_data = context.space_data row = layout.row(align=True) row.prop(space_data, "show_mask_smooth", text="Smooth") - row.prop(space_data, "mask_draw_type", text="") + row.prop(space_data, "mask_display_type", text="") row = layout.row(align=True) row.prop(space_data, "show_mask_overlay", text="Overlay") sub = row.row() diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 8d4112ad456..4f95f1fbf05 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -229,7 +229,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): obj_type = obj.type is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}) is_wire = (obj_type in {'CAMERA', 'EMPTY'}) - is_empty_image = (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE') + is_empty_image = (obj_type == 'EMPTY' and obj.empty_display_type == 'IMAGE') is_dupli = (obj.dupli_type != 'NONE') col = flow.column() @@ -254,7 +254,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col.prop(obj.display, "show_shadows", text="Shadow") col = flow.column() - col.prop(obj, "show_x_ray", text="In Front") + col.prop(obj, "show_in_front", text="In Front") # if obj_type == 'MESH' or is_empty_image: # col.prop(obj, "show_transparent", text="Transparency") @@ -262,15 +262,15 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col = flow.column() if is_wire: - # wire objects only use the max. draw type for duplis + # wire objects only use the max. display type for duplis col.active = is_dupli - col.prop(obj, "draw_type", text="Display As") + col.prop(obj, "display_type", text="Display As") split = flow.split(factor=0.6) split.prop(obj, "show_bounds", text="Bounds") row = split.row() - row.active = obj.show_bounds or (obj.draw_type == 'BOUNDS') - row.prop(obj, "draw_bounds_type", text="") + row.active = obj.show_bounds or (obj.display_type == 'BOUNDS') + row.prop(obj, "display_bounds_type", text="") if is_geometry or is_empty_image: # Only useful with object having faces/materials... diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index ff8aeb3106b..da8034761f6 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1614,29 +1614,29 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, Panel): psys = context.particle_system part = particle_get_settings(context) - layout.prop(part, "draw_method", text="Display As") + layout.prop(part, "display_method", text="Display As") - if part.draw_method == 'NONE' or (part.render_type == 'NONE' and part.draw_method == 'RENDER'): + if part.display_method == 'NONE' or (part.render_type == 'NONE' and part.display_method == 'RENDER'): return - path = (part.render_type == 'PATH' and part.draw_method == 'RENDER') or part.draw_method == 'PATH' + path = (part.render_type == 'PATH' and part.display_method == 'RENDER') or part.display_method == 'PATH' layout.separator() col = layout.column() - col.prop(part, "draw_color", text="Color") - if part.draw_color in {'VELOCITY', 'ACCELERATION'}: + col.prop(part, "display_color", text="Color") + if part.display_color in {'VELOCITY', 'ACCELERATION'}: col.prop(part, "color_maximum", text="Fade Distance") col = layout.column() if path: - col.prop(part, "draw_step", text="Strand Steps") - col.prop(part, "draw_percentage", slider=True, text="Amount") - if part.draw_method != 'RENDER' or part.render_type == 'HALO': - col.prop(part, "draw_size", text="Size") + col.prop(part, "display_step", text="Strand Steps") + col.prop(part, "display_percentage", slider=True, text="Amount") + if part.display_method != 'RENDER' or part.render_type == 'HALO': + col.prop(part, "display_size", text="Size") - if part.draw_percentage != 100 and psys is not None: + if part.display_percentage != 100 and psys is not None: if part.type == 'HAIR': if psys.use_hair_dynamics and psys.point_cache.is_baked is False: layout.row().label(text="Display percentage makes dynamics inaccurate without baking") diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 7c9e843fcad..9896d3afc52 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -643,7 +643,7 @@ class PHYSICS_PT_smoke_viewport_display_debug(PhysicButtonsPanel, Panel): def draw_header(self, context): md = context.smoke.domain_settings - self.layout.prop(md, "draw_velocity", text="") + self.layout.prop(md, "display_velocity", text="") def draw(self, context): layout = self.layout @@ -653,8 +653,8 @@ class PHYSICS_PT_smoke_viewport_display_debug(PhysicButtonsPanel, Panel): domain = context.smoke.domain_settings col = flow.column() - col.enabled = domain.draw_velocity - col.prop(domain, "vector_draw_type", text="Display As") + col.enabled = domain.display_velocity + col.prop(domain, "vector_display_type", text="Display As") col.prop(domain, "vector_scale") diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 38b73b0397a..b1ca853a1e8 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -814,7 +814,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): row.label(text="Cubemap Display") sub = row.row(align=True) - sub.prop(props, "gi_cubemap_draw_size", text="Size") + sub.prop(props, "gi_cubemap_display_size", text="Size") if props.gi_show_cubemaps: sub.prop(props, "gi_show_cubemaps", text="", toggle=True, icon='HIDE_OFF') else: @@ -825,7 +825,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): row.label(text="Irradiance Display") sub = row.row(align=True) - sub.prop(props, "gi_irradiance_draw_size", text="Size") + sub.prop(props, "gi_irradiance_display_size", text="Size") if props.gi_show_irradiance: sub.prop(props, "gi_show_irradiance", text="", toggle=True, icon='HIDE_OFF') else: diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 95c7072f14a..6c295db8bfa 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -578,7 +578,7 @@ class IMAGE_HT_header(Header): # draw options. row = layout.row() - row.prop(sima, "draw_channels", icon_only=True) + row.prop(sima, "display_channels", icon_only=True) row = layout.row(align=True) if ima.type == 'COMPOSITE': @@ -755,7 +755,7 @@ class IMAGE_PT_view_display_uv_edit_overlays(Panel): col = layout.column() - col.prop(uvedit, "edge_draw_type", text="Edges") + col.prop(uvedit, "edge_display_type", text="Edges") col.prop(uvedit, "show_faces", text="Faces") col = layout.column() @@ -796,7 +796,7 @@ class IMAGE_PT_view_display_uv_edit_overlays_advanced(Panel): sub = col.column() sub.active = uvedit.show_stretch - sub.prop(uvedit, "draw_stretch_type", text="Type") + sub.prop(uvedit, "display_stretch_type", text="Type") class IMAGE_UL_render_slots(UIList): diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index f5f0edc7311..a5227a28889 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -224,7 +224,7 @@ class SEQUENCER_MT_view(Menu): layout.prop(st, "show_frame_indicator") layout.prop(st, "show_strip_offset") - layout.prop_menu_enum(st, "waveform_draw_type") + layout.prop_menu_enum(st, "waveform_display_type") if is_preview: if st.display_mode == 'IMAGE': @@ -912,7 +912,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel): layout.prop(sound, "use_mono") - if st.waveform_draw_type == 'DEFAULT_WAVEFORMS': + if st.waveform_display_type == 'DEFAULT_WAVEFORMS': layout.prop(strip, "show_waveform") col = layout.column(align=True) @@ -1160,7 +1160,7 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel): col = layout.column() if st.display_mode == 'IMAGE': - col.prop(st, "draw_overexposed") + col.prop(st, "show_overexposed") col.separator() elif st.display_mode == 'WAVEFORM': diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 246d2c68aab..8a253d028d9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -423,11 +423,11 @@ class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base): # armature specific extensions follow... obj = context.object if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}: - if obj.data.draw_type == 'BBONE': + if obj.data.display_type == 'BBONE': layout.separator() layout.operator("transform.transform", text="Scale BBone").mode = 'BONE_SIZE' - elif obj.data.draw_type == 'ENVELOPE': + elif obj.data.display_type == 'ENVELOPE': layout.separator() layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONE_SIZE' @@ -1761,7 +1761,7 @@ class VIEW3D_MT_object_specials(Menu): props = layout.operator("wm.context_modal_mouse", text="Empty Draw Size") props.data_path_iter = "selected_editable_objects" - props.data_path_item = "empty_draw_size" + props.data_path_item = "empty_display_size" props.input_scale = 0.01 props.header_text = "Empty Draw Size: %.3f" @@ -4330,8 +4330,8 @@ class VIEW3D_PT_overlay_motion_tracking(Panel): col = layout.column() col.label(text="Tracks:") row = col.row(align=True) - row.prop(view, "tracks_draw_type", text="") - row.prop(view, "tracks_draw_size", text="Size") + row.prop(view, "tracks_display_type", text="") + row.prop(view, "tracks_display_size", text="Size") class VIEW3D_PT_overlay_edit_mesh(Panel): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 513c3293ed1..4fe4ce4375d 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1345,8 +1345,8 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel): col = layout.column(align=True) col.active = pe.is_editable - col.label(text="Draw:") - col.prop(pe, "draw_step", text="Path Steps") + col.label(text="Display:") + col.prop(pe, "display_step", text="Path Steps") if pe.is_hair: col.prop(pe, "show_particles", text="Children") else: -- cgit v1.2.3