From ba21c27e7659b8a279596f88295d5ac3183cfc8c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Sep 2018 14:15:18 +1000 Subject: Cleanup: use single quotes for enum's --- .../scripts/startup/bl_operators/add_mesh_torus.py | 10 +-- release/scripts/startup/bl_operators/freestyle.py | 8 ++- .../startup/bl_operators/vertexpaint_dirt.py | 4 +- .../startup/bl_ui/properties_data_lightprobe.py | 2 +- .../startup/bl_ui/properties_data_modifier.py | 74 +++++++++++----------- release/scripts/startup/bl_ui/properties_render.py | 2 +- .../startup/bl_ui/space_toolsystem_toolbar.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 6 +- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 2 +- 9 files changed, 57 insertions(+), 53 deletions(-) diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py index 6bd470091c3..c4fd60140b5 100644 --- a/release/scripts/startup/bl_operators/add_mesh_torus.py +++ b/release/scripts/startup/bl_operators/add_mesh_torus.py @@ -149,10 +149,12 @@ class AddTorus(Operator, object_utils.AddObjectHelper): ) mode: bpy.props.EnumProperty( name="Torus Dimensions", - items=(("MAJOR_MINOR", "Major/Minor", - "Use the major/minor radii for torus dimensions"), - ("EXT_INT", "Exterior/Interior", - "Use the exterior/interior radii for torus dimensions")), + items=( + ('MAJOR_MINOR', "Major/Minor", + "Use the major/minor radii for torus dimensions"), + ('EXT_INT', "Exterior/Interior", + "Use the exterior/interior radii for torus dimensions"), + ), update=mode_update_callback, ) major_radius: FloatProperty( diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py index 894808de3ed..7196c53098b 100644 --- a/release/scripts/startup/bl_operators/freestyle.py +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -36,9 +36,11 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): type: EnumProperty( name="Type", description="Type of the modifier to work on", - items=(("COLOR", "Color", "Color modifier type"), - ("ALPHA", "Alpha", "Alpha modifier type"), - ("THICKNESS", "Thickness", "Thickness modifier type")), + items=( + ('COLOR', "Color", "Color modifier type"), + ('ALPHA', "Alpha", "Alpha modifier type"), + ('THICKNESS', "Thickness", "Thickness modifier type"), + ), ) name: StringProperty( name="Name", diff --git a/release/scripts/startup/bl_operators/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py index 335c3d8bbda..e0bc5286bfe 100644 --- a/release/scripts/startup/bl_operators/vertexpaint_dirt.py +++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py @@ -155,14 +155,14 @@ class VertexPaintDirt(Operator): description="Less than 90 limits the angle used in the tonal range", min=0.0, max=pi, default=pi, - unit="ROTATION", + unit='ROTATION', ) dirt_angle: FloatProperty( name="Dirt Angle", description="Less than 90 limits the angle used in the tonal range", min=0.0, max=pi, default=0.0, - unit="ROTATION", + unit='ROTATION', ) dirt_only: BoolProperty( name="Dirt Only", diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py index 4faf1fcef3d..2de9a85e507 100644 --- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py +++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py @@ -94,7 +94,7 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel): sub = col.column() sub.prop(probe, "clip_start", text="Clipping Start") - if probe.type != "PLANAR": + if probe.type != 'PLANAR': sub.prop(probe, "clip_end", text="End") if probe.type == 'GRID': diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index f5b65e70487..6caea0644dd 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1627,7 +1627,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = split.column() row = col.row(align=True) row.prop(md, "factor") - row.prop(md, "random", text="", icon="TIME", toggle=True) + row.prop(md, "random", text="", icon='TIME', toggle=True) row = col.row() row.enabled = md.random row.prop(md, "step") @@ -1638,16 +1638,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') row = layout.row(align=True) row.label(text="Affect:") @@ -1668,17 +1668,17 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') col = split.column() 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') row = layout.row(align=True) row.label(text="Affect:") @@ -1695,16 +1695,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = split.column() row = col.row(align=True) row.prop(md, "level") - row.prop(md, "simple", text="", icon="PARTICLE_POINT") + row.prop(md, "simple", text="", icon='PARTICLE_POINT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') col = split.column() 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') def GP_SIMPLIFY(self, layout, ob, md): gpd = ob.data @@ -1731,7 +1731,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') def GP_THICK(self, layout, ob, md): gpd = ob.data @@ -1742,7 +1742,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "thickness") row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') col.prop(md, "normalize_thickness") @@ -1750,12 +1750,12 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') if not md.normalize_thickness: split = layout.split() @@ -1777,10 +1777,10 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') row = layout.row() row.prop(md, "create_materials") @@ -1800,10 +1800,10 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') row = layout.row() row.prop(md, "create_materials") @@ -1821,16 +1821,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') row = layout.row() row.prop(md, "create_materials") @@ -1859,7 +1859,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "rotation", text="") col.separator() row = col.row(align=True) - row.prop(md, "random_rot", text="", icon="TIME", toggle=True) + row.prop(md, "random_rot", text="", icon='TIME', toggle=True) row.prop(md, "rot_factor", text="") col = split.column() @@ -1867,7 +1867,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "scale", text="") col.separator() row = col.row(align=True) - row.prop(md, "random_scale", text="", icon="TIME", toggle=True) + row.prop(md, "random_scale", text="", icon='TIME', toggle=True) row.prop(md, "scale_factor", text="") split = layout.split() @@ -1875,10 +1875,10 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') def GP_BUILD(self, layout, ob, md): gpd = ob.data @@ -1910,7 +1910,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') def GP_LATTICE(self, layout, ob, md): gpd = ob.data @@ -1924,16 +1924,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') layout.separator() layout.prop(md, "strength", slider=True) @@ -1953,11 +1953,11 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') layout.label(text="Object:") layout.prop(md, "object", text="") @@ -1977,16 +1977,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') use_falloff = (md.falloff_type != 'NONE') split = layout.split() @@ -2023,16 +2023,16 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): 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") + row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT') 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") + row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') row = col.row(align=True) row.prop(md, "pass_index", text="Pass") - row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") + row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT') def GP_ARMATURE(self, layout, ob, md): split = layout.split() diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 6b8cbc55c08..c402ad5df45 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -735,7 +735,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): col = layout.column() col.operator("scene.light_cache_bake", text="Bake Indirect Lighting", icon='RENDER_STILL') - col.operator("scene.light_cache_bake", text="Bake Cubemap Only", icon='LIGHTPROBE_CUBEMAP').subset = "CUBEMAPS" + col.operator("scene.light_cache_bake", text="Bake Cubemap Only", icon='LIGHTPROBE_CUBEMAP').subset = 'CUBEMAPS' col.operator("scene.light_cache_free", text="Free Lighting Cache") cache_info = scene.eevee.gi_cache_info diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 003f1fa4a7a..43716f6f861 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1203,7 +1203,7 @@ class _defs_gpencil_paint: gp_settings = brush.gpencil_settings ts = context.tool_settings row = layout.row(align=True) - row.prop(ts, "use_gpencil_thumbnail_list", text="", icon="IMGDISPLAY") + row.prop(ts, "use_gpencil_thumbnail_list", text="", icon='IMGDISPLAY') if ts.use_gpencil_thumbnail_list is False: row.template_ID(gp_settings, "material", live_icon=True) else: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 285a1887983..5d4b5f4e25a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -90,7 +90,7 @@ class VIEW3D_HT_header(Header): if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode: row = layout.row(align=True) - row.prop(gpd, "use_multiedit", text="", icon="FORCE_HARMONIC") + row.prop(gpd, "use_multiedit", text="", icon='FORCE_HARMONIC') sub = row.row(align=True) sub.active = gpd.use_multiedit @@ -3593,9 +3593,9 @@ class VIEW3D_MT_gpencil_copy_layer(Menu): done = True if done is False: - layout.label(text="No destination object", icon="ERROR") + layout.label(text="No destination object", icon='ERROR') else: - layout.label(text="No layer to copy", icon="ERROR") + layout.label(text="No layer to copy", icon='ERROR') class VIEW3D_MT_edit_gpencil(Menu): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 6915129ef2c..513c3293ed1 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1444,7 +1444,7 @@ class VIEW3D_PT_tools_grease_pencil_brush(View3DPanel, Panel): row.prop(gp_settings, "gpencil_fill_show_boundary", text="", icon='GRID') col = layout.column(align=True) - col.enabled = gp_settings.gpencil_fill_draw_mode != "STROKE" + col.enabled = gp_settings.gpencil_fill_draw_mode != 'STROKE' col.prop(gp_settings, "gpencil_fill_hide", text="Hide Transparent Lines") sub = col.row(align=True) sub.enabled = gp_settings.gpencil_fill_hide -- cgit v1.2.3