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

modified userprefs layout.

Browse Source 
modified linenumber display.

for Win32:
added display of framenumber in titlebar of animwindow.
added userpref that enables all codecs for rendering.
This commit is contained in:
Rob Haarsma
2003-05-11 23:28:32 +00:00
parent 83e91abcc5
commit 5756d0e1bd
5 changed files with 62 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -89,6 +89,7 @@ extern UserDef U; /* from usiblender.c !!!! */
#define EVTTOCONSOLE 32 //print ghost events, here for tuhopuu compat. --phase
#define FLIPINFOMENU 64
#define FLIPFULLSCREEN 128
#define ALLWINCODECS 256
/* transopts */

6
source/blender/src/drawtext.c
View File

@@ -562,7 +562,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
else st->viewlines= 0;
if(st->showlinenrs) {
cpack(C_DERK);
cpack(0x8c787c);
glRecti(23, 0, (st->lheight==15)?63:59, curarea->winy - 2);
}
@@ -578,10 +578,10 @@ void drawtextspace(ScrArea *sa, void *spacedata)
for (i=0; i<st->viewlines && tmp; i++, tmp= tmp->next) {
if(st->showlinenrs) {
if(((float)(i + linecount + 1)/10000.0) < 1.0) {
sprintf(linenr, "%04d", i + linecount + 1);
sprintf(linenr, "%4d", i + linecount + 1);
glRasterPos2i(TXT_OFFSET - 7, curarea->winy-st->lheight*(i+1));
} else {
sprintf(linenr, "%05d", i + linecount + 1);
sprintf(linenr, "%5d", i + linecount + 1);
glRasterPos2i(TXT_OFFSET - 11, curarea->winy-st->lheight*(i+1));
}
BMF_DrawString(spacetext_get_font(st), linenr);

6
source/blender/src/playanim.c
View File

@@ -461,7 +461,11 @@ void playanim(int argc, char **argv)
if (ibuf){
strcpy(ibuf->name, picture->name);
while (pupdate_time()) PIL_sleep_ms(1);
#ifdef _WIN32
window_set_title(g_window, picture->name);
#endif
while (pupdate_time()) PIL_sleep_ms(1);
ptottime -= swaptime;
toscreen(ibuf);
} /* else deleten */

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

@@ -1406,7 +1406,7 @@ void drawinfospace(ScrArea *sa, void *spacedata)
(short)(xpos+dx),ypostab,(short)dx,buth,
&U.userpref,1.0,1.0, 0, 0,"");
uiDefButI(block, ROW,B_USERPREF,"Language & Colors",
uiDefButI(block, ROW,B_USERPREF,"Language & Font",
(short)(xpos+2*dx),ypostab,(short)dx,buth,
&U.userpref,1.0,2.0, 0, 0,"");
@@ -1458,69 +1458,72 @@ void drawinfospace(ScrArea *sa, void *spacedata)
uiDefButS(block, TOG|BIT|1, 0, "Grab",
(xpos+edgespace+medprefbut+midspace),y2,smallprefbut,buth,
&(U.flag), 0, 0, 0, 0,
"Constrains objects to grid points when moving");
"Move objects to grid units");
uiDefButS(block, TOG|BIT|2, 0, "Rotate",
(xpos+edgespace+medprefbut+(2*midspace)+smallprefbut),y2,smallprefbut,buth,
&(U.flag), 0, 0, 0, 0,
"Constrains objects to grid points when rotating");
"Rotate objects to grid units");
uiDefButS(block, TOG|BIT|3, 0, "Size",
(xpos+edgespace+medprefbut+(3*midspace)+(2*smallprefbut)),y2,smallprefbut,buth,
&(U.flag), 0, 0, 0, 0,
"Constrains objects to grid points when scaling");
"Scale objects to grid units");
uiDefBut(block, LABEL,0,"Middle mouse button:",
(xpos+edgespace+(2*midspace)+(3*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiBlockSetCol(block, BUTGREEN);
uiDefButS(block, TOGN|BIT|10, B_DRAWINFO, "Rotate View",
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y2,(smallprefbut+2),buth,
(xpos+edgespace+(4*midspace)+(4*medprefbut)),y2,(smallprefbut+2),buth,
&(U.flag), 0, 0, 0, 0, "Default action for the middle mouse button");
uiDefButS(block, TOG|BIT|10, B_DRAWINFO, "Pan View",
(xpos+edgespace+(3*midspace)+(3*medprefbut)+smallprefbut+2),y2,(smallprefbut+2),buth,
(xpos+edgespace+(4*midspace)+(4*medprefbut)+smallprefbut+2),y2,(smallprefbut+2),buth,
&(U.flag), 0, 0, 0, 0, "Default action for the middle mouse button");
uiBlockSetCol(block, BUTGREY);
uiDefBut(block, LABEL,0,"Middle mouse button:",
(xpos+edgespace+(3*midspace)+(4*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiDefButS(block, TOG|BIT|12, 0, "Emulate 3 Buttons",
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y1,medprefbut,buth,
(xpos+edgespace+(4*midspace)+(4*medprefbut)),y1,medprefbut,buth,
&(U.flag), 0, 0, 0, 0,
"Emulates a middle mouse button with ALT+LeftMouse");
uiDefBut(block, LABEL,0,"View rotation method:",
(xpos+edgespace+(3*midspace)+(4*medprefbut)),y3label,medprefbut,buth,
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiBlockSetCol(block, BUTGREEN);
uiDefButS(block, TOG|BIT|5, B_DRAWINFO, "Trackball",
(xpos+edgespace+(4*midspace)+(4*medprefbut)),y2,(smallprefbut+2),buth,
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y2,(smallprefbut+2),buth,
&(U.flag), 0, 0, 0, 0,
"Use trackball style rotation with middle mouse button");
uiDefButS(block, TOGN|BIT|5, B_DRAWINFO, "Turntable",
(xpos+edgespace+(4*midspace)+(4*medprefbut)+smallprefbut+2),y2,(smallprefbut+2),buth,
(xpos+edgespace+(3*midspace)+(3*medprefbut)+smallprefbut+2),y2,(smallprefbut+2),buth,
&(U.flag), 0, 0, 0, 0,
"Use turntable style rotation with middle mouse button");
uiBlockSetCol(block, BUTGREY);
uiDefBut(block, LABEL,0,"Mousewheel:",
(xpos+edgespace+(4*midspace)+(5*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiDefButS(block, TOG|BIT|2, 0, "Invert Wheel Zoom",
(xpos+edgespace+(4*midspace)+(4*medprefbut)),y1,medprefbut,buth,
(xpos+edgespace+(5*midspace)+(5*medprefbut)),y1,medprefbut,buth,
&(U.uiflag), 0, 0, 0, 0,
"Swaps mouse wheel zoom direction");
uiDefButI(block, NUM, 0, "Scroll Lines:",
(xpos+edgespace+(5*midspace)+(5*medprefbut)),y1,medprefbut,buth,
(xpos+edgespace+(5*midspace)+(5*medprefbut)),y2,medprefbut,buth,
&U.wheellinescroll, 0.0, 32.0, 0, 0,
"The number of lines scrolled at a time with the mouse wheel");
@@ -1630,7 +1633,7 @@ void drawinfospace(ScrArea *sa, void *spacedata)
(xpos+edgespace+medprefbut+midspace),y1,medprefbut,buth,
&U.fontsize, 0, 0, 0, 0, "Current interface font size (points)");
/*
/*
uiDefButS(block, MENU|SHO, B_SETENCODING, encoding_pup(),
(xpos+edgespace+medprefbut+midspace),y1,medprefbut,buth,
&U.encoding, 0, 0, 0, 0, "Current interface font encoding");
@@ -1639,7 +1642,7 @@ void drawinfospace(ScrArea *sa, void *spacedata)
uiDefBut(block, LABEL,0,"Translate:",
(xpos+edgespace+(2.1*medprefbut)+(2*midspace)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
*/
*/
uiDefButS(block, TOG|BIT|0, B_SETTRANSBUTS, "Tooltips",
(xpos+edgespace+(2.2*medprefbut)+(3*midspace)),y1,smallprefbut,buth,
@@ -1714,17 +1717,35 @@ void drawinfospace(ScrArea *sa, void *spacedata)
&U.console_buffer, 1.0, 4000.0, 0, 0, "Maximum number of internal console lines");
*/
#ifdef _WIN32
uiDefBut(block, LABEL,0,"Win Codecs:",
(xpos+edgespace+(2*midspace)+(2*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiDefButS(block, TOG|BIT|8, 0, "Enable all codecs",
(xpos+edgespace+(2*medprefbut)+(2*midspace)),y2,medprefbut,buth,
&(U.uiflag), 0, 0, 0, 0, "Allows all codecs for rendering (not guaranteed)");
#endif
uiDefBut(block, LABEL,0,"Keyboard:",
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiDefButS(block, TOG|BIT|9, B_U_CAPSLOCK, "Disable Caps Lock",
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y2,medprefbut,buth,
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y1,medprefbut,buth,
&(U.flag), 0, 0, 0, 0,
"Disables the Caps Lock key when entering text");
uiDefButS(block, TOG|BIT|13, 0, "Emulate Numpad",
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y1,medprefbut,buth,
(xpos+edgespace+(3*midspace)+(3*medprefbut)),y2,medprefbut,buth,
&(U.flag), 0, 0, 0, 0,
"Causes the 1 to 0 keys to act as the numpad (useful for laptops)");
uiDefBut(block, LABEL,0,"System:",
(xpos+edgespace+(4*midspace)+(4*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiDefButI(block, TOG|BIT|USERDEF_DISABLE_SOUND_BIT, B_SOUNDTOGGLE, "Disable Sound",
(xpos+edgespace+(4*medprefbut)+(4*midspace)),y2,medprefbut,buth,
&(U.gameflags), 0, 0, 0, 0, "Disables sounds from being played");
@@ -1734,6 +1755,10 @@ void drawinfospace(ScrArea *sa, void *spacedata)
&(U.uiflag), 0, 0, 0, 0, "Display only files with extensions in the image select window");
uiDefBut(block, LABEL,0,"OpenGL:",
(xpos+edgespace+(5*midspace)+(5*medprefbut)),y3label,medprefbut,buth,
0, 0, 0, 0, 0, "");
uiDefButI(block, TOGN|BIT|USERDEF_DISABLE_MIPMAP_BIT, B_MIPMAPCHANGED, "Mipmaps",
(xpos+edgespace+(5*medprefbut)+(5*midspace)),y2,medprefbut,buth,
&(U.gameflags), 0, 0, 0, 0, "Toggles between mipmap textures on (beautiful) and off (fast)");

10
source/blender/src/writeavicodec.c
View File

@@ -50,6 +50,7 @@
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
#include "DNA_userdef_types.h"
#include "render_types.h"
#include "render.h"
@@ -782,16 +783,23 @@ int get_avicodec_settings(void)
AVICOMPRESSOPTIONS *aopts[1] = {&opts};
AviCodecData *acd = G.scene->r.avicodecdata;
static PAVISTREAM psdummy;
UINT uiFlags;
acd_to_opts(G.scene->r.avicodecdata);
psdummy = NewBall();
if(U.uiflag & ALLWINCODECS)
uiFlags = ICMF_CHOOSE_ALLCOMPRESSORS;
else
uiFlags = ICMF_CHOOSE_KEYFRAME | ICMF_CHOOSE_DATARATE;
if (psdummy == NULL) {
ret_val = 1;
} else {
if (!AVISaveOptions(NULL,
ICMF_CHOOSE_KEYFRAME | ICMF_CHOOSE_DATARATE,
uiFlags,
// ICMF_CHOOSE_KEYFRAME | ICMF_CHOOSE_DATARATE,
// ICMF_CHOOSE_ALLCOMPRESSORS,
1,
&psdummy,