[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19285] branches/blender2.5/blender: 2. 5 filebrowser
Andrea Weikert
elubie at gmx.net
Sat Mar 14 14:12:12 CET 2009
Revision: 19285
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19285
Author: elubie
Date: 2009-03-14 14:12:11 +0100 (Sat, 14 Mar 2009)
Log Message:
-----------
2.5 filebrowser
* added filter buttons to header
* changed large icon for movie files to match small icon
* fixed small stack corruption in interface_draw.c (Matt, check if this is ok)
* moved nice display of file size to storage.c, where string is created.
Modified Paths:
--------------
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/blender2.5/blender/release/datafiles/prvicons
branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
branches/blender2.5/blender/source/blender/editors/datafiles/prvicons.c
branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
Modified: branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-03-14 13:11:34 UTC (rev 19284)
+++ branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-03-14 13:12:11 UTC (rev 19285)
@@ -383,6 +383,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\interface\interface_layout.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\interface\interface_panel.c"
>
</File>
@@ -699,6 +703,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_object.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_scene.c"
>
</File>
Modified: branches/blender2.5/blender/release/datafiles/prvicons
===================================================================
(Binary files differ)
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/storage.c 2009-03-14 13:11:34 UTC (rev 19284)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/storage.c 2009-03-14 13:12:11 UTC (rev 19285)
@@ -401,24 +401,19 @@
* everyone starts using __USE_FILE_OFFSET64 or equivalent.
*/
st_size= (off_t)files[num].s.st_size;
-
- num1= st_size % 1000;
- num2= st_size/1000;
- num2= num2 % 1000;
- num3= st_size/(1000*1000);
- num3= num3 % 1000;
- num4= st_size/(1000*1000*1000);
- num4= num4 % 1000;
- num5= st_size/(1000000000000LL);
- num5= num5 % 1000;
- if(num5)
- sprintf(files[num].size, "%1d %03d %03d %03d K", (int)num5, (int)num4, (int)num3, (int)num2);
- else if(num4) sprintf(files[num].size, "%3d %03d %03d %03d", (int)num4, (int)num3, (int)num2, (int)num1);
- else if(num3) sprintf(files[num].size, "%7d %03d %03d", (int)num3, (int)num2, (int)num1);
- else if(num2) sprintf(files[num].size, "%11d %03d", (int)num2, (int)num1);
- else if(num1) sprintf(files[num].size, "%15d", (int)num1);
- else sprintf(files[num].size, "0");
+ if (st_size > 1024*1024*1024) {
+ sprintf(files[num].size, "%.2f GB", st_size/(1024*1024*1024));
+ }
+ else if (st_size > 1024*1024) {
+ sprintf(files[num].size, "%.1f MB", st_size/(1024*1024));
+ }
+ else if (st_size > 1024) {
+ sprintf(files[num].size, "%d KB", (int)(st_size/1024));
+ }
+ else {
+ sprintf(files[num].size, "%d B", (int)st_size);
+ }
strftime(datum, 32, "%d-%b-%y %H:%M", tm);
Modified: branches/blender2.5/blender/source/blender/editors/datafiles/prvicons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/datafiles/prvicons.c 2009-03-14 13:11:34 UTC (rev 19284)
+++ branches/blender2.5/blender/source/blender/editors/datafiles/prvicons.c 2009-03-14 13:12:11 UTC (rev 19285)
@@ -1,322 +1,304 @@
/* DataToC output of file <prvicons> */
-int datatoc_prvicons_size= 10111;
+int datatoc_prvicons_size= 9534;
char datatoc_prvicons[]= {
-137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0,192, 0, 0, 0,192, 8, 6, 0, 0, 0, 82,220,
-108, 7, 0, 0, 0, 1,115, 82, 71, 66, 0,174,206, 28,233, 0, 0, 0, 6, 98, 75, 71, 68, 0,255, 0,255, 0,255,160,189,167,
-147, 0, 0, 0, 9,112, 72, 89,115, 0, 0, 11, 19, 0, 0, 11, 19, 1, 0,154,156, 24, 0, 0, 0, 7,116, 73, 77, 69, 7,217,
- 3, 11, 22, 20, 52,126,245,230,180, 0, 0, 0, 29,116, 69, 88,116, 67,111,109,109,101,110,116, 0, 67,114,101, 97,116,101,100,
- 32,119,105,116,104, 32, 84,104,101, 32, 71, 73, 77, 80,239,100, 37,110, 0, 0, 32, 0, 73, 68, 65, 84,120,218,237,157,123,124,
- 84,213,185,247,127,251, 50,123,207,100,102, 50,153, 36,144, 64,144, 75,129, 4, 67, 8, 32, 66, 33,132,112, 9,245, 0, 61, 96,
-241, 28,181,111, 69,251,126,236,123,168,120,170,109,189, 32,136, 98,244,181,165, 92,173,130,104, 43, 34, 69,240,214,234, 71,241,
- 61, 94,192,106,197,218, 24,136,128, 6, 73, 32,144,132,132,225,154,235, 36,153,100, 46,123,207,251, 7,236,221,153,201,158,201,
- 92,246,158, 73,154,245,251,124,230,147,100, 38, 51,243,236,189,191,207, 90,207,243,172,181,215, 2,136,136,136,136,136,136,136,
-136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
-136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
-136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
-136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
-136,136,136,136,136,136,136,136,136,136,136,136,136,136,174,138, 26, 72, 7, 59,117,234,212, 76, 81, 20, 15, 0,200,211,234, 59,
- 56,142,187, 84, 90, 90,154,169,197,103,143, 25, 51,134,183, 90,173,211, 5, 65, 48,107,101,191, 78,167,115,150,149,149, 29, 24,
- 40, 76,176, 3, 5,160,107,182,127,182,101,203, 22,174,168,168, 8,229,229,229,200,202,202,130, 94,175, 7,195, 48,160, 40, 10,
- 52, 77,255,179,101,160,168,144,191,251, 62, 39,253,237,112, 56, 48,127,254,252, 12,173,224, 79, 73, 73,153,177,105,211, 38,186,
-168,168, 8, 71,142, 28, 65, 86, 86, 22, 56,142, 3,203, 94,189,140, 12,195, 4,125,127,168,215, 36,185, 92, 46,204,153, 51,135,
- 31, 72,141, 34, 27, 41, 64,155, 55,111,230,102,207,158, 45, 3,196,243, 60, 24,134, 1, 77,211, 61,224,232, 13,156,192,223,181,
- 2, 72,178,125,211,166, 77,124, 81, 81,209, 40, 0, 40, 47, 47, 71,119,119, 55,146,147,147,193,178,172,124, 12,210,113, 4,123,
-132,122,189,182,182, 22, 90,194,191,126,253,122,186,168,168, 40, 9, 0, 14, 29, 58,132,188,188, 60,164,164,164,200,246,251, 66,
- 46, 57, 69, 32,252,193,158,103, 24, 70, 51,251,251,189, 3,248, 2, 52,123,246,236, 81, 0, 80, 86, 86,134,188,188, 60, 88, 44,
-150,160, 0, 5,194,210,219,107, 53, 53, 53, 90,133, 61,159,109,220,184,145,159, 51,103,206, 40,233,121,154,166, 33,138,162,159,
- 3,134,130, 59, 92,199,208, 18,254,121,243,230, 37,133,211,162, 71, 3,255, 64, 21, 27, 45, 64, 12,195,192,235,245, 6, 5, 40,
- 82,248,165,223,181,128,127,195,134, 13,250,185,115,231,142, 12, 22, 18,196, 2,191, 86,182,135,130, 63, 16,102,223,227,137, 22,
-254,192,207, 35, 14, 16, 3, 64,209,194,175, 38, 68,190,182,207,155, 55,111,164, 82, 76, 28, 41,224,225,188, 22, 15,248,195,129,
-152,192, 31,163, 3,132, 11,144, 20, 78, 68, 10,127,176,255,139, 7,252,210, 69,151,146, 94,181,224, 87,203,254,222,224,151,206,
-127,176,208, 37, 90,248, 7, 98, 40,196, 70, 11,144, 78,167,139,186,165,215, 50, 4,242, 13,217, 2,123, 45, 95,241,124,207, 98,
- 71,164,241,190, 22, 14, 16, 14,252,193,236, 39, 45,191, 10, 14, 16, 46, 64, 28,199, 41,194, 19, 11,252,190,101,200, 88,171, 61,
-190,249, 10, 0, 56,157, 78,212,213,213,161,190,190, 30,205,205,205,126,229,207, 88, 91,125,181,236, 15, 5,191,211,233, 68,109,
-109, 45,234,235,235,209,210,210,130,164,164,164, 30,176,199, 2,255, 64, 77,132,217, 72, 0,146, 46, 64,115,115, 51, 12, 6,131,
- 95,253, 60,209,240, 3,128, 40,138, 7,174,213,249, 71,137,162, 8,155,205,134,202,202, 74,156, 60,121, 18,141,141,141, 72, 78,
- 78, 70,106,106, 42, 44, 22, 11,204,102,115, 15, 7,136, 53, 23,136, 85, 86,171,117,250,181, 58,127,146, 32, 8,176,217,108,168,
-170,170, 66,117,117, 53, 26, 27, 27, 97, 54,155, 97,181, 90,145,146,146, 2,179,217, 12,150,101,123,128, 31, 11,252, 3, 62, 4,
- 18, 69,241,192,181, 58,191, 12,208,137, 19, 39,100,128,204,102, 51, 82, 83, 83,145,146,146, 2,163,209,232, 87,255,143, 21,126,
-149, 66,136,188,220,220, 92,108,223,190, 29,213,213,213, 96, 24, 6, 25, 25, 25, 72, 75, 75,195,208,161, 67,229, 65, 35,142,227,
-160,215,235,101,128,122,171,255, 71,242, 90, 44, 18, 4,193,156,155,155,139,231,159,127, 30, 53, 53, 53, 96, 24, 6,131, 6, 13,
- 66,122,122, 58,242,243,243,193,178, 44,120,158, 7,199,113,242,248, 75,176, 86,159,192, 31, 93, 8,148, 55,126,252,120,108,219,
-182, 13,213,213,213, 96, 89, 22, 25, 25, 25, 72, 77, 77,197,132, 9, 19,100,128,120,158,135, 94,175,135, 78,167, 3,203,178,170,
-193,175, 70, 43,218,222,222, 14,147,201,132,162,162, 34,164,164,164,200, 73,186,111,178,174,211,233,122, 64, 20, 12,242,120, 87,
-129,236,118, 59,204,102, 51, 10, 11, 11, 97,181, 90,123,192, 45,217,203,243,188,108,191, 82, 47, 64,224,143, 50, 7,176,219,237,
- 48, 26,141, 50, 64,129,149, 30,154,166,101, 39,224,121, 94,254, 59,210,106, 79,176,215, 98,149,209,104, 68,126,126, 62, 4, 65,
-144,115, 19,223,159, 52, 77,131, 97, 24,232,116, 58,249,167, 82, 15, 16,109, 34, 28,171,146,147,147, 49,113,226, 68,217,254, 96,
-149,159, 64,248, 73,216,163,146, 3, 72, 0, 5,142,146,250, 2,196,178,172, 12, 14,199,113,126, 0,197, 26, 18,197,124, 64,215,
- 66, 28,175,215,171, 8,191,244,125,190, 45,191, 90,185,128, 26,246, 75,173,187,199,227,233, 21, 90, 53,225,151,194,193, 1,239,
- 0, 82,235, 46,138, 98,143, 11, 43,129,254,208,158, 43,248,240,208, 69, 8,162, 55,170, 47,237,120,119,145,102,101, 80,223, 11,
- 41, 57,129,239, 35,112, 0, 44,146,150, 63, 30,137,176,210,188,158, 80,213, 29, 37,248,195,201, 11, 66,253,207,128,119, 0,223,
- 11, 16,120,145,105,154,198,155,171,111, 64, 83, 39,240,211, 13,135,241,217,177,203,242,123, 91,223,253, 17, 44, 70,157,223,231,
- 93,106,233,198,183, 53,109,120,122,111, 37, 14, 86, 92, 9, 89, 50, 85, 67,190,161,148,218, 37,206,222,202,159,106, 29, 67, 56,
- 85,157,104,192, 38,240,247, 20, 29, 12, 32,169,117,145, 30, 82,194,203, 48, 12,154,154,154,192,122,218,240,228,157, 57,126,239,
-109,110,106, 66, 99, 99, 35,154,154,154,208,220,220,140,150,150, 22, 24, 24, 23,102, 94,111,198, 39, 27, 10,177,112, 90,102,200,
- 1, 39, 53,114, 0, 53, 71,117, 35,129, 95,171,201,112,241,130,127,160,230, 2, 65, 29,160,183,216, 93, 20, 69,100,165, 4, 94,
- 44,101,160, 5, 65,128,203,233,196,227,119, 92, 31,242, 59,212,146, 90,240,135, 91, 30,213,106, 66, 28,129, 63, 1, 33, 80,176,
-164, 81,201, 17,140,172,255, 5,103, 20,128,240,253,251,134,209,102,204,155, 52, 88, 83,248, 67,217,175,166, 99,104, 53, 15, 40,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list