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

- fixed colors of ipokeys in 3d window

Browse Source 
- fixed constraint popup menu (used icons)
- moved 'full' and 'View3d props' and 'background' items in menu to bottom
  Hope Matt wont kill me for it, but these were about the only useful
  ones there... :)
- little fix in interface.c for menus...
This commit is contained in:
Ton Roosendaal
2003-10-25 22:29:24 +00:00
parent 36668278ac
commit bbd9018ec5
5 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/src/buttons_object.c
View File

@@ -625,32 +625,30 @@ static uiBlock *add_constraintmenu(void *arg_unused)
block= uiNewBlock(&curarea->uiblocks, "add_constraintmenu", UI_EMBOSSP, UI_HELV, curarea->win);
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_LOCLIKE, ICON_BLANK1,"Copy Location", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_ROTLIKE, ICON_BLANK1,"Copy Rotation", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_LOCLIKE,"Copy Location", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_ROTLIKE,"Copy Rotation", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_TRACKTO, ICON_BLANK1,"Track To", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_LOCKTRACK, ICON_BLANK1,"Lock Track", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_FOLLOWPATH, ICON_BLANK1,"Follow Path", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_TRACKTO,"Track To", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_LOCKTRACK,"Lock Track", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_FOLLOWPATH,"Follow Path", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
if (type==TARGET_BONE) {
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_KINEMATIC, ICON_BLANK1,"IK Solver", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_ACTION, ICON_BLANK1,"Action", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_KINEMATIC,"IK Solver", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_ACTION,"Action", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
}
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, B_CONSTRAINT_ADD_NULL, ICON_BLANK1,"Null", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, B_CONSTRAINT_ADD_NULL,"Null", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiBlockSetDirection(block, UI_RIGHT);
uiTextBoundsBlock(block, 50);
uiBlockSetDirection(block, UI_RIGHT);
return block;
}

4
source/blender/src/drawobject.c
View File

@@ -3467,11 +3467,11 @@ void draw_object(Base *base)
// no theme yet
if(ob->id.lib) {
if(base->flag & (SELECT+BA_WASSEL)) colindex = 4;
else colindex = 5;
else colindex = 3;
}
else if(warning_recursive==1) {
if(base->flag & (SELECT+BA_WASSEL)) colindex = 7;
else colindex = 8;
else colindex = 6;
}
}

3
source/blender/src/ghostwinlay.c
View File

@@ -369,7 +369,8 @@ static int change_bit(int val, int bit, int to_on) {
return to_on?(val|bit):(val&~bit);
}
static int event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private) {
static int event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private)
{
GHOST_TEventType type= GHOST_GetEventType(evt);
if (type == GHOST_kEventQuit) {

3
source/blender/src/interface.c
View File

@@ -301,6 +301,7 @@ void uiTextBoundsBlock(uiBlock *block, int addval)
bt= block->buttons.first;
while(bt) {
bt->x2 = i + addval;
ui_check_but(bt); // clips text again
bt= bt->next;
}
}
@@ -2637,7 +2638,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent)
else if(but->type==BLOCK || but->type==MENU) { // automatic opens block button (pulldown)
int time;
if(uevent->event!=LEFTMOUSE ) {
if(block->auto_open==2) time= 2; // test for toolbox
if(block->auto_open==2) time= 1; // test for toolbox
else if(block->auto_open) time= 5*U.menuthreshold2;
else if(U.uiflag & MENUOPENAUTO) time= 5*U.menuthreshold1;
else time= -1;

66
source/blender/src/toolbox.c
View File

@@ -1513,6 +1513,7 @@ ListBase tb_listb= {NULL, NULL};
#define TB_TAB 256
#define TB_ALT 512
#define TB_CTRL 1024
#define TB_PAD 2048
typedef struct TBitem {
int icon;
@@ -1535,6 +1536,19 @@ static void tb_do_hotkey(void *arg, int event)
}
if(event & TB_TAB) key= TABKEY;
else if(event & TB_PAD) {
event &= ~TB_PAD;
switch(event) {
case '0': event= PAD0; break;
case '5': event= PAD5; break;
case '/': event= PADSLASHKEY; break;
case '.': event= PADPERIOD; break;
case '*': event= PADASTERKEY; break;
case 'h': event= HOMEKEY; break;
case 'u': event= PAGEUPKEY; break;
case 'd': event= PAGEDOWNKEY; break;
}
}
else asciitoraw(event, &key, &qual2);
if(qual1) mainqenter(qual1, 1);
@@ -1559,15 +1573,44 @@ static TBitem tb_object_select[]= {
/* *************Edit ********** */
static TBitem tb_mesh_edit[]= {
{ 0, "Exit Editmode|Tab", TB_TAB, NULL},
{ 0, "Undo|U", 'u', NULL},
{ 0, "Redo|Shift U", 'U', NULL},
{ 0, "Make Edge/Face|F", 'f', NULL},
{ 0, "Extrude|E", 'e', NULL},
{ 0, "Split|Y", 'y', NULL},
{ 0, "Separate|P", 'p', NULL},
{ 0, "Tools Menu|W", 'w', NULL},
{ -1, "", 0, tb_do_hotkey}};
static TBitem tb_object_ipo[]= {
{ 0, "Show/Hide", 'k', NULL},
{ 0, "Select Next", TB_PAD|'u', NULL},
{ 0, "Select Prev", TB_PAD|'d', NULL},
{ -1, "", 0, tb_do_hotkey}};
static TBitem tb_object_edit[]= {
{ 0, "Enter Editmode|Tab", TB_TAB, NULL},
{ 0, "Insert Keyframe|I", 'i', NULL},
{ 0, "Insert Key...|I", 'i', NULL},
{ 0, "Object Keys", 0, tb_object_ipo},
{ 0, "Boolean...|W", 'w', NULL},
{ 0, "Join Objects|CTRL J", TB_CTRL|'j', NULL},
{ 0, "Convert Object...|Alt C", 'i', NULL},
{ -1, "", 0, tb_do_hotkey}};
/* *************Mesh ********** */
static TBitem tb_mesh[]= {
{ 0, "Duplicate|Shift D", 'D', NULL},
{ 0, "Delete|X", 'x', NULL},
{ -1, "", 0, tb_do_hotkey}};
/* *************Object ********** */
@@ -1580,12 +1623,14 @@ static TBitem tb_object[]= {
{ 0, "SEPR", 0, NULL},
{ 0, "Make Parent|Ctrl P", TB_CTRL|'p', NULL},
{ 0, "Clear Parent|Alt P", TB_ALT|'p', NULL},
{ 0, "Make Track|Ctrl T", TB_CTRL|'t', NULL},
{ 0, "Clear Track|Alt T", TB_ALT|'t', NULL},
{ 0, "Copy Properties...|Ctrl C", TB_CTRL|'c', NULL},
{ 0, "Move to Layer...|M", 'm', NULL},
{ -1, "", 0, tb_do_hotkey}};
/* *************TRANSFORM ********** */
/* *************VIEW ********** */
static void tb_do_view_dt(void *arg, int event){
G.vd->drawtype= event;
@@ -1600,6 +1645,18 @@ static TBitem tb_view_dt[]= {
{ ICON_POTATO, "Textured", 5, NULL},
{ -1, "", 0, tb_do_view_dt}};
static TBitem tb_view[]= {
{ 0, "Viewport Shading", 0, tb_view_dt},
{ 0, "SEPR", 0, NULL},
{ 0, "Ortho/Persp|Pad 5", TB_PAD|'5', NULL},
{ 0, "Local View|Pad /", TB_PAD|'/', NULL},
{ 0, "Frame All|Home", TB_PAD|'h', NULL},
{ 0, "Frame Selected|Pad .", TB_PAD|'.', NULL},
{ 0, "Centre Cursor|C", 'c', NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Play Back |Alt A", TB_ALT|'a', NULL},
{ -1, "", 0, tb_do_hotkey}};
/* *************TRANSFORM ********** */
@@ -1758,12 +1815,13 @@ void toolbox_n(void)
menu3= tb_object_select; str3= "Select";
menu4= tb_object_edit; str4= "Edit";
menu5= tb_transform; str5= "Transform";
menu6= tb_view_dt; str6= "View";
menu6= tb_view; str6= "View";
if(G.obedit) {
if(G.obedit->type==OB_MESH) {
menu1= tb_test; str1= "Mesh";
menu1= tb_mesh; str1= "Mesh";
menu2= addmenu_mesh; str2= "Add";
menu4= tb_mesh_edit; str4= "Edit";
}
else if(G.obedit->type==OB_CURVE) {
menu1= tb_test; str1= "Curve";