[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26169] trunk/blender: - temp marker rename in menu (using python or the outliner isnt fun)

[Campbell Barton]

Revision: 26169
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26169
Author:   campbellbarton
Date:     2010-01-21 20:43:27 +0100 (Thu, 21 Jan 2010)

Log Message:
-----------
- temp marker rename in menu (using python or the outliner isnt fun)
- marker selected property
- rigify error formatting error

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/rigify/__init__.py
    trunk/blender/release/scripts/ui/space_time.py
    trunk/blender/source/blender/makesrna/intern/rna_timeline.c

Modified: trunk/blender/release/scripts/modules/rigify/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/__init__.py	2010-01-21 18:32:34 UTC (rev 26168)
+++ trunk/blender/release/scripts/modules/rigify/__init__.py	2010-01-21 19:43:27 UTC (rev 26169)
@@ -431,7 +431,7 @@
             else:
                 new_objects.append((obj, None))
         else:
-            print("note: rig type '%s' has no metarig_template(), can't test this", module_name)
+            print("note: rig type '%s' has no metarig_template(), can't test this" % module_name)
 
     return new_objects
 

Modified: trunk/blender/release/scripts/ui/space_time.py
===================================================================
--- trunk/blender/release/scripts/ui/space_time.py	2010-01-21 18:32:34 UTC (rev 26168)
+++ trunk/blender/release/scripts/ui/space_time.py	2010-01-21 19:43:27 UTC (rev 26169)
@@ -114,8 +114,14 @@
         layout.operator("marker.duplicate", text="Duplicate Marker")
         layout.operator("marker.move", text="Grab/Move Marker")
         layout.operator("marker.delete", text="Delete Marker")
-        layout.label(text="ToDo: Name Marker")
 
+        # it was ok for riscos... ok TODO, operator
+        for marker in context.scene.timeline_markers:
+            if marker.selected:
+                layout.separator()
+                layout.prop(marker, "name", text="", icon='MARKER_HLT')
+                break
+
         layout.separator()
 
         layout.operator("time.start_frame_set")

Modified: trunk/blender/source/blender/makesrna/intern/rna_timeline.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_timeline.c	2010-01-21 18:32:34 UTC (rev 26168)
+++ trunk/blender/source/blender/makesrna/intern/rna_timeline.c	2010-01-21 19:43:27 UTC (rev 26169)
@@ -31,6 +31,8 @@
 
 #include "DNA_scene_types.h"
 
+#include "WM_types.h"
+
 #ifdef RNA_RUNTIME
 
 #else
@@ -48,10 +50,17 @@
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "");
 	RNA_def_struct_name_property(srna, prop);
+	RNA_def_property_update(prop, NC_ANIMATION, NULL);
 
 	prop= RNA_def_property(srna, "frame", PROP_INT, PROP_TIME);
 	RNA_def_property_ui_text(prop, "Frame", "The frame on which the timeline marker appears.");
+	RNA_def_property_update(prop, NC_ANIMATION, NULL);
 
+	prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", 1 /*SELECT*/);
+	RNA_def_property_ui_text(prop, "Selected", "Marker selection state.");
+	RNA_def_property_update(prop, NC_ANIMATION, NULL);
+
 #ifdef DURIAN_CAMERA_SWITCH
 	prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "Object");