Revision: 21209
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21209
Author: aligorith
Date: 2009-06-28 05:13:01 +0200 (Sun, 28 Jun 2009)
Log Message:
-----------
NLA SoC: Renamed NLA-Editor operators to be more in line with those in other
editors
Modified Paths:
--------------
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_intern.h
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_select.c
Modified:
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c
2009-06-28 03:01:08 UTC (rev 21208)
+++ branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c
2009-06-28 03:13:01 UTC (rev 21209)
@@ -381,10 +381,10 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_properties(wmOperatorType *ot)
+void NLA_OT_properties(wmOperatorType *ot)
{
ot->name= "Properties";
- ot->idname= "NLAEDIT_OT_properties";
+ ot->idname= "NLA_OT_properties";
ot->exec= nla_properties;
ot->poll= ED_operator_nla_active;
Modified:
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_edit.c
2009-06-28 03:01:08 UTC (rev 21208)
+++ branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_edit.c
2009-06-28 03:13:01 UTC (rev 21209)
@@ -139,11 +139,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_tweakmode_enter (wmOperatorType *ot)
+void NLA_OT_tweakmode_enter (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Enter Tweak Mode";
- ot->idname= "NLAEDIT_OT_tweakmode_enter";
+ ot->idname= "NLA_OT_tweakmode_enter";
ot->description= "Enter tweaking mode for the action referenced by the
active strip.";
/* api callbacks */
@@ -205,11 +205,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_tweakmode_exit (wmOperatorType *ot)
+void NLA_OT_tweakmode_exit (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Exit Tweak Mode";
- ot->idname= "NLAEDIT_OT_tweakmode_exit";
+ ot->idname= "NLA_OT_tweakmode_exit";
ot->description= "Exit tweaking mode for the action referenced by the
active strip.";
/* api callbacks */
@@ -239,7 +239,7 @@
/* loop through Actions in Main database, adding as items in the menu */
for (act= m->action.first; act; act= act->id.next)
- uiItemStringO(layout, act->id.name+2, 0,
"NLAEDIT_OT_add_actionclip", "action", act->id.name);
+ uiItemStringO(layout, act->id.name+2, 0,
"NLA_OT_add_actionclip", "action", act->id.name);
uiItemS(layout);
uiPupMenuEnd(C, pup);
@@ -322,11 +322,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_add_actionclip (wmOperatorType *ot)
+void NLA_OT_add_actionclip (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Add Action Strip";
- ot->idname= "NLAEDIT_OT_add_actionclip";
+ ot->idname= "NLA_OT_add_actionclip";
ot->description= "Add an Action-Clip strip (i.e. an NLA Strip
referencing an Action) to the active track.";
/* api callbacks */
@@ -431,11 +431,11 @@
}
}
-void NLAEDIT_OT_add_transition (wmOperatorType *ot)
+void NLA_OT_add_transition (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Add Transition";
- ot->idname= "NLAEDIT_OT_add_transition";
+ ot->idname= "NLA_OT_add_transition";
ot->description= "Add a transition strip between two adjacent selected
strips.";
/* api callbacks */
@@ -529,11 +529,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_duplicate (wmOperatorType *ot)
+void NLA_OT_duplicate (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Duplicate Strips";
- ot->idname= "NLAEDIT_OT_duplicate";
+ ot->idname= "NLA_OT_duplicate";
ot->description= "Duplicate selected NLA-Strips, adding the new strips
in new tracks above the originals.";
/* api callbacks */
@@ -592,11 +592,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_delete (wmOperatorType *ot)
+void NLA_OT_delete (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Delete Strips";
- ot->idname= "NLAEDIT_OT_delete";
+ ot->idname= "NLA_OT_delete";
ot->description= "Delete selected strips.";
/* api callbacks */
@@ -688,11 +688,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_split (wmOperatorType *ot)
+void NLA_OT_split (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Split Strips";
- ot->idname= "NLAEDIT_OT_split";
+ ot->idname= "NLA_OT_split";
ot->description= "Split selected strips at their midpoints.";
/* api callbacks */
@@ -768,11 +768,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_move_up (wmOperatorType *ot)
+void NLA_OT_move_up (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Move Strips Up";
- ot->idname= "NLAEDIT_OT_move_up";
+ ot->idname= "NLA_OT_move_up";
ot->description= "Move selected strips up a track if there's room.";
/* api callbacks */
@@ -845,11 +845,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_move_down (wmOperatorType *ot)
+void NLA_OT_move_down (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Move Strips Down";
- ot->idname= "NLAEDIT_OT_move_down";
+ ot->idname= "NLA_OT_move_down";
ot->description= "Move selected strips down a track if there's room.";
/* api callbacks */
@@ -944,11 +944,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_apply_scale (wmOperatorType *ot)
+void NLA_OT_apply_scale (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Apply Scale";
- ot->idname= "NLAEDIT_OT_apply_scale";
+ ot->idname= "NLA_OT_apply_scale";
ot->description= "Apply scaling of selected strips to their referenced
Actions.";
/* api callbacks */
@@ -1005,11 +1005,11 @@
return OPERATOR_FINISHED;
}
-void NLAEDIT_OT_clear_scale (wmOperatorType *ot)
+void NLA_OT_clear_scale (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Clear Scale";
- ot->idname= "NLAEDIT_OT_clear_scale";
+ ot->idname= "NLA_OT_clear_scale";
ot->description= "Reset scaling of selected strips.";
/* api callbacks */
Modified:
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_header.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_header.c
2009-06-28 03:01:08 UTC (rev 21208)
+++ branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_header.c
2009-06-28 03:13:01 UTC (rev 21209)
@@ -90,7 +90,7 @@
RNA_pointer_create(&sc->id, &RNA_SpaceNLA, snla, &spaceptr);
/* create menu */
- uiItemO(layout, NULL, ICON_MENU_PANEL, "NLAEDIT_OT_properties");
+ uiItemO(layout, NULL, ICON_MENU_PANEL, "NLA_OT_properties");
uiItemS(layout);
@@ -104,9 +104,9 @@
uiItemS(layout);
if (scene->flag & SCE_NLA_EDIT_ON)
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_tweakmode_exit");
+ uiItemO(layout, NULL, 0, "NLA_OT_tweakmode_exit");
else
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_tweakmode_enter");
+ uiItemO(layout, NULL, 0, "NLA_OT_tweakmode_enter");
uiItemS(layout);
@@ -125,13 +125,13 @@
static void nla_selectmenu(bContext *C, uiLayout *layout, void *arg_unused)
{
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_select_all_toggle");
- uiItemBooleanO(layout, "Invert All", 0, "NLAEDIT_OT_select_all_toggle",
"invert", 1);
+ uiItemO(layout, NULL, 0, "NLA_OT_select_all_toggle");
+ uiItemBooleanO(layout, "Invert All", 0, "NLA_OT_select_all_toggle",
"invert", 1);
uiItemS(layout);
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_select_border");
- uiItemBooleanO(layout, "Border Axis Range", 0,
"NLAEDIT_OT_select_border", "axis_range", 1);
+ uiItemO(layout, NULL, 0, "NLA_OT_select_border");
+ uiItemBooleanO(layout, "Border Axis Range", 0, "NLA_OT_select_border",
"axis_range", 1);
}
static void nla_edit_transformmenu(bContext *C, uiLayout *layout, void
*arg_unused)
@@ -148,28 +148,28 @@
uiItemS(layout);
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_duplicate");
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_split");
+ uiItemO(layout, NULL, 0, "NLA_OT_duplicate");
+ uiItemO(layout, NULL, 0, "NLA_OT_split");
uiItemS(layout);
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_delete");
+ uiItemO(layout, NULL, 0, "NLA_OT_delete");
uiItemS(layout);
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_apply_scale");
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_clear_scale");
+ uiItemO(layout, NULL, 0, "NLA_OT_apply_scale");
+ uiItemO(layout, NULL, 0, "NLA_OT_clear_scale");
uiItemS(layout);
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_move_up");
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_move_down");
+ uiItemO(layout, NULL, 0, "NLA_OT_move_up");
+ uiItemO(layout, NULL, 0, "NLA_OT_move_down");
}
static void nla_addmenu(bContext *C, uiLayout *layout, void *arg_unused)
{
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_add_actionclip");
- uiItemO(layout, NULL, 0, "NLAEDIT_OT_add_transition");
+ uiItemO(layout, NULL, 0, "NLA_OT_add_actionclip");
+ uiItemO(layout, NULL, 0, "NLA_OT_add_transition");
uiItemS(layout);
Modified:
branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_intern.h
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_intern.h
2009-06-28 03:01:08 UTC (rev 21208)
+++ branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_intern.h
2009-06-28 03:13:01 UTC (rev 21209)
@@ -54,7 +54,7 @@
ARegion *nla_has_buttons_region(ScrArea *sa);
void nla_buttons_register(ARegionType *art);
-void NLAEDIT_OT_properties(wmOperatorType *ot);
+void NLA_OT_properties(wmOperatorType *ot);
/* **************************************** */
/* nla_draw.c */
@@ -80,30 +80,30 @@
/* --- */
-void NLAEDIT_OT_select_all_toggle(wmOperatorType *ot);
-void NLAEDIT_OT_select_border(wmOperatorType *ot);
-void NLAEDIT_OT_click_select(wmOperatorType *ot);
+void NLA_OT_select_all_toggle(wmOperatorType *ot);
+void NLA_OT_select_border(wmOperatorType *ot);
+void NLA_OT_click_select(wmOperatorType *ot);
/* **************************************** */
/* nla_edit.c */
-void NLAEDIT_OT_tweakmode_enter(wmOperatorType *ot);
-void NLAEDIT_OT_tweakmode_exit(wmOperatorType *ot);
+void NLA_OT_tweakmode_enter(wmOperatorType *ot);
+void NLA_OT_tweakmode_exit(wmOperatorType *ot);
/* --- */
-void NLAEDIT_OT_add_actionclip(wmOperatorType *ot);
-void NLAEDIT_OT_add_transition(wmOperatorType *ot);
+void NLA_OT_add_actionclip(wmOperatorType *ot);
+void NLA_OT_add_transition(wmOperatorType *ot);
-void NLAEDIT_OT_duplicate(wmOperatorType *ot);
-void NLAEDIT_OT_delete(wmOperatorType *ot);
-void NLAEDIT_OT_split(wmOperatorType *ot);
+void NLA_OT_duplicate(wmOperatorType *ot);
+void NLA_OT_delete(wmOperatorType *ot);
+void NLA_OT_split(wmOperatorType *ot);
-void NLAEDIT_OT_move_up(wmOperatorType *ot);
-void NLAEDIT_OT_move_down(wmOperatorType *ot);
+void NLA_OT_move_up(wmOperatorType *ot);
+void NLA_OT_move_down(wmOperatorType *ot);
-void NLAEDIT_OT_apply_scale(wmOperatorType *ot);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
