diff options
Diffstat (limited to 'source/blender/editors/space_action/action_select.c')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 0247b656923..7932690e1ff 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -338,7 +338,7 @@ void ACT_OT_keyframes_deselectall (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - RNA_def_property(ot->srna, "invert", PROP_BOOLEAN, PROP_NONE); + RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Border Select Operator **************************** */ @@ -507,13 +507,13 @@ void ACT_OT_keyframes_borderselect(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* rna */ - RNA_def_property(ot->srna, "event_type", PROP_INT, PROP_NONE); - RNA_def_property(ot->srna, "xmin", PROP_INT, PROP_NONE); - RNA_def_property(ot->srna, "xmax", PROP_INT, PROP_NONE); - RNA_def_property(ot->srna, "ymin", PROP_INT, PROP_NONE); - RNA_def_property(ot->srna, "ymax", PROP_INT, PROP_NONE); + RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); - RNA_def_property(ot->srna, "axis_range", PROP_BOOLEAN, PROP_NONE); + RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); } /* ******************** Column Select Operator **************************** */ @@ -728,8 +728,6 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) void ACT_OT_keyframes_columnselect (wmOperatorType *ot) { - PropertyRNA *prop; - /* identifiers */ ot->name= "Select All"; ot->idname= "ACT_OT_keyframes_columnselect"; @@ -742,8 +740,7 @@ void ACT_OT_keyframes_columnselect (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - prop= RNA_def_property(ot->srna, "mode", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_items(prop, prop_column_select_types); + RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); } /* ******************** Mouse-Click Select Operator *********************** */ @@ -1115,8 +1112,6 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void ACT_OT_keyframes_clickselect (wmOperatorType *ot) { - PropertyRNA *prop; - /* identifiers */ ot->name= "Mouse Select Keys"; ot->idname= "ACT_OT_keyframes_clickselect"; @@ -1127,10 +1122,9 @@ void ACT_OT_keyframes_clickselect (wmOperatorType *ot) /* id-props */ // XXX should we make this into separate operators? - prop= RNA_def_property(ot->srna, "left_right", PROP_ENUM, PROP_NONE); // ALTKEY - //RNA_def_property_enum_items(prop, prop_actkeys_clickselect_items); - prop= RNA_def_property(ot->srna, "extend_select", PROP_BOOLEAN, PROP_NONE); // SHIFTKEY - prop= RNA_def_property(ot->srna, "column_select", PROP_BOOLEAN, PROP_NONE); // CTRLKEY + RNA_def_enum(ot->srna, "left_right", NULL /* XXX prop_actkeys_clickselect_items */, 0, "Left Right", ""); // ALTKEY + RNA_def_boolean(ot->srna, "extend_select", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "column_select", 0, "Column Select", ""); // CTRLKEY } /* ************************************************************************** */ |