[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22765] branches/blender2.5/blender: Moved the autokey mode menu from the timeline header into the timeline menus .

[William Reynish]

Revision: 22765
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22765
Author:   billrey
Date:     2009-08-25 14:31:35 +0200 (Tue, 25 Aug 2009)

Log Message:
-----------
Moved the autokey mode menu from the timeline header into the timeline menus. Its previous prominent large size made it seem like this setting was very important, when in fact it's a setting you are almost never likely to touch. This helps clean up the main UI.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_physics_cloth.py
    branches/blender2.5/blender/release/ui/buttons_physics_softbody.py
    branches/blender2.5/blender/release/ui/space_time.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c

Modified: branches/blender2.5/blender/release/ui/buttons_physics_cloth.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_cloth.py	2009-08-25 10:56:01 UTC (rev 22764)
+++ branches/blender2.5/blender/release/ui/buttons_physics_cloth.py	2009-08-25 12:31:35 UTC (rev 22765)
@@ -91,7 +91,7 @@
 		layout.set_context_pointer("PointCache", cache)
 		
 		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
 		col = row.column(align=True)
 		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
 		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")

Modified: branches/blender2.5/blender/release/ui/buttons_physics_softbody.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_softbody.py	2009-08-25 10:56:01 UTC (rev 22764)
+++ branches/blender2.5/blender/release/ui/buttons_physics_softbody.py	2009-08-25 12:31:35 UTC (rev 22765)
@@ -66,7 +66,7 @@
 		layout.set_context_pointer("PointCache", cache)
 		
 		row = layout.row()
-		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+		row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2)
 		col = row.column(align=True)
 		col.itemO("ptcache.add_new", icon='ICON_ZOOMIN', text="")
 		col.itemO("ptcache.remove", icon='ICON_ZOOMOUT', text="")

Modified: branches/blender2.5/blender/release/ui/space_time.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_time.py	2009-08-25 10:56:01 UTC (rev 22764)
+++ branches/blender2.5/blender/release/ui/space_time.py	2009-08-25 12:31:35 UTC (rev 22765)
@@ -33,6 +33,8 @@
 			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')
@@ -47,18 +49,13 @@
 		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()
 		
@@ -88,6 +85,7 @@
 
 	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")
@@ -99,6 +97,12 @@
 		
 		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'
@@ -108,6 +112,7 @@
 		layout = self.layout
 		
 		st = context.space_data
+		rd = context.scene.render_data
 		
 		layout.itemR(st, "play_top_left")
 		layout.itemR(st, "play_all_3d")
@@ -115,10 +120,32 @@
 		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)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-08-25 10:56:01 UTC (rev 22764)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-08-25 12:31:35 UTC (rev 22765)
@@ -418,7 +418,7 @@
 		{0, NULL, 0, NULL, NULL}};
 		
 	static EnumPropertyItem auto_key_items[] = {
-		{AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add/Replace", ""},
+		{AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add & Replace", ""},
 		{AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", 0, "Replace", ""},
 		{0, NULL, 0, NULL, NULL}};