diff options
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 39 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_ops.c | 40 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_panels.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/fsmenu.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/writeimage.c | 8 |
11 files changed, 52 insertions, 51 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index ad3ec1a3d69..b8ce2307c71 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -528,6 +528,22 @@ void file_draw_list(const bContext *C, ARegion *ar) file = filelist_file(files, i); + UI_ThemeColor4(TH_TEXT); + + spos = ( FILE_IMGDISPLAY == params->display ) ? sx : sx + ICON_DEFAULT_WIDTH + 4; + + sw = file_string_width(file->relname); + if (file->flags & EDITING) { + int but_width = (FILE_IMGDISPLAY == params->display) ? layout->tile_w : layout->column_widths[COLUMN_NAME]; + + uiBut *but = uiDefBut(block, TEX, 1, "", spos, sy-layout->tile_h-3, + but_width, layout->textheight*2, file->relname, 1.0f, (float)FILE_MAX,0,0,""); + uiButSetRenameFunc(but, renamebutton_cb, file); + if ( 0 == uiButActiveOnly(C, block, but)) { + file->flags &= ~EDITING; + } + } + if (!(file->flags & EDITING)) { if (params->active_file == i) { if (file->flags & ACTIVE) colorid= TH_HILITE; @@ -538,8 +554,7 @@ void file_draw_list(const bContext *C, ARegion *ar) draw_tile(sx, sy-3, layout->tile_w+4, sfile->layout->tile_h+layout->tile_border_y, colorid,0); } } - - spos = sx; + uiSetRoundBox(0); if ( FILE_IMGDISPLAY == params->display ) { if ( (file->flags & IMAGEFILE) /* || (file->flags & MOVIEFILE) */) { @@ -555,29 +570,15 @@ void file_draw_list(const bContext *C, ARegion *ar) file_draw_preview(block, file, sx, sy, imb, layout, !is_icon && (file->flags & IMAGEFILE)); } else { - file_draw_icon(block, file->path, spos, sy-3, get_file_icon(file), ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH); - spos += ICON_DEFAULT_WIDTH + 4; + file_draw_icon(block, file->path, sx, sy-3, get_file_icon(file), ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH); } UI_ThemeColor4(TH_TEXT); - - sw = file_string_width(file->relname); - if (file->flags & EDITING) { - int but_width = (FILE_IMGDISPLAY == params->display) ? layout->tile_w : layout->column_widths[COLUMN_NAME]; - - uiBut *but = uiDefBut(block, TEX, 1, "", spos, sy-layout->tile_h-3, - but_width, layout->textheight*2, file->relname, 1.0f, (float)FILE_MAX,0,0,""); - uiButSetRenameFunc(but, renamebutton_cb, file); - if ( 0 == uiButActiveOnly(C, block, but)) { - file->flags &= ~EDITING; - } - } else { + if (!(file->flags & EDITING)) { float name_width = (FILE_IMGDISPLAY == params->display) ? layout->tile_w : sw; file_draw_string(spos, sy, file->relname, name_width, layout->tile_h, FILE_SHORTEN_END); } - uiSetRoundBox(0); - if (params->display == FILE_SHORTDISPLAY) { spos += layout->column_widths[COLUMN_NAME] + 12; if (!(file->type & S_IFDIR)) { diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 58899818b7c..1d239f1741e 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 93230c79b19..312118491be 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -228,7 +228,7 @@ void FILE_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Activate/Select File"; - ot->description= "Activate/select the file(s) contained in the border."; + ot->description= "Activate/select the file(s) contained in the border"; ot->idname= "FILE_OT_select_border"; /* api callbacks */ @@ -277,7 +277,7 @@ void FILE_OT_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Activate/Select File"; - ot->description= "Activate/select file."; + ot->description= "Activate/select file"; ot->idname= "FILE_OT_select"; /* api callbacks */ @@ -322,7 +322,7 @@ void FILE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ ot->name= "Select/Deselect all files"; - ot->description= "Select/deselect all files."; + ot->description= "Select/deselect all files"; ot->idname= "FILE_OT_select_all_toggle"; /* api callbacks */ @@ -358,7 +358,7 @@ void FILE_OT_select_bookmark(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Directory"; - ot->description= "Select a bookmarked directory."; + ot->description= "Select a bookmarked directory"; ot->idname= "FILE_OT_select_bookmark"; /* api callbacks */ @@ -391,7 +391,7 @@ void FILE_OT_bookmark_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Bookmark"; - ot->description= "Add a bookmark for the selected/active directory."; + ot->description= "Add a bookmark for the selected/active directory"; ot->idname= "FILE_OT_bookmark_add"; /* api callbacks */ @@ -424,7 +424,7 @@ void FILE_OT_delete_bookmark(wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Bookmark"; - ot->description= "Delete selected bookmark."; + ot->description= "Delete selected bookmark"; ot->idname= "FILE_OT_delete_bookmark"; /* api callbacks */ @@ -454,7 +454,7 @@ void FILE_OT_loadimages(wmOperatorType *ot) /* identifiers */ ot->name= "Load Images"; - ot->description= "Load selected image(s)."; + ot->description= "Load selected image(s)"; ot->idname= "FILE_OT_loadimages"; /* api callbacks */ @@ -509,7 +509,7 @@ void FILE_OT_highlight(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Highlight File"; - ot->description= "Highlight selected file(s)."; + ot->description= "Highlight selected file(s)"; ot->idname= "FILE_OT_highlight"; /* api callbacks */ @@ -551,7 +551,7 @@ void FILE_OT_cancel(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Cancel File Load"; - ot->description= "Cancel loading of selected file."; + ot->description= "Cancel loading of selected file"; ot->idname= "FILE_OT_cancel"; /* api callbacks */ @@ -647,7 +647,7 @@ void FILE_OT_execute(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Execute File Window"; - ot->description= "Execute selected file."; + ot->description= "Execute selected file"; ot->idname= "FILE_OT_execute"; /* api callbacks */ @@ -680,7 +680,7 @@ void FILE_OT_parent(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Parent File"; - ot->description= "Move to parent directory."; + ot->description= "Move to parent directory"; ot->idname= "FILE_OT_parent"; /* api callbacks */ @@ -705,7 +705,7 @@ void FILE_OT_previous(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Previous Folder"; - ot->description= "Move to previous folder."; + ot->description= "Move to previous folder"; ot->idname= "FILE_OT_previous"; /* api callbacks */ @@ -736,7 +736,7 @@ void FILE_OT_next(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Next Folder"; - ot->description= "Move to next folder."; + ot->description= "Move to next folder"; ot->idname= "FILE_OT_next"; /* api callbacks */ @@ -889,7 +889,7 @@ void FILE_OT_refresh(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Refresh Filelist"; - ot->description= "Refresh the file list."; + ot->description= "Refresh the file list"; ot->idname= "FILE_OT_refresh"; /* api callbacks */ @@ -917,7 +917,7 @@ void FILE_OT_hidedot(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Hide Dot Files"; - ot->description= "Toggle hide hidden dot files."; + ot->description= "Toggle hide hidden dot files"; ot->idname= "FILE_OT_hidedot"; /* api callbacks */ @@ -967,7 +967,7 @@ void FILE_OT_bookmark_toggle(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Toggle Bookmarks"; - ot->description= "Toggle bookmarks display."; + ot->description= "Toggle bookmarks display"; ot->idname= "FILE_OT_bookmark_toggle"; /* api callbacks */ @@ -996,7 +996,7 @@ void FILE_OT_filenum(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Increment Number in Filename"; - ot->description= "Increment number in filename."; + ot->description= "Increment number in filename"; ot->idname= "FILE_OT_filenum"; /* api callbacks */ @@ -1048,7 +1048,7 @@ void FILE_OT_rename(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Rename File or Directory"; - ot->description= "Rename file or file directory."; + ot->description= "Rename file or file directory"; ot->idname= "FILE_OT_rename"; /* api callbacks */ @@ -1099,7 +1099,7 @@ void FILE_OT_delete(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Delete File"; - ot->description= "Delete selected file."; + ot->description= "Delete selected file"; ot->idname= "FILE_OT_delete"; /* api callbacks */ diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index 4e731cda5f3..b6152f26947 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 556ab13654b..3631e0743da 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h index 157a2f5cd52..8a0e5ebdbc3 100644 --- a/source/blender/editors/space_file/filelist.h +++ b/source/blender/editors/space_file/filelist.h @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index bf580545455..a82e4ba6fed 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 214c5ff685b..d3e859602d7 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 2cab622d523..d685a844cde 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index e73a8c9a7fa..3996c6135a0 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_file/writeimage.c b/source/blender/editors/space_file/writeimage.c index 5f0b75d068a..07eb58bffbc 100644 --- a/source/blender/editors/space_file/writeimage.c +++ b/source/blender/editors/space_file/writeimage.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. @@ -114,14 +114,14 @@ static void save_rendered_image_cb_real(char *name, int confirm) if(overwrite) { if(scene->r.imtype==R_MULTILAYER) { - Render *re= RE_GetRender(scene->id.name); + Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW); RenderResult *rr= RE_AcquireResultRead(re); if(rr) RE_WriteRenderResult(rr, str, scene->r.quality); RE_ReleaseResult(re); } else { - Render *re= RE_GetRender(scene->id.name); + Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW); RenderResult rres; ImBuf *ibuf; @@ -235,7 +235,7 @@ void BIF_save_rendered_image(char *name) /* calls fileselect */ void BIF_save_rendered_image_fs(Scene *scene) { - Render *re= RE_GetRender(scene->id.name); + Render *re= RE_GetRender(scene->id.name, RE_SLOT_VIEW); RenderResult rres; RE_AcquireResultImage(re, &rres); |