Merge with trunk r39928
[blender-staging.git] / source / blender / makesrna / intern / rna_space.c
index 0e1d638960823507e41a05776bc4038baf8c0bac..884018da868ffd2b9a64d066722dfc5b3155ece8 100644 (file)
@@ -591,7 +591,8 @@ static void rna_SpaceTextEditor_text_set(PointerRNA *ptr, PointerRNA value)
        SpaceText *st= (SpaceText*)(ptr->data);
 
        st->text= value.data;
-       st->top= 0;
+
+       WM_main_add_notifier(NC_TEXT|NA_SELECTED, st->text);
 }
 
 static void rna_SpaceTextEditor_updateEdited(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
@@ -1621,6 +1622,7 @@ static void rna_def_space_image(BlenderRNA *brna)
        RNA_def_property_flag(prop, PROP_EDITABLE);
        RNA_def_property_struct_type(prop, "GreasePencil");
        RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this space");
+       RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
 
        prop= RNA_def_property(srna, "use_grease_pencil", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DISPGP);
@@ -1878,11 +1880,12 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
        StructRNA *srna;
        PropertyRNA *prop;
        
+       // XXX: action-editor is currently for object-level only actions, so show that using object-icon hint
        static EnumPropertyItem mode_items[] = {
-               {SACTCONT_DOPESHEET, "DOPESHEET", 0, "DopeSheet", "DopeSheet Editor"},
-               {SACTCONT_ACTION, "ACTION", 0, "Action Editor", "Action Editor"},
-               {SACTCONT_SHAPEKEY, "SHAPEKEY", 0, "ShapeKey Editor", "ShapeKey Editor"},
-               {SACTCONT_GPENCIL, "GPENCIL", 0, "Grease Pencil", "Grease Pencil"},
+               {SACTCONT_DOPESHEET, "DOPESHEET", ICON_OOPS, "DopeSheet", "DopeSheet Editor"},
+               {SACTCONT_ACTION, "ACTION", ICON_OBJECT_DATA, "Action Editor", "Action Editor"},
+               {SACTCONT_SHAPEKEY, "SHAPEKEY", ICON_SHAPEKEY_DATA, "ShapeKey Editor", "ShapeKey Editor"},
+               {SACTCONT_GPENCIL, "GPENCIL", ICON_GREASEPENCIL, "Grease Pencil", "Grease Pencil"},
                {0, NULL, 0, NULL, NULL}};
                
        
@@ -1961,8 +1964,8 @@ static void rna_def_space_graph(BlenderRNA *brna)
        PropertyRNA *prop;
        
        static EnumPropertyItem mode_items[] = {
-               {SIPO_MODE_ANIMATION, "FCURVES", 0, "F-Curve Editor", "Edit f-curves"},
-               {SIPO_MODE_DRIVERS, "DRIVERS", 0, "Drivers", "Edit drivers"},
+               {SIPO_MODE_ANIMATION, "FCURVES", ICON_IPO, "F-Curve Editor", "Edit animation/keyframes displayed as 2D curves"},
+               {SIPO_MODE_DRIVERS, "DRIVERS", ICON_DRIVER, "Drivers", "Edit drivers"},
                {0, NULL, 0, NULL, NULL}};
                
                /* this is basically the same as the one for the 3D-View, but with some entries ommitted */
@@ -2019,9 +2022,9 @@ static void rna_def_space_graph(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Only Selected Keyframes Handles", "Only show and edit handles of selected keyframes");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
        
-       prop= RNA_def_property(srna, "use_fancy_drawing", PROP_BOOLEAN, PROP_NONE);
+       prop= RNA_def_property(srna, "use_beauty_drawing", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_BEAUTYDRAW_OFF);
-       RNA_def_property_ui_text(prop, "Use Fancy Drawing", "Draw F-Curves using Anti-Aliasing and other fancy effects. Disable for better performance");
+       RNA_def_property_ui_text(prop, "Use High Quality Drawing", "Draw F-Curves using Anti-Aliasing and other fancy effects. Disable for better performance");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL);
        
        /* editing */
@@ -2131,7 +2134,7 @@ static void rna_def_space_time(BlenderRNA *brna)
        /* 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);