COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook

1 files changed, 22 insertions, 15 deletions

diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/ui/space_outliner.py
index d5bb35baa6c..38e749c4a75 100644
--- a/release/scripts/ui/space_outliner.py
+++ b/release/scripts/ui/space_outliner.py
@@ -28,7 +28,7 @@ class OUTLINER_HT_header(bpy.types.Header):
 
         space = context.space_data
         scene = context.scene
-        ks = context.scene.active_keying_set
+        ks = context.scene.keying_sets.active
 
         row = layout.row(align=True)
         row.template_header()
@@ -36,11 +36,14 @@ class OUTLINER_HT_header(bpy.types.Header):
         if context.area.show_menus:
             sub = row.row(align=True)
             sub.menu("OUTLINER_MT_view")
+            sub.menu("OUTLINER_MT_search")
             if space.display_mode == 'DATABLOCKS':
                 sub.menu("OUTLINER_MT_edit_datablocks")
 
         layout.prop(space, "display_mode", text="")
 
+        layout.prop(space, "filter_text", icon='VIEWZOOM', text="")
+
         layout.separator()
 
         if space.display_mode == 'DATABLOCKS':
@@ -50,7 +53,7 @@ class OUTLINER_HT_header(bpy.types.Header):
 
             if ks:
                 row = layout.row(align=False)
-                row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="")
+                row.prop_search(scene.keying_sets, "active", scene, "keying_sets", text="")
 
                 row = layout.row(align=True)
                 row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
@@ -70,7 +73,7 @@ class OUTLINER_MT_view(bpy.types.Menu):
 
         col = layout.column()
         if space.display_mode not in ('DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'):
-            col.prop(space, "show_restriction_columns")
+            col.prop(space, "show_restrict_columns")
             col.separator()
             col.operator("outliner.show_active")
 
@@ -83,6 +86,20 @@ class OUTLINER_MT_view(bpy.types.Menu):
         layout.operator("screen.screen_full_area")
 
 
+class OUTLINER_MT_search(bpy.types.Menu):
+    bl_label = "Search"
+
+    def draw(self, context):
+        layout = self.layout
+
+        space = context.space_data
+
+        col = layout.column()
+
+        col.prop(space, "use_filter_case_sensitive")
+        col.prop(space, "use_filter_complete")
+
+
 class OUTLINER_MT_edit_datablocks(bpy.types.Menu):
     bl_label = "Edit"
 
@@ -100,22 +117,12 @@ class OUTLINER_MT_edit_datablocks(bpy.types.Menu):
         col.operator("outliner.drivers_delete_selected")
 
 
-classes = [
-    OUTLINER_HT_header,
-    OUTLINER_MT_view,
-    OUTLINER_MT_edit_datablocks]
-
-
 def register():
-    register = bpy.types.register
-    for cls in classes:
-        register(cls)
+    pass
 
 
 def unregister():
-    unregister = bpy.types.unregister
-    for cls in classes:
-        unregister(cls)
+    pass
 
 if __name__ == "__main__":
     register()