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

Added a few more button align's

Browse Source
This commit is contained in:
Campbell Barton
2006-02-27 16:30:53 +00:00
parent f68b0ddb2a
commit 833e0be7bf
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2492,7 +2492,7 @@ void logic_buts(void)
else buttons_ketsji(block, ob); else buttons_ketsji(block, ob);
uiBlockSetCol(block, TH_AUTO); uiBlockSetCol(block, TH_AUTO);
uiDefBut(block, BUT, B_ADD_PROP, "ADD property", 10, 90, 340, 24, uiDefBut(block, BUT, B_ADD_PROP, "Add Property", 10, 90, 340, 24,
NULL, 0.0, 100.0, 100, 0, NULL, 0.0, 100.0, 100, 0,
""); "");
@@ -2500,6 +2500,7 @@ void logic_buts(void)
a= 0; a= 0;
prop= ob->prop.first; prop= ob->prop.first;
uiBlockBeginAlign(block);
while(prop) { while(prop) {
but= uiDefBut(block, BUT, 1, "Del", 10, (short)(70-20*a), 40, 19, NULL, 0.0, 0.0, 1, (float)a, ""); but= uiDefBut(block, BUT, 1, "Del", 10, (short)(70-20*a), 40, 19, NULL, 0.0, 0.0, 1, (float)a, "");
@@ -2532,7 +2533,7 @@ void logic_buts(void)
a++; a++;
prop= prop->next; prop= prop->next;
} }
uiBlockEndAlign(block);
uiClearButLock(); uiClearButLock();
idar= get_selected_and_linked_obs(&count, G.buts->scaflag); idar= get_selected_and_linked_obs(&count, G.buts->scaflag);

17
source/blender/src/buttons_script.c
View File

@@ -277,13 +277,16 @@ void draw_scriptlink(uiBlock *block, ScriptLink *script, int sx, int sy, int sce
strcat(str, "OnLoad%x 2|"); strcat(str, "OnLoad%x 2|");
strcat(str, "OnSave%x 8"); strcat(str, "OnSave%x 8");
} }
uiBlockBeginAlign(block);
uiDefButS(block, MENU, 1, str, (short)sx, (short)sy, 140, 19, &script->flag[script->actscript-1], 0, 0, 0, 0, "Script links for this event"); uiDefButS(block, MENU, 1, str, (short)sx, (short)sy, 140, 19, &script->flag[script->actscript-1], 0, 0, 0, 0, "Script links for this event");
uiDefIDPoinBut(block, test_scriptpoin_but, ID_SCRIPT, 1, "", (short)(sx+140),(short)sy, 140, 19, &script->scripts[script->actscript-1], "Name of Script to link"); uiDefIDPoinBut(block, test_scriptpoin_but, ID_SCRIPT, 1, "", (short)(sx+140),(short)sy, 140, 19, &script->scripts[script->actscript-1], "Name of Script to link");
uiBlockEndAlign(block);
} }
sprintf(str,"%d Scr:", script->totscript); sprintf(str,"%d Scr:", script->totscript);
uiDefButS(block, NUM, REDRAWBUTSSCRIPT, str, (short)(sx+140), (short)sy-20,60,19, &script->actscript, 1, script->totscript, 0, 0, "Total / Active Script link (LeftMouse + Drag to change)"); uiDefButS(block, NUM, REDRAWBUTSSCRIPT, str, (short)(sx+140), (short)sy-20,60,19, &script->actscript, 1, script->totscript, 0, 0, "Total / Active Script link (LeftMouse + Drag to change)");
if (scene) { if (scene) {
@@ -291,18 +294,17 @@ void draw_scriptlink(uiBlock *block, ScriptLink *script, int sx, int sy, int sce
uiDefBut(block, BUT, B_SSCRIPT_ADD, "New", (short)(sx+240), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Add a new Script link"); uiDefBut(block, BUT, B_SSCRIPT_ADD, "New", (short)(sx+240), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Add a new Script link");
if (script->totscript) if (script->totscript)
uiDefBut(block, BUT, B_SSCRIPT_DEL, "Del", (short)(sx+200), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Delete the current Script link"); uiDefBut(block, BUT, B_SSCRIPT_DEL, "Del", (short)(sx+200), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Delete the current Script link");
uiDefBut(block, LABEL, 0, "Scene Script link", sx,sy-20,140,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, "Scene Script link", sx,sy-20,140,20, 0, 0, 0, 0, 0, "");
} }
else { else {
if (script->totscript<32767) if (script->totscript<32767)
uiDefBut(block, BUT, B_SCRIPT_ADD, "New", (short)(sx+240), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Add a new Script link"); uiDefBut(block, BUT, B_SCRIPT_ADD, "New", (short)(sx+240), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Add a new Script link");
if (script->totscript) if (script->totscript)
uiDefBut(block, BUT, B_SCRIPT_DEL, "Del", (short)(sx+200), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Delete the current Script link"); uiDefBut(block, BUT, B_SCRIPT_DEL, "Del", (short)(sx+200), (short)sy-20, 40, 19, 0, 0, 0, 0, 0, "Delete the current Script link");
uiDefBut(block, LABEL, 0, "Selected Script link", sx,sy-20,140,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, "Selected Script link", sx,sy-20,140,20, 0, 0, 0, 0, 0, "");
} }
} }
/* ************************************* */ /* ************************************* */
@@ -323,8 +325,9 @@ static void script_panel_scriptlink(void)
"Enable execution of all assigned Script links"); "Enable execution of all assigned Script links");
/* for proper alignment: */ /* for proper alignment: */
uiDefBut(block, LABEL, 0, "", 160, 200,150,20, NULL, 0.0, 0.0, 0, 0, ""); uiDefBut(block, LABEL, 0, "", 160, 200,150,20, NULL, 0.0, 0.0, 0, 0, "");
if (G.f & G_DOSCRIPTLINKS) { if (G.f & G_DOSCRIPTLINKS) {
uiBlockBeginAlign(block);
ob= OBACT; ob= OBACT;
if(ob) if(ob)
uiDefIconButS(block, ROW, B_REDR, ICON_OBJECT, xco,175,25,20, &G.buts->scriptblock, 2.0, (float)ID_OB, 0, 0, "Displays Object script links"); uiDefIconButS(block, ROW, B_REDR, ICON_OBJECT, xco,175,25,20, &G.buts->scriptblock, 2.0, (float)ID_OB, 0, 0, "Displays Object script links");
@@ -340,7 +343,7 @@ static void script_panel_scriptlink(void)
if(ob && ob->type==OB_LAMP) if(ob && ob->type==OB_LAMP)
uiDefIconButS(block, ROW, B_REDR, ICON_LAMP, xco+=25,175,25,20, &G.buts->scriptblock, 2.0, (float)ID_LA, 0, 0, "Displays Lamp script links"); uiDefIconButS(block, ROW, B_REDR, ICON_LAMP, xco+=25,175,25,20, &G.buts->scriptblock, 2.0, (float)ID_LA, 0, 0, "Displays Lamp script links");
uiBlockEndAlign(block);
if (ob && G.buts->scriptblock==ID_OB) { if (ob && G.buts->scriptblock==ID_OB) {
script= &ob->scriptlink; script= &ob->scriptlink;

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

@@ -2741,10 +2741,10 @@ static void material_panel_texture(Material *ma)
else uiDefIconButBitS(block, TOG, 1<<a, B_MATPRV, ICON_CHECKBOX_HLT, -20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel"); else uiDefIconButBitS(block, TOG, 1<<a, B_MATPRV, ICON_CHECKBOX_HLT, -20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel");
} }
} }
uiBlockBeginAlign(block);
uiDefIconBut(block, BUT, B_MTEXCOPY, ICON_COPYUP, 100,180,23,21, 0, 0, 0, 0, 0, "Copies the mapping settings to the buffer"); uiDefIconBut(block, BUT, B_MTEXCOPY, ICON_COPYUP, 100,180,23,21, 0, 0, 0, 0, 0, "Copies the mapping settings to the buffer");
uiDefIconBut(block, BUT, B_MTEXPASTE, ICON_PASTEUP, 125,180,23,21, 0, 0, 0, 0, 0, "Pastes the mapping settings from the buffer"); uiDefIconBut(block, BUT, B_MTEXPASTE, ICON_PASTEUP, 125,180,23,21, 0, 0, 0, 0, 0, "Pastes the mapping settings from the buffer");
uiBlockEndAlign(block);
uiBlockSetCol(block, TH_AUTO); uiBlockSetCol(block, TH_AUTO);
mtex= ma->mtex[ ma->texact ]; mtex= ma->mtex[ ma->texact ];
@@ -3056,10 +3056,10 @@ static void material_panel_material(Material *ma)
if(uiNewPanel(curarea, block, "Material", "Material", 320, 0, 318, 204)==0) return; if(uiNewPanel(curarea, block, "Material", "Material", 320, 0, 318, 204)==0) return;
uiSetButLock(ma->id.lib!=NULL, "Can't edit library data"); uiSetButLock(ma->id.lib!=NULL, "Can't edit library data");
uiBlockBeginAlign(block);
uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYUP, 262,200,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer"); uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYUP, 262,200,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer");
uiDefIconBut(block, BUT, B_MATPASTE, ICON_PASTEUP, 283,200,XIC,YIC, 0, 0, 0, 0, 0, "Pastes Material from the buffer"); uiDefIconBut(block, BUT, B_MATPASTE, ICON_PASTEUP, 283,200,XIC,YIC, 0, 0, 0, 0, 0, "Pastes Material from the buffer");
uiBlockEndAlign(block);
if(ma->dynamode & MA_DRAW_DYNABUTS) { if(ma->dynamode & MA_DRAW_DYNABUTS) {
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
uiDefButF(block, NUMSLI, B_DIFF, "Restitut ", 128,120,175,20, &ma->reflect, 0.0, 1.0, 0, 0, "Elasticity of collisions"); uiDefButF(block, NUMSLI, B_DIFF, "Restitut ", 128,120,175,20, &ma->reflect, 0.0, 1.0, 0, 0, "Elasticity of collisions");