Revision: 21750
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21750
Author: aligorith
Date: 2009-07-21 07:08:59 +0200 (Tue, 21 Jul 2009)
Log Message:
-----------
2.5 - Porting 'Pose' Menu (and its submenus) to Layout Engine
It's alarming how many tools are still missing here!
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-07-21 04:21:07 UTC (rev 21749)
+++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-07-21 05:08:59 UTC (rev 21750)
@@ -225,7 +225,7 @@
WM_keymap_add_item(keymap, "POSE_OT_hide", HKEY, KM_PRESS, 0, 0);
kmi= WM_keymap_add_item(keymap, "POSE_OT_hide", HKEY, KM_PRESS,
KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "unselected", 1);
+ RNA_boolean_set(kmi->ptr, "unselected", 1);
WM_keymap_add_item(keymap, "POSE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
/*clear pose*/
WM_keymap_add_item(keymap, "POSE_OT_rot_clear", RKEY, KM_PRESS, KM_ALT,
0);
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-07-21 04:21:07 UTC (rev 21749)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-07-21 05:08:59 UTC (rev 21750)
@@ -2091,12 +2091,11 @@
uiItemS(layout);
-#if 0
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 18, "");
+ // TODO: these operators may get renamed
+ uiItemO(layout, NULL, 0, "ANIM_OT_insert_keyframe_menu");
+ uiItemO(layout, NULL, 0, "ANIM_OT_delete_keyframe_old");
uiItemS(layout);
-#endif
uiItemO(layout, NULL, 0, "OBJECT_OT_duplicate");
uiItemBooleanO(layout, "Duplicate Linked", 0, "OBJECT_OT_duplicate",
"linked", 1);
@@ -2118,14 +2117,17 @@
uiItemMenuF(layout, "Constraints", 0,
view3d_edit_object_constraintsmenu);
#if 0
- uiItemS(layout);
-
if(ob && ob->type == OB_MESH) {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Boolean
Operation...|W", 0, yco-=20, menuwidth, 19, NULL, 0.0,
0.0, 1, 7, "");
}
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Join Objects|Ctrl J",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, "");
+
+ // join... (added already)
+
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Object
Type...|Alt C", 0, yco-=20, menuwidth, 19, NULL, 0.0,
0.0, 1, 9, "");
#endif
+ uiItemS(layout);
+
+ uiItemO(layout, NULL, 0, "OBJECT_OT_join");
uiItemS(layout);
@@ -3002,155 +3004,45 @@
return block;
}
-static void do_view3d_pose_armature_transformmenu(bContext *C, void *arg, int
event)
-{
-#if 0
- Scene *scene= CTX_data_scene(C);
- Object *ob= CTX_data_active_object(C);
-
- switch(event) {
- case 0: /* clear origin */
- clear_object('o');
- break;
- case 1: /* clear scale */
- clear_object('s');
- break;
- case 2: /* clear rotation */
- clear_object('r');
- break;
- case 3: /* clear location */
- clear_object('g');
- break;
- case 4: /* clear user transform */
- clear_user_transform(scene, ob);
- break;
- }
-#endif
-}
-static uiBlock *view3d_pose_armature_transformmenu(bContext *C, ARegion *ar,
void *arg_unused)
+static void view3d_pose_armature_transformmenu(bContext *C, uiLayout *layout,
void *arg_unused)
{
- uiBlock *block;
- short yco = 20, menuwidth = 120;
-
- block= uiBeginBlock(C, ar, "view3d_pose_armature_transformmenu",
UI_EMBOSSP);
- uiBlockSetButmFunc(block, do_view3d_pose_armature_transformmenu, NULL);
+ //uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear User
Transform|W", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+ //used: clear_user_transform(scene, ob);
+ //uiDefBut(block, SEPR, 0, "", 0, yco-=6,
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear User Transform|W",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
- uiDefBut(block, SEPR, 0, "", 0, yco-=6,
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Location|Alt G",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Rotation|Alt R",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Scale|Alt S", 0,
yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Origin|Alt O",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
+ uiItemO(layout, NULL, 0, "POSE_OT_loc_clear");
+ uiItemO(layout, NULL, 0, "POSE_OT_rot_clear");
+ uiItemO(layout, NULL, 0, "POSE_OT_scale_clear");
- uiBlockSetDirection(block, UI_RIGHT);
- uiTextBoundsBlock(block, 60);
- return block;
+ // ???
+ //uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Origin|Alt O",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
+ //used:clear_object('o');
}
-static void do_view3d_pose_armature_showhidemenu(bContext *C, void *arg, int
event)
+static void view3d_pose_armature_showhidemenu(bContext *C, uiLayout *layout,
void *arg_unused)
{
-#if 0
+ uiItemO(layout, "Show Hidden", 0, "POSE_OT_reveal");
- switch(event) {
-
- case 0: /* show hidden bones */
- show_all_pose_bones();
- break;
- case 1: /* hide selected bones */
- hide_selected_pose_bones();
- break;
- case 2: /* hide deselected bones */
- hide_unselected_pose_bones();
- break;
- }
-#endif
+ uiItemO(layout, "Hide Selected", 0, "POSE_OT_hide");
+ uiItemBooleanO(layout, "Hide Unselected", 0, "POSE_OT_hide",
"unselected", 1);
}
-static uiBlock *view3d_pose_armature_showhidemenu(bContext *C, ARegion *ar,
void *arg_unused)
+static void view3d_pose_armature_ikmenu(bContext *C, uiLayout *layout, void
*arg_unused)
{
- uiBlock *block;
- short yco = 20, menuwidth = 120;
-
- block= uiBeginBlock(C, ar, "view3d_pose_armature_showhidemenu",
UI_EMBOSSP);
- uiBlockSetButmFunc(block, do_view3d_pose_armature_showhidemenu, NULL);
-
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden|Alt H",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hide Selected|H",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hide Unselected|Shift
H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-
- uiBlockSetDirection(block, UI_RIGHT);
- uiTextBoundsBlock(block, 60);
- return block;
+ uiItemO(layout, NULL, 0, "POSE_OT_ik_add");
+ uiItemO(layout, NULL, 0, "POSE_OT_ik_clear");
}
-static void do_view3d_pose_armature_ikmenu(bContext *C, void *arg, int event)
+static void view3d_pose_armature_constraintsmenu(bContext *C, uiLayout
*layout, void *arg_unused)
{
-#if 0
-
- switch(event) {
-
- case 1:
- pose_add_IK();
- break;
- case 2:
- pose_clear_IK();
- break;
- }
-#endif
+ uiItemO(layout, NULL, 0, "POSE_OT_constraint_add_with_targets");
+ uiItemO(layout, NULL, 0, "POSE_OT_constraints_clear");
}
-static uiBlock *view3d_pose_armature_ikmenu(bContext *C, ARegion *ar, void
*arg_unused)
-{
- uiBlock *block;
- short yco = 20, menuwidth = 120;
-
- block= uiBeginBlock(C, ar, "view3d_pose_armature_ikmenu", UI_EMBOSSP);
- uiBlockSetButmFunc(block, do_view3d_pose_armature_ikmenu, NULL);
-
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Shift
I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear IK...|Ctrl Alt I",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-
- uiBlockSetDirection(block, UI_RIGHT);
- uiTextBoundsBlock(block, 60);
- return block;
-}
-
-static void do_view3d_pose_armature_constraintsmenu(bContext *C, void *arg,
int event)
-{
#if 0
-
- switch(event) {
-
- case 1:
- add_constraint(0);
- break;
- case 2:
- pose_clear_constraints();
- break;
- }
-#endif
-}
-
-static uiBlock *view3d_pose_armature_constraintsmenu(bContext *C, ARegion *ar,
void *arg_unused)
-{
- uiBlock *block;
- short yco = 20, menuwidth = 120;
-
- block= uiBeginBlock(C, ar, "view3d_pose_armature_constraintsmenu",
UI_EMBOSSP);
- uiBlockSetButmFunc(block, do_view3d_pose_armature_constraintsmenu,
NULL);
-
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Constraint to
Bone...|Ctrl Alt C", 0, yco-=20, menuwidth, 19, NULL, 0.0,
0.0, 1, 1, "");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Constraints...|Alt
C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
-
- uiBlockSetDirection(block, UI_RIGHT);
- uiTextBoundsBlock(block, 60);
- return block;
-}
-
static void do_view3d_pose_armature_groupmenu(bContext *C, void *arg, int
event)
{
-#if 0
switch (event) {
case 1:
pose_assign_to_posegroup(1);
@@ -3168,7 +3060,6 @@
pose_remove_posegroup();
break;
}
-#endif
}
static uiBlock *view3d_pose_armature_groupmenu(bContext *C, ARegion *ar, void
*arg_unused)
@@ -3192,8 +3083,6 @@
static void do_view3d_pose_armature_motionpathsmenu(bContext *C, void *arg,
int event)
{
-#if 0
-
switch(event) {
case 1:
@@ -3203,9 +3092,9 @@
pose_clear_paths(OBACT);
break;
}
-#endif
}
+
static uiBlock *view3d_pose_armature_motionpathsmenu(bContext *C, ARegion *ar,
void *arg_unused)
{
uiBlock *block;
@@ -3221,54 +3110,22 @@
uiTextBoundsBlock(block, 60);
return block;
}
-
-static void do_view3d_pose_armature_poselibmenu(bContext *C, void *arg, int
event)
-{
-#if 0
- Object *ob= OBACT;
-
- switch(event) {
- case 1:
- poselib_preview_poses(ob, 0);
- break;
- case 2:
- poselib_add_current_pose(ob, 0);
- break;
- case 3:
- poselib_rename_pose(ob);
- break;
- case 4:
- poselib_remove_pose(ob, NULL);
- break;
- }
-
#endif
-}
-static uiBlock *view3d_pose_armature_poselibmenu(bContext *C, ARegion *ar,
void *arg_unused)
+static void view3d_pose_armature_poselibmenu(bContext *C, uiLayout *layout,
void *arg_unused)
{
- uiBlock *block;
- short yco = 20, menuwidth = 120;
-
- block= uiBeginBlock(C, ar, "view3d_pose_armature_poselibmenu",
UI_EMBOSSP);
- uiBlockSetButmFunc(block, do_view3d_pose_armature_poselibmenu, NULL);
+ uiItemO(layout, NULL, 0, "POSELIB_OT_browse_interactive");
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Browse Poses|Ctrl L",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+ uiItemS(layout);
- uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0,
0.0, 0, 0, "");
-
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add/Replace Pose|Shift
L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
