[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41497] trunk/blender/release/scripts/ startup/bl_ui: patch [#27917] MARKER MENUS: Unification and adding " Duplicate Marker to Scene..."
Campbell Barton
ideasman42 at gmail.com
Thu Nov 3 13:47:39 CET 2011
Revision: 41497
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41497
Author: campbellbarton
Date: 2011-11-03 12:47:39 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
patch [#27917] MARKER MENUS: Unification and adding "Duplicate Marker to Scene..."
from Troy Sobotka (sobotka), with edits
- remove Markers from Ctrl+L menu (was out of place here and was broken from recent changes to marker operators)
- further de-duplicte scripts by having all menus call the same function: marker_menu_generic().
this fixes bug [#29083] too.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_graph.py
trunk/blender/release/scripts/startup/bl_ui/space_nla.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_time.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
Modified: trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py 2011-11-03 12:43:45 UTC (rev 41496)
+++ trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py 2011-11-03 12:47:39 UTC (rev 41497)
@@ -213,19 +213,11 @@
def draw(self, context):
layout = self.layout
+ from .space_time import marker_menu_generic
+ marker_menu_generic(layout)
+
st = context.space_data
- #layout.operator_context = 'EXEC_REGION_WIN'
-
- layout.operator("marker.add", "Add Marker")
- layout.operator("marker.duplicate", text="Duplicate Marker")
- layout.operator("marker.delete", text="Delete Marker")
-
- layout.separator()
-
- layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
-
if st.mode in {'ACTION', 'SHAPEKEY'} and st.action:
layout.separator()
layout.prop(st, "show_pose_markers")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_graph.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_graph.py 2011-11-03 12:43:45 UTC (rev 41496)
+++ trunk/blender/release/scripts/startup/bl_ui/space_graph.py 2011-11-03 12:47:39 UTC (rev 41497)
@@ -144,17 +144,9 @@
def draw(self, context):
layout = self.layout
- #layout.operator_context = 'EXEC_REGION_WIN'
+ from .space_time import marker_menu_generic
+ marker_menu_generic(layout)
- layout.operator("marker.add", "Add Marker")
- layout.operator("marker.duplicate", text="Duplicate Marker")
- layout.operator("marker.delete", text="Delete Marker")
-
- layout.separator()
-
- layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
-
# TODO: pose markers for action edit mode only?
Modified: trunk/blender/release/scripts/startup/bl_ui/space_nla.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_nla.py 2011-11-03 12:43:45 UTC (rev 41496)
+++ trunk/blender/release/scripts/startup/bl_ui/space_nla.py 2011-11-03 12:47:39 UTC (rev 41497)
@@ -104,18 +104,10 @@
def draw(self, context):
layout = self.layout
- #layout.operator_context = 'EXEC_REGION_WIN'
+ from .space_time import marker_menu_generic
+ marker_menu_generic(layout)
- layout.operator("marker.add", "Add Marker")
- layout.operator("marker.duplicate", text="Duplicate Marker")
- layout.operator("marker.delete", text="Delete Marker")
- layout.separator()
-
- layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
-
-
class NLA_MT_edit(Menu):
bl_label = "Edit"
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2011-11-03 12:43:45 UTC (rev 41496)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2011-11-03 12:47:39 UTC (rev 41497)
@@ -158,20 +158,10 @@
def draw(self, context):
layout = self.layout
- #layout.operator_context = 'EXEC_REGION_WIN'
+ from .space_time import marker_menu_generic
+ marker_menu_generic(layout)
- layout.operator("marker.add", "Add Marker")
- layout.operator("marker.duplicate", text="Duplicate Marker")
- layout.operator("marker.delete", text="Delete Marker")
- layout.separator()
-
- layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
-
- #layout.operator("sequencer.sound_strip_add", text="Transform Markers") # toggle, will be rna - (sseq->flag & SEQ_MARKER_TRANS)
-
-
class SEQUENCER_MT_change(Menu):
bl_label = "Change"
Modified: trunk/blender/release/scripts/startup/bl_ui/space_time.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_time.py 2011-11-03 12:43:45 UTC (rev 41496)
+++ trunk/blender/release/scripts/startup/bl_ui/space_time.py 2011-11-03 12:47:39 UTC (rev 41497)
@@ -36,6 +36,7 @@
if context.area.show_menus:
row.menu("TIME_MT_view")
+ row.menu("TIME_MT_marker")
row.menu("TIME_MT_frame")
row.menu("TIME_MT_playback")
@@ -91,6 +92,15 @@
row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
+class TIME_MT_marker(bpy.types.Menu):
+ bl_label = "Marker"
+
+ def draw(self, context):
+ layout = self.layout
+
+ marker_menu_generic(layout)
+
+
class TIME_MT_view(Menu):
bl_label = "View"
@@ -142,17 +152,6 @@
def draw(self, context):
layout = self.layout
- layout.operator("marker.add", text="Add Marker")
- layout.operator("marker.duplicate", text="Duplicate Marker")
- layout.operator("marker.delete", text="Delete Marker")
-
- layout.separator()
-
- layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
-
- layout.separator()
-
layout.operator("time.start_frame_set")
layout.operator("time.end_frame_set")
@@ -197,5 +196,28 @@
layout.prop_enum(tools, "auto_keying_mode", 'ADD_REPLACE_KEYS')
layout.prop_enum(tools, "auto_keying_mode", 'REPLACE_KEYS')
+
+def marker_menu_generic(layout):
+
+ #layout.operator_context = 'EXEC_REGION_WIN'
+
+ layout.column()
+ layout.operator("marker.add", "Add Marker")
+ layout.operator("marker.duplicate", text="Duplicate Marker")
+
+ if(len(bpy.data.scenes) > 10):
+ layout.operator_context = 'INVOKE_DEFAULT'
+ layout.operator("marker.make_links_scene", text="Duplicate Marker to Scene...", icon='OUTLINER_OB_EMPTY')
+ else:
+ layout.operator_menu_enum("marker.make_links_scene", "scene", text="Duplicate Marker to Scene...")
+
+ layout.operator("marker.delete", text="Delete Marker")
+
+ layout.separator()
+
+ layout.operator("marker.rename", text="Rename Marker")
+ layout.operator("marker.move", text="Grab/Move Marker")
+
+
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-03 12:43:45 UTC (rev 41496)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-03 12:47:39 UTC (rev 41497)
@@ -976,10 +976,8 @@
if(len(bpy.data.scenes) > 10):
layout.operator_context = 'INVOKE_DEFAULT'
layout.operator("object.make_links_scene", text="Objects to Scene...", icon='OUTLINER_OB_EMPTY')
- layout.operator("object.make_links_scene", text="Markers to Scene...", icon='OUTLINER_OB_EMPTY')
else:
layout.operator_menu_enum("object.make_links_scene", "scene", text="Objects to Scene...")
- layout.operator_menu_enum("marker.make_links_scene", "scene", text="Markers to Scene...")
layout.operator_enum("object.make_links_data", "type") # inline
More information about the Bf-blender-cvs
mailing list