Commit: 23cfdc948fadcb8215ef16bf12ba45e02d31231f Author: Brian Meisenheimer Date: Thu Apr 25 19:34:34 2019 +0200 Branches: filebrowser_redesign https://developer.blender.org/rB23cfdc948fadcb8215ef16bf12ba45e02d31231f
Changed the layout of the directory buttons, display mode panel and the "Create new directory" button =================================================================== M release/scripts/addons M release/scripts/addons_contrib M release/scripts/startup/bl_ui/space_filebrowser.py M source/tools =================================================================== diff --git a/release/scripts/addons b/release/scripts/addons index e4165cee8b3..1b3bbeea01d 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit e4165cee8b34b216db5ff41b20b9a05991a4b4b7 +Subproject commit 1b3bbeea01d4cb1aca3ccd2986fee85b253c8d3c diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index ca68e1d4e01..fe37465a84f 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit ca68e1d4e01d343b1758118b500bdc92eaea30ee +Subproject commit fe37465a84fdcadcb0465888d58bed2f87c36ce5 diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 9d61c11a0ff..aa3ec65526e 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -34,14 +34,7 @@ class FILEBROWSER_HT_header(Header): layout.menu("FILEBROWSER_MT_view") - row = layout.row(align=True) - row.operator("file.previous", text="", icon='BACK') - row.operator("file.next", text="", icon='FORWARD') - row.operator("file.parent", text="", icon='FILE_PARENT') - row.operator("file.refresh", text="", icon='FILE_REFRESH') - layout.operator_context = 'EXEC_DEFAULT' - layout.operator("file.directory_new", icon='NEWFOLDER', text="") layout.operator_context = 'INVOKE_DEFAULT' @@ -49,7 +42,6 @@ class FILEBROWSER_HT_header(Header): if params: is_lib_browser = params.use_library_browsing - layout.prop(params, "display_type", expand=True, text="") layout.prop(params, "sort_method", expand=True, text="") layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN') @@ -257,8 +249,23 @@ class FILEBROWSER_PT_directory_path(Panel): layout.scale_y = 1.3 row = layout.row() + + subrow = row.row(align=True) + subrow.operator("file.previous", text="", icon='BACK') + subrow.operator("file.next", text="", icon='FORWARD') + subrow.operator("file.parent", text="", icon='FILE_PARENT') + subrow.operator("file.refresh", text="", icon='FILE_REFRESH') # TODO proper directory input text field - row.prop(params, "directory", text="") + + subrow = row.row() + subrow.prop(params, "directory", text="") + + subrow = row.row(align=True) + subrow.prop(params, "display_type", expand=True, text="") + + subrow = row.row(align=True) + subrow.operator("file.directory_new", icon='NEWFOLDER', text="") + class FILEBROWSER_PT_file_operation(Panel): diff --git a/source/tools b/source/tools index 6cf5f61a957..4fad0d8ffc9 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 6cf5f61a957798d3fa0678aa92a2afd99023b033 +Subproject commit 4fad0d8ffc9a90e4c6660b3f7512f23cb4a086a7 _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs