Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / release / ui / space_time.py
index bb82eea..d1c9f98 100644 (file)
@@ -2,7 +2,7 @@
 import bpy
 
 class TIME_HT_header(bpy.types.Header):
-       __space_type__ = 'TIMELINE'
+       __space_type__ = "TIMELINE"
 
        def draw(self, context):
                layout = self.layout
@@ -22,7 +22,7 @@ class TIME_HT_header(bpy.types.Header):
                        sub.itemM("TIME_MT_frame")
                        sub.itemM("TIME_MT_playback")
 
-               layout.itemR(scene, "use_preview_range", text="PR")
+               layout.itemR(scene, "use_preview_range", text="PR", toggle=True)
                
                row = layout.row(align=True)
                if not scene.use_preview_range:
@@ -33,8 +33,6 @@ class TIME_HT_header(bpy.types.Header):
                        row.itemR(scene, "preview_range_end_frame", text="End")
                
                layout.itemR(scene, "current_frame", text="")
-               
-               layout.itemS()
 
                row = layout.row(align=True)
                row.item_booleanO("screen.frame_jump", "end", False, text="", icon='ICON_REW')
@@ -49,23 +47,28 @@ class TIME_HT_header(bpy.types.Header):
                row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME')
                row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF')
                
+               layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
+               
+               layout.itemS()
+               
                row = layout.row(align=True)
                row.itemR(tools, "enable_auto_key", text="", toggle=True, icon='ICON_REC')
+               sub = row.row()
+               sub.active = tools.enable_auto_key
+               sub.itemR(tools, "autokey_mode", text="")
                if screen.animation_playing and tools.enable_auto_key:
                        subsub = row.row()
                        subsub.itemR(tools, "record_with_nla", toggle=True)
-                       
-               layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
                
                layout.itemS()
                
                row = layout.row(align=True)
-               row.item_pointerR(scene, "active_keying_set", scene, "keying_sets", text="")
-               row.itemO("anim.insert_keyframe", text="", icon='ICON_KEY_HLT')
-               row.itemO("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT')
+               row.itemR(scene, "active_keying_set", text="")
+               row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")
+               row.itemO("anim.delete_keyframe", text="", icon="ICON_KEY_DEHLT")
 
 class TIME_MT_view(bpy.types.Menu):
-       __space_type__ = 'TIMELINE'
+       __space_type__ = "TIMELINE"
        __label__ = "View"
 
        def draw(self, context):
@@ -80,12 +83,11 @@ class TIME_MT_view(bpy.types.Menu):
                layout.itemR(st, "only_selected")
 
 class TIME_MT_frame(bpy.types.Menu):
-       __space_type__ = 'TIMELINE'
+       __space_type__ = "TIMELINE"
        __label__ = "Frame"
 
        def draw(self, context):
                layout = self.layout
-               tools = context.tool_settings
                
                layout.itemO("marker.add", text="Add Marker")
                layout.itemO("marker.duplicate", text="Duplicate Marker")
@@ -97,22 +99,15 @@ class TIME_MT_frame(bpy.types.Menu):
                
                layout.itemO("time.start_frame_set")
                layout.itemO("time.end_frame_set")
-               
-               layout.itemS()
-               
-               sub = layout.row()
-               sub.active = tools.enable_auto_key
-               sub.itemM("TIME_MT_autokey")
 
 class TIME_MT_playback(bpy.types.Menu):
-       __space_type__ = 'TIMELINE'
+       __space_type__ = "TIMELINE"
        __label__ = "Playback"
 
        def draw(self, context):
                layout = self.layout
                
                st = context.space_data
-               rd = context.scene.render_data
                
                layout.itemR(st, "play_top_left")
                layout.itemR(st, "play_all_3d")
@@ -120,32 +115,10 @@ class TIME_MT_playback(bpy.types.Menu):
                layout.itemR(st, "play_buttons")
                layout.itemR(st, "play_image")
                layout.itemR(st, "play_sequencer")
-               
                layout.itemS()
-               
                layout.itemR(st, "continue_physics")
-               
-               layout.itemS()
-               
-               layout.itemR(rd, "sync_audio", icon='ICON_SPEAKER')
-
-               
-               
-class TIME_MT_autokey(bpy.types.Menu):
-       __space_type__ = 'TIMELINE'
-       __label__ = "Auto-Keyframing Mode"
-
-       def draw(self, context):
-               layout = self.layout
-               tools = context.tool_settings
-               
-               layout.active = tools.enable_auto_key
-               
-               layout.item_enumR(tools, "autokey_mode", 'ADD_REPLACE_KEYS')
-               layout.item_enumR(tools, "autokey_mode", 'REPLACE_KEYS')
 
 bpy.types.register(TIME_HT_header)
 bpy.types.register(TIME_MT_view)
 bpy.types.register(TIME_MT_frame)
-bpy.types.register(TIME_MT_autokey)
 bpy.types.register(TIME_MT_playback)