UI messages fixes...
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Nov 2013 18:58:22 +0000 (18:58 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Nov 2013 18:58:22 +0000 (18:58 +0000)
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_tracking.c

index b35ed10b157bf9f1ae5fda1c954b2a2845bbe9dc..203907226e3e7a76875d25cfb9a52bb1dcb91056 100644 (file)
@@ -3234,8 +3234,10 @@ void MESH_OT_quads_convert_to_tris(wmOperatorType *ot)
        /* flags */
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-       RNA_def_enum(ot->srna, "quad_method", modifier_triangulate_quad_method_items, MOD_TRIANGULATE_QUAD_BEAUTY, "Quad Method", "Method for splitting the quads into triangles");
-       RNA_def_enum(ot->srna, "ngon_method", modifier_triangulate_ngon_method_items, MOD_TRIANGULATE_NGON_BEAUTY, "Ngon Method", "Method for splitting the ngons into triangles");
+       RNA_def_enum(ot->srna, "quad_method", modifier_triangulate_quad_method_items, MOD_TRIANGULATE_QUAD_BEAUTY,
+                    "Quad Method", "Method for splitting the quads into triangles");
+       RNA_def_enum(ot->srna, "ngon_method", modifier_triangulate_ngon_method_items, MOD_TRIANGULATE_NGON_BEAUTY,
+                    "Polygon Method", "Method for splitting the polygons into triangles");
 }
 
 static int edbm_tris_convert_to_quads_exec(bContext *C, wmOperator *op)
index 61a484c8a2a847899a7249763b35d41ef36e349c..5607d7dc635b6958a7cdb823f5a5ddefbe7d2178 100644 (file)
@@ -1423,7 +1423,7 @@ static int track_markers_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS
        if (sc == NULL) {
                /* TODO(sergey): Support clip for invoke as well. */
                BKE_report(op->reports, RPT_ERROR,
-                          "Invoking this operator only supported from Clip Editor space.");
+                          "Invoking this operator only supported from Clip Editor space");
                return OPERATOR_CANCELLED;
        }
 
index 276d8e0a67838fbe337704fc9f023266165fcd4b..eee7692e2edbe0da37cb25ff2f1ec1114cc4f7e2 100644 (file)
@@ -112,13 +112,15 @@ EnumPropertyItem modifier_type_items[] = {
 EnumPropertyItem modifier_triangulate_quad_method_items[] = {
        {MOD_TRIANGULATE_QUAD_BEAUTY, "BEAUTY", 0, "Beauty ", "Split the quads in nice triangles, slower method"},
        {MOD_TRIANGULATE_QUAD_FIXED, "FIXED", 0, "Fixed", "Split the quads on the first and third vertices"},
-       {MOD_TRIANGULATE_QUAD_ALTERNATE, "FIXED_ALTERNATE", 0, "Fixed Alternate", "Split the quads on the 2nd and 4th vertices"},
-       {MOD_TRIANGULATE_QUAD_SHORTEDGE, "SHORTEST_DIAGONAL", 0, "Shortest Diagonal", "Split the quads based on the distance between the vertices"},
+       {MOD_TRIANGULATE_QUAD_ALTERNATE, "FIXED_ALTERNATE", 0, "Fixed Alternate",
+                                            "Split the quads on the 2nd and 4th vertices"},
+       {MOD_TRIANGULATE_QUAD_SHORTEDGE, "SHORTEST_DIAGONAL", 0, "Shortest Diagonal",
+                                            "Split the quads based on the distance between the vertices"},
        {0, NULL, 0, NULL, NULL}
 };
 
 EnumPropertyItem modifier_triangulate_ngon_method_items[] = {
-       {MOD_TRIANGULATE_NGON_SCANFILL, "SCANFILL", 0, "Scanfill", "Split the ngons using a scanfill algorithm "},
+       {MOD_TRIANGULATE_NGON_SCANFILL, "SCANFILL", 0, "Scanfill", "Split the polygons using a scanfill algorithm"},
        {MOD_TRIANGULATE_NGON_BEAUTY, "BEAUTY", 0, "Beauty", "Arrange the new triangles nicely, slower method"},
        {0, NULL, 0, NULL, NULL}
 };
@@ -3523,7 +3525,7 @@ static void rna_def_modifier_triangulate(BlenderRNA *brna)
        prop = RNA_def_property(srna, "ngon_method", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "ngon_method");
        RNA_def_property_enum_items(prop, modifier_triangulate_ngon_method_items);
-       RNA_def_property_ui_text(prop, "Ngon Method", "Method for splitting the ngons into triangles");
+       RNA_def_property_ui_text(prop, "Polygon Method", "Method for splitting the polygons into triangles");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
index a99cdda6ff351fc5eaa9084569d823d4d2cba0c6..07723b348379f1176cd377e4675a157e63d063eb 100644 (file)
@@ -1212,7 +1212,8 @@ static int rna_SpaceNodeEditor_tree_type_poll(void *Cv, bNodeTreeType *type)
        else
                return TRUE;
 }
-static EnumPropertyItem *rna_SpaceNodeEditor_tree_type_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free)
+static EnumPropertyItem *rna_SpaceNodeEditor_tree_type_itemf(bContext *C, PointerRNA *UNUSED(ptr),
+                                                             PropertyRNA *UNUSED(prop), int *free)
 {
        return rna_node_tree_type_itemf(C, rna_SpaceNodeEditor_tree_type_poll, free);
 }
@@ -1785,8 +1786,8 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        prop = RNA_def_property(srna, "use_render_border", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_RENDER_BORDER);
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-       RNA_def_property_ui_text(prop, "Render Border",
-                                "Use a region within the frame size for rendered viewport (when not viewing through the camera)");
+       RNA_def_property_ui_text(prop, "Render Border", "Use a region within the frame size for rendered viewport "
+                                "(when not viewing through the camera)");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
        prop = RNA_def_property(srna, "render_border_min_x", PROP_FLOAT, PROP_NONE);
@@ -1832,7 +1833,8 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        prop = RNA_def_property(srna, "viewport_shade", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "drawtype");
        RNA_def_property_enum_items(prop, viewport_shade_items);
-       RNA_def_property_enum_funcs(prop, "rna_SpaceView3D_viewport_shade_get", NULL, "rna_SpaceView3D_viewport_shade_itemf");
+       RNA_def_property_enum_funcs(prop, "rna_SpaceView3D_viewport_shade_get", NULL,
+                                   "rna_SpaceView3D_viewport_shade_itemf");
        RNA_def_property_ui_text(prop, "Viewport Shading", "Method to display/shade objects in the 3D View");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
 
@@ -2884,13 +2886,14 @@ static void rna_def_space_graph(BlenderRNA *brna)
        /* nromalize curves */
        prop = RNA_def_property(srna, "use_normalization", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_NORMALIZE);
-       RNA_def_property_ui_text(prop, "use Normalization", "Display curves in normalized to -1..1 range, "
-                               "for easier editing of multiple curves with different ranges");
+       RNA_def_property_ui_text(prop, "Use Normalization", "Display curves in normalized to -1..1 range, "
+                                "for easier editing of multiple curves with different ranges");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL);
 
        prop = RNA_def_property(srna, "use_auto_normalization", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NORMALIZE_FREEZE);
-       RNA_def_property_ui_text(prop, "Auto Normalization", "Automatically recalculate curve normalization on every curve edit");
+       RNA_def_property_ui_text(prop, "Auto Normalization",
+                                "Automatically recalculate curve normalization on every curve edit");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL);
 }
 
@@ -3385,7 +3388,8 @@ static void rna_def_space_node(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "tree_type", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, dummy_items);
-       RNA_def_property_enum_funcs(prop, "rna_SpaceNodeEditor_tree_type_get", "rna_SpaceNodeEditor_tree_type_set", "rna_SpaceNodeEditor_tree_type_itemf");
+       RNA_def_property_enum_funcs(prop, "rna_SpaceNodeEditor_tree_type_get", "rna_SpaceNodeEditor_tree_type_set",
+                                   "rna_SpaceNodeEditor_tree_type_itemf");
        RNA_def_property_ui_text(prop, "Tree Type", "Node tree type to display and edit");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, NULL);
 
@@ -3417,7 +3421,8 @@ static void rna_def_space_node(BlenderRNA *brna)
        rna_def_space_node_path_api(brna, prop);
 
        prop = RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE);
-       RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceNodeEditor_node_tree_set", NULL, "rna_SpaceNodeEditor_node_tree_poll");
+       RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceNodeEditor_node_tree_set", NULL,
+                                      "rna_SpaceNodeEditor_node_tree_poll");
        RNA_def_property_pointer_sdna(prop, NULL, "nodetree");
        RNA_def_property_flag(prop, PROP_EDITABLE | PROP_CONTEXT_UPDATE);
        RNA_def_property_ui_text(prop, "Node Tree", "Base node tree from context");
index 662673adf776b683d9790f860f43db4811d4389d..92d12a3a92ca1926e0be9bea65e5cc73543a4bbf 100644 (file)
@@ -570,7 +570,8 @@ static MovieTrackingTrack *rna_trackingTracks_new(ID *id, MovieTracking *trackin
        return track;
 }
 
-static MovieTrackingTrack *rna_trackingObject_tracks_new(ID *id, MovieTrackingObject *object, const char *name, int frame)
+static MovieTrackingTrack *rna_trackingObject_tracks_new(ID *id, MovieTrackingObject *object, const char *name,
+                                                         int frame)
 {
        MovieClip *clip = (MovieClip *) id;
        ListBase *tracksbase = &object->tracks;
@@ -649,7 +650,8 @@ static void rna_trackingMarkers_delete_frame(MovieTrackingTrack *track, int fram
        WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 }
 
-static MovieTrackingPlaneMarker *rna_trackingPlaneMarkers_find_frame(MovieTrackingPlaneTrack *plane_track, int framenr, int exact)
+static MovieTrackingPlaneMarker *rna_trackingPlaneMarkers_find_frame(MovieTrackingPlaneTrack *plane_track,
+                                                                     int framenr, int exact)
 {
        if (exact)
                return BKE_tracking_plane_marker_get_exact(plane_track, framenr);
@@ -657,7 +659,8 @@ static MovieTrackingPlaneMarker *rna_trackingPlaneMarkers_find_frame(MovieTracki
                return BKE_tracking_plane_marker_get(plane_track, framenr);
 }
 
-static MovieTrackingPlaneMarker *rna_trackingPlaneMarkers_insert_frame(MovieTrackingPlaneTrack *plane_track, int framenr)
+static MovieTrackingPlaneMarker *rna_trackingPlaneMarkers_insert_frame(MovieTrackingPlaneTrack *plane_track,
+                                                                       int framenr)
 {
        MovieTrackingPlaneMarker plane_marker, *new_plane_marker;
 
@@ -1094,7 +1097,7 @@ static void rna_def_trackingMarker(BlenderRNA *brna)
        prop = RNA_def_property(srna, "is_keyed", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", MARKER_TRACKED);
-       RNA_def_property_ui_text(prop, "Keyframed", "Indicates whether position of marker is keyframed, not tracked");
+       RNA_def_property_ui_text(prop, "Keyframed", "Whether the position of the marker is keyframed or tracked");
 }
 
 static void rna_def_trackingMarkers(BlenderRNA *brna, PropertyRNA *cprop)
@@ -1350,7 +1353,7 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
        prop = RNA_def_property(srna, "weight", PROP_FLOAT, PROP_FACTOR);
        RNA_def_property_float_sdna(prop, NULL, "weight");
        RNA_def_property_range(prop, 0.0f, 1.0f);
-       RNA_def_property_ui_text(prop, "Weight", "How much this track affects on a final solution");
+       RNA_def_property_ui_text(prop, "Weight", "Influence of this track on a final solution");
 }
 
 static void rna_def_trackingPlaneMarker(BlenderRNA *brna)