From c85251f874e9d8b51a030d6b0cfc8b37c23e3296 Mon Sep 17 00:00:00 2001 From: NBurn <7nburn@gmail.com> Date: Mon, 20 May 2019 03:05:08 -0400 Subject: API update: percentage to factor --- development_ui_classes.py | 2 +- magic_uv/utils/compatibility.py | 2 +- materials_utils/__init__.py | 6 ++-- mesh_extra_tools/__init__.py | 4 +-- mesh_extra_tools/mesh_edge_roundifier.py | 6 ++-- mesh_extra_tools/mesh_edgetools.py | 4 +-- .../mesh_select_tools/mesh_info_select.py | 2 +- netrender/ui.py | 2 +- object_skinify.py | 4 +-- render_povray/nodes.py | 8 ++--- sequencer_kinoraw_tools/recursive_loader.py | 4 +-- sequencer_kinoraw_tools/ui.py | 34 +++++++++++----------- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/development_ui_classes.py b/development_ui_classes.py index 65d3b1b5..b43da686 100644 --- a/development_ui_classes.py +++ b/development_ui_classes.py @@ -58,7 +58,7 @@ class TEXT_PT_ui_cheat_sheet(Panel): col.prop(scene, "dev_ui_cheat_type", expand=True) row = layout.row(align=True) - split = row.split(percentage=0.8, align=True) + split = row.split(factor=0.8, align=True) split.operator("text.ui_cheat_sheet") split.prop(scene, "searchable", text="", icon='SHORTDISPLAY') diff --git a/magic_uv/utils/compatibility.py b/magic_uv/utils/compatibility.py index c30ae595..9cd754aa 100644 --- a/magic_uv/utils/compatibility.py +++ b/magic_uv/utils/compatibility.py @@ -81,7 +81,7 @@ def matmul(m1, m2): def layout_split(layout, factor=0.0, align=False): if check_version(2, 80, 0) < 0: - return layout.split(percentage=factor, align=align) + return layout.split(factor=factor, align=align) return layout.split(factor=factor, align=align) diff --git a/materials_utils/__init__.py b/materials_utils/__init__.py index 78055b15..70ff4fc9 100644 --- a/materials_utils/__init__.py +++ b/materials_utils/__init__.py @@ -2394,11 +2394,11 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): box = col_m.box() size_split = 0.3 if self.show_mat_preview else 1.0 - split = box.split(percentage=size_split, align=True) + split = box.split(factor=size_split, align=True) split.prop(self, "show_mat_preview") if self.show_mat_preview: - subsplit = split.split(percentage=0.7, align=True) + subsplit = split.split(factor=0.7, align=True) row = subsplit.row(align=True) row.prop(self, "set_preview_type", expand=True) @@ -2408,7 +2408,7 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): box = col_m.box() size_split = 0.3 if self.show_converters else 1.0 - split = box.split(percentage=size_split, align=True) + split = box.split(factor=size_split, align=True) split.prop(self, "show_converters") if self.show_converters: diff --git a/mesh_extra_tools/__init__.py b/mesh_extra_tools/__init__.py index 307db313..669d22f0 100644 --- a/mesh_extra_tools/__init__.py +++ b/mesh_extra_tools/__init__.py @@ -430,11 +430,11 @@ class EditToolsPanel(Panel): row = layout.row() row.label(text="Custom Colors:", icon="COLOR") - col = layout.column().split(percentage=0.1, align=True) + col = layout.column().split(factor=0.1, align=True) col.label(text="", icon_value=tris.icon_id) col.prop(mesh_check, "custom_tri_color", text="") - col = layout.column().split(percentage=0.1, align=True) + col = layout.column().split(factor=0.1, align=True) col.label(text="", icon_value=ngons.icon_id) col.prop(mesh_check, "custom_ngons_color", text="") diff --git a/mesh_extra_tools/mesh_edge_roundifier.py b/mesh_extra_tools/mesh_edge_roundifier.py index 7c3b44d1..f216b1db 100644 --- a/mesh_extra_tools/mesh_edge_roundifier.py +++ b/mesh_extra_tools/mesh_edge_roundifier.py @@ -580,7 +580,7 @@ class EdgeRoundifier(Operator): def addParameterToUI(self, layout, alignment, percent, label, properties, disable=True): row = layout.row(align=alignment) - split = row.split(percentage=percent) + split = row.split(factor=percent) col = split.column() col.label(label) @@ -595,7 +595,7 @@ class EdgeRoundifier(Operator): row.label(label) row2 = layout.row(align=alignment) if property2: - split = row2.split(percentage=0.5) + split = row2.split(factor=0.5) split.prop(self, property1, toggle=True) split.prop(self, property2, toggle=True) else: @@ -604,7 +604,7 @@ class EdgeRoundifier(Operator): def addEnumParameterToUI(self, layout, alignment, percent, label, properties): row = layout.row(align=alignment) - split = row.split(percentage=percent) + split = row.split(factor=percent) col = split.column() col.label(label) diff --git a/mesh_extra_tools/mesh_edgetools.py b/mesh_extra_tools/mesh_edgetools.py index a5fd3e59..0547e915 100644 --- a/mesh_extra_tools/mesh_edgetools.py +++ b/mesh_extra_tools/mesh_edgetools.py @@ -823,12 +823,12 @@ class Spline(Operator): layout.prop(self, "segments") layout.label(text="Edge 1:") - split = layout.split(percentage=0.8, align=True) + split = layout.split(factor=0.8, align=True) split.prop(self, "ten1") split.prop(self, "flip1", text="", icon="ALIGN", toggle=True) layout.label(text="Edge 2:") - split = layout.split(percentage=0.8, align=True) + split = layout.split(factor=0.8, align=True) split.prop(self, "ten2") split.prop(self, "flip2", text="", icon="ALIGN", toggle=True) diff --git a/mesh_extra_tools/mesh_select_tools/mesh_info_select.py b/mesh_extra_tools/mesh_select_tools/mesh_info_select.py index 000619a9..2a9f1991 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_info_select.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_info_select.py @@ -94,7 +94,7 @@ class DATA_PT_info_panel(Panel): box = layout.box() col = box.column() - split = col.split(percentage=0.6 if check_used else 0.75, align=True) + split = col.split(factor=0.6 if check_used else 0.75, align=True) split.prop(mesh_extra_tools, "mesh_info_show", toggle=True) split.prop(mesh_extra_tools, "mesh_info_delay") diff --git a/netrender/ui.py b/netrender/ui.py index bcd83197..04c9a988 100644 --- a/netrender/ui.py +++ b/netrender/ui.py @@ -123,7 +123,7 @@ class RENDER_PT_network_settings(NetRenderButtonsPanel, bpy.types.Panel): row = layout.row() - split = layout.split(percentage=0.5) + split = layout.split(factor=0.5) col = split.column() col.prop(netsettings, "server_address", text="Address") diff --git a/object_skinify.py b/object_skinify.py index ef46a02e..9b256af0 100644 --- a/object_skinify.py +++ b/object_skinify.py @@ -689,12 +689,12 @@ class BONE_PT_custom_shape(Panel): row = layout.row() row.operator("object.skinify_rig", text="Add Shape", icon='BONE_DATA') - split = layout.split(percentage=0.3) + split = layout.split(factor=0.3) split.label(text="Thickness:") split.prop(scn, "thickness", text="Body", icon='MOD_SKIN') split.prop(scn, "finger_thickness", text="Fingers", icon='HAND') - split = layout.split(percentage=0.3) + split = layout.split(factor=0.3) split.label(text="Mesh Density:") split.prop(scn, "sub_level", icon='MESH_ICOSPHERE') diff --git a/render_povray/nodes.py b/render_povray/nodes.py index afacfc82..1c04d8ce 100644 --- a/render_povray/nodes.py +++ b/render_povray/nodes.py @@ -514,7 +514,7 @@ class PovrayColorImageNode(Node, ObjectNodeTree): for image in bpy.data.images: if image.name == self.image: im=image - split = column.split(percentage=0.8,align=True) + split = column.split(factor=0.8,align=True) split.prop_search(self,"image",context.blend_data,"images",text="") split.operator("pov.imageopen",text="",icon="FILEBROWSER") if im is not None: @@ -532,7 +532,7 @@ class PovrayColorImageNode(Node, ObjectNodeTree): for image in bpy.data.images: if image.name == self.image: im=image - split = column.split(percentage=0.8,align=True) + split = column.split(factor=0.8,align=True) split.prop_search(self,"image",context.blend_data,"images",text="") split.operator("pov.imageopen",text="",icon="FILEBROWSER") if im is not None: @@ -665,7 +665,7 @@ class PovrayImagePatternNode(Node, ObjectNodeTree): for image in bpy.data.images: if image.name == self.image: im=image - split = column.split(percentage=0.8,align=True) + split = column.split(factor=0.8,align=True) split.prop_search(self,"image",context.blend_data,"images",text="") split.operator("pov.imageopen",text="",icon="FILEBROWSER") if im is not None: @@ -684,7 +684,7 @@ class PovrayImagePatternNode(Node, ObjectNodeTree): for image in bpy.data.images: if image.name == self.image: im=image - split = column.split(percentage=0.8,align=True) + split = column.split(factor=0.8,align=True) split.prop_search(self,"image",context.blend_data,"images",text="") split.operator("pov.imageopen",text="",icon="FILEBROWSER") if im is not None: diff --git a/sequencer_kinoraw_tools/recursive_loader.py b/sequencer_kinoraw_tools/recursive_loader.py index 246e1b70..07cc1e8e 100644 --- a/sequencer_kinoraw_tools/recursive_loader.py +++ b/sequencer_kinoraw_tools/recursive_loader.py @@ -245,7 +245,7 @@ class ExifInfoPanel(Panel): try: if len(sce['metadata']) == 1: for d in sce['metadata'][0]: - split = layout.split(percentage=0.5) + split = layout.split(factor=0.5) col = split.column() row = col.row() col.label(text=d) @@ -253,7 +253,7 @@ class ExifInfoPanel(Panel): col.label(text=str(sce['metadata'][0][d])) else: for d in sce['metadata'][frame - f]: - split = layout.split(percentage=0.5) + split = layout.split(factor=0.5) col = split.column() row = col.row() col.label(text=d) diff --git a/sequencer_kinoraw_tools/ui.py b/sequencer_kinoraw_tools/ui.py index 8f073fbc..a2721cac 100644 --- a/sequencer_kinoraw_tools/ui.py +++ b/sequencer_kinoraw_tools/ui.py @@ -123,7 +123,7 @@ def clip_clip_menu_func(self, context): def draw_color_balance(layout, color_balance): - layout = layout.split(percentage=0.33) + layout = layout.split(factor=0.33) col = layout.column() col.label(text="Lift:") col.template_color_picker(color_balance, "lift", value_slider=True, cubic=True) @@ -227,7 +227,7 @@ class JumptoCut(Panel): # jump to cut main controls col = layout.column(align=True) row = col.row(align=True) - split = row.split(percentage=0.33, align=True) + split = row.split(factor=0.33, align=True) box = split.box() row = box.row(align=True) @@ -252,7 +252,7 @@ class JumptoCut(Panel): rd = scn.render screen = context.screen row = col.row(align=True) - split = row.split(percentage=0.33, align=True) + split = row.split(factor=0.33, align=True) sub_box = split.box() sub_row = sub_box.row(align=True) sub_row.alignment = "CENTER" @@ -299,18 +299,18 @@ class JumptoCut(Panel): # panel setup row = layout.row(align=True) - split = row.split(percentage=0.5) + split = row.split(factor=0.5) sub_row = split.row(align=True) sub_row.prop(prefs, "kr_show_tools", text="Tools", icon='SEQ_SEQUENCER') if prefs.kr_show_tools: sub_row.prop(prefs, "kr_mini_ui", text="Compact UI", toggle=True) row = split.row() - row = row.split(percentage=0.33) + row = row.split(factor=0.33) row.prop(prefs, "kr_show_info", text="", icon='VIEWZOOM') - row = row.split(percentage=0.5) + row = row.split(factor=0.5) row.prop(prefs, "kr_extra_info", text="", icon='BORDERMOVE') - row = row.split(percentage=1) + row = row.split(factor=1) row.prop(prefs, "kr_show_modifiers", text="", icon='RESTRICT_VIEW_OFF') if prefs.kr_show_tools: @@ -413,7 +413,7 @@ class JumptoCut(Panel): row3 = col.row() row3.operator("sequencerextra.setinout", icon='ARROW_LEFTRIGHT', text="Selected") - sub_col = box.split(percentage=0.67, align=True) + sub_col = box.split(factor=0.67, align=True) row4 = sub_col.row(align=True) if scn.kr_auto_markers is False: @@ -459,11 +459,11 @@ class JumptoCut(Panel): if strip is not None: if prefs.kr_show_info: layout = layout.box() - row = layout.split(percentage=0.075) + row = layout.split(factor=0.075) row.prop(prefs, "kr_show_info", text="", icon='VIEWZOOM', emboss=True) - row = row.split(percentage=0.3) + row = row.split(factor=0.3) row.prop(strip, "type", text="") - row = row.split(percentage=1) + row = row.split(factor=1) row.prop(strip, "name", text="") # mute information @@ -476,7 +476,7 @@ class JumptoCut(Panel): row.prop(strip, "frame_final_duration") # source info - row = layout.split(percentage=0.8) + row = layout.split(factor=0.8) if strip.type == 'MOVIE': row.prop(strip, "filepath", text="") @@ -502,7 +502,7 @@ class JumptoCut(Panel): # trim info if strip.type not in {"SPEED", "WIPE", "CROSS", "ADJUSTMENT"}: - row = row.split(percentage=1) + row = row.split(factor=1) row.prop(prefs, "kr_show_trim", text="Trim", toggle=True) if prefs.kr_show_trim: box = layout.box() @@ -619,7 +619,7 @@ class JumptoCut(Panel): row.prop(strip, "mute", toggle=True, icon_only=True) row.prop(strip, "lock", toggle=True, icon_only=True) - split = box.split(percentage=0.5) + split = box.split(factor=0.5) left_box = split.box() row = left_box.row() row.prop(strip, "strobe") @@ -687,12 +687,12 @@ class JumptoCut(Panel): layout = layout.box() # mute this box layout.active = (not strip.mute) - row = layout.split(percentage=0.075) + row = layout.split(factor=0.075) row.prop(prefs, "kr_show_modifiers", text="", icon='RESTRICT_VIEW_OFF', emboss=True) - row = row.split(percentage=0.40) + row = row.split(factor=0.40) row.prop(strip, "use_linear_modifiers", text="Linear") - row = row.split(percentage=1) + row = row.split(factor=1) row.operator_menu_enum("sequencer.strip_modifier_add", "type") for mod in strip.modifiers: -- cgit v1.2.3