archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Oops, left the script menu in there. problems.

Browse Source
This commit is contained in:
Campbell Barton
2005-12-16 13:50:45 +00:00
parent f5121b2496
commit 3a50444ad4
6 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/include/BIF_drawoops.h
View File

@@ -35,7 +35,7 @@
void give_oopslink_line(Oops *oops, OopsLink *ol, float *v1, float *v2);
void mysbox(float x1, float y1, float x2, float y2);
void boundbox_oops(void);
void boundbox_oops(short sel);
#endif

2
source/blender/include/BSE_drawoops.h
View File

@@ -36,7 +36,7 @@
struct ScrArea;
struct Oops;
void boundbox_oops(void);
void boundbox_oops(short sel);
void give_oopslink_line(struct Oops *oops, struct OopsLink *ol, float *v1, float *v2);
void draw_oopslink(struct Oops *oops);
void draw_icon_oops(float *co, short type);

1
source/blender/include/blendef.h
View File

@@ -248,6 +248,7 @@
#define B_OOPSHOME 251
#define B_OOPSBORDER 252
#define B_NEWOOPS 253
#define B_OOPSVIEWSEL 254
/* INFO: 300 */
/* watch: also in filesel.c and editobject.c */

8
source/blender/src/drawoops.c
View File

@@ -71,7 +71,7 @@
float oopscalex;
struct BMF_Font *font; /* for using different sized fonts */
void boundbox_oops()
void boundbox_oops(short sel)
{
Oops *oops;
float min[2], max[2];
@@ -80,13 +80,13 @@ void boundbox_oops()
if(G.soops==0) return;
min[0]= 1000.0;
max[0]= -10000.0;
max[0]= -1000.0;
min[1]= 1000.0;
max[1]= -1000.0;
oops= G.soops->oops.first;
while(oops) {
if(oops->hide==0) {
if (oops->hide==0 && !sel || (sel && oops->flag & SELECT )) {
ok= 1;
min[0]= MIN2(min[0], oops->x);
@@ -430,7 +430,7 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
else {
build_oops(); /* changed to become first call... */
boundbox_oops();
boundbox_oops(0);
calc_scrollrcts(sa, G.v2d, curarea->winx, curarea->winy);
myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);

65
source/blender/src/header_oops.c
View File

@@ -71,6 +71,9 @@
#include "BKE_depsgraph.h"
#include "BPY_extern.h"
#include "BPY_menus.h"
static int viewmovetemp = 0;
void do_oops_buttons(short event)
@@ -82,7 +85,21 @@ void do_oops_buttons(short event)
switch(event) {
case B_OOPSHOME:
init_v2d_oops(curarea, curarea->spacedata.first); // forces min/max to be reset
boundbox_oops();
boundbox_oops(0);
G.v2d->cur= G.v2d->tot;
dx= 0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin);
dy= 0.15*(G.v2d->cur.ymax-G.v2d->cur.ymin);
G.v2d->cur.xmin-= dx;
G.v2d->cur.xmax+= dx;
G.v2d->cur.ymin-= dy;
G.v2d->cur.ymax+= dy;
test_view2d(G.v2d, curarea->winx, curarea->winy);
scrarea_queue_winredraw(curarea);
break;
case B_OOPSVIEWSEL:
init_v2d_oops(curarea, curarea->spacedata.first); // forces min/max to be reset
boundbox_oops(1);
G.v2d->cur= G.v2d->tot;
dx= 0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin);
dy= 0.15*(G.v2d->cur.ymax-G.v2d->cur.ymin);
@@ -115,10 +132,13 @@ static void do_oops_viewmenu(void *arg, int event)
case 2: /* View All */
do_oops_buttons(B_OOPSHOME);
break;
case 3: /* Maximize Window */
case 3: /* View All */
do_oops_buttons(B_OOPSVIEWSEL);
break;
case 4: /* Maximize Window */
/* using event B_FULL */
break;
case 4: /* show outliner */
case 5: /* show outliner */
{
SpaceOops *soops= curarea->spacedata.first;
if(soops->type==SO_OOPS || soops->type==SO_DEPSGRAPH) soops->type= SO_OUTLINER;
@@ -128,23 +148,23 @@ static void do_oops_viewmenu(void *arg, int event)
scrarea_queue_winredraw(curarea);
}
break;
case 5:
case 6:
outliner_toggle_visible(curarea);
break;
case 6:
case 7:
outliner_show_hierarchy(curarea);
break;
case 7:
case 8:
outliner_show_active(curarea);
break;
case 8:
case 9:
outliner_one_level(curarea, 1);
break;
case 9:
case 10:
outliner_one_level(curarea, -1);
break;
#ifdef SHOWDEPGRAPH
case 10:
case 11:
// show deps
{
SpaceOops *soops= curarea->spacedata.first;
@@ -172,9 +192,9 @@ static uiBlock *oops_viewmenu(void *arg_unused)
uiBlockSetButmFunc(block, do_oops_viewmenu, NULL);
if(soops->type==SO_OOPS) {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Outliner", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Outliner", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
#ifdef SHOWDEPGRAPH
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Dependancies", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Dependancies", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
#endif
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -184,31 +204,32 @@ static uiBlock *oops_viewmenu(void *arg_unused)
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View Selected|NumPad .", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
}
#ifdef SHOWDEPGRAPH
else if(soops->type==SO_DEPSGRAPH) {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Outliner", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Oops Schematic", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Outliner", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Oops Schematic", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
}
#endif
else {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Oops Schematic", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Oops Schematic", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
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, 8, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Collapse One Level|NumPad -", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
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, 5, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hierarchy|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Active|NumPad .", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
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, 3, "");
else uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
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);
@@ -314,6 +335,7 @@ static uiBlock *oops_blockmenu(void *arg_unused)
}
void oops_buttons(void)
{
SpaceOops *soops;
@@ -367,6 +389,7 @@ void oops_buttons(void)
xmax= GetButStringLength("Block");
uiDefPulldownBut(block, oops_blockmenu, NULL, "Block", xco, -2, xmax-3, 24, "");
xco+= xmax;
}
}

5
source/blender/src/space.c
View File

@@ -4143,6 +4143,11 @@ static void winqreadoopsspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
do_oops_buttons(B_OOPSHOME);
break;
case PADPERIOD:
if((G.qual==0))
do_oops_buttons(B_OOPSVIEWSEL);
break;
case AKEY:
if((G.qual==0)) {
swap_select_all_oops();