diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-01-18 18:20:10 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-01-18 18:20:10 +0300 |
commit | 51bcf7bd5f3f21e0ff38b04965cc8413c339b3cf (patch) | |
tree | ce1bd09fc1a06af279541053998a0478e837367e /release/scripts/startup/bl_ui/space_outliner.py | |
parent | 9398db07cce4ec8b6992e14358dcb840dbe46825 (diff) |
Outliner: Get rid of Search Menu
Use inline options instead. This will be collapsable once we merge the upcoming
filter sytem.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_outliner.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 2f0406d6ee7..f231ab7d43c 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -38,11 +38,16 @@ class OUTLINER_HT_header(Header): layout.prop(space, "display_mode", text="") - layout.prop(space, "filter_text", icon='VIEWZOOM', text="") + row = layout.row(align=True) + row.prop(space, "filter_text", icon='VIEWZOOM', text="") + row.prop(space, "use_filter_complete", text="") + row.prop(space, "use_filter_case_sensitive", text="") - layout.separator() + if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS', 'ACT_LAYER', 'COLLECTIONS'}: + row.prop(space, "use_sort_alpha", text="") - if space.display_mode == 'DATABLOCKS': + elif space.display_mode == 'DATABLOCKS': + layout.separator() row = layout.row(align=True) row.operator("outliner.keyingset_add_selected", icon='ZOOMIN', text="") row.operator("outliner.keyingset_remove_selected", icon='ZOOMOUT', text="") @@ -71,7 +76,6 @@ class OUTLINER_MT_editor_menus(Menu): space = context.space_data layout.menu("OUTLINER_MT_view") - layout.menu("OUTLINER_MT_search") if space.display_mode == 'DATABLOCKS': layout.menu("OUTLINER_MT_edit_datablocks") @@ -92,8 +96,6 @@ class OUTLINER_MT_view(Menu): space = context.space_data if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}: - if space.display_mode not in {'ACT_LAYER', 'COLLECTIONS'}: - layout.prop(space, "use_sort_alpha") layout.prop(space, "show_restrict_columns") layout.separator() layout.operator("outliner.show_active") @@ -109,18 +111,6 @@ class OUTLINER_MT_view(Menu): layout.operator("screen.screen_full_area", text="Toggle Fullscreen Area").use_hide_panels = True -class OUTLINER_MT_search(Menu): - bl_label = "Search" - - def draw(self, context): - layout = self.layout - - space = context.space_data - - layout.prop(space, "use_filter_case_sensitive") - layout.prop(space, "use_filter_complete") - - class OUTLINER_MT_edit_active_view_layer(Menu): bl_label = "Edit" @@ -170,7 +160,6 @@ classes = ( OUTLINER_HT_header, OUTLINER_MT_editor_menus, OUTLINER_MT_view, - OUTLINER_MT_search, OUTLINER_MT_edit_active_view_layer, OUTLINER_MT_edit_datablocks, OUTLINER_MT_edit_orphan_data, |