[Bf-blender-cvs] [e9fb2feb2ea] blender2.8: UI: text keyword argument to label
Campbell Barton
noreply at git.blender.org
Tue Aug 28 04:44:49 CEST 2018
Commit: e9fb2feb2eaef92384b4bf7064fe2c61b1d3dad9
Author: Campbell Barton
Date: Tue Aug 28 12:34:51 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBe9fb2feb2eaef92384b4bf7064fe2c61b1d3dad9
UI: text keyword argument to label
Prepare for keyword only args
===================================================================
M doc/python_api/examples/bpy.types.Panel.1.py
M doc/python_api/examples/bpy.types.Panel.2.py
M doc/python_api/examples/bpy.types.UIList.2.py
M doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
M intern/cycles/blender/addon/ui.py
M release/scripts/modules/bpy_types.py
M release/scripts/modules/rna_prop_ui.py
M release/scripts/startup/bl_ui/properties_constraint.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_data_lightprobe.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/properties_data_workspace.py
M release/scripts/startup/bl_ui/properties_freestyle.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_mask_common.py
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_common.py
M release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M release/scripts/startup/bl_ui/properties_physics_field.py
M release/scripts/startup/bl_ui/properties_physics_fluid.py
M release/scripts/startup/bl_ui/properties_physics_rigidbody.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M release/scripts/startup/bl_ui/properties_render.py
M release/scripts/startup/bl_ui/properties_texture.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_filebrowser.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_statusbar.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M release/scripts/templates_py/custom_nodes.py
===================================================================
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="W
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list