[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23177] trunk/blender/source/blender: 2. 5 filebrowser

[Andrea Weikert]

Revision: 23177
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23177
Author:   elubie
Date:     2009-09-13 11:41:00 +0200 (Sun, 13 Sep 2009)

Log Message:
-----------
2.5 filebrowser
* Fix for space init when loading with pupmenu (without operator) - parameters now get reset
* experimental: made new director operator jump directly into renaming

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/file_ops.c
    trunk/blender/source/blender/editors/space_file/filesel.c
    trunk/blender/source/blender/editors/space_file/space_file.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c	2009-09-13 08:50:54 UTC (rev 23176)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c	2009-09-13 09:41:00 UTC (rev 23177)
@@ -705,7 +705,9 @@
 			BLI_join_dirfile(tmpstr, tmpstr, tmpdir);
 		}
 		BLI_recurdir_fileops(tmpstr);
-		if (!BLI_exists(tmpstr)) {
+		if (BLI_exists(tmpstr)) {
+			BLI_strncpy(sfile->params->renamefile, tmpdir, FILE_MAXFILE);
+		} else {
 			filelist_free(sfile->files);
 			filelist_parent(sfile->files);
 			BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), FILE_MAX);

Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c	2009-09-13 08:50:54 UTC (rev 23176)
+++ trunk/blender/source/blender/editors/space_file/filesel.c	2009-09-13 09:41:00 UTC (rev 23177)
@@ -154,8 +154,9 @@
 		if (params->filter != 0)
 			params->flag |= FILE_FILTER;
 
+		params->flag |= FILE_HIDE_DOT;
+
 		if (params->type == FILE_LOADLIB) {
-			params->flag |= FILE_HIDE_DOT;
 			params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
 			params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
 			params->flag |= RNA_boolean_get(op->ptr, "active_layer") ? FILE_ACTIVELAY : 0;

Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c	2009-09-13 08:50:54 UTC (rev 23176)
+++ trunk/blender/source/blender/editors/space_file/space_file.c	2009-09-13 09:41:00 UTC (rev 23177)
@@ -45,6 +45,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_rand.h"
+#include "BLI_storage_types.h"
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
@@ -154,6 +155,9 @@
 /* spacetype; init callback, area size changes, screen set, etc */
 static void file_init(struct wmWindowManager *wm, ScrArea *sa)
 {
+	SpaceFile *sfile= (SpaceFile*)sa->spacedata.first;
+	MEM_freeN(sfile->params);
+	sfile->params = 0;
 	printf("file_init\n");
 }
 
@@ -203,7 +207,17 @@
 		filelist_readdir(sfile->files);
 	}
 	if(params->sort!=FILE_SORT_NONE) filelist_sort(sfile->files, params->sort);		
-
+	
+	if (params->renamefile[0] != '\0') {
+		int idx = filelist_find(sfile->files, params->renamefile);
+		if (idx >= 0) {
+			struct direntry *file= filelist_file(sfile->files, idx);
+			if (file) {
+				file->flags |= EDITING;
+			}
+		}
+		params->renamefile[0] = '\0';
+	}
 	if (sfile->layout) sfile->layout->dirty= 1;
 
 }

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2009-09-13 08:50:54 UTC (rev 23176)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2009-09-13 09:41:00 UTC (rev 23177)
@@ -153,6 +153,7 @@
 	char title[24]; /* title, also used for the text of the execute button */
 	char dir[240]; /* directory */
 	char file[80]; /* file */
+	char renamefile[80];
 
 	short type; /* XXXXX for now store type here, should be moved to the operator */
 	short flag; /* settings for filter, hiding dots files,...  */