2.5 Outliner:

Finally, the Outliner Header is drawn via Python too. 
* Also added some Operators to the View Menu. 

2 files changed, 0 insertions, 332 deletions

diff --git a/source/blender/editors/space_outliner/outliner_header.c b/source/blender/editors/space_outliner/outliner_header.c
deleted file mode 100644
index b60cc075869..00000000000
--- a/source/blender/editors/space_outliner/outliner_header.c
+++ /dev/null
@@ -1,309 +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.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_ID.h"
-#include "DNA_anim_types.h"
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-
-#include "BKE_animsys.h"
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_main.h"
-#include "BKE_screen.h"
-
-#include "ED_keyframing.h"
-#include "ED_screen.h"
-#include "ED_util.h"
-#include "ED_types.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "outliner_intern.h"
-
-
-/* ************************ header area region *********************** */
-
-static void do_viewmenu(bContext *C, void *arg, int event)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceOops *soops= curarea->spacedata.first;
-	
-	switch(event) {
-		case 0: /* Shuffle Selected Blocks */
-			//shuffle_oops();
-			break;
-		case 1: /* Shrink Selected Blocks */
-			//shrink_oops();
-			break;
-		case 2: /* View All */
-			//do_oops_buttons(B_OOPSHOME);
-			break;
-		case 3: /* View All */
-			//do_oops_buttons(B_OOPSVIEWSEL);
-			break;
-		case 4: /* Maximize Window */
-			/* using event B_FULL */
-			break;
-			break;
-		case 6:
-			//outliner_toggle_visible(curarea);
-			break;
-		case 7:
-			//outliner_show_hierarchy(curarea);
-			break;
-		case 8:
-			//outliner_show_active(curarea);
-			break;
-		case 9:
-			//outliner_one_level(curarea, 1);
-			break;
-		case 10:
-			//outliner_one_level(curarea, -1);
-			break;
-		case 12:
-			if (soops->flag & SO_HIDE_RESTRICTCOLS) soops->flag &= ~SO_HIDE_RESTRICTCOLS;
-			else soops->flag |= SO_HIDE_RESTRICTCOLS;
-			break;
-	}
-	ED_area_tag_redraw(curarea);
-}
-
-static uiBlock *outliner_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceOops *soops= curarea->spacedata.first;
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "outliner_viewmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_viewmenu, NULL);
-	
-	if (soops->flag & SO_HIDE_RESTRICTCOLS)
-		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Show Restriction Columns", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, "");
-	else
-		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Show Restriction Columns", 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, "Expand One Level|NumPad +", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Collapse One Level|NumPad -", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
-	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");  
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show/Hide All", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hierarchy|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Active|NumPad .", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, "");
-	
-//	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");  
-//	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;
-}
-
-enum {
-	B_REDR	= 1,
-	
-	B_KEYINGSET_CHANGE,
-	B_KEYINGSET_REMOVE,
-} eOutlinerHeader_Events;
-
-static void do_outliner_buttons(bContext *C, void *arg, int event)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	Scene *scene= CTX_data_scene(C);
-	
-	switch(event) {
-		case B_REDR:
-			ED_area_tag_redraw(sa);
-			break;
-			
-		case B_KEYINGSET_CHANGE:
-			/* add a new KeyingSet if active is -1 */
-			if (scene->active_keyingset == -1) {
-				// XXX the default settings have yet to evolve... need to keep this in sync with the 
-				BKE_keyingset_add(&scene->keyingsets, NULL, KEYINGSET_ABSOLUTE, 0);
-				scene->active_keyingset= BLI_countlist(&scene->keyingsets);
-			}
-			
-			/* redraw regions with KeyingSet info */
-			WM_event_add_notifier(C, NC_SCENE|ND_KEYINGSET, scene);
-			break;
-			
-		case B_KEYINGSET_REMOVE:
-			/* remove the active KeyingSet */
-			if (scene->active_keyingset) {
-				KeyingSet *ks= BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);
-				
-				/* firstly free KeyingSet's data, then free the KeyingSet itself */
-				if (ks) {
-					BKE_keyingset_free(ks);
-					BLI_freelinkN(&scene->keyingsets, ks);
-					scene->active_keyingset= 0;
-				}
-				else
-					scene->active_keyingset= 0;
-			}
-			
-			/* redraw regions with KeyingSet info */
-			WM_event_add_notifier(C, NC_SCENE|ND_KEYINGSET, scene);
-			break;
-	}
-}
-
-
-void outliner_header_buttons(const bContext *C, ARegion *ar)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	Scene *scene= CTX_data_scene(C);
-	SpaceOops *soutliner= CTX_wm_space_outliner(C);
-	uiBlock *block;
-	int xco, yco= 3, xmax;
-	
-	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
-	uiBlockSetHandleFunc(block, do_outliner_buttons, NULL);
-	
-	xco= ED_area_header_standardbuttons(C, block, yco);
-	
-	if((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		
-		xmax= GetButStringLength("View");
-		uiDefPulldownBut(block, outliner_viewmenu, CTX_wm_area(C), 
-						 "View", xco, yco-2, xmax-3, 24, ""); 
-		xco += xmax;
-		
-		/* header text */
-		xco += XIC;
-		
-		uiBlockSetEmboss(block, UI_EMBOSS);
-	}
-	
-	/* data selector*/
-	if(G.main->library.first) 
-		uiDefButS(block, MENU, B_REDR, "Outliner Display%t|Libraries %x7|All Scenes %x0|Current Scene %x1|Visible Layers %x2|Groups %x6|Same Types %x5|Selected %x3|Active %x4|Sequence %x10|Datablocks %x11|User Preferences %x12||Key Maps %x13",	 xco, yco, 120, 20,  &soutliner->outlinevis, 0, 0, 0, 0, "");
-	else
-		uiDefButS(block, MENU, B_REDR, "Outliner Display%t|All Scenes %x0|Current Scene %x1|Visible Layers %x2|Groups %x6|Same Types %x5|Selected %x3|Active %x4|Sequence %x10|Datablocks %x11|User Preferences %x12||Key Maps %x13",	 xco, yco, 120, 20,  &soutliner->outlinevis, 0, 0, 0, 0, "");	
-	xco += 120;
-	
-	/* KeyingSet editing buttons */
-	if ((soutliner->flag & SO_HIDE_KEYINGSETINFO)==0 && (soutliner->outlinevis==SO_DATABLOCKS)) {
-		KeyingSet *ks= NULL;
-		char *menustr= NULL;
-		
-		xco+= (int)(XIC*1.5);
-		
-		if (scene->active_keyingset)
-			ks= (KeyingSet *)BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);
-		
-		uiBlockBeginAlign(block);
-			/* currently 'active' KeyingSet */
-			menustr= ANIM_build_keyingsets_menu(&scene->keyingsets, 1);
-			uiDefButI(block, MENU, B_KEYINGSET_CHANGE, menustr, xco,yco, 18,20, &scene->active_keyingset, 0, 0, 0, 0, "Browse Keying Sets");
-			MEM_freeN(menustr);
-			xco += 18;
-			
-			/* currently 'active' KeyingSet - change name */
-			if (ks) {
-				/* active KeyingSet */
-				uiDefBut(block, TEX, B_KEYINGSET_CHANGE,"", xco,yco,120,20, ks->name, 0, 63, 0, 0, "Name of Active Keying Set");
-				xco += 120;
-				uiDefIconBut(block, BUT, B_KEYINGSET_REMOVE, VICON_X, xco, yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Remove this Keying Set");
-				xco += 20;
-			}
-			else {
-				/* no active KeyingSet... so placeholder instead */
-				uiDefBut(block, LABEL, 0,"<No Keying Set Active>", xco,yco,140,20, NULL, 0, 63, 0, 0, "Name of Active Keying Set");
-				xco += 140;
-			}
-		uiBlockEndAlign(block);
-		
-		/* current 'active' KeyingSet */
-		if (ks) {
-			xco += 5;
-			
-			/* operator buttons to add/remove selected items from set */
-			uiBlockBeginAlign(block);
-					// XXX the icons here are temporary
-				uiDefIconButO(block, BUT, "OUTLINER_OT_keyingset_remove_selected", WM_OP_INVOKE_REGION_WIN, ICON_ZOOMOUT, xco,yco,XIC,YIC, "Remove selected properties from active Keying Set (Alt-K)");
-				xco += XIC;
-				uiDefIconButO(block, BUT, "OUTLINER_OT_keyingset_add_selected", WM_OP_INVOKE_REGION_WIN, ICON_ZOOMIN, xco,yco,XIC,YIC, "Add selected properties to active Keying Set (K)");
-				xco += XIC;
-			uiBlockEndAlign(block);
-			
-			xco += 10;
-			
-			/* operator buttons to insert/delete keyframes for the active set */
-			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*2;
-	}
-	
-	/* always as last  */
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+100, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin));
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
-}
-
-
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index fabe889ace6..826a313217a 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -153,38 +153,15 @@ static void outliner_main_area_listener(ARegion *ar, wmNotifier *wmn)
 
 /* ************************ header outliner area region *********************** */
 
-//#define PY_HEADER
-
 /* add handlers, stuff you only do once or on area/region changes */
 static void outliner_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 outliner_header_area_draw(const bContext *C, ARegion *ar)
 {
-#ifdef PY_HEADER
 	ED_region_header(C, ar);
-#else
-	float col[3];
-	
-	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);
-
-	outliner_header_buttons(C, ar);
-#endif
 }
 
 static void outliner_header_area_free(ARegion *ar)