From cca87ccc753a85b447872a259c9d3e3f07ec1c13 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 13 Jul 2018 19:13:44 +0200 Subject: UI: remove space/region from popover args Instead use global panel-type list. --- release/scripts/startup/bl_operators/presets.py | 8 ++----- release/scripts/startup/bl_ui/space_dopesheet.py | 4 +--- release/scripts/startup/bl_ui/space_graph.py | 4 +--- release/scripts/startup/bl_ui/space_nla.py | 4 +--- release/scripts/startup/bl_ui/space_outliner.py | 10 ++++---- release/scripts/startup/bl_ui/space_time.py | 8 ++----- release/scripts/startup/bl_ui/space_view3d.py | 30 +++++++----------------- 7 files changed, 21 insertions(+), 47 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 55e61be6370..530194e5bb7 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -263,9 +263,7 @@ class PresetMenu(Panel): def draw_panel_header(cls, layout): layout.emboss = 'NONE' layout.popover( - cls.bl_space_type, - cls.bl_region_type, - cls.__name__, + panel=cls.__name__, icon='PRESET', text="", ) @@ -276,9 +274,7 @@ class PresetMenu(Panel): text = cls.bl_label layout.popover( - cls.bl_space_type, - cls.bl_region_type, - cls.__name__, + panel=cls.__name__, icon='PRESET', text=text, ) diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 1b89cfd470d..efd5e195fb8 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -263,9 +263,7 @@ class DOPESHEET_HT_editor_buttons(Header): row.prop(st.dopesheet, "filter_text", text="") layout.popover( - space_type='DOPESHEET_EDITOR', - region_type='HEADER', - panel_type="DOPESHEET_PT_filters", + panel="DOPESHEET_PT_filters", text="", icon='FILTER', ) diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index de5dcdbc36d..eacfb364130 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -60,9 +60,7 @@ class GRAPH_HT_header(Header): row.operator("graph.ghost_curves_create", text="", icon='GHOST_ENABLED') layout.popover( - space_type='GRAPH_EDITOR', - region_type='HEADER', - panel_type="GRAPH_PT_filters", + panel="GRAPH_PT_filters", text="", icon='FILTER', ) diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 4bf338b89d6..4e20001b133 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -44,9 +44,7 @@ class NLA_HT_header(Header): dopesheet_filter(layout, context) layout.popover( - space_type='NLA_EDITOR', - region_type='HEADER', - panel_type="NLA_PT_filters", + panel="NLA_PT_filters", text="", icon='FILTER', ) diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 965de6b1ce1..97fae2690fd 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -49,11 +49,11 @@ class OUTLINER_HT_header(Header): row = layout.row(align=True) if display_mode in {'VIEW_LAYER'}: - row.popover(space_type='OUTLINER', - region_type='HEADER', - panel_type="OUTLINER_PT_filter", - text="", - icon='FILTER') + row.popover( + panel="OUTLINER_PT_filter", + text="", + icon='FILTER', + ) elif display_mode in {'LIBRARIES', 'ORPHAN_DATA'}: row.prop(space, "use_filter_id_type", text="", icon='FILTER') sub = row.row(align=True) diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 9db2afd62b4..99e5f6b08e5 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -94,15 +94,11 @@ class TIME_MT_editor_menus(Menu): row = layout.row() sub = row.row(align=True) sub.popover( - space_type='DOPESHEET_EDITOR', - region_type='HEADER', - panel_type="TIME_PT_playback", + panel="TIME_PT_playback", text="Playback", ) sub.popover( - space_type='DOPESHEET_EDITOR', - region_type='HEADER', - panel_type="TIME_PT_keyframing_settings", + panel="TIME_PT_keyframing_settings", text="Keying", ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 53e4346550e..50914a15fba 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -116,9 +116,7 @@ class VIEW3D_HT_header(Header): row = layout.row(align=True) row.popover( - space_type='VIEW_3D', - region_type='HEADER', - panel_type="VIEW3D_PT_transform_orientations", + panel="VIEW3D_PT_transform_orientations", text=trans_name, icon=trans_icon, ) @@ -155,11 +153,9 @@ class VIEW3D_HT_header(Header): sub = row.row(align=True) sub.popover( - space_type='VIEW_3D', - region_type='HEADER', - panel_type="VIEW3D_PT_snapping", + panel="VIEW3D_PT_snapping", icon=icon, - text="" + text="", ) # Proportional editing @@ -199,9 +195,7 @@ class VIEW3D_HT_header(Header): act_pivot_point = bpy.types.ToolSettings.bl_rna.properties["transform_pivot_point"].enum_items[pivot_point] row = layout.row(align=True) row.popover( - space_type='VIEW_3D', - region_type='HEADER', - panel_type="VIEW3D_PT_pivot_point", + panel="VIEW3D_PT_pivot_point", icon=act_pivot_point.icon, text="", ) @@ -210,9 +204,7 @@ class VIEW3D_HT_header(Header): # Viewport Settings layout.popover( - space_type='VIEW_3D', - region_type='HEADER', - panel_type="VIEW3D_PT_object_type_visibility", + panel="VIEW3D_PT_object_type_visibility", icon_value=view.icon_from_show_object_viewport, text="", ) @@ -221,13 +213,13 @@ class VIEW3D_HT_header(Header): row.prop(overlay, "show_overlays", icon='WIRE', text="") sub = row.row(align=True) sub.active = overlay.show_overlays - sub.popover(space_type='VIEW_3D', region_type='HEADER', panel_type="VIEW3D_PT_overlay") + sub.popover(panel="VIEW3D_PT_overlay") row = layout.row(align=True) row.prop(shading, "type", text="", expand=True) sub = row.row(align=True) sub.enabled = shading.type != 'RENDERED' - sub.popover(space_type='VIEW_3D', region_type='HEADER', panel_type="VIEW3D_PT_shading") + sub.popover(panel="VIEW3D_PT_shading") class VIEW3D_MT_editor_menus(Menu): @@ -3861,9 +3853,7 @@ class VIEW3D_PT_shading_options(Panel): sub.active = is_shadows sub.prop(shading, "shadow_intensity", text="Shadow") sub.popover( - space_type='VIEW_3D', - region_type='HEADER', - panel_type="VIEW3D_PT_shading_options_shadow", + panel="VIEW3D_PT_shading_options_shadow", icon='SCRIPTWIN', text="" ) @@ -3879,9 +3869,7 @@ class VIEW3D_PT_shading_options(Panel): sub.prop(shading, "cavity_ridge_factor") sub.prop(shading, "cavity_valley_factor") sub.popover( - space_type='VIEW_3D', - region_type='HEADER', - panel_type="VIEW3D_PT_shading_options_ssao", + panel="VIEW3D_PT_shading_options_ssao", icon='SCRIPTWIN', text="" ) -- cgit v1.2.3