diff options
author | Julian Eisel <julian@blender.org> | 2020-12-14 16:07:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-12-15 19:03:48 +0300 |
commit | 2d6a69ae4e9905a19ac7228b97ed08fb4ea72e75 (patch) | |
tree | 12ebb3ef64af1a91d03e7acd14e48d061482d608 /release/scripts/startup/bl_ui/space_filebrowser.py | |
parent | 70474e1a7cc45a1b1cc08d39b3e472c88c8d3225 (diff) |
Asset System: New Asset Browser editor
This introduces the User Interface part of the Asset Browser, based on the
design in T54642.
Additions:
* New Asset Browser (internally a sub-editor of the File Browser).
* Navigation region showing asset categories.
* Main region showing the assets of the selected asset library with previews.
The assets may be stored over multiple .blends in the directory that's
"mounted" as asset library in the Preferences. They will all be shown in this
list.
* Header with an asset library dropdown, allowing to choose the active asset
library to show. Options are the "Current File" as asset library and all
custom libraries.
* Display popover, filter popover and search box (partially dummies, see
T82680).
* Sidebar showing the metadata of the currently active file (name, preview,
description and tags), which can be edited for assets in the "Current File"
asset library. (For others it will reset on reload.)
* The sidebar includes a button to load a custom preview image from a file.
* Make asset files draggable (with preview image).
* If a library with invalid path is selected, a message is drawn in the main
region to help the user understand what's wrong.
* Operators to add and remove asset tags. Exposed in the sidebar.
* "Only Assets" option for Link/Append.
* Internal utilities for asset UI scripts.
For screenshots or demo videos, please see D9725. Or the 2.92 release notes.
Note that there are many things to be tweaked and polished in the Asset Browser
UI still. For example, the filter and display popovers are mostly dummies. See
T82680.
Part of the first Asset Browser milestone. Check the #asset_browser_milestone_1
project milestone on developer.blender.org.
Differential Revision: https://developer.blender.org/D9725
Reviewed by: Brecht Van Lommel, Hans Goudey
Diffstat (limited to 'release/scripts/startup/bl_ui/space_filebrowser.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_filebrowser.py | 196 |
1 files changed, 174 insertions, 22 deletions
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index a9bb2e79762..527a5bc623e 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -17,27 +17,79 @@ # ##### END GPL LICENSE BLOCK ##### # <pep8 compliant> + +import bpy + from bpy.types import Header, Panel, Menu, UIList +from bpy_extras import ( + asset_utils, +) + class FILEBROWSER_HT_header(Header): bl_space_type = 'FILE_BROWSER' + def draw_asset_browser_buttons(self, context): + layout = self.layout + + space_data = context.space_data + params = space_data.params + + row = layout.row(align=True) + row.prop(params, "asset_library", text="") + # External libraries don't auto-refresh, add refresh button. + if params.asset_library != 'LOCAL': + row.operator("file.refresh", text="", icon="FILE_REFRESH") + + layout.separator_spacer() + + # Uses prop_with_popover() as popover() only adds the triangle icon in headers. + layout.prop_with_popover( + params, + "display_type", + panel="FILEBROWSER_PT_display", + text="", + icon_only=True, + ) + layout.prop_with_popover( + params, + "display_type", + panel="FILEBROWSER_PT_filter", + text="", + icon='FILTER', + icon_only=True, + ) + + layout.prop(params, "filter_search", text="", icon='VIEWZOOM') + + layout.operator( + "screen.region_toggle", + text="", + icon='PREFERENCES', + depress=is_option_region_visible(context, space_data) + ).region_type = 'TOOL_PROPS' + def draw(self, context): + from bpy_extras.asset_utils import SpaceAssetInfo + layout = self.layout - st = context.space_data + space_data = context.space_data - if st.active_operator is None: + if space_data.active_operator is None: layout.template_header() FILEBROWSER_MT_editor_menus.draw_collapsible(context, layout) - # can be None when save/reload with a file selector open - - layout.separator_spacer() + if SpaceAssetInfo.is_asset_browser(space_data): + layout.separator() + self.draw_asset_browser_buttons(context) + else: + layout.separator_spacer() - layout.template_running_jobs() + if not context.screen.show_statusbar: + layout.template_running_jobs() class FILEBROWSER_PT_display(Panel): @@ -144,6 +196,9 @@ class FILEBROWSER_PT_filter(Panel): row.label(icon='BLANK1') # Indentation sub = row.column(align=True) + + sub.prop(params, "use_filter_asset_only") + filter_id = params.filter_id for identifier in dir(filter_id): if identifier.startswith("category_"): @@ -160,6 +215,11 @@ def panel_poll_is_upper_region(region): return region.alignment in {'LEFT', 'RIGHT'} +def panel_poll_is_asset_browsing(context): + from bpy_extras.asset_utils import SpaceAssetInfo + return SpaceAssetInfo.is_asset_browser_poll(context) + + class FILEBROWSER_UL_dir(UIList): def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index): direntry = item @@ -187,7 +247,7 @@ class FILEBROWSER_PT_bookmarks_volumes(Panel): @classmethod def poll(cls, context): - return panel_poll_is_upper_region(context.region) + return panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) def draw(self, context): layout = self.layout @@ -207,7 +267,7 @@ class FILEBROWSER_PT_bookmarks_system(Panel): @classmethod def poll(cls, context): - return not context.preferences.filepaths.hide_system_bookmarks and panel_poll_is_upper_region(context.region) + return not context.preferences.filepaths.hide_system_bookmarks and panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) def draw(self, context): layout = self.layout @@ -241,7 +301,7 @@ class FILEBROWSER_PT_bookmarks_favorites(Panel): @classmethod def poll(cls, context): - return panel_poll_is_upper_region(context.region) + return panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) def draw(self, context): layout = self.layout @@ -278,7 +338,7 @@ class FILEBROWSER_PT_bookmarks_recents(Panel): @classmethod def poll(cls, context): - return not context.preferences.filepaths.hide_recent_locations and panel_poll_is_upper_region(context.region) + return not context.preferences.filepaths.hide_recent_locations and panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) def draw(self, context): layout = self.layout @@ -302,7 +362,7 @@ class FILEBROWSER_PT_advanced_filter(Panel): @classmethod def poll(cls, context): # only useful in append/link (library) context currently... - return context.space_data.params.use_library_browsing and panel_poll_is_upper_region(context.region) + return context.space_data.params.use_library_browsing and panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) def draw(self, context): layout = self.layout @@ -314,12 +374,26 @@ class FILEBROWSER_PT_advanced_filter(Panel): if params.use_filter_blendid: layout.separator() col = layout.column(align=True) + + col.prop(params, "use_filter_asset_only") + filter_id = params.filter_id for identifier in dir(filter_id): if identifier.startswith("filter_"): col.prop(filter_id, identifier, toggle=True) +def is_option_region_visible(context, space): + if not space.active_operator: + return False + + for region in context.area.regions: + if region.type == 'TOOL_PROPS' and region.width <= 1: + return False + + return True + + class FILEBROWSER_PT_directory_path(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'UI' @@ -334,16 +408,6 @@ class FILEBROWSER_PT_directory_path(Panel): return True - def is_option_region_visible(self, context, space): - if not space.active_operator: - return False - - for region in context.area.regions: - if region.type == 'TOOL_PROPS' and region.width <= 1: - return False - - return True - def draw(self, context): layout = self.layout space = context.space_data @@ -388,7 +452,7 @@ class FILEBROWSER_PT_directory_path(Panel): "screen.region_toggle", text="", icon='PREFERENCES', - depress=self.is_option_region_visible(context, space) + depress=is_option_region_visible(context, space) ).region_type = 'TOOL_PROPS' @@ -482,6 +546,89 @@ class FILEBROWSER_MT_context_menu(Menu): layout.prop_menu_enum(params, "sort_method") +class ASSETBROWSER_PT_navigation_bar(asset_utils.AssetBrowserPanel, Panel): + bl_label = "Asset Navigation" + bl_region_type = 'TOOLS' + bl_options = {'HIDE_HEADER'} + + def draw(self, context): + layout = self.layout + + space_file = context.space_data + + col = layout.column() + + col.scale_x = 1.3 + col.scale_y = 1.3 + col.prop(space_file.params, "asset_category", expand=True) + + +class ASSETBROWSER_PT_metadata(asset_utils.AssetBrowserPanel, Panel): + bl_region_type = 'TOOL_PROPS' + bl_label = "Asset Metadata" + bl_options = {'HIDE_HEADER'} + + def draw(self, context): + layout = self.layout + active_file = context.active_file + active_asset = asset_utils.SpaceAssetInfo.get_active_asset(context) + + layout.use_property_split = True + + if not active_file or not active_asset: + layout.label(text="No asset selected.") + return + + box = layout.box() + box.template_icon(icon_value=active_file.preview_icon_id, scale=5.0) + if bpy.ops.ed.lib_id_load_custom_preview.poll(): + box.operator("ed.lib_id_load_custom_preview", icon='FILEBROWSER', text="Load Custom") + layout.prop(active_file, "name") + + +class ASSETBROWSER_PT_metadata_details(asset_utils.AssetBrowserPanel, Panel): + bl_region_type = 'TOOL_PROPS' + bl_label = "Details" + bl_parent_id = "ASSETBROWSER_PT_metadata" + + def draw(self, context): + layout = self.layout + active_asset = asset_utils.SpaceAssetInfo.get_active_asset(context) + + layout.use_property_split = True + + if active_asset: + layout.prop(active_asset, "description") + + +class ASSETBROWSER_PT_metadata_tags(asset_utils.AssetMetaDataPanel, Panel): + bl_label = "Tags" + + def draw(self, context): + layout = self.layout + asset_data = asset_utils.SpaceAssetInfo.get_active_asset(context) + + row = layout.row() + row.template_list("ASSETBROWSER_UL_metadata_tags", "asset_tags", asset_data, "tags", + asset_data, "active_tag", rows=4) + + col = row.column(align=True) + col.operator("asset.tag_add", icon='ADD', text="") + col.operator("asset.tag_remove", icon='REMOVE', text="") + + +class ASSETBROWSER_UL_metadata_tags(UIList): + def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index): + tag = item + + row = layout.row(align=True) + # Non-editable entries would show grayed-out, which is bad in this specific case, so switch to mere label. + if tag.is_property_readonly("name"): + row.label(text=tag.name, icon_value=icon) + else: + row.prop(tag, "name", text="", emboss=False, icon_value=icon) + + classes = ( FILEBROWSER_HT_header, FILEBROWSER_PT_display, @@ -498,6 +645,11 @@ classes = ( FILEBROWSER_MT_view, FILEBROWSER_MT_select, FILEBROWSER_MT_context_menu, + ASSETBROWSER_PT_navigation_bar, + ASSETBROWSER_PT_metadata, + ASSETBROWSER_PT_metadata_details, + ASSETBROWSER_PT_metadata_tags, + ASSETBROWSER_UL_metadata_tags, ) if __name__ == "__main__": # only for live edit. |