Tweak: Try to make the purpose of the collection/search fields clearer

Note: The labels in this panel are still WIP. There are probably clearer
names for some of these, including maybe even omitting some.

1 files changed, 10 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 99da6213188..7208135f5e6 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -86,19 +86,22 @@ class DopesheetFilterPopoverBase:
         dopesheet = context.space_data.dopesheet
         is_nla = context.area.type == 'NLA_EDITOR'
 
-        if (not generic_filters_only) and (bpy.data.collections):
-            row = layout.row(align=True)
-            row.prop(dopesheet, "filter_collection", text="")
-
+        col = layout.column(align=True)
+        col.label("With Name:")
         if not is_nla:
-            row = layout.row(align=True)
+            row = col.row(align=True)
             row.prop(dopesheet, "filter_fcurve_name", text="")
             row.prop(dopesheet, "use_multi_word_filter", text="")
         else:
-            row = layout.row(align=True)
+            row = col.row(align=True)
             row.prop(dopesheet, "filter_text", text="")
             row.prop(dopesheet, "use_multi_word_filter", text="")
 
+        if (not generic_filters_only) and (bpy.data.collections):
+            col = layout.column(align=True)
+            col.label("In Collection:")
+            col.prop(dopesheet, "filter_collection", text="")
+
     # Standard = Present in all panels
     @classmethod
     def draw_standard_filters(cls, context, layout):
@@ -232,6 +235,7 @@ class DOPESHEET_HT_editor_buttons(Header):
         toolsettings = context.tool_settings
 
         if st.mode in {'ACTION', 'SHAPEKEY'}:
+            # TODO: These buttons need some tidying up - Probably by using a popover, and bypassing the template_id() here
             row = layout.row(align=True)
             row.operator("action.layer_prev", text="", icon='TRIA_DOWN')
             row.operator("action.layer_next", text="", icon='TRIA_UP')