forked from bartvdbraak/blender
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.
This commit is contained in:
Thomas Dinges
parent
ea2f7c907c
commit
32b34d631a
@ -56,10 +56,6 @@ void graph_draw_channel_names(struct bContext *C, struct bAnimContext *ac, struc
|
||||
void graph_draw_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar, struct View2DGrid *grid, short sel);
|
||||
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 */
|
||||
|
||||
|
||||
@ -51,9 +51,6 @@ struct ARegion *image_has_scope_region(struct ScrArea *sa);
|
||||
|
||||
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 */
|
||||
|
||||
@ -50,11 +50,6 @@ void NLA_OT_properties(wmOperatorType *ot);
|
||||
void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar);
|
||||
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 */
|
||||
|
||||
|
||||
@ -229,7 +229,4 @@ void OUTLINER_OT_action_set(struct wmOperatorType *ot);
|
||||
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 */
|
||||
|
||||
@ -35,7 +35,6 @@ set(INC_SYS
|
||||
|
||||
set(SRC
|
||||
script_edit.c
|
||||
script_header.c
|
||||
script_ops.c
|
||||
space_script.c
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -40,8 +40,5 @@ struct wmWindowManager;
|
||||
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 */
|
||||
|
||||
|
||||
@ -873,7 +873,7 @@ enum {
|
||||
SPACE_SOUND, /* Deprecated */
|
||||
SPACE_ACTION,
|
||||
SPACE_NLA,
|
||||
SPACE_SCRIPT,
|
||||
SPACE_SCRIPT, /* Deprecated */
|
||||
SPACE_TIME,
|
||||
SPACE_NODE,
|
||||
SPACE_LOGIC,
|
||||
|
||||
@ -62,7 +62,6 @@ EnumPropertyItem space_type_items[] = {
|
||||
{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 @@ static StructRNA* rna_Space_refine(struct PointerRNA *ptr)
|
||||
return &RNA_SpaceDopeSheetEditor;
|
||||
case SPACE_NLA:
|
||||
return &RNA_SpaceNLA;
|
||||
/*case SPACE_SCRIPT:
|
||||
return &RNA_SpaceScriptsWindow;*/
|
||||
case SPACE_TIME:
|
||||
return &RNA_SpaceTimeline;
|
||||
case SPACE_NODE:
|
||||
|
||||
@ -1392,7 +1392,7 @@ static void rna_def_userdef_theme_space_logic(BlenderRNA *brna)
|
||||
StructRNA *srna;
|
||||
PropertyRNA *prop;
|
||||
|
||||
/* space_buts */
|
||||
/* space_logic */
|
||||
|
||||
srna= RNA_def_struct(brna, "ThemeLogicEditor", NULL);
|
||||
RNA_def_struct_sdna(srna, "ThemeSpace");
|
||||
|
||||
@ -33,7 +33,7 @@ defs = """
|
||||
SPACE_SOUND, #Deprecated
|
||||
SPACE_ACTION,
|
||||
SPACE_NLA,
|
||||
SPACE_SCRIPT,
|
||||
SPACE_SCRIPT, #Deprecated
|
||||
SPACE_TIME,
|
||||
SPACE_NODE,
|
||||
SPACEICONMAX
|
||||
|
||||
Loading…
Reference in New Issue
Block a user