Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Center ID Blocks in Dopesheet Editor

Browse Source 
Also move use_multi_word_filter to the View menu instead of next to every
search field, as it can be very slow in big scenes.
This commit is contained in:
William Reynish
2018-06-28 00:49:04 +02:00
committed by Pablo Vazquez
parent 7a8c49ef91
commit fe258fd445
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
release/scripts/startup/bl_ui/space_dopesheet.py
View File

@@ -48,11 +48,9 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
if not is_nla: if not is_nla:
row = layout.row(align=True) row = layout.row(align=True)
row.prop(dopesheet, "filter_fcurve_name", text="") row.prop(dopesheet, "filter_fcurve_name", text="")
row.prop(dopesheet, "use_multi_word_filter", text="")
else: else:
row = layout.row(align=True) row = layout.row(align=True)
row.prop(dopesheet, "filter_text", text="") row.prop(dopesheet, "filter_text", text="")
row.prop(dopesheet, "use_multi_word_filter", text="")
####################################### #######################################
# Dopesheet Filtering Popovers # Dopesheet Filtering Popovers
@@ -93,11 +91,9 @@ class DopesheetFilterPopoverBase:
if not is_nla: if not is_nla:
row = col.row(align=True) row = col.row(align=True)
row.prop(dopesheet, "filter_fcurve_name", text="") row.prop(dopesheet, "filter_fcurve_name", text="")
row.prop(dopesheet, "use_multi_word_filter", text="")
else: else:
row = col.row(align=True) row = col.row(align=True)
row.prop(dopesheet, "filter_text", text="") row.prop(dopesheet, "filter_text", text="")
row.prop(dopesheet, "use_multi_word_filter", text="")
if (not generic_filters_only) and (bpy.data.collections): if (not generic_filters_only) and (bpy.data.collections):
col = layout.column(align=True) col = layout.column(align=True)
@@ -213,13 +209,7 @@ class DOPESHEET_HT_header(Header):
TIME_HT_editor_buttons.draw_header(context, layout) TIME_HT_editor_buttons.draw_header(context, layout)
else: else:
layout.prop(st, "ui_mode", text="") layout.prop(st, "ui_mode", text="")
layout.popover(
space_type='DOPESHEET_EDITOR',
region_type='HEADER',
panel_type="DOPESHEET_PT_filters",
text="",
icon='FILTER',
)
DOPESHEET_MT_editor_menus.draw_collapsible(context, layout) DOPESHEET_MT_editor_menus.draw_collapsible(context, layout)
DOPESHEET_HT_editor_buttons.draw_header(context, layout) DOPESHEET_HT_editor_buttons.draw_header(context, layout)
@@ -244,13 +234,15 @@ class DOPESHEET_HT_editor_buttons(Header):
row.operator("action.layer_prev", text="", icon='TRIA_DOWN') row.operator("action.layer_prev", text="", icon='TRIA_DOWN')
row.operator("action.layer_next", text="", icon='TRIA_UP') row.operator("action.layer_next", text="", icon='TRIA_UP')
layout.template_ID(st, "action", new="action.new", unlink="action.unlink")
row = layout.row(align=True) row = layout.row(align=True)
row.operator("action.push_down", text="Push Down", icon='NLA_PUSHDOWN') row.operator("action.push_down", text="Push Down", icon='NLA_PUSHDOWN')
row.operator("action.stash", text="Stash", icon='FREEZE') row.operator("action.stash", text="Stash", icon='FREEZE')
# layout.separator_spacer() layout.separator_spacer()
layout.template_ID(st, "action", new="action.new", unlink="action.unlink")
layout.separator_spacer()
if st.mode == 'DOPESHEET': if st.mode == 'DOPESHEET':
dopesheet_filter(layout, context) dopesheet_filter(layout, context)
@@ -269,9 +261,16 @@ class DOPESHEET_HT_editor_buttons(Header):
row = layout.row(align=True) row = layout.row(align=True)
row.prop(st.dopesheet, "filter_text", text="") row.prop(st.dopesheet, "filter_text", text="")
row.prop(st.dopesheet, "use_multi_word_filter", text="")
layout.separator_spacer() layout.popover(
space_type='DOPESHEET_EDITOR',
region_type='HEADER',
panel_type="DOPESHEET_PT_filters",
text="",
icon='FILTER',
)
layout.separator()
row = layout.row(align=True) row = layout.row(align=True)
row.prop(toolsettings, "use_proportional_action", text="", icon_only=True) row.prop(toolsettings, "use_proportional_action", text="", icon_only=True)
@@ -327,6 +326,10 @@ class DOPESHEET_MT_view(Menu):
layout.operator("action.properties", icon='MENU_PANEL') layout.operator("action.properties", icon='MENU_PANEL')
layout.separator() layout.separator()
layout.prop(st.dopesheet, "use_multi_word_filter", text="Multi-word Match Search")
layout.separator()
layout.prop(st, "use_realtime_update") layout.prop(st, "use_realtime_update")
layout.prop(st, "show_frame_indicator") layout.prop(st, "show_frame_indicator")
layout.prop(st, "show_sliders") layout.prop(st, "show_sliders")