[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18110] branches/blender2.5/blender: 2. 5 - Reworked the icon system a bit
Matt Ebb
matt at mke3.net
Sun Dec 28 08:39:26 CET 2008
Revision: 18110
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18110
Author: broken
Date: 2008-12-28 08:39:23 +0100 (Sun, 28 Dec 2008)
Log Message:
-----------
2.5 - Reworked the icon system a bit
* After several hours of manual dragging and typing the icon file is now
enlarged and completely reorganised logically, rather than scattered
throughout. This should provide a lot more room for growth, and is a
lot easier to work with (also allowing more space for toggle buttons
that require two icon slots next to each other). The icon grid has now
25 x 24 icons - hopefully this might last us for a couple more years :)
Some of the naming of icon defines is a bit ancient and can be cleaned
up a bit further. Other devs, if when bringing spaces back, it's
finding the wrong icon, or missing a define, try and look to see if
it's already existing in the new icon file, or drop me a note and I'll
fix it up.
Note: after these changes, older custom blender 2.4 icon
files won't work and will need to be updated to the new layout.
* Enlarged the icons themselves from 15x16 pixels to 16x16 pixels (icon
designer request). This is a more standard size, and is easier to fit
stuff in proportionally.
* Added a bunch more of jendrzych's icons that weren't added previously
since there wasn't space in the icon file (including a few more
modifier icons)
* Tweaked the outliner somewhat, so that instead of just showing a
generic 'object' icon for all objects, it shows 'object type' icons,
per object type. This makes the outliner a lot more useful for browsing
at a glance - a huge row of identical 'object' icons doesn't really
give much useful information. See here:
http://mke3.net/blender/devel/2.5/outliner_obtypes.png
Modified Paths:
--------------
branches/blender2.5/blender/release/datafiles/blenderbuttons
branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c
branches/blender2.5/blender/source/blender/editors/include/UI_resources.h
branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: branches/blender2.5/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c 2008-12-28 04:13:18 UTC (rev 18109)
+++ branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c 2008-12-28 07:39:23 UTC (rev 18110)
@@ -1,3248 +1,3896 @@
/* DataToC output of file <blenderbuttons> */
-int datatoc_blenderbuttons_size= 103734;
+int datatoc_blenderbuttons_size= 124464;
char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 2, 0, 0, 0,
- 1, 0, 8, 6, 0, 0, 0,197,144,206,103, 0, 0, 0, 4,115, 66, 73, 84, 8, 8, 8, 8,124, 8,100,136, 0, 0, 0, 9,112,
- 72, 89,115, 0, 0, 13,215, 0, 0, 13,215, 1, 66, 40,155,120, 0, 0, 0, 25,116, 69, 88,116, 83,111,102,116,119, 97,114,101,
- 0,119,119,119, 46,105,110,107,115, 99, 97,112,101, 46,111,114,103,155,238, 60, 26, 0, 0, 32, 0, 73, 68, 65, 84,120,156,236,
-157,119, 88, 84,215,214,198,223, 83,166, 23,102, 64, 4,105, 98, 99, 20, 59, 86, 44,140, 93, 98,137,198,118, 21, 9,198, 22, 59,
- 22,108,137, 53,209,216,174, 45,118, 19,187, 40, 38, 38, 98, 98, 47,136, 99,111,216, 21, 71, 35, 98, 1,233, 51, 8,211,103,206,
-249,254,160, 92, 52,192, 12,234,189,201,253,238,252,158,231, 60, 48,103,206,121,103,157, 41,103,173,189,246,218,123, 19,106,141,
- 10, 78,156, 56,113,226,196,137,147,255, 45,200,191,218, 0, 39, 78,156, 56,113,226,196,201,127, 30,103, 0,224,196,137, 19, 39,
- 78,156,252, 15,226, 12, 0,156, 56,113,226,196,137,147,255, 65,232,191,218, 0, 39, 78,156, 56,113,226,196,201,199,231,249, 77,
-157,177,180,253, 28, 82, 32,243,106, 68, 26,157, 1,128, 19, 39, 78,156,252,135, 81,200,149,164, 90,163, 98,254,106, 59,156,252,
-255,166,106,144,136, 95,222,243,196,223,101, 20,192,192, 14,147,188, 40,138,106, 6,192,205,102,179, 29,223,119,102,117,234, 95,
-109,147,147,191, 63, 10,185,146, 0, 0,181, 70,197,254,213,182,252,213,244,109, 59,238, 98,112,112,112,157,155, 55,111,154, 25,
-134, 1, 73,146, 32, 8,162,120, 99, 24, 38,101,207,169, 21, 77,254,106, 59,255,215,233, 88,127,240,226,182,109,219, 78,190,126,
-253,250,143, 71,174,111,157, 80,209,243,219,215, 29, 20, 36,149, 74,191,179, 90,173,205,173, 86,171, 64, 40, 20,222,207,205,205,
- 93,123,230,254,222,221,239, 99,207,223, 93,207,201,135, 83,148, 9, 40,106,249, 23,237,127,239, 0, 32,188,203,212,234, 12,195,
- 12, 1, 16,206,178,236,173,152,184, 85,253, 42,114,254, 23,221,102, 10, 44, 22,203, 4,150,101,131, 73,138,211,172, 86,253, 86,
-222, 65, 45,149,208,232, 88,156,250,233,159, 79,133, 60, 78,189,205,177,223,148,154,190, 40,141,176, 78, 83, 14, 3,232, 94,218,
-115, 4, 65,124,179,231,212,138,249,142,106, 13,234, 56, 57, 20,192,204,194,135, 75, 98,226, 86, 29,119,244,220,255, 4,138, 47,
-215,113, 61,212,236, 33,138,195,233,192,218,172, 52,195, 88,167,158, 83, 77, 90,241, 87,219, 85,132,178,205,202, 64, 23,185,108,
- 20, 73, 17,116, 78,142,102,211,185,115, 83,238,253, 59, 94, 71, 33, 87, 10,191, 29, 89,175, 7, 77,146,204,215,155,239,198,170,
- 53, 42,219, 7,234,241, 1,248, 1,120,174,214,168, 76,246,142,175,175,152, 86, 95,224, 34, 61,106,122, 99,110,123,231,209,130,
-228, 15,121,237,119,236,112,173, 82,165, 74, 61,155,205,230, 75,146,228,171,180,180,180,251,106,141, 42,219,222,121, 3,218, 69,
-190,184,121,243,166,239,137, 19, 39, 32, 20, 10, 33, 22,139, 33,145, 72, 32, 22,139, 33, 22,139,209,163, 71,143,212, 45,191, 47,
-244,118,212,142, 33,159,204,120,110,177, 88,252, 42, 98, 59,151,203,205,228,241,120, 94,155, 99,191,177,190,251, 92,187,192,129,
-207, 9,130,168,144, 30, 65, 16,153, 41, 41, 41, 94,106,141,234,223,174, 87, 26, 10,185,178,166, 68, 34, 25,197, 48, 76, 40, 73,
-146,167,242,242,242, 54,171, 53, 42,117, 69, 94,179, 36, 93, 27, 15,145,117,237,218, 85,179,113,227, 70,140, 31, 63,158, 57,120,
-240,160, 71,252,131,152, 44, 71,207,239,214,116, 88, 36,135,195, 89, 52,123,246,108, 97,171, 86,173, 9,161, 80,136, 7, 15,238,
- 99,254,252,249,121, 25, 25, 25,231,213,106,117,207,138,100, 22, 74,234,181,110, 93,160,119,255,254,223, 71,207,201,135,243,252,
-166,206, 88,228,248, 75,254, 15, 84,176, 6,160, 79,155,177, 98, 30,143,215,159, 36,201, 47, 26, 53,109,213,182,215,128,161,132,
-149, 16, 98,225,212, 48,135,126, 76, 69, 12,236, 48, 41,152,164, 57, 59, 35, 38, 44,174, 85,181,102, 32,248, 34, 23,228,155, 8,
-164,105,109,224,233, 24,248, 54, 82,215, 72,190,246,115, 8,128,147, 21,144,237,254,211,145, 43, 72,213,216, 64, 16, 0, 65, 0,
- 36, 1,228, 25, 24,124, 61,172,237, 60, 0,243, 29, 21, 34, 73,114,238,176,197,103,130, 25, 22,216,241,117, 7, 46,128,191, 77,
- 0,160,248,114, 29,215,243, 41,153,173,168, 93, 77, 60,111,242, 96,108, 59,120, 29,113, 39,143, 47, 5,240,151, 6, 0,173,218,
-253,211, 91, 38, 16, 15,229,112,121,195,234, 55,168, 45,233,219,179,179, 27, 8, 2,177, 71,226,254,209,235,211,173,249, 86, 27,
-179, 67,255, 38,111,107,252,249, 41, 47,237,105,133,180, 95,247,156,181,149,239,120,196,110,222,135,150,140,169,191,111,122,184,
- 98,193,134, 95,159, 46, 7,224, 14, 32,237,221,227,218,117,222,122,148,160,248,213, 1,128, 32, 1,138, 36, 0,155, 57,245,212,
-177, 47, 58,148, 60, 78, 33, 87, 10,151,140,169,223, 59, 42, 76, 49,145,211,246,151,137, 10,185,242,122,121, 1, 69,131,186,211,
- 63,145,186,185, 29,170,221,164, 61,245,248,102,220,163, 6, 13,102,246,189,123,119,201, 17,123,215, 86, 22, 10,185,146, 87,185,
-114,229,218, 52, 77,215,233,216,177, 35,111,252,248,241,188, 46, 93,186,224,228,201,147,138,245,235,215, 87, 13,169, 61,192, 98,
- 50,153, 30,106,181, 90,181, 90,163, 42, 53, 48,182,217,108, 47,199,140, 25, 35, 78, 72, 72, 40, 43, 3,240,167,247,167, 60,108,
- 54,155, 87,124,124, 60,196, 98,177,221, 99, 9,130, 64,126,126, 62, 58,118,236,232,138,130,251, 74,105,247, 4,175,200,200, 72,
- 72,165, 82, 24, 12, 6, 24, 12, 6, 24,141, 70, 24,141, 70,152, 76, 38,152, 76, 38,152,205,102,152,205,102, 88, 44, 22, 24,141,
- 70, 36, 36, 36,184,250,251,251,151,169, 55, 97,194, 4, 72, 36,146, 98, 45,131,193, 80,172, 99, 52, 26,139,245, 76, 38, 19,140,
- 70, 35,110,223,190, 93,158, 30, 0, 64, 33, 87, 74,197, 98,113, 24, 73,146,195,125,125,125,201, 62,125,250, 36,184,185,185,157,
-201,202,202,146,196,198,198,238,109,226,219, 29, 0,182,231,231,231,239, 86,107, 84,185, 14,189,153,133, 24, 12, 6, 5, 65, 16,
-120,241,226, 5, 8,130, 32, 25,134,169, 7,224,172, 35,231,118,168, 23,214, 72, 44, 22, 47, 62,112, 56, 78,104,161, 92,160,177,
- 49,208,228, 3,110,254,205, 16,189,255,176,100,100, 68,127,165,193, 96,152, 10, 96, 89, 69,244,206,158, 61, 43,244,240,240,248,
-215,254, 14, 29, 16, 28, 28, 44,233,221,187,247,123,235, 85,174, 92, 25, 44, 91,144,148,107,223,190,253,123,233,253,183,178,120,
-242,246,111, 77, 38,211, 87, 12,195,208, 36, 73,218, 4, 2,193,202, 25, 43,134, 76,255, 0, 61,127,179,217,236,103,177, 88, 8,
- 14,135,195,242,249,252, 87, 51, 86, 12, 73,250, 24,182,218, 13, 0, 20,114, 37,209,180,105, 83, 37,203,178, 95, 84,171, 81,171,
-127,223,193,163,132,213, 2, 26, 32,143,113, 65, 82, 38,131,155,103, 98, 0, 96,159, 35, 47,214,189,217,112,158, 76, 38, 91, 80,
- 45,176, 69,212,200, 73,243,201,123,105, 2,156, 77,178,129, 38,205,160, 72,192,148,151,129,220,212, 68,164, 61, 58,171,183, 88,
- 44, 23, 43,122, 49, 47,115,172, 56,151,104, 2, 69, 2,100,225,205,158, 34, 42,170, 2,176, 44,235,197, 2, 56,122,219, 0,150,
-101, 29,110, 49,253, 39,240, 80,179,135,235,212,173, 33, 94, 56,103, 26,166,172,137,199,243,171,199,193,218, 44, 51, 62, 84,183,
- 81,221,113,190, 52,193, 29, 77,144,132, 12, 4, 41, 4, 99,123,206, 51,153,150, 95,120,188, 33,223,222,185,173, 91,125, 95,133,
-230,114,158,215,170, 89, 29,243,166,143,165, 92,229, 46,197,207,181,111,211,220, 77,163,125,227,246,221,138, 77,115,174, 37,220,
-155,171,108,191,170,186, 42,126,114,114,121,122, 44, 99,245, 90,179,110, 61, 60,228,124,100,230,154, 49, 97,252,120,124,191,102,
- 13,188, 43, 9,240, 70,111,195, 15, 39, 94,165, 52,201, 91,118,118,250,167,138, 5,123, 79,191,220, 48,126,229,173,187, 0,116,
-165,138,145,116,141, 29, 27, 23, 5,248, 84,226,129, 34, 73,228,228, 91, 48,248,203,233,220,146,135, 20, 57,255,233,225,138, 5,
- 27, 99,147,118, 1,224, 0, 16, 0, 40,245,218, 27,212,253,122,172,139,171,251,218, 14, 3,166,146,138, 26,126,104,221,188, 49,
-239,194,169,216, 67,189,123,108,128,193,160,103,205, 86, 54, 37, 43, 59,103,250,189,251,139, 29,250, 93,132, 6,125,209,182,118,
-237,218,213, 71,142, 28,201,253,199, 63, 6, 81, 95, 45,221,217,109,246,154,195,193, 99,191,141,150,203,165, 46,185, 13, 2, 67,
-174, 93,218,178,237,208,239,177,191, 54,219,184,113, 99,195, 78, 13,194,147, 79,223,141, 62,247,174,206,175,231,215,183, 6,128,
- 62,109, 46, 94,108,217,178,101,157, 27, 55,110,152, 89,150, 45, 25, 4,120,135,117,154,146, 86,178, 75, 96,239,233,149,229,118,
- 9,240,120, 60,168, 84, 42, 80, 20,133,186, 29, 59,130,176, 88,240,226,234, 85,208, 34, 17,170, 4, 5,129, 48,155,145,247,248,
- 49, 56, 98, 49,104,218,126,123, 66, 34,145,160,107,215,174,224,241,120,104,218,180, 41,184, 92, 46, 56, 28, 78,153,155, 61, 68,
- 34, 17,190,249,230, 27, 0, 0, 77,211,144, 8, 4, 24,219,188, 57,132, 44,139, 45,106, 53,140, 12, 3,154,166, 65,211,180, 67,
-122, 77,253,122,236,144, 74,165,237,218,183,111,127, 99,230,204,153,251, 91,182,108,169, 5,128,221,187,119,251,206,156, 57,243,
-225,247,223,127,127,253,218,181,107, 46, 75,150, 44, 81,198,197,197, 77,105,228, 21,122,233,118,234,241,112,123,186, 10,185,146,
-244,242,242,154,215,183,111,223, 89, 35, 70,140,128,187,187, 59, 70,140, 24, 1,138,162,226,218,215, 29,180, 44, 53, 53,117,182,
-189, 12,150, 68, 34, 89, 60, 99,198, 12, 1,195,113,193,226,159,146,161,213, 89, 0, 0, 2, 46,133,113,157, 37,136,138,138, 18,
-141, 26, 53,106, 46, 28,116,176, 69,122, 37,157, 63, 0, 88, 44, 22,228,228,228,124,144, 94, 66, 66, 2, 76,166,130, 36, 26, 65,
- 16,240,245,245,173,176,222,127, 35, 17,161,211, 61,130,130,130,102,175, 92,185,146,144,203,229,200,203,203,163,102,204,152, 49,
-109,120,207, 89,235,182, 30,250,238, 69, 69,245,250,180, 25,203, 13, 9, 9,169,186,106,213, 42,200,100, 50,228,231,231, 19,211,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list