bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

2.6 User Interface:

Browse Source 
* New Icons for the File menu, patch by David Klein (cgeffex). Thanks a lot!
* This patch also adds a new icon for the use_filter_text in Filebrowser.
This commit is contained in:
Thomas Dinges 2012-03-15 14:36:54 +00:00
parent 32a92a65e5
commit 1002714fd8
5 changed files with 7112 additions and 6892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blender_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 KiB

After

Width:  |  Height:  |  Size: 221 KiB

22
release/scripts/startup/bl_ui/space_info.py
View File

@ -109,43 +109,43 @@ class INFO_MT_file(Menu):
layout.operator("wm.read_homefile", text="New", icon='NEW')
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.open_mainfile", text="Open...", icon='FILE_FOLDER')
layout.menu("INFO_MT_file_open_recent")
layout.menu("INFO_MT_file_open_recent", icon='OPEN_RECENT')
layout.operator("wm.recover_last_session", icon='RECOVER_LAST')
layout.operator("wm.recover_auto_save", text="Recover Auto Save...")
layout.operator("wm.recover_auto_save", text="Recover Auto Save...", icon='RECOVER_AUTO')
layout.separator()
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_mainfile", text="Save", icon='FILE_TICK').check_existing = False
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_as_mainfile", text="Save As...")
layout.operator("wm.save_as_mainfile", text="Save As...", icon='SAVE_AS')
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.save_as_mainfile", text="Save Copy...").copy = True
layout.operator("wm.save_as_mainfile", text="Save Copy...", icon='SAVE_COPY').copy = True
layout.separator()
layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
layout.operator_context = 'EXEC_AREA'
layout.operator("wm.save_homefile")
layout.operator("wm.read_factory_settings")
layout.operator("wm.save_homefile", icon='SAVE_PREFS')
layout.operator("wm.read_factory_settings", icon='LOAD_FACTORY')
layout.separator()
layout.operator_context = 'INVOKE_AREA'
layout.operator("wm.link_append", text="Link")
props = layout.operator("wm.link_append", text="Append")
layout.operator("wm.link_append", text="Link", icon='LINK_BLEND')
props = layout.operator("wm.link_append", text="Append", icon='APPEND_BLEND')
props.link = False
props.instance_groups = False
layout.separator()
layout.menu("INFO_MT_file_import")
layout.menu("INFO_MT_file_export")
layout.menu("INFO_MT_file_import", icon='IMPORT')
layout.menu("INFO_MT_file_export", icon='EXPORT')
layout.separator()
layout.menu("INFO_MT_file_external_data")
layout.menu("INFO_MT_file_external_data", icon='EXTERNAL_DATA')
layout.separator()

13944
source/blender/editors/datafiles/blender_icons.png.c
View File

File diff suppressed because it is too large Load Diff

36
source/blender/editors/include/UI_icons.h
View File

@ -843,17 +843,13 @@ DEF_ICON(LONGDISPLAY)
DEF_ICON(SHORTDISPLAY)
DEF_ICON(GHOST)
DEF_ICON(IMGDISPLAY)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK284)
DEF_ICON(BLANK285)
#endif
DEF_ICON(SAVE_AS)
DEF_ICON(SAVE_COPY)
DEF_ICON(BOOKMARKS)
DEF_ICON(FONTPREVIEW)
DEF_ICON(FILTER)
DEF_ICON(NEWFOLDER)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK285F)
#endif
DEF_ICON(OPEN_RECENT)
DEF_ICON(FILE_PARENT)
DEF_ICON(FILE_REFRESH)
DEF_ICON(FILE_FOLDER)
@ -864,26 +860,26 @@ DEF_ICON(FILE_MOVIE)
DEF_ICON(FILE_SCRIPT)
DEF_ICON(FILE_SOUND)
DEF_ICON(FILE_FONT)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK291b)
DEF_ICON(FILE_TEXT)
/* available */
DEF_ICON(BLANK292)
DEF_ICON(BLANK293)
DEF_ICON(BLANK294)
DEF_ICON(BLANK295)
DEF_ICON(BLANK296)
DEF_ICON(BLANK297)
DEF_ICON(BLANK298)
DEF_ICON(BLANK299)
/* FILE SELECT */
DEF_ICON(RECOVER_AUTO)
DEF_ICON(SAVE_PREFS)
DEF_ICON(LINK_BLEND)
DEF_ICON(APPEND_BLEND)
DEF_ICON(IMPORT)
DEF_ICON(EXPORT)
DEF_ICON(EXTERNAL_DATA)
DEF_ICON(LOAD_FACTORY)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK300)
DEF_ICON(BLANK301)
DEF_ICON(BLANK302)
DEF_ICON(BLANK303)
DEF_ICON(BLANK304)
DEF_ICON(BLANK305)
DEF_ICON(BLANK306)
#endif
DEF_ICON(LOOP_BACK)
DEF_ICON(LOOP_FORWARDS)
DEF_ICON(BACK)
DEF_ICON(FORWARD)
#ifndef DEF_ICON_BLANK_SKIP

2
source/blender/makesrna/intern/rna_space.c
View File

@ -2610,7 +2610,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_filter_text", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "filter", TEXTFILE);
RNA_def_property_ui_text(prop, "Filter Text", "Show text files");
RNA_def_property_ui_icon(prop, ICON_FILE_BLANK, 0);
RNA_def_property_ui_icon(prop, ICON_FILE_TEXT, 0);
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
prop = RNA_def_property(srna, "use_filter_folder", PROP_BOOLEAN, PROP_NONE);