diff options
| author | Andrea Weikert <elubie@gmx.net> | 2012-10-27 21:47:58 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2012-10-27 21:47:58 +0400 |
| commit | 89b7e2257884388de36c7e963a6ba4de17986b89 (patch) | |
| tree | 70f4f3cca83c51a6797837d1c665379de626a3b4 /source/blender/editors/space_file | |
| parent | 3f88ca0d80150707e4be5b606ca54807a4f84b5e (diff) | |
== filebrowser ==
PATCH: [#32985] File Browser text file icon does not match text filter icon
Contributed by Georg Kronthaler, many thanks!
* set correct icon for text files and drag&drop
* remove duplicate if for filter_text
* fixed a couple of blanks at the end of line.
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/file_draw.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index cd0347a4dbc..66a255f9a47 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -264,14 +264,16 @@ static int get_file_icon(struct direntry *file) return ICON_FILE_MOVIE; else if (file->flags & PYSCRIPTFILE) return ICON_FILE_SCRIPT; - else if (file->flags & SOUNDFILE) + else if (file->flags & SOUNDFILE) return ICON_FILE_SOUND; - else if (file->flags & FTFONTFILE) + else if (file->flags & FTFONTFILE) return ICON_FILE_FONT; - else if (file->flags & BTXFILE) + else if (file->flags & BTXFILE) return ICON_FILE_BLANK; - else if (file->flags & COLLADAFILE) + else if (file->flags & COLLADAFILE) return ICON_FILE_BLANK; + else if (file->flags & TEXTFILE) + return ICON_FILE_TEXT; else return ICON_FILE_BLANK; } diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 6afc0305115..562fcfd633d 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -833,6 +833,8 @@ int ED_file_extension_icon(const char *relname) return ICON_FILE_BLANK; else if (type == COLLADAFILE) return ICON_FILE_BLANK; + else if (type == TEXTFILE) + return ICON_FILE_TEXT; return ICON_FILE_BLANK; } diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 8d0f90f5931..49562958f82 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -168,8 +168,6 @@ short ED_fileselect_set_params(SpaceFile *sfile) params->filter |= RNA_boolean_get(op->ptr, "filter_image") ? IMAGEFILE : 0; if (RNA_struct_find_property(op->ptr, "filter_movie")) params->filter |= RNA_boolean_get(op->ptr, "filter_movie") ? MOVIEFILE : 0; - if (RNA_struct_find_property(op->ptr, "filter_text")) - params->filter |= RNA_boolean_get(op->ptr, "filter_text") ? TEXTFILE : 0; if (RNA_struct_find_property(op->ptr, "filter_python")) params->filter |= RNA_boolean_get(op->ptr, "filter_python") ? PYSCRIPTFILE : 0; if (RNA_struct_find_property(op->ptr, "filter_font")) |