Revision: 18919
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18919
Author: campbellbarton
Date: 2009-02-11 03:09:41 +0100 (Wed, 11 Feb 2009)
Log Message:
-----------
Names from uiMenuItemEnumO were not being used.
Changed some of the sequencer menus to use uiMenuItem's
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-02-10 23:17:58 UTC (rev 18918)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-02-11 02:09:41 UTC (rev 18919)
@@ -1835,8 +1835,13 @@
else if(item->type==MENU_ITEM_OPNAME_ENUM) {
const char *name;
char bname[64];
-
- name= ui_menu_enumpropname(item->opname,
item->propname, item->enumval);
+
+ /* If no name is given, use the enum name */
+ if (item->name[0] == '\0')
+ name= ui_menu_enumpropname(item->opname,
item->propname, item->enumval);
+ else
+ name= item->name;
+
BLI_strncpy(bname, name, sizeof(bname));
but= uiDefIconTextButO(block, BUTM, item->opname,
item->opcontext, item->icon, bname, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
2009-02-10 23:17:58 UTC (rev 18918)
+++
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
2009-02-11 02:09:41 UTC (rev 18919)
@@ -42,6 +42,7 @@
#include "BLI_blenlib.h"
+#include "BKE_animsys.h"
#include "BKE_context.h"
#include "BKE_screen.h"
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
2009-02-10 23:17:58 UTC (rev 18918)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
2009-02-11 02:09:41 UTC (rev 18919)
@@ -91,7 +91,6 @@
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL,
"Grease Pencil...", 0, yco-=20,
menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
-
uiDefMenuSep(block);
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1,
@@ -144,46 +143,23 @@
return block;
}
-static uiBlock *seq_selectmenu(bContext *C, ARegion *ar, void *arg_unused)
+//static uiBlock *seq_selectmenu(bContext *C, ARegion *ar, void *arg_unused)
+static void seq_selectmenu(bContext *C, uiMenuItem *head, void *arg_unused)
{
- ScrArea *sa= CTX_wm_area(C);
+ uiMenuContext(head, WM_OP_INVOKE_DEFAULT);
- uiBlock *block= uiBeginBlock(C, ar, "seq_selectmenu", UI_EMBOSSP,
UI_HELV);
- uiBut *but;
-
- but= uiDefMenuButO(block, "SEQUENCER_OT_select_active_side", "Strips to
the Left");
- RNA_enum_set(uiButGetOperatorPtrRNA(but), "side", 'l');
- but= uiDefMenuButO(block, "SEQUENCER_OT_select_active_side", "Strips to
the Right");
- RNA_enum_set(uiButGetOperatorPtrRNA(but), "side", 'r');
- uiDefMenuSep(block);
- but= uiDefMenuButO(block, "SEQUENCER_OT_select_handles", "Surrounding
Handles");
- RNA_enum_set(uiButGetOperatorPtrRNA(but), "side", SEQ_SIDE_BOTH);
- but= uiDefMenuButO(block, "SEQUENCER_OT_select_handles", "Left
Handles");
- RNA_enum_set(uiButGetOperatorPtrRNA(but), "side", SEQ_SIDE_LEFT);
- but= uiDefMenuButO(block, "SEQUENCER_OT_select_handles", "Right
Handles");
- RNA_enum_set(uiButGetOperatorPtrRNA(but), "side", SEQ_SIDE_RIGHT);
- uiDefMenuSep(block);
- uiDefMenuButO(block, "SEQUENCER_OT_borderselect", NULL);
- uiDefMenuSep(block);
- uiDefMenuButO(block, "SEQUENCER_OT_select_linked", NULL);
- uiDefMenuButO(block, "SEQUENCER_OT_deselect_all", NULL);
- uiDefMenuButO(block, "SEQUENCER_OT_select_invert", NULL);
-
-
- if(sa->headertype==HEADERTOP) {
- uiBlockSetDirection(block, UI_DOWN);
- }
- else {
- uiBlockSetDirection(block, UI_TOP);
- uiBlockFlipOrder(block);
- }
-
- /* position menu */
- uiTextBoundsBlock(block, 60);
-
- uiEndBlock(C, block);
-
- return block;
+ uiMenuItemEnumO(head, "Strips to the Left", 0,
"SEQUENCER_OT_select_active_side", "side", SEQ_SIDE_LEFT);
+ uiMenuItemEnumO(head, "Strips to the Right", 0,
"SEQUENCER_OT_select_active_side", "side", SEQ_SIDE_RIGHT);
+ uiMenuSeparator(head);
+ uiMenuItemEnumO(head, "Surrounding Handles", 0,
"SEQUENCER_OT_select_handles", "side", SEQ_SIDE_BOTH);
+ uiMenuItemEnumO(head, "Left Handles", 0, "SEQUENCER_OT_select_handles",
"side", SEQ_SIDE_LEFT);
+ uiMenuItemEnumO(head, "Right Handles", 0,
"SEQUENCER_OT_select_handles", "side", SEQ_SIDE_RIGHT);
+ uiMenuSeparator(head);
+ uiMenuItemO(head, 0, "SEQUENCER_OT_select_linked");
+ uiMenuSeparator(head);
+ uiMenuItemO(head, 0, "SEQUENCER_OT_select_linked");
+ uiMenuItemO(head, 0, "SEQUENCER_OT_deselect_all");
+ uiMenuItemO(head, 0, "SEQUENCER_OT_select_invert");
}
static uiBlock *seq_markermenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -233,157 +209,115 @@
return block;
}
-static uiBlock *seq_addmenu_effectmenu(bContext *C, ARegion *ar, void
*arg_unused)
+//static uiBlock *seq_addmenu_effectmenu(bContext *C, ARegion *ar, void
*arg_unused)
+static void seq_addmenu_effectmenu(bContext *C, uiMenuItem *head, void
*arg_unused)
{
- uiBlock *block= uiBeginBlock(C, ar, "seq_addmenu_effectmenu",
UI_EMBOSSP, UI_HELV);
-
-
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Add")), "type", SEQ_ADD);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Subtract")), "type", SEQ_SUB);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Multiply")), "type", SEQ_MUL);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Cross")), "type", SEQ_CROSS);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Gamma Cross")), "type", SEQ_GAMCROSS);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Alpha Over")), "type", SEQ_ALPHAOVER);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Alpha Under")), "type", SEQ_ALPHAUNDER);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Alpha Over Drop")), "type", SEQ_OVERDROP);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Wipe")), "type", SEQ_WIPE);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Glow")), "type", SEQ_GLOW);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Transform")), "type", SEQ_TRANSFORM);
- /* Color is an effect but moved to the other menu since its not that
exciting */
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Speed Control")), "type", SEQ_SPEED);
- uiDefMenuSep(block);
- RNA_enum_set(uiButGetOperatorPtrRNA(uiDefMenuButO(block,
"SEQUENCER_OT_add_effect_strip", "Plugin...")), "type", SEQ_PLUGIN);
+ uiMenuContext(head, WM_OP_INVOKE_DEFAULT);
- /* position menu */
- uiBlockSetDirection(block, UI_RIGHT);
- uiTextBoundsBlock(block, 60);
-
- uiEndBlock(C, block);
-
- return block;
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_ADD);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_SUB);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_MUL);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_CROSS);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_GAMCROSS);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_ALPHAOVER);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_ALPHAUNDER);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_OVERDROP);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_WIPE);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_GLOW);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_TRANSFORM);
+ /* Color is an effect but moved to the other menu since its not that
exciting */
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_SPEED);
+ uiMenuSeparator(head);
+ uiMenuItemEnumO(head, "", 0, "SEQUENCER_OT_add_effect_strip", "type",
SEQ_PLUGIN);
}
-static uiBlock *seq_addmenu(bContext *C, ARegion *ar, void *arg_unused)
+//static uiBlock *seq_addmenu(bContext *C, ARegion *ar, void *arg_unused)
+static void seq_addmenu(bContext *C, uiMenuItem *head, void *arg_unused)
{
- ScrArea *sa= CTX_wm_area(C);
- uiBlock *block= uiBeginBlock(C, ar, "seq_addmenu", UI_EMBOSSP, UI_HELV);
- uiBut *but;
-
- uiDefMenuSub(block, seq_addmenu_effectmenu, "Effect");
+ uiMenuLevel(head, "Effects...", seq_addmenu_effectmenu);
+ uiMenuSeparator(head);
- uiDefMenuSep(block);
+ uiMenuContext(head, WM_OP_INVOKE_DEFAULT);
#ifdef WITH_FFMPEG
- uiDefMenuButO(block, "SEQUENCER_OT_add_sound_strip", "Audio (RAM)");
- but= uiDefMenuButO(block, "SEQUENCER_OT_add_sound_strip", "Audio (HD)");
- RNA_boolean_set(uiButGetOperatorPtrRNA(but), "hd", TRUE);
+ uiMenuItemBooleanO(head, "Audio (RAM)", 0,
"SEQUENCER_OT_add_sound_strip", "hd", FALSE);
+ uiMenuItemBooleanO(head, "Audio (HD)", 0,
"SEQUENCER_OT_add_sound_strip", "hd", TRUE);
#else
- uiDefMenuButO(block, "SEQUENCER_OT_add_sound_strip", NULL);
+ uiMenuItemO(head, 0, "SEQUENCER_OT_add_sound_strip");
#endif
- but= uiDefMenuButO(block, "SEQUENCER_OT_add_effect_strip", "Add Color
Strip");
- RNA_enum_set(uiButGetOperatorPtrRNA(but), "type", SEQ_COLOR);
+ uiMenuItemEnumO(head, "Add Color Strip", 0,
"SEQUENCER_OT_add_effect_strip", "type", SEQ_COLOR);
- uiDefMenuButO(block, "SEQUENCER_OT_add_image_strip", NULL);
- uiDefMenuButO(block, "SEQUENCER_OT_add_movie_strip", NULL);
- uiDefMenuButO(block, "SEQUENCER_OT_add_scene_strip", NULL);
+ uiMenuItemO(head, 0, "SEQUENCER_OT_add_image_strip");
+ uiMenuItemO(head, 0, "SEQUENCER_OT_add_movie_strip");
+ uiMenuItemO(head, 0, "SEQUENCER_OT_add_scene_strip");
#ifdef WITH_FFMPEG
- but= uiDefMenuButO(block, "SEQUENCER_OT_add_movie_strip", NULL);
- RNA_boolean_set(uiButGetOperatorPtrRNA(but), "sound", TRUE);
+ uiMenuItemBooleanO(head, "Movie and Sound", 0,
"SEQUENCER_OT_add_movie_strip", "sound", TRUE);
#endif
-
- if(sa->headertype==HEADERTOP) {
- uiBlockSetDirection(block, UI_DOWN);
- }
- else {
- uiBlockSetDirection(block, UI_TOP);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
