diff options
39 files changed, 187 insertions, 187 deletions
diff --git a/doc/python_api/examples/bpy.types.Panel.1.py b/doc/python_api/examples/bpy.types.Panel.1.py index 13a9f53fa7b..b409f8dadea 100644 --- a/doc/python_api/examples/bpy.types.Panel.1.py +++ b/doc/python_api/examples/bpy.types.Panel.1.py @@ -34,7 +34,7 @@ class ObjectSelectPanel(bpy.types.Panel): row.prop(obj, "hide_render") box = layout.box() - box.label("Selection Tools") + box.label(text="Selection Tools") box.operator("object.select_all").action = 'TOGGLE' row = box.row() row.operator("object.select_all").action = 'INVERT' diff --git a/doc/python_api/examples/bpy.types.Panel.2.py b/doc/python_api/examples/bpy.types.Panel.2.py index 261430f1396..2c860e3e1a7 100644 --- a/doc/python_api/examples/bpy.types.Panel.2.py +++ b/doc/python_api/examples/bpy.types.Panel.2.py @@ -21,7 +21,7 @@ class PanelOne(View3DPanel, bpy.types.Panel): bl_label = "Panel One" def draw(self, context): - self.layout.label("Small Class") + self.layout.label(text="Small Class") class PanelTwo(View3DPanel, bpy.types.Panel): @@ -29,7 +29,7 @@ class PanelTwo(View3DPanel, bpy.types.Panel): bl_label = "Panel Two" def draw(self, context): - self.layout.label("Also Small Class") + self.layout.label(text="Also Small Class") bpy.utils.register_class(PanelOne) diff --git a/doc/python_api/examples/bpy.types.UIList.2.py b/doc/python_api/examples/bpy.types.UIList.2.py index a02a0530a66..81bbec11d9a 100644 --- a/doc/python_api/examples/bpy.types.UIList.2.py +++ b/doc/python_api/examples/bpy.types.UIList.2.py @@ -76,7 +76,7 @@ class MESH_UL_vgroups_slow(bpy.types.UIList): subrow.prop(self, "use_filter_empty_reverse", text="", icon=icon) row = layout.row(align=True) - row.label("Order by:") + row.label(text="Order by:") row.prop(self, "use_order_name", toggle=True) row.prop(self, "use_order_importance", toggle=True) icon = 'TRIA_UP' if self.use_filter_orderby_invert else 'TRIA_DOWN' diff --git a/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py b/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py index e6329f677f7..670444b8283 100644 --- a/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py +++ b/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py @@ -8,7 +8,7 @@ import bpy def draw(self, context): - self.layout.label("Hello World") + self.layout.label(text="Hello World") bpy.context.window_manager.popup_menu(draw, title="Greeting", icon='INFO') diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 0ad3a8ba5ac..d4753455e84 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -129,15 +129,15 @@ def draw_samples_info(layout, context): if use_branched_path(context) or (cscene.use_square_samples and integrator == 'PATH'): col = layout.column(align=True) col.scale_y = 0.6 - col.label("Total Samples:") + col.label(text="Total Samples:") col.separator() if integrator == 'PATH': - col.label("%s AA" % aa) + col.label(text="%s AA" % aa) else: - col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" % + col.label(text="%s AA, %s Diffuse, %s Glossy, %s Transmission" % (aa, d * aa, g * aa, t * aa)) col.separator() - col.label("%s AO, %s Mesh Light, %s Subsurface, %s Volume" % + col.label(text="%s AO, %s Mesh Light, %s Subsurface, %s Volume" % (ao * aa, ml * aa, sss * aa, vol * aa)) @@ -1671,7 +1671,7 @@ class CYCLES_RENDER_PT_debug(CyclesButtonsPanel, Panel): col = layout.column() - col.label('CPU Flags:') + col.label(text="CPU Flags:") row = col.row(align=True) row.prop(cscene, "debug_use_cpu_sse2", toggle=True) row.prop(cscene, "debug_use_cpu_sse3", toggle=True) @@ -1684,14 +1684,14 @@ class CYCLES_RENDER_PT_debug(CyclesButtonsPanel, Panel): col.separator() col = layout.column() - col.label('CUDA Flags:') + col.label(text="CUDA Flags:") col.prop(cscene, "debug_use_cuda_adaptive_compile") col.prop(cscene, "debug_use_cuda_split_kernel") col.separator() col = layout.column() - col.label('OpenCL Flags:') + col.label(text="OpenCL Flags:") col.prop(cscene, "debug_opencl_kernel_type", text="Kernel") col.prop(cscene, "debug_opencl_device_type", text="Device") col.prop(cscene, "debug_opencl_kernel_single_program", text="Single Program") diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 96193b047c6..453c0d0cbe5 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -848,7 +848,7 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta): layout = self.layout if not searchpaths: - layout.label("* Missing Paths *") + layout.label(text="* Missing Paths *") # collect paths files = [] diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index 0d17c11456e..a0c73a23454 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -214,7 +214,7 @@ class PropertyPanel: rna_item, context_member = rna_idprop_context_value(context, self._context_path, self._property_type) tot = len(rna_item.keys()) if tot: - self.layout().label("%d:" % tot) + self.layout().label(text="%d:" % tot) """ def draw(self, context): diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index 352b96c6431..bf61a651bd0 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -898,7 +898,7 @@ class ConstraintButtonsPanel: box.prop_search(con, "object_path", cache_file, "object_paths") def SCRIPT(self, context, layout, con): - layout.label("Blender 2.6 doesn't support python constraints yet") + layout.label(text="Blender 2.6 doesn't support python constraints yet") class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index f7517f34d61..130264bb91d 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -251,7 +251,7 @@ class DATA_PT_camera_dof_aperture(CameraButtonsPanel, Panel): col.prop(dof_options, "ratio") else: col = flow.column() - col.label("Viewport") + col.label(text="Viewport") col.prop(dof_options, "fstop") col.prop(dof_options, "blades") diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index 601c014bb48..8230047657b 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -271,7 +271,7 @@ class DATA_PT_gpencil_onionpanel(Panel): layout.enabled = gpd.use_onion_skinning and gpd.users <= 1 if gpd.use_onion_skinning and gpd.users > 1: - layout.label("Multiuser datablock not supported", icon='ERROR') + layout.label(text="Multiuser datablock not supported", icon='ERROR') GreasePencilOnionPanel.draw_settings(layout, gpd) diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py index 5924a796b65..8720b549450 100644 --- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py +++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py @@ -100,7 +100,7 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel): if probe.type == 'GRID': col.separator() - col.label("Visibility") + col.label(text="Visibility") col.prop(probe, "visibility_buffer_bias", "Bias") col.prop(probe, "visibility_bleed_bias", "Bleed Bias") col.prop(probe, "visibility_blur", "Blur") diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 32744cb4262..2dd0f658b47 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -228,7 +228,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.label(text="Axis Mapping:") split = layout.split(percentage=0.5, align=True) split.alert = (md.forward_axis[-1] == md.up_axis[-1]) - split.label("Forward/Up Axis:") + split.label(text="Forward/Up Axis:") split.prop(md, "forward_axis", text="") split.prop(md, "up_axis", text="") split = layout.split(percentage=0.5) @@ -335,7 +335,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): else: # decimate_type == 'DISSOLVE': layout.prop(md, "angle_limit") layout.prop(md, "use_dissolve_boundaries") - layout.label("Delimit:") + layout.label(text="Delimit:") row = layout.row() row.prop(md, "delimit") layout_info = layout @@ -641,7 +641,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def OCEAN(self, layout, ob, md): if not bpy.app.build_options.mod_oceansim: - layout.label("Built without OceanSim modifier") + layout.label(text="Built without OceanSim modifier") return layout.prop(md, "geometry_mode") @@ -665,7 +665,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "size") col.prop(md, "spatial_size") - layout.label("Waves:") + layout.label(text="Waves:") split = layout.split() @@ -696,7 +696,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.active = md.use_foam - col.label("Foam Data Layer Name:") + col.label(text="Foam Data Layer Name:") col.prop(md, "foam_layer_name", text="") layout.separator() @@ -1004,12 +1004,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = layout.column(align=True) col.scale_y = 0.6 col.separator() - col.label("Final Dicing Rate:") + col.label(text="Final Dicing Rate:") col.separator() render = max(scene.cycles.dicing_rate * ob.cycles.dicing_rate, 0.1) preview = max(scene.cycles.preview_dicing_rate * ob.cycles.dicing_rate, 0.1) - col.label(f"Render {render:10.2f} px, Preview {preview:10.2f} px") + col.label(text=f"Render {render:10.2f} px, Preview {preview:10.2f} px") def SURFACE(self, layout, ob, md): layout.label(text="Settings are inside the Physics tab") @@ -1154,7 +1154,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def REMESH(self, layout, ob, md): if not bpy.app.build_options.mod_remesh: - layout.label("Built without Remesh modifier") + layout.label(text="Built without Remesh modifier") return layout.prop(md, "mode") @@ -1432,7 +1432,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): row.label(icon='RIGHTARROW') row.prop(md, "layers_vgroup_select_dst", text="") row = sub.row(align=True) - row.label("", icon='NONE') + row.label(text="", icon='NONE') layout.separator() @@ -1463,7 +1463,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): sub.prop(md, "data_types_loops") sub = split.column(align=True) row = sub.row(align=True) - row.label("", icon='NONE') + row.label(text="", icon='NONE') row = sub.row(align=True) row.prop(md, "layers_vcol_select_src", text="") row.label(icon='RIGHTARROW') @@ -1542,7 +1542,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "use_direction_parallel") subcol = col.column(align=True) - subcol.label("Mix Mode:") + subcol.label(text="Mix Mode:") subcol.prop(md, "mix_mode", text="") subcol.prop(md, "mix_factor") row = subcol.row(align=True) @@ -1580,7 +1580,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.operator("object.correctivesmooth_bind", text="Unbind" if is_bind else "Bind") def WEIGHTED_NORMAL(self, layout, ob, md): - layout.label("Weighting Mode:") + layout.label(text="Weighting Mode:") split = layout.split(align=True) col = split.column(align=True) col.prop(md, "mode", text="") @@ -1636,12 +1636,12 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "move_extreme") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") @@ -1651,7 +1651,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") row = layout.row(align=True) - row.label("Affect:") + row.label(text="Affect:") row = layout.row(align=True) row.prop(md, "affect_position", text="Position", icon='MESH_DATA', toggle=True) row.prop(md, "affect_strength", text="Strength", icon='COLOR', toggle=True) @@ -1666,13 +1666,13 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") col = split.column() - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") @@ -1682,7 +1682,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") row = layout.row(align=True) - row.label("Affect:") + row.label(text="Affect:") row = layout.row(align=True) row.prop(md, "affect_position", text="Position", icon='MESH_DATA', toggle=True) row.prop(md, "affect_strength", text="Strength", icon='COLOR', toggle=True) @@ -1702,7 +1702,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") @@ -1716,7 +1716,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Settings:") + col.label(text="Settings:") row = col.row(align=True) row.enabled = md.mode == 'FIXED' row.prop(md, "step") @@ -1726,7 +1726,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "factor") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1748,12 +1748,12 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "normalize_thickness") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") @@ -1775,7 +1775,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "factor") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") @@ -1793,13 +1793,13 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Color:") + col.label(text="Color:") col.prop(md, "hue", text="H") col.prop(md, "saturation", text="S") col.prop(md, "value", text="V") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") @@ -1816,16 +1816,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Opacity:") + col.label(text="Opacity:") col.prop(md, "factor") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") @@ -1846,18 +1846,18 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Offset:") + col.label(text="Offset:") col.prop(md, "offset", text="") col = split.column() - col.label("Shift:") + col.label(text="Shift:") col.prop(md, "shift", text="") row = col.row(align=True) row.prop(md, "lock_axis", expand=True) split = layout.split() col = split.column() - col.label("Rotation:") + col.label(text="Rotation:") col.prop(md, "rotation", text="") col.separator() row = col.row(align=True) @@ -1865,7 +1865,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "rot_factor", text="") col = split.column() - col.label("Scale:") + col.label(text="Scale:") col.prop(md, "scale", text="") col.separator() row = col.row(align=True) @@ -1874,7 +1874,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") @@ -1909,7 +1909,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): sub.prop(md, "frame_end", text="End") col.separator() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") @@ -1923,12 +1923,12 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "object", text="") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") @@ -1952,7 +1952,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): # layout.separator() # layout.prop(md, "clip") - layout.label("Layer:") + layout.label(text="Layer:") row = layout.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") @@ -1976,12 +1976,12 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop_search(md, "subtarget", md.object.data, "bones", text="") col = split.column() - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") @@ -2022,12 +2022,12 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.prop(md, "rotation") - col.label("Layer:") + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') row.prop(md, "invert_layers", text="", icon="ARROW_LEFTRIGHT") - col.label("Vertex Group:") + col.label(text="Vertex Group:") row = col.row(align=True) row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon="ARROW_LEFTRIGHT") diff --git a/release/scripts/startup/bl_ui/properties_data_workspace.py b/release/scripts/startup/bl_ui/properties_data_workspace.py index 3cda3dd0abd..0b2f556b8e5 100644 --- a/release/scripts/startup/bl_ui/properties_data_workspace.py +++ b/release/scripts/startup/bl_ui/properties_data_workspace.py @@ -66,7 +66,7 @@ class WORKSPACE_PT_owner_ids(WorkSpaceButtonsPanel, Panel): text="", emboss=False, ).owner_id = module_name - row.label("%s: %s" % (info["category"], info["name"])) + row.label(text="%s: %s" % (info["category"], info["name"])) if is_enabled: owner_ids.remove(module_name) @@ -82,7 +82,7 @@ class WORKSPACE_PT_owner_ids(WorkSpaceButtonsPanel, Panel): text="", emboss=False, ).owner_id = module_name - row.label(module_name) + row.label(text=module_name) class WORKSPACE_PT_custom_props(WorkSpaceButtonsPanel, PropertyPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 12ecbeb3e6b..17839258062 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -97,7 +97,7 @@ class VIEWLAYER_UL_linesets(UIList): layout.prop(lineset, "show_render", text="", index=index) elif self.layout_type == 'GRID': layout.alignment = 'CENTER' - layout.label("", icon_value=icon) + layout.label(text="", icon_value=icon) class RENDER_MT_lineset_specials(Menu): @@ -151,7 +151,7 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): if freestyle.mode == 'SCRIPT': row = layout.row() - row.label("Style modules:") + row.label(text="Style modules:") row.operator("scene.freestyle_module_add", text="Add") for i, module in enumerate(freestyle.modules): box = layout.box() diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 8aa57476ddc..5d2cab0ff8e 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -47,11 +47,11 @@ def gpencil_stroke_placement_settings(context, layout): def gpencil_active_brush_settings_simple(context, layout): brush = context.active_gpencil_brush if brush is None: - layout.label("No Active Brush") + layout.label(text="No Active Brush") return col = layout.column() - col.label("Active Brush: ") + col.label(text="Active Brush: ") row = col.row(align=True) row.operator_context = 'EXEC_REGION_WIN' @@ -121,7 +121,7 @@ class AnnotationDrawingToolsPanel: if context.space_data.type in {'CLIP_EDITOR'}: col.separator() - col.label("Data Source:") + col.label(text="Data Source:") row = col.row(align=True) if is_3d_view: row.prop(context.tool_settings, "grease_pencil_source", expand=True) @@ -360,7 +360,7 @@ class GPENCIL_MT_pie_tool_palette(Menu): row.operator("transform.rotate", icon='MAN_ROT') row.operator("transform.resize", text="Scale", icon='MAN_SCALE') row = col.row(align=True) - row.label("Proportional Edit:") + row.label(text="Proportional Edit:") row.prop(context.tool_settings, "proportional_edit", text="", icon_only=True) row.prop(context.tool_settings, "proportional_edit_falloff", text="", icon_only=True) @@ -430,7 +430,7 @@ class GPENCIL_MT_pie_settings_palette(Menu): # N - Active Layer col = pie.column() - col.label("Active Layer: ") + col.label(text="Active Layer: ") row = col.row() row.operator_context = 'EXEC_REGION_WIN' @@ -448,13 +448,13 @@ class GPENCIL_MT_pie_settings_palette(Menu): if is_editmode: # NW - Move stroke Down col = pie.column(align=True) - col.label("Arrange Strokes") + col.label(text="Arrange Strokes") col.operator("gpencil.stroke_arrange", text="Send to Back").direction = 'BOTTOM' col.operator("gpencil.stroke_arrange", text="Send Backward").direction = 'DOWN' # NE - Move stroke Up col = pie.column(align=True) - col.label("Arrange Strokes") + col.label(text="Arrange Strokes") col.operator("gpencil.stroke_arrange", text="Bring to Front").direction = 'TOP' col.operator("gpencil.stroke_arrange", text="Bring Forward").direction = 'UP' @@ -464,7 +464,7 @@ class GPENCIL_MT_pie_settings_palette(Menu): # SE - Join strokes col = pie.column(align=True) - col.label("Join Strokes") + col.label(text="Join Strokes") row = col.row() row.operator("gpencil.stroke_join", text="Join").type = 'JOIN' row.operator("gpencil.stroke_join", text="Join & Copy").type = 'JOINCOPY' @@ -524,7 +524,7 @@ class GPENCIL_MT_pie_sculpt(Menu): # W - Launch Sculpt Mode col = pie.column() - # col.label("Tool:") + # col.label(text="Tool:") col.prop(settings, "tool", text="") col.operator("gpencil.brush_paint", text="Sculpt", icon='SCULPTMODE_HLT') @@ -793,7 +793,7 @@ class GreasePencilToolsPanel: layout.separator() - layout.label("Proportional Edit:") + layout.label(text="Proportional Edit:") row = layout.row() row.prop(context.tool_settings, "proportional_edit", text="") row.prop(context.tool_settings, "proportional_edit_falloff", text="") diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index c766c8dedbc..bf32ebfc55a 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -177,7 +177,7 @@ class MASK_PT_point: # so do not over-complicate things for now by using single template_ID #col.template_any_ID(parent, "id", "id_type", text="") - col.label("Parent:") + col.label(text="Parent:") col.prop(parent, "id", text="") if parent.id_type == 'MOVIECLIP' and parent.id: diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index cabd6e5677a..34cd38f42f4 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -282,7 +282,7 @@ class MATERIAL_PT_gpencil_preview(GPMaterialButtonsPanel, Panel): def draw(self, context): ma = context.object.active_material - self.layout.label(ma.name) + self.layout.label(text=ma.name) self.layout.template_preview(ma) diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index f1e5102f061..7649925b52b 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -116,11 +116,11 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal col.template_palette(settings, "palette", color=True) if brush.use_gradient: - col.label("Gradient Colors") + col.label(text="Gradient Colors") col.template_color_ramp(brush, "gradient", expand=True) if brush.image_tool == 'DRAW': - col.label("Background Color") + col.label(text="Background Color") row = col.row(align=True) panel.prop_unified_color(row, context, brush, "secondary_color", text="") col.prop(brush, "gradient_stroke_mode", text="Mode") @@ -167,14 +167,14 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal if settings.mode == 'MATERIAL': if len(ob.material_slots) > 1: - col.label("Materials") + col.label(text="Materials") col.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=2) mat = ob.active_material if mat: - col.label("Source Clone Slot") + col.label(text="Source Clone Slot") col.template_list("TEXTURE_UL_texpaintslots", "", mat, "texture_paint_images", mat, "paint_clone_slot", rows=2) @@ -183,9 +183,9 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal mesh = ob.data clone_text = mesh.uv_texture_clone.name if mesh.uv_texture_clone else "" - col.label("Source Clone Image") + col.label(text="Source Clone Image") col.template_ID(settings, "clone_image") - col.label("Source Clone UV Map") + col.label(text="Source Clone UV Map") col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text, translate=False) else: col.prop(brush, "clone_image", text="Image") diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 393c9784be8..f4a25ccb38d 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -396,10 +396,10 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): else: label = "ERROR" icon = 'ERROR' - box.label(label, icon=icon) - box.label("Iterations: %d .. %d (avg. %d)" % + box.label(text=label, icon=icon) + box.label(text="Iterations: %d .. %d (avg. %d)" % (result.min_iterations, result.max_iterations, result.avg_iterations)) - box.label("Error: %.5f .. %.5f (avg. %.5f)" % (result.min_error, result.max_error, result.avg_error)) + box.label(text="Error: %.5f .. %.5f (avg. %.5f)" % (result.min_error, result.max_error, result.avg_error)) class PARTICLE_PT_hair_dynamics_structure(ParticleButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index 9653d98d428..06df096cfea 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -67,7 +67,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel): row = layout.row(align=True) row.alignment = 'RIGHT' - row.label("Enable physics for:") + row.label(text="Enable physics for:") flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=True) @@ -184,7 +184,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype): if not is_saved: col = layout.column(align=True) col.alignment = 'RIGHT' - col.label("Options are disabled until the file is saved") + col.label(text="Options are disabled until the file is saved") flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=True) flow.enabled = enabled and is_saved diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index 424ad6ce5e1..ff2ced7704f 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -466,7 +466,7 @@ class PHYSICS_PT_dp_canvas_output_bake(PhysicButtonsPanel, Panel): row = layout.row(align=True) row.alignment = 'RIGHT' - row.label("Cache Path") + row.label(text="Cache Path") layout.prop(surface, "image_output_path", text="") layout.operator("dpaint.bake", text="Bake Image Sequence", icon='MOD_DYNAMICPAINT') diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py index aaa2892c5c4..ad840bbc89f 100644 --- a/release/scripts/startup/bl_ui/properties_physics_field.py +++ b/release/scripts/startup/bl_ui/properties_physics_field.py @@ -297,7 +297,7 @@ class PHYSICS_PT_field_falloff_radial(PhysicButtonsPanel, Panel): def collision_warning(layout): row = layout.row(align=True) row.alignment = 'RIGHT' - row.label("No collision settings available") + row.label(text="No collision settings available") class PHYSICS_PT_collision(PhysicButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 23fc39f0f54..b3ec45c2571 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -76,7 +76,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): if not bpy.app.build_options.mod_fluid: col = layout.column() col.alignment = 'RIGHT' - col.label("Built without fluids") + col.label(text="Built without fluids") return md = context.fluid @@ -290,7 +290,7 @@ class PHYSICS_PT_domain_bake(PhysicButtonsPanel, Panel): row = layout.row(align=True) row.alignment = 'RIGHT' - row.label("Cache Path") + row.label(text="Cache Path") layout.prop(fluid, "filepath", text="") diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py index e6e30d28c5c..aed9b27968a 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -27,7 +27,7 @@ from bpy.types import ( def rigid_body_warning(layout): row = layout.row(align=True) row.alignment = 'RIGHT' - row.label("Object does not have a Rigid Body") + row.label(text="Object does not have a Rigid Body") class PHYSICS_PT_rigidbody_panel: diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 7f21b14e03c..7660eb4a2b9 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -65,7 +65,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel): if not bpy.app.build_options.mod_smoke: col = layout.column(align=True) col.alignment = 'RIGHT' - col.label("Built without Smoke modifier") + col.label(text="Built without Smoke modifier") return md = context.smoke @@ -529,7 +529,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, Panel): if not bpy.app.build_options.openvdb: row = layout.row(align=True) row.alignment = 'RIGHT' - row.label("Built without OpenVDB support") + row.label(text="Built without OpenVDB support") return col = flow.column() diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index af2b3faafa7..76fa99687d1 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -408,7 +408,7 @@ class RENDER_UL_renderviews(UIList): elif self.layout_type == 'GRID': layout.alignment = 'CENTER' - layout.label("", icon_value=icon + (not view.use)) + layout.label(text="", icon_value=icon + (not view.use)) class RENDER_PT_stereoscopy(RenderButtonsPanel, Panel): @@ -751,7 +751,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): layout.use_property_split = False row = layout.split(percentage=0.5) row.alignment = 'RIGHT' - row.label("Cubemap Display") + row.label(text="Cubemap Display") sub = row.row(align=True) sub.prop(props, "gi_cubemap_draw_size", text="Size") @@ -762,7 +762,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): row = layout.split(percentage=0.5) row.alignment = 'RIGHT' - row.label("Irradiance Display") + row.label(text="Irradiance Display") sub = row.row(align=True) sub.prop(props, "gi_irradiance_draw_size", text="Size") diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index ae42e3f1d08..93ba6fce2cd 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -907,7 +907,7 @@ class TEXTURE_PT_colors_ramp(TextureButtonsPanel, TextureColorsPoll, Panel): layout.template_color_ramp(tex, "color_ramp", expand=True) else: layout.alignment = 'RIGHT' - layout.label("Please enable the Color Ramp first") + layout.label(text="Please enable the Color Ramp first") class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index efd5e195fb8..f16a906f4cf 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -87,7 +87,7 @@ class DopesheetFilterPopoverBase: is_nla = context.area.type == 'NLA_EDITOR' col = layout.column(align=True) - col.label("With Name:") + col.label(text="With Name:") if not is_nla: row = col.row(align=True) row.prop(dopesheet, "filter_fcurve_name", text="") @@ -97,7 +97,7 @@ class DopesheetFilterPopoverBase: if (not generic_filters_only) and (bpy.data.collections): col = layout.column(align=True) - col.label("In Collection:") + col.label(text="In Collection:") col.prop(dopesheet, "filter_collection", text="") # Standard = Present in all panels @@ -106,7 +106,7 @@ class DopesheetFilterPopoverBase: dopesheet = context.space_data.dopesheet # Object Data Filters - layout.label("Include Sub-Object Data:") + layout.label(text="Include Sub-Object Data:") split = layout.split() # TODO: Add per-channel/axis convenience toggles? @@ -119,7 +119,7 @@ class DopesheetFilterPopoverBase: layout.separator() # datablock filters - layout.label("Include From Types:") + layout.label(text="Include From Types:") flow = layout.grid_flow(row_major=True, columns=2, even_rows=False, align=False) flow.prop(dopesheet, "show_scenes", text="Scenes") @@ -159,7 +159,7 @@ class DopesheetFilterPopoverBase: # performance-related options (users will mostly have these enabled) col = layout.column(align=True) - col.label("Options:") + col.label(text="Options:") col.prop(dopesheet, "use_datablock_sort", icon='NONE') diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index a85dd591b2f..2f659b8d248 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -68,7 +68,7 @@ class FILEBROWSER_HT_header(Header): if params.filter_glob: # if st.active_operator and hasattr(st.active_operator, "filter_glob"): # row.prop(params, "filter_glob", text="") - row.label(params.filter_glob) + row.label(text=params.filter_glob) else: row.prop(params, "use_filter_blender", text="") row.prop(params, "use_filter_backup", text="") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 24673af319e..e5b13a59583 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -292,7 +292,7 @@ class IMAGE_MT_uvs_proportional(Menu): layout.separator() - layout.label("Falloff:") + layout.label(text="Falloff:") layout.props_enum(context.tool_settings, "proportional_edit_falloff") diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 9ead34406c2..c106c197ecf 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -427,7 +427,7 @@ class NODE_PT_active_node_properties(Panel): value_inputs = [socket for socket in node.inputs if socket.enabled and not socket.is_linked] if value_inputs: layout.separator() - layout.label("Inputs:") + layout.label(text="Inputs:") for socket in value_inputs: row = layout.row() socket.draw(context, row, node, iface_(socket.name, socket.bl_rna.translation_context)) diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 5dfe54d695f..62becbc080e 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -707,7 +707,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if strip_channel > 2: BT_ROW = 4 - col.label("Cut To:") + col.label(text="Cut To:") row = col.row() for i in range(1, strip_channel): @@ -726,7 +726,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if strip.channel > BT_ROW and (strip_channel - 1) % BT_ROW: for i in range(strip.channel, strip_channel + ((BT_ROW + 1 - strip_channel) % BT_ROW)): - row.label("") + row.label(text="") else: col.separator() col.label(text="Two or more channels are needed below this strip", icon='INFO') @@ -746,7 +746,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): col.prop(strip, "align_x") col.prop(strip, "align_y") - col.label("Location") + col.label(text="Location") row = col.row(align=True) row.prop(strip, "location", text="") col.prop(strip, "wrap_width") @@ -971,7 +971,7 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): if scene: # Warning, this is not a good convention to follow. # Expose here because setting the alpha from the 'Render' menu is very inconvenient. - layout.label("Preview") + layout.label(text="Preview") layout.prop(scene.render, "alpha_mode") if scene: @@ -1058,7 +1058,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): col.prop(strip, "use_flip_x", text="X Flip") col.prop(strip, "use_flip_y", text="Y Flip") - layout.label("Color:") + layout.label(text="Color:") col = layout.column(align=True) col.prop(strip, "color_saturation", text="Saturation") col.prop(strip, "color_multiply", text="Multiply") diff --git a/release/scripts/startup/bl_ui/space_statusbar.py b/release/scripts/startup/bl_ui/space_statusbar.py index dbcfbf165ce..2cc5bd94bd7 100644 --- a/release/scripts/startup/bl_ui/space_statusbar.py +++ b/release/scripts/startup/bl_ui/space_statusbar.py @@ -37,7 +37,7 @@ class STATUSBAR_HT_header(Header): row = layout.row(align=True) if bpy.app.autoexec_fail is True and bpy.app.autoexec_fail_quiet is False: - row.label("Auto-run disabled", icon='ERROR') + row.label(text="Auto-run disabled", icon='ERROR') if bpy.data.is_saved: props = row.operator("wm.revert_mainfile", icon='SCREEN_BACK', text="Reload Trusted") props.use_scripts = True @@ -45,7 +45,7 @@ class STATUSBAR_HT_header(Header): row.operator("script.autoexec_warn_clear", text="Ignore") # include last so text doesn't push buttons out of the header - row.label(bpy.app.autoexec_fail_message) + row.label(text=bpy.app.autoexec_fail_message) layout.template_running_jobs() diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 2d9a48a1852..2893e391b01 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -245,7 +245,7 @@ class TIME_PT_playback(TimelinePanelButtons, Panel): layout.separator() col = layout.column() - col.label("Play Animation In:") + col.label(text="Play Animation In:") layout.prop(screen, "use_play_top_left_3d_editor", text="Active Editor Only") layout.prop(screen, "use_play_3d_editors") layout.prop(screen, "use_play_animation_editors") @@ -280,18 +280,18 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel): userprefs = context.user_preferences col = layout.column(align=True) - col.label("Active Keying Set:") + col.label(text="Active Keying Set:") row = col.row(align=True) row.prop_search(scene.keying_sets_all, "active", scene, "keying_sets_all", text="") row.operator("anim.keyframe_insert", text="", icon='KEY_HLT') row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT') col = layout.column(align=True) - col.label("New Keyframe Type:") + col.label(text="New Keyframe Type:") col.prop(toolsettings, "keyframe_type", text="") col = layout.column(align=True) - col.label("Auto Keyframing:") + col.label(text="Auto Keyframing:") row = col.row() row.prop(toolsettings, "auto_keying_mode", text="") row.prop(toolsettings, "use_keyframe_insert_keyingset", text="") diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py index 9432561ede1..0209d15170d 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py @@ -377,7 +377,7 @@ class ToolSelectPanelHelper: while True: if is_sep is True: if column_index != column_last: - row.label("") + row.label(text="") col = layout.column(align=True) row = col.row(align=True) row.scale_x = scale_x @@ -387,7 +387,7 @@ class ToolSelectPanelHelper: is_sep = yield row if is_sep is None: if column_index == column_last: - row.label("") + row.label(text="") yield None return @@ -522,7 +522,7 @@ class ToolSelectPanelHelper: if item is None: return # Note: we could show 'item.text' here but it makes the layout jitter when switcuing tools. - layout.label(" ", icon_value=icon_value) + layout.label(text=" ", icon_value=icon_value) draw_settings = item.draw_settings if draw_settings is not None: draw_settings(context, layout, tool) @@ -553,7 +553,7 @@ class WM_MT_toolsystem_submenu(Menu): cls, item_group = self._tool_group_from_button(context) if item_group is None: # Should never happen, just in case - layout.label("Unable to find toolbar group") + layout.label(text="Unable to find toolbar group") return for item in item_group: diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 4e12dcc75d4..1597e427109 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -159,17 +159,17 @@ class USERPREF_MT_splash(Menu): row = split.row() if any(bpy.utils.app_template_paths()): - row.label("Template:") + row.label(text="Template:") template = context.user_preferences.app_template row.menu( "USERPREF_MT_templates_splash", text=bpy.path.display_name(template) if template else "Default", ) else: - row.label("") + row.label(text="") row = split.row() - row.label("Interaction:") + row.label(text="Interaction:") text = bpy.path.display_name(context.window_manager.keyconfigs.active.name) if not text: @@ -222,7 +222,7 @@ class USERPREF_PT_interface(Panel): sub = col.column(align=True) - sub.label("3D Viewport Axis:") + sub.label(text="3D Viewport Axis:") sub.row().prop(view, "mini_axis_type", text="") sub = col.column(align=True) @@ -245,7 +245,7 @@ class USERPREF_PT_interface(Panel): col.separator() - col.label("Development:") + col.label(text="Development:") col.prop(view, "show_tooltips_python") col.prop(view, "show_developer_ui") @@ -303,7 +303,7 @@ class USERPREF_PT_interface(Panel): col.prop(view, "show_splash") - col.label("Warnings:") + col.label(text="Warnings:") col.prop(view, "use_quit_dialog") col.separator() @@ -635,7 +635,7 @@ class USERPREF_PT_theme(Panel): col = split.column() def theme_generic_recurse(data): - col.label(data.rna_type.name) + col.label(text=data.rna_type.name) row = col.row() subsplit = row.split(percentage=0.95) @@ -677,9 +677,9 @@ class USERPREF_PT_theme(Panel): if prop.identifier in th_delimiters: if i: colsub = colsub_pair[1] - colsub.row().label("") - colsub_pair[0].row().label("") - colsub_pair[1].row().label("") + colsub.row().label(text="") + colsub_pair[0].row().label(text="") + colsub_pair[1].row().label(text="") i = 0 theme_generic_recurse(themedata) @@ -861,7 +861,7 @@ class USERPREF_PT_theme(Panel): col.separator() col.separator() - col.label("Styles:") + col.label(text="Styles:") row = col.row() @@ -886,7 +886,7 @@ class USERPREF_PT_theme(Panel): col.separator() col.separator() - col.label("Axis & Gizmo Colors:") + col.label(text="Axis & Gizmo Colors:") row = col.row() @@ -915,7 +915,7 @@ class USERPREF_PT_theme(Panel): col = split.column() for i, ui in enumerate(theme.bone_color_sets, 1): - col.label(iface_(f"Color Set {i:d}"), translate=False) + col.label(text=iface_(f"Color Set {i:d}"), translate=False) row = col.row() @@ -1335,10 +1335,10 @@ class USERPREF_PT_addons(Panel): lines = message.split("\n") box = layout.box() sub = box.row() - sub.label(lines[0]) + sub.label(text=lines[0]) sub.label(icon='ERROR') for l in lines[1:]: - box.label(l) + box.label(text=l) def draw(self, context): import os @@ -1374,15 +1374,15 @@ class USERPREF_PT_addons(Panel): if addon_utils.error_duplicates: box = col.box() row = box.row() - row.label("Multiple add-ons with the same name found!") + row.label(text="Multiple add-ons with the same name found!") row.label(icon='ERROR') - box.label("Please delete one of each pair:") + box.label(text="Please delete one of each pair:") for (addon_name, addon_file, addon_path) in addon_utils.error_duplicates: box.separator() sub_col = box.column(align=True) - sub_col.label(addon_name + ":") - sub_col.label(" " + addon_file) - sub_col.label(" " + addon_path) + sub_col.label(text=addon_name + ":") + sub_col.label(text=" " + addon_file) + sub_col.label(text=" " + addon_path) if addon_utils.error_encoding: self.draw_error( @@ -1517,7 +1517,7 @@ class USERPREF_PT_addons(Panel): if draw is not None: addon_preferences_class = type(addon_preferences) box_prefs = col_box.box() - box_prefs.label("Preferences:") + box_prefs.label(text="Preferences:") addon_preferences_class.layout = box_prefs try: draw(context) @@ -1575,7 +1575,7 @@ class StudioLightPanelMixin(): for studio_light in lights: self.draw_studio_light(flow, studio_light) else: - layout.label("No custom {} configured".format(self.bl_label)) + layout.label(text="No custom {} configured".format(self.bl_label)) def draw_studio_light(self, layout, studio_light): box = layout.box() diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7f56e2841ae..893f3965584 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -542,7 +542,7 @@ class VIEW3D_MT_edit_proportional(Menu): layout.separator() - layout.label("Falloff:") + layout.label(text="Falloff:") layout.props_enum(tool_settings, "proportional_edit_falloff") @@ -3590,9 +3590,9 @@ class VIEW3D_MT_gpencil_copy_layer(Menu): done = True if done is False: - layout.label("No destination object", icon="ERROR") + layout.label(text="No destination object", icon="ERROR") else: - layout.label("No layer to copy", icon="ERROR") + layout.label(text="No layer to copy", icon="ERROR") class VIEW3D_MT_edit_gpencil(Menu): @@ -4022,7 +4022,7 @@ class VIEW3D_PT_shading_color(Panel): layout = self.layout shading = VIEW3D_PT_shading.get_shading(context) - layout.row().label("Background") + layout.row().label(text="Background") layout.row().prop(shading, 'background_type', expand=True) if shading.background_type == 'VIEWPORT': layout.row().prop(shading, "background_color", text="") @@ -4687,7 +4687,7 @@ class VIEW3D_PT_pivot_point(Panel): layout = self.layout col = layout.column() - col.label("Pivot Point") + col.label(text="Pivot Point") col.prop(toolsettings, "transform_pivot_point", expand=True) if (obj is None) or (mode in {'OBJECT', 'POSE', 'WEIGHT_PAINT'}): @@ -4714,7 +4714,7 @@ class VIEW3D_PT_snapping(Panel): layout = self.layout col = layout.column() - col.label("Snapping") + col.label(text="Snapping") col.prop(toolsettings, "snap_elements", expand=True) col.separator() @@ -4722,7 +4722,7 @@ class VIEW3D_PT_snapping(Panel): col.prop(toolsettings, "use_snap_grid_absolute") if snap_elements != {'INCREMENT'}: - col.label("Target") + col.label(text="Target") row = col.row(align=True) row.prop(toolsettings, "snap_target", expand=True) @@ -4747,7 +4747,7 @@ class VIEW3D_PT_transform_orientations(Panel): def draw(self, context): layout = self.layout - layout.label("Transform Orientations") + layout.label(text="Transform Orientations") scene = context.scene orientation = scene.current_orientation diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 0ccb1a51fef..2c50d12d16c 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -107,10 +107,10 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel): row.prop(mesh, "use_mirror_topology") col = layout.column(align=True) - col.label("Edge Select Mode:") + col.label(text="Edge Select Mode:") col.prop(tool_settings, "edge_path_mode", text="") col.prop(tool_settings, "edge_path_live_unwrap") - col.label("Double Threshold:") + col.label(text="Double Threshold:") col.prop(tool_settings, "double_threshold", text="") col.prop(tool_settings, "use_mesh_automerge") # , icon='AUTOMERGE_ON' @@ -134,7 +134,7 @@ class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel): col.prop(cps, "curve_type") if cps.curve_type == 'BEZIER': - col.label("Bezier Options:") + col.label(text="Bezier Options:") col.prop(cps, "error_threshold") col.prop(cps, "fit_method") col.prop(cps, "use_corners_detect") @@ -143,7 +143,7 @@ class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel): col.active = cps.use_corners_detect col.prop(cps, "corner_angle") - col.label("Pressure Radius:") + col.label(text="Pressure Radius:") row = layout.row(align=True) rowsub = row.row(align=True) rowsub.prop(cps, "radius_min", text="Min") @@ -152,13 +152,13 @@ class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel): row.prop(cps, "use_pressure_radius", text="", icon_only=True) col = layout.column() - col.label("Taper Radius:") + col.label(text="Taper Radius:") row = layout.row(align=True) row.prop(cps, "radius_taper_start", text="Start") row.prop(cps, "radius_taper_end", text="End") col = layout.column() - col.label("Projection Depth:") + col.label(text="Projection Depth:") row = layout.row(align=True) row.prop(cps, "depth_mode", expand=True) @@ -222,18 +222,18 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): toolsettings = context.tool_settings.image_paint col = layout.column() - col.label("Missing Data", icon='ERROR') + col.label(text="Missing Data", icon='ERROR') if toolsettings.missing_uvs: col.separator() - col.label("Missing UVs", icon='INFO') - col.label("Unwrap the mesh in edit mode or generate a simple UV layer") + col.label(text="Missing UVs", icon='INFO') + col.label(text="Unwrap the mesh in edit mode or generate a simple UV layer") col.operator("paint.add_simple_uvs") if toolsettings.mode == 'MATERIAL': if toolsettings.missing_materials: col.separator() - col.label("Missing Materials", icon='INFO') - col.label("Add a material and paint slot below") + col.label(text="Missing Materials", icon='INFO') + col.label(text="Add a material and paint slot below") col.operator_menu_enum("paint.add_texture_paint_slot", "type", text="Add Paint Slot") elif toolsettings.missing_texture: ob = context.active_object @@ -241,27 +241,27 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): col.separator() if mat: - col.label("Missing Texture Slots", icon='INFO') - col.label("Add a paint slot below") + col.label(text="Missing Texture Slots", icon='INFO') + col.label(text="Add a paint slot below") col.operator_menu_enum("paint.add_texture_paint_slot", "type", text="Add Paint Slot") else: - col.label("Missing Materials", icon='INFO') - col.label("Add a material and paint slot below") + col.label(text="Missing Materials", icon='INFO') + col.label(text="Add a material and paint slot below") col.operator_menu_enum("paint.add_texture_paint_slot", "type", text="Add Paint Slot") elif toolsettings.mode == 'IMAGE': if toolsettings.missing_texture: col.separator() - col.label("Missing Canvas", icon='INFO') - col.label("Add or assign a canvas image below") - col.label("Canvas Image:") + col.label(text="Missing Canvas", icon='INFO') + col.label(text="Add or assign a canvas image below") + col.label(text="Canvas Image:") col.template_ID(toolsettings, "canvas", new="image.new", open="image.open") if toolsettings.missing_stencil: col.separator() - col.label("Missing Stencil", icon='INFO') - col.label("Add or assign a stencil image below") - col.label("Stencil Image:") + col.label(text="Missing Stencil", icon='INFO') + col.label(text="Add or assign a stencil image below") + col.label(text="Stencil Image:") col.template_ID(toolsettings, "stencil_image", new="image.new", open="image.open") @@ -558,20 +558,20 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): ob = context.active_object col = layout.column() - col.label("Painting Mode:") + col.label(text="Painting Mode:") col.prop(settings, "mode", text="") col.separator() if settings.mode == 'MATERIAL': if len(ob.material_slots) > 1: - col.label("Materials:") + col.label(text="Materials:") col.template_list("MATERIAL_UL_matslots", "layers", ob, "material_slots", ob, "active_material_index", rows=2) mat = ob.active_material if mat: - col.label("Available Paint Slots:") + col.label(text="Available Paint Slots:") col.template_list("TEXTURE_UL_texpaintslots", "", mat, "texture_paint_images", mat, "paint_active_slot", rows=2) @@ -582,15 +582,15 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): slot = None if slot and slot.is_valid: - col.label("UV Map:") + col.label(text="UV Map:") col.prop_search(slot, "uv_layer", ob.data, "uv_layers", text="") elif settings.mode == 'IMAGE': mesh = ob.data uv_text = mesh.uv_layers.active.name if mesh.uv_layers.active else "" - col.label("Canvas Image:") + col.label(text="Canvas Image:") col.template_ID(settings, "canvas", new="image.new", open="image.open") - col.label("UV Map:") + col.label(text="UV Map:") col.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text=uv_text, translate=False) col.separator() @@ -628,14 +628,14 @@ class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel): split = col.split(0.5) colsub = split.column() colsub.alignment = 'RIGHT' - colsub.label("UV Layer") + colsub.label(text="UV Layer") split.column().menu("VIEW3D_MT_tools_projectpaint_stencil", text=stencil_text, translate=False) # todo this should be combinded into a single row split = col.split(0.5) colsub = split.column() colsub.alignment = 'RIGHT' - colsub.label("Stencil Image") + colsub.label(text="Stencil Image") colsub = split.column() colsub.template_ID(ipaint, "stencil_image", new="image.new", open="image.open") @@ -817,7 +817,7 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel): colsub = col.split(0.5) row = colsub.row(align=True) row.alignment = 'RIGHT' - row.label("Jitter") + row.label(text="Jitter") row = colsub.row(align=True) row.prop(brush, "use_relative_jitter", icon_only=True) if brush.use_relative_jitter: @@ -1126,7 +1126,7 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel): row.active = mesh.use_mirror_x row.prop(mesh, "use_mirror_topology") - col.label("Show Zero Weights:") + col.label(text="Show Zero Weights:") sub = col.row() sub.prop(tool_settings, "vertex_group_user", expand=True) @@ -1607,13 +1607,13 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel): gp_settings = brush.gpencil_settings # Brush - layout.label("Sensitivity") + layout.label(text="Sensitivity") layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True) - layout.label("Strength") + layout.label(text="Strength") layout.template_curve_mapping(gp_settings, "curve_strength", brush=True) - layout.label("Jitter") + layout.label(text="Jitter") layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True) @@ -1666,7 +1666,7 @@ class VIEW3D_PT_tools_grease_pencil_interpolate(Panel): settings = context.tool_settings.gpencil_interpolate col = layout.column(align=True) - col.label("Interpolate Strokes") + col.label(text="Interpolate Strokes") col.operator("gpencil.interpolate", text="Interpolate") col.operator("gpencil.interpolate_sequence", text="Sequence") col.operator("gpencil.interpolate_reverse", text="Remove Breakdowns") diff --git a/release/scripts/templates_py/custom_nodes.py b/release/scripts/templates_py/custom_nodes.py index 7e4e89dafeb..a2701360c9b 100644 --- a/release/scripts/templates_py/custom_nodes.py +++ b/release/scripts/templates_py/custom_nodes.py @@ -103,7 +103,7 @@ class MyCustomNode(Node, MyCustomTreeNode): # Additional buttons displayed on the node. def draw_buttons(self, context, layout): - layout.label("Node settings") + layout.label(text="Node settings") layout.prop(self, "my_float_prop") # Detail buttons in the sidebar. |