[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39072] branches/soc-2011-pepper/source/ blender/makesrna/intern: Timeline UI Nitpicks:

[Joshua Leung]

Revision: 39072
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39072
Author:   aligorith
Date:     2011-08-05 12:17:49 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Timeline UI Nitpicks:
* "Only Selected channels" -> "Only Selected Channels"
* Use Keying Set icon for "only keying set" toggle for autokeying

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_space.c

Modified: branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c	2011-08-05 12:07:05 UTC (rev 39071)
+++ branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c	2011-08-05 12:17:49 UTC (rev 39072)
@@ -1010,9 +1010,8 @@
 
 static void rna_TimeLine_remove(Scene *scene, ReportList *reports, TimeMarker *marker)
 {
-	/* try to remove the F-Curve from the action */
 	if (!BLI_remlink_safe(&scene->markers, marker)) {
-		BKE_reportf(reports, RPT_ERROR, "TimelineMarker '%s' not found in action '%s'", marker->name, scene->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "TimelineMarker '%s' not found in scene '%s'", marker->name, scene->id.name+2);
 		return;
 	}
 
@@ -1231,7 +1230,7 @@
 	prop= RNA_def_property(srna, "use_keyframe_insert_keyingset", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_ONLYKEYINGSET);
 	RNA_def_property_ui_text(prop, "Auto Keyframe Insert Keying Set", "Automatic keyframe insertion using active Keying Set only");
-	RNA_def_property_ui_icon(prop, ICON_KEY_HLT, 0); // XXX: we need a dedicated icon
+	RNA_def_property_ui_icon(prop, ICON_KEYINGSET, 0);
 	
 	/* UV */
 	prop= RNA_def_property(srna, "uv_select_mode", PROP_ENUM, PROP_NONE);

Modified: branches/soc-2011-pepper/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/soc-2011-pepper/source/blender/makesrna/intern/rna_space.c	2011-08-05 12:07:05 UTC (rev 39071)
+++ branches/soc-2011-pepper/source/blender/makesrna/intern/rna_space.c	2011-08-05 12:17:49 UTC (rev 39072)
@@ -2131,7 +2131,7 @@
 	/* view settings */	
 	prop= RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TIME_ONLYACTSEL);
-	RNA_def_property_ui_text(prop, "Only Selected channels", "Show keyframes for active Object and/or its selected channels only");	
+	RNA_def_property_ui_text(prop, "Only Selected Channels", "Show keyframes for active Object and/or its selected bones only");	
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL);
 	
 	prop= RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE);