Revision: 41449
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41449
Author: dingto
Date: 2011-11-01 20:14:58 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Space types:
* Some cleanup, removed references to already deleted *_header.c files.
* Marked SpaceScript as deprecated and removed header. Will keep space for now
though, as some script operators are there and Campbell might want to re-use
the space later.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_graph/graph_intern.h
trunk/blender/source/blender/editors/space_image/image_intern.h
trunk/blender/source/blender/editors/space_nla/nla_intern.h
trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/script_intern.h
trunk/blender/source/blender/editors/space_time/time_intern.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/python/simple_enum_gen.py
Removed Paths:
-------------
trunk/blender/source/blender/editors/space_script/script_header.c
Modified: trunk/blender/source/blender/editors/space_graph/graph_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_intern.h
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_graph/graph_intern.h
2011-11-01 20:14:58 UTC (rev 41449)
@@ -57,10 +57,6 @@
void graph_draw_ghost_curves(struct bAnimContext *ac, struct SpaceIpo *sipo,
struct ARegion *ar);
/* ***************************************** */
-/* graph_header.c */
-void graph_header_buttons(const bContext *C, struct ARegion *ar);
-
-/* ***************************************** */
/* graph_select.c */
void GRAPH_OT_select_all_toggle(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/space_image/image_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_intern.h
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_image/image_intern.h
2011-11-01 20:14:58 UTC (rev 41449)
@@ -51,9 +51,6 @@
extern const char *image_context_dir[]; /* doc access */
-/* image_header.c */
-void image_header_buttons(const struct bContext *C, struct ARegion *ar);
-
void IMAGE_OT_toolbox(struct wmOperatorType *ot);
/* image_draw.c */
Modified: trunk/blender/source/blender/editors/space_nla/nla_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_intern.h 2011-11-01
19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_nla/nla_intern.h 2011-11-01
20:14:58 UTC (rev 41449)
@@ -51,11 +51,6 @@
void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar);
/* **************************************** */
-/* nla_header.c */
-
-void nla_header_buttons(const bContext *C, ARegion *ar);
-
-/* **************************************** */
/* nla_select.c */
/* defines for left-right select tool */
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
2011-11-01 20:14:58 UTC (rev 41449)
@@ -229,7 +229,4 @@
void outliner_operatortypes(void);
void outliner_keymap(struct wmKeyConfig *keyconf);
-/* outliner_header.c */
-void outliner_header_buttons(const struct bContext *C, struct ARegion *ar);
-
#endif /* ED_OUTLINER_INTERN_H */
Modified: trunk/blender/source/blender/editors/space_script/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_script/CMakeLists.txt
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_script/CMakeLists.txt
2011-11-01 20:14:58 UTC (rev 41449)
@@ -35,7 +35,6 @@
set(SRC
script_edit.c
- script_header.c
script_ops.c
space_script.c
Deleted: trunk/blender/source/blender/editors/space_script/script_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_header.c
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_script/script_header.c
2011-11-01 20:14:58 UTC (rev 41449)
@@ -1,120 +0,0 @@
-/*
- * ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/space_script/script_header.c
- * \ingroup spscript
- */
-
-
-#include <string.h>
-#include <stdio.h>
-
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
-
-#include "BKE_context.h"
-
-#include "ED_screen.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "script_intern.h"
-
-/* ************************ header area region *********************** */
-
-static void do_viewmenu(bContext *UNUSED(C), void *UNUSED(arg), int
UNUSED(event))
-{
-
-}
-
-static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *UNUSED(arg))
-{
- ScrArea *curarea= CTX_wm_area(C);
- uiBlock *block;
- short yco= 0, menuwidth=120;
-
- block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
- uiBlockSetButmFunc(block, do_viewmenu, NULL);
-
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0,
yco-=20,
- menuwidth, 19, NULL, 0.0, 0.0, 1, 3,
"");
-
- 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_script_buttons(bContext *UNUSED(C), void *UNUSED(arg), int
UNUSED(event))
-{
- //switch(event) {
- //}
-}
-
-
-void script_header_buttons(const bContext *C, ARegion *ar)
-{
- ScrArea *sa= CTX_wm_area(C);
- uiBlock *block;
- int xco, yco= 3;
-
- block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
- uiBlockSetHandleFunc(block, do_script_buttons, NULL);
-
- xco= ED_area_header_standardbuttons(C, block, yco);
-
- if((sa->flag & HEADER_NO_PULLDOWN)==0) {
- int xmax;
-
- xmax= GetButStringLength("View");
- uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
- "View", xco, yco-2, xmax-3,
UI_UNIT_Y, "");
- xco+=UI_UNIT_X+xmax;
- }
-
- uiBlockSetEmboss(block, UI_EMBOSS);
-
- /* always as last */
- UI_view2d_totRect_set(&ar->v2d, xco+UI_UNIT_X+80,
ar->v2d.tot.ymax-ar->v2d.tot.ymin);
-
- uiEndBlock(C, block);
- uiDrawBlock(C, block);
-}
-
-
Modified: trunk/blender/source/blender/editors/space_script/script_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_intern.h
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_script/script_intern.h
2011-11-01 20:14:58 UTC (rev 41449)
@@ -33,10 +33,6 @@
/* internal exports only */
-
-/* script_header.c */
-void script_header_buttons(const bContext *C, ARegion *ar);
-
/* script_ops.c */
void script_operatortypes(void);
void script_keymap(struct wmKeyConfig *keyconf);
Modified: trunk/blender/source/blender/editors/space_time/time_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_time/time_intern.h
2011-11-01 19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/editors/space_time/time_intern.h
2011-11-01 20:14:58 UTC (rev 41449)
@@ -40,8 +40,5 @@
void time_operatortypes(void);
void time_keymap(struct wmKeyConfig *keyconf);
-/* time_header.c */
-void time_header_buttons(const bContext *C, ARegion *ar);
-
#endif /* ED_TIME_INTERN_H */
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2011-11-01
19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2011-11-01
20:14:58 UTC (rev 41449)
@@ -873,7 +873,7 @@
SPACE_SOUND, /* Deprecated */
SPACE_ACTION,
SPACE_NLA,
- SPACE_SCRIPT,
+ SPACE_SCRIPT, /* Deprecated */
SPACE_TIME,
SPACE_NODE,
SPACE_LOGIC,
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-11-01
19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-11-01
20:14:58 UTC (rev 41449)
@@ -62,7 +62,6 @@
{SPACE_TEXT, "TEXT_EDITOR", 0, "Text Editor", ""},
{SPACE_ACTION, "DOPESHEET_EDITOR", 0, "DopeSheet Editor", ""},
{SPACE_NLA, "NLA_EDITOR", 0, "NLA Editor", ""},
- {SPACE_SCRIPT, "SCRIPTS_WINDOW", 0, "Scripts Window", ""},
{SPACE_TIME, "TIMELINE", 0, "Timeline", ""},
{SPACE_NODE, "NODE_EDITOR", 0, "Node Editor", ""},
{SPACE_LOGIC, "LOGIC_EDITOR", 0, "Logic Editor", ""},
@@ -154,8 +153,6 @@
return &RNA_SpaceDopeSheetEditor;
case SPACE_NLA:
return &RNA_SpaceNLA;
- /*case SPACE_SCRIPT:
- return &RNA_SpaceScriptsWindow;*/
case SPACE_TIME:
return &RNA_SpaceTimeline;
case SPACE_NODE:
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2011-11-01
19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2011-11-01
20:14:58 UTC (rev 41449)
@@ -1392,7 +1392,7 @@
StructRNA *srna;
PropertyRNA *prop;
- /* space_buts */
+ /* space_logic */
srna= RNA_def_struct(brna, "ThemeLogicEditor", NULL);
RNA_def_struct_sdna(srna, "ThemeSpace");
Modified: trunk/blender/source/blender/python/simple_enum_gen.py
===================================================================
--- trunk/blender/source/blender/python/simple_enum_gen.py 2011-11-01
19:48:45 UTC (rev 41448)
+++ trunk/blender/source/blender/python/simple_enum_gen.py 2011-11-01
20:14:58 UTC (rev 41449)
@@ -33,7 +33,7 @@
SPACE_SOUND, #Deprecated
SPACE_ACTION,
SPACE_NLA,
- SPACE_SCRIPT,
+ SPACE_SCRIPT, #Deprecated
SPACE_TIME,
SPACE_NODE,
SPACEICONMAX
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
