From 9b25a3bb2aea0447583a06e4bd89767cee1ee7cb Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 19 Aug 2009 09:12:21 +0000 Subject: 2.5 Timeline: * Removed timeline_header.c with old Buttons code. --- source/blender/editors/space_time/space_time.c | 29 -- source/blender/editors/space_time/time_header.c | 476 ------------------------ 2 files changed, 505 deletions(-) delete mode 100644 source/blender/editors/space_time/time_header.c (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 784b151f909..f18da93c35d 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -270,42 +270,15 @@ static void time_main_area_listener(ARegion *ar, wmNotifier *wmn) /* ************************ header time area region *********************** */ -#define PY_HEADER /* add handlers, stuff you only do once or on area/region changes */ static void time_header_area_init(wmWindowManager *wm, ARegion *ar) { -#ifdef PY_HEADER ED_region_header_init(ar); -#else - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy); -#endif } static void time_header_area_draw(const bContext *C, ARegion *ar) { -#ifdef PY_HEADER ED_region_header(C, ar); -#else - - float col[3]; - - /* clear */ - if(ED_screen_area_active(C)) - UI_GetThemeColor3fv(TH_HEADER, col); - else - UI_GetThemeColor3fv(TH_HEADERDESEL, col); - - glClearColor(col[0], col[1], col[2], 0.0); - glClear(GL_COLOR_BUFFER_BIT); - - /* set view2d view matrix for scrolling (without scrollers) */ - UI_view2d_view_ortho(C, &ar->v2d); - - time_header_buttons(C, ar); -#endif - - /* restore view matrix? */ - UI_view2d_view_restore(C); } static void time_header_area_listener(ARegion *ar, wmNotifier *wmn) @@ -382,8 +355,6 @@ static SpaceLink *time_new(const bContext *C) static void time_free(SpaceLink *sl) { } - - /* spacetype; init callback in ED_area_initialize() */ /* init is called to (re)initialize an existing editor (file read, screen changes) */ /* validate spacedata, add own area level handlers */ diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c deleted file mode 100644 index 13265166d98..00000000000 --- a/source/blender/editors/space_time/time_header.c +++ /dev/null @@ -1,476 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2008 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#include -#include - -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_userdef_types.h" - -#include "MEM_guardedalloc.h" - -#include "BLI_blenlib.h" - -#include "BKE_context.h" -#include "BKE_global.h" -#include "BKE_screen.h" - -#include "ED_keyframing.h" -#include "ED_screen.h" -#include "ED_screen_types.h" -#include "ED_types.h" -#include "ED_util.h" - -#include "WM_api.h" -#include "WM_types.h" - -#include "RNA_access.h" - -#include "BIF_gl.h" -#include "BIF_glutil.h" - -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" - -#include "ED_markers.h" - -#include "time_intern.h" - - -/* ************************ header time area region *********************** */ - -static void do_time_viewmenu(bContext *C, void *arg, int event) -{ - ScrArea *curarea= CTX_wm_area(C); - SpaceTime *stime= CTX_wm_space_time(C); - View2D *v2d= UI_view2d_fromcontext_rwin(C); - Scene *scene= CTX_data_scene(C); - int first; - - switch(event) { - case 2: /* Play Back Animation */ - //if(!has_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM)) - // start_animated_screen(stime); - break; - case 3: /* View All */ - if(v2d) { - first= scene->r.sfra; - if(first >= scene->r.efra) first= scene->r.efra; - v2d->cur.xmin=v2d->tot.xmin= (float)first-2; - v2d->cur.xmax=v2d->tot.xmax= (float)scene->r.efra+2; - - ED_area_tag_redraw(curarea); - } - break; - case 4: /* Maximize Window */ - /* using event B_FULL */ - break; - case 5: /* show time or frames */ - stime->flag ^= TIME_DRAWFRAMES; - ED_area_tag_redraw(curarea); - break; - case 6: - //nextprev_marker(1); - break; - case 7: - //nextprev_marker(-1); - break; - case 10: - //timeline_frame_to_center(); - break; - case 11: - if(v2d) { - v2d->flag ^= V2D_VIEWSYNC_SCREEN_TIME; - UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_SET); - } - break; - case 12: /* only show keyframes from selected data */ - stime->flag ^= TIME_ONLYACTSEL; - ED_area_tag_redraw(curarea); - break; - } -} - -static uiBlock *time_viewmenu(bContext *C, ARegion *ar, void *arg_unused) -{ - ScrArea *curarea= CTX_wm_area(C); - SpaceTime *stime= CTX_wm_space_time(C); - View2D *v2d= UI_view2d_fromcontext_rwin(C); - uiBlock *block; - short yco= 0, menuwidth=120; - - block= uiBeginBlock(C, ar, "time_viewmenu", UI_EMBOSSP); - uiBlockSetButmFunc(block, do_time_viewmenu, NULL); - - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation", 0, yco-=20, - menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); - - uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - - if(stime->flag & TIME_DRAWFRAMES) - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Seconds|Ctrl T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); - else - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Frames|Ctrl T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); - - uiDefIconTextBut(block, BUTM, 1, (stime->flag & TIME_ONLYACTSEL)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, - "Only Selected Data Keys|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, ""); - - uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Next Marker|PageUp", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Prev Marker|PageDown", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Next Key|Ctrl PageUp", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Prev Key|Ctrl PageDown", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, ""); - - uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Center View|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); - uiDefIconTextBut(block, BUTM, 1, (v2d->flag & V2D_VIEWSYNC_SCREEN_TIME)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, - "Lock Time to Other Windows|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, ""); - -// if (!curarea->full) -// uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, ""); -// else -// uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, ""); - - if(curarea->headertype==HEADERTOP) { - uiBlockSetDirection(block, UI_DOWN); - } - else { - uiBlockSetDirection(block, UI_TOP); - uiBlockFlipOrder(block); - } - - uiTextBoundsBlock(block, 50); - uiEndBlock(C, block); - - return block; -} - -static void do_time_framemenu(bContext *C, void *arg, int event) -{ - Scene *scene= CTX_data_scene(C); - - switch(event) { - case 1: /*Set as Start */ - if (scene->r.psfra) { - if (scene->r.pefra < scene->r.cfra) - scene->r.pefra= scene->r.cfra; - scene->r.psfra= scene->r.cfra; - } - else - scene->r.sfra = scene->r.cfra; - WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene); - break; - case 2: /* Set as End */ - if (scene->r.psfra) { - if (scene->r.cfra < scene->r.psfra) - scene->r.psfra= scene->r.cfra; - scene->r.pefra= scene->r.cfra; - } - else - scene->r.efra = scene->r.cfra; - WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene); - break; - case 3: /* Rename Marker */ - //rename_marker(); - break; - } -} - -static uiBlock *time_framemenu(bContext *C, ARegion *ar, void *arg_unused) -{ - ScrArea *curarea= CTX_wm_area(C); - uiBlock *block; - short yco= 0, menuwidth=120; - - block= uiBeginBlock(C, ar, "time_framemenu", UI_EMBOSSP); - uiBlockSetButmFunc(block, do_time_framemenu, NULL); - - uiDefIconTextButO(block, BUTM, "MARKER_OT_add", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Add Marker", - 0, yco-=2, menuwidth, 19, ""); - uiDefIconTextButO(block, BUTM, "MARKER_OT_duplicate", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Duplicate Marker", - 0, yco-=20, menuwidth, 19, ""); - uiDefIconTextButO(block, BUTM, "MARKER_OT_delete", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Delete Marker", - 0, yco-=20, menuwidth, 19, ""); - - uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Name Marker|Ctrl M", - 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); - uiDefIconTextButO(block, BUTM, "MARKER_OT_move", WM_OP_INVOKE_REGION_WIN, ICON_BLANK1, "Grab/Move Marker", - 0, yco-=20, menuwidth, 19, ""); - - uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set as Start|S", - 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set as End|E", - 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); - - if(curarea->headertype==HEADERTOP) { - uiBlockSetDirection(block, UI_DOWN); - } - else { - uiBlockSetDirection(block, UI_TOP); - uiBlockFlipOrder(block); - } - - uiTextBoundsBlock(block, 50); - uiEndBlock(C, block); - - return block; -} - - -#define B_REDRAWALL 750 -#define B_TL_PLAY 752 -#define B_TL_RPLAY 760 -#define B_TL_STOP 756 -#define B_TL_PREVIEWON 757 - -#define B_FLIPINFOMENU 0 -#define B_NEWFRAME 0 -#define B_DIFF 0 - - -void do_time_buttons(bContext *C, void *arg, int event) -{ - Scene *scene= CTX_data_scene(C); - - switch(event) { - case B_REDRAWALL: - WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene); - break; - case B_NEWFRAME: - WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); - break; - case B_TL_PREVIEWON: - if (scene->r.psfra) { - /* turn on preview range */ - scene->r.psfra= scene->r.sfra; - scene->r.pefra= scene->r.efra; - } - else { - /* turn off preview range */ - scene->r.psfra= 0; - scene->r.pefra= 0; - } - //BIF_undo_push("Set anim-preview range"); - WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene); - break; - } -} - - -void time_header_buttons(const bContext *C, ARegion *ar) -{ - ScrArea *sa= CTX_wm_area(C); - Scene *scene= CTX_data_scene(C); - wmTimer *animtimer= CTX_wm_screen(C)->animtimer; - uiBlock *block; - uiBut *but; - int xco, yco= 3; - char *menustr= NULL; - - block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS); - uiBlockSetHandleFunc(block, do_time_buttons, NULL); - - xco= ED_area_header_standardbuttons(C, block, yco); - - if((sa->flag & HEADER_NO_PULLDOWN)==0) { - int xmax; - - xmax= GetButStringLength("View"); - uiDefPulldownBut(block, time_viewmenu, sa, - "View", xco, yco, xmax-3, 20, ""); - xco+= xmax; - xmax= GetButStringLength("Frame"); - uiDefPulldownBut(block, time_framemenu, sa, - "Frame", xco, yco, xmax-3, 20, ""); - xco+= xmax; - } - - uiBlockSetEmboss(block, UI_EMBOSS); - - - - uiDefButI(block, TOG, B_TL_PREVIEWON,"PR", - xco,yco, XIC*2, YIC, - &scene->r.psfra,0, 1, 0, 0, - "Show settings for frame range of animation preview"); - - xco += XIC*2; - - uiBlockBeginAlign(block); - - if (scene->r.psfra) { - uiDefButI(block, NUM, B_REDRAWALL,"Start:", - xco,yco, (int)4.5*XIC, YIC, - &scene->r.psfra,MINFRAMEF, MAXFRAMEF, 0, 0, - "The start frame of the animation preview (inclusive)"); - - xco += (int)(4.5*XIC); - - uiDefButI(block, NUM, B_REDRAWALL,"End:", - xco,yco, (int)4.5*XIC,YIC, - &scene->r.pefra,(float)PSFRA, MAXFRAMEF, 0, 0, - "The end frame of the animation preview (inclusive)"); - } - else { - uiDefButI(block, NUM, B_REDRAWALL,"Start:", - xco,yco, (int)4.5*XIC, YIC, - &scene->r.sfra,MINFRAMEF, MAXFRAMEF, 0, 0, - "The start frame of the animation (inclusive)"); - - xco += (short)(4.5*XIC); - - uiDefButI(block, NUM, B_REDRAWALL,"End:", - xco,yco, (int)4.5*XIC,YIC, - &scene->r.efra,(float)SFRA, MAXFRAMEF, 0, 0, - "The end frame of the animation (inclusive)"); - } - uiBlockEndAlign(block); - - xco += (short)(4.5 * XIC); - - /* MINAFRAMEF not MINFRAMEF, since MINAFRAMEF allows to set current frame negative - * to facilitate easier keyframing in some situations - */ - uiDefButI(block, NUM, B_NEWFRAME, "", - xco,yco, (int)4.5*XIC,YIC, - &(scene->r.cfra), MINAFRAMEF, MAXFRAMEF, 0, 0, - "Displays Current Frame of animation"); - - xco += (short)(4.5 * XIC); - - uiBlockBeginAlign(block); - - but= uiDefIconButO(block, BUT, "SCREEN_OT_frame_jump", WM_OP_INVOKE_REGION_WIN, ICON_REW, xco,yco,XIC,YIC, "Skip to Start frame (Shift DownArrow)"); - RNA_boolean_set(uiButGetOperatorPtrRNA(but), "end", 0); - xco+= XIC; - - but= uiDefIconButO(block, BUT, "SCREEN_OT_keyframe_jump", WM_OP_INVOKE_REGION_WIN, ICON_PREV_KEYFRAME, xco,yco,XIC,YIC, "Skip to previous keyframe (Ctrl PageDown)"); - RNA_boolean_set(uiButGetOperatorPtrRNA(but), "next", 0); - xco+= XIC; - - if (animtimer) { - /* pause button 2*size to keep buttons in place */ - but=uiDefIconButO(block, BUT, "SCREEN_OT_animation_play", WM_OP_INVOKE_REGION_WIN, ICON_PAUSE, xco,yco,XIC*2,YIC, "Stop Playing Timeline"); - - xco+= XIC; - } - else { - but=uiDefIconButO(block, BUT, "SCREEN_OT_animation_play", WM_OP_INVOKE_REGION_WIN, ICON_PLAY_REVERSE, xco,yco,XIC,YIC, "Play Timeline in Reverse"); - RNA_boolean_set(uiButGetOperatorPtrRNA(but), "reverse", 1); - xco+= XIC; - - but=uiDefIconButO(block, BUT, "SCREEN_OT_animation_play", WM_OP_INVOKE_REGION_WIN, ICON_PLAY, xco,yco,XIC,YIC, "Play Timeline"); - RNA_boolean_set(uiButGetOperatorPtrRNA(but), "reverse", 0); - } - xco+= XIC; - - but= uiDefIconButO(block, BUT, "SCREEN_OT_keyframe_jump", WM_OP_INVOKE_REGION_WIN, ICON_NEXT_KEYFRAME, xco,yco,XIC,YIC, "Skip to next keyframe (Ctrl PageUp)"); - RNA_boolean_set(uiButGetOperatorPtrRNA(but), "next", 1); - xco+= XIC; - - but= uiDefIconButO(block, BUT, "SCREEN_OT_frame_jump", WM_OP_INVOKE_REGION_WIN, ICON_FF, xco,yco,XIC,YIC, "Skip to End frame (Shift UpArrow)"); - RNA_boolean_set(uiButGetOperatorPtrRNA(but), "end", 1); - xco+= XIC; - uiBlockEndAlign(block); - - xco+= (short)(0.5*XIC); - - uiBlockBeginAlign(block); - uiDefIconButBitS(block, TOG, AUTOKEY_ON, B_REDRAWALL, ICON_REC, - xco, yco, XIC, YIC, &(scene->toolsettings->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones"); - xco+= 1*XIC; - if (IS_AUTOKEY_ON(scene)) { - uiDefButS(block, MENU, B_REDRAWALL, - "Auto-Keying Mode %t|Add/Replace%x3|Replace%x5", - xco, yco, (int)(4.25*XIC), YIC, &(scene->toolsettings->autokey_mode), 0, 1, 0, 0, - "Mode of automatic keyframe insertion for Objects and Bones"); - xco+= (short)(4.25*XIC); - - if (animtimer) { - uiDefButBitS(block, TOG, ANIMRECORD_FLAG_WITHNLA, B_REDRAWALL, "Layered", - xco,yco, (int)(3.5*XIC), YIC, - &(scene->toolsettings->autokey_flag),0, 1, 0, 0, - "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking."); - uiBlockEndAlign(block); - - xco+= (short)(3.5*XIC); - } - - xco += XIC; - - uiBlockEndAlign(block); - } - else { - xco+= (short)(5.25*XIC); - uiBlockEndAlign(block); - } - - menustr= ANIM_build_keyingsets_menu(&scene->keyingsets, 0); - uiDefButI(block, MENU, B_DIFF, - menustr, - xco, yco, (int)5.5*XIC, YIC, &(scene->active_keyingset), 0, 1, 0, 0, - "Active Keying Set (i.e. set of channels to Insert Keyframes for)"); - MEM_freeN(menustr); - xco+= (5.5*XIC); - - /* NOTE: order of these buttons needs to be kept in sync with other occurances - * (see Outliner header for instance, also +/- stuff for filebrowser) - */ - uiBlockBeginAlign(block); - uiDefIconButO(block, BUT, "ANIM_OT_delete_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_DEHLT, xco,yco,XIC,YIC, "Delete Keyframes for the Active Keying Set (Alt-I)"); - xco += XIC; - uiDefIconButO(block, BUT, "ANIM_OT_insert_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_HLT, xco,yco,XIC,YIC, "Insert Keyframes for the Active Keying Set (I)"); - xco += XIC; - uiBlockEndAlign(block); - - xco+= XIC; - - uiDefIconButBitS(block, TOG, AUDIO_SYNC, B_DIFF, ICON_SPEAKER, - xco, yco, XIC, YIC, &(scene->r.audio.flag), 0, 0, 0, 0, "Play back and sync with audio from Sequence Editor"); - - - /* always as last */ - UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin)); - - uiEndBlock(C, block); - uiDrawBlock(C, block); -} - - -- cgit v1.2.3