- include operator commands in tooltips (needs sanitizing for transform operators, there are massive :|)

- WM_operator_pystring can now be used with an operator type and properties (rather then a wmOperator instance)
- removed menus from file selector

1 files changed, 4 insertions, 28 deletions

diff --git a/release/ui/space_filebrowser.py b/release/ui/space_filebrowser.py
index 2d35616069c..0fecbdbfbba 100644
--- a/release/ui/space_filebrowser.py
+++ b/release/ui/space_filebrowser.py
@@ -11,18 +11,16 @@ class FILEBROWSER_HT_header(bpy.types.Header):
 		
 		params = st.params 
 		layout.template_header()
-
-		if context.area.show_menus:
-			row = layout.row()
-			row.itemM("FILEBROWSER_MT_directory")
-			row.itemM("FILEBROWSER_MT_bookmarks")
-
+		
 		row = layout.row(align=True)
 		row.itemO("file.parent", text="", icon='ICON_FILE_PARENT')
 		row.itemO("file.refresh", text="", icon='ICON_FILE_REFRESH')
 		row.itemO("file.previous", text="", icon='ICON_PREV_KEYFRAME')
 		row.itemO("file.next", text="", icon='ICON_NEXT_KEYFRAME')
 		
+		row = layout.row(align=True)
+		row.itemO("file.directory_new", text="", icon='ICON_NEWFOLDER')
+		
 		layout.itemR(params, "display", expand=True, text="")
 		layout.itemR(params, "sort", expand=True, text="")
 		
@@ -41,27 +39,5 @@ class FILEBROWSER_HT_header(bpy.types.Header):
 
 		row.active = params.do_filter
 
-class FILEBROWSER_MT_directory(bpy.types.Menu):
-	__space_type__ = "FILE_BROWSER"
-	__label__ = "Directory"
-
-	def draw(self, context):
-		layout = self.layout
-
-		layout.itemO("file.directory_new", text="New Directory", icon='ICON_NEWFOLDER')
-		layout.itemO("file.refresh", text="Refresh", icon='ICON_FILE_REFRESH')
-		layout.itemO("file.parent", text="Parent", icon='ICON_FILE_PARENT')
-		
-class FILEBROWSER_MT_bookmarks(bpy.types.Menu):
-	__space_type__ = "FILE_BROWSER"
-	__label__ = "Bookmarks"
-
-	def draw(self, context):
-		layout = self.layout
-
-		layout.itemO("file.add_bookmark", text="Add current directory", icon='ICON_BOOKMARKS')
-
 		
 bpy.types.register(FILEBROWSER_HT_header)
-bpy.types.register(FILEBROWSER_MT_directory)
-bpy.types.register(FILEBROWSER_MT_bookmarks)