[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10974] branches/imgbrowser-elubie/source/ blender: == imagebrowser ==

Andrea Weikert elubie at gmx.net
Tue Jun 19 21:03:12 CEST 2007


Revision: 10974
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10974
Author:   elubie
Date:     2007-06-19 21:03:12 +0200 (Tue, 19 Jun 2007)

Log Message:
-----------
== imagebrowser ==
- fixed bug where type for image browser wasn't reset from space type menu
- activated filtering for all types of image browser
- file extensions are now evaluated for all types of image browser
(type means: FILE_LOADLIB, FILE_BLENDER, FILE_MAIN, FILE_UNIX etc.)

Modified Paths:
--------------
    branches/imgbrowser-elubie/source/blender/makesdna/DNA_space_types.h
    branches/imgbrowser-elubie/source/blender/src/filelist.c
    branches/imgbrowser-elubie/source/blender/src/header_filesel.c
    branches/imgbrowser-elubie/source/blender/src/header_imasel.c
    branches/imgbrowser-elubie/source/blender/src/space.c

Modified: branches/imgbrowser-elubie/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/imgbrowser-elubie/source/blender/makesdna/DNA_space_types.h	2007-06-19 18:40:17 UTC (rev 10973)
+++ branches/imgbrowser-elubie/source/blender/makesdna/DNA_space_types.h	2007-06-19 19:03:12 UTC (rev 10974)
@@ -406,7 +406,7 @@
 #define FILE_MAX			240
 
 /* filesel types */
-#define FILE_UNIX			8
+#define FILE_UNIX			7
 #define FILE_BLENDER		8
 #define FILE_SPECIAL		9
 

Modified: branches/imgbrowser-elubie/source/blender/src/filelist.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/src/filelist.c	2007-06-19 18:40:17 UTC (rev 10973)
+++ branches/imgbrowser-elubie/source/blender/src/filelist.c	2007-06-19 19:03:12 UTC (rev 10974)
@@ -295,27 +295,28 @@
 
 	// How many files are left after filter ?
 	for (i = 0; i < num_files; ++i) {
-		if (old_filelist[i].type & S_IFDIR) {
+		if (old_filelist[i].flags & filelist->filter) {
+			num_filtered++;
+		} 
+		else if (old_filelist[i].type & S_IFDIR) {
 			if (filelist->filter & FOLDERFILE) {
 				num_filtered++;
 			}
-		}
-		else if (old_filelist[i].flags & filelist->filter) {
-			num_filtered++;
-		} 
+		}		
 	}
 	
 	filelist->filelist = (struct direntry *)malloc(num_filtered * sizeof(struct direntry));
 	filelist->numfiles = num_filtered;
 
 	for (i = 0, j=0; i < num_files; ++i) {
-		if (old_filelist[i].type & S_IFDIR) {
+		if (old_filelist[i].flags & filelist->filter) {
+			filelist->filelist[j++] = old_filelist[i];
+		}
+		else if (old_filelist[i].type & S_IFDIR) {
 			if (filelist->filter & FOLDERFILE) {
 				filelist->filelist[j++] = old_filelist[i];
 			}
-		} else if (old_filelist[i].flags & filelist->filter) {
-			filelist->filelist[j++] = old_filelist[i];
-		}
+		}  
 	}
 }
 
@@ -678,89 +679,84 @@
 		if (file->type & S_IFDIR)
 			continue;
 				
-		if(filelist->type==FILE_BLENDER || filelist->type==FILE_LOADLIB) {
-			if(BLO_has_bfile_extension(file->relname)) {
-				file->flags |= BLENDERFILE;
+		
+		
+		if(BLO_has_bfile_extension(file->relname)) {
+			file->flags |= BLENDERFILE;
+			if(filelist->type==FILE_LOADLIB) {		
+				char name[FILE_MAXDIR+FILE_MAXFILE];
+				BLI_strncpy(name, filelist->dir, sizeof(name));
+				strcat(name, file->relname);
 				
-				if(filelist->type==FILE_LOADLIB) {
-					char name[FILE_MAXDIR+FILE_MAXFILE];
-					BLI_strncpy(name, filelist->dir, sizeof(name));
-					strcat(name, file->relname);
-					
-					/* prevent current file being used as acceptable dir */
-					if (BLI_streq(G.main->name, name)==0) {
-						file->type &= ~S_IFMT;
-						file->type |= S_IFDIR;
-					}
+				/* prevent current file being used as acceptable dir */
+				if (BLI_streq(G.main->name, name)==0) {
+					file->type &= ~S_IFMT;
+					file->type |= S_IFDIR;
 				}
 			}
-		} else if (filelist->type == 0 || filelist->type==FILE_SPECIAL){
-			if(BLO_has_bfile_extension(file->relname)) {
-				file->flags |= BLENDERFILE;
-			} else if(BLI_testextensie(file->relname, ".py")) {
-					file->flags |= PYSCRIPTFILE;
-			} else if(BLI_testextensie(file->relname, ".txt")) {
-					file->flags |= TEXTFILE;
-			} else if( BLI_testextensie(file->relname, ".ttf")
-						|| BLI_testextensie(file->relname, ".ttc")
-						|| BLI_testextensie(file->relname, ".pfb")
-						|| BLI_testextensie(file->relname, ".otf")
-						|| BLI_testextensie(file->relname, ".otc")) {
-					file->flags |= FTFONTFILE;			
-			} else if (has_quicktime){
-				if(		BLI_testextensie(file->relname, ".jpg")
-					||	BLI_testextensie(file->relname, ".jpeg")
-					||	BLI_testextensie(file->relname, ".tga")
-					||	BLI_testextensie(file->relname, ".rgb")
-					||	BLI_testextensie(file->relname, ".bmp")
-					||	BLI_testextensie(file->relname, ".png")
-					||	BLI_testextensie(file->relname, ".iff")
-					||	BLI_testextensie(file->relname, ".lbm")
-					||	BLI_testextensie(file->relname, ".gif")
-					||	BLI_testextensie(file->relname, ".psd")
-					||	BLI_testextensie(file->relname, ".tif")
-					||	BLI_testextensie(file->relname, ".tiff")
-					||	BLI_testextensie(file->relname, ".pct")
-					||	BLI_testextensie(file->relname, ".pict")
-					||	BLI_testextensie(file->relname, ".pntg") //macpaint
-					||	BLI_testextensie(file->relname, ".qtif")
-					||	BLI_testextensie(file->relname, ".sgi")) {
-					file->flags |= IMAGEFILE;			
-				}
-				else if(BLI_testextensie(file->relname, ".avi")
-					||	BLI_testextensie(file->relname, ".flc")
-					||	BLI_testextensie(file->relname, ".mov")
-					||	BLI_testextensie(file->relname, ".movie")
-					||	BLI_testextensie(file->relname, ".mp4")
-					||	BLI_testextensie(file->relname, ".m4v")
-					||	BLI_testextensie(file->relname, ".mv")) {
-					file->flags |= MOVIEFILE;			
-				}
-				else if(BLI_testextensie(file->relname, ".wav")) {
-					file->flags |= SOUNDFILE;
-				}
-			} else { // no quicktime
-				if(BLI_testextensie(file->relname, ".jpg")
-					||	BLI_testextensie(file->relname, ".tga")
-					||	BLI_testextensie(file->relname, ".rgb")
-					||	BLI_testextensie(file->relname, ".bmp")
-					||	BLI_testextensie(file->relname, ".png")
-					||	BLI_testextensie(file->relname, ".iff")
-					||	BLI_testextensie(file->relname, ".tif")
-					||	BLI_testextensie(file->relname, ".tiff")
-					||	BLI_testextensie(file->relname, ".lbm")
-					||	BLI_testextensie(file->relname, ".sgi")) {
-					file->flags |= IMAGEFILE;			
-				}
-				else if(BLI_testextensie(file->relname, ".avi")
-					||	BLI_testextensie(file->relname, ".mp4")
-					||	BLI_testextensie(file->relname, ".mv")) {
-					file->flags |= MOVIEFILE;			
-				}
-				else if(BLI_testextensie(file->relname, ".wav")) {
-					file->flags |= SOUNDFILE;
-				}				
+		} else if(BLI_testextensie(file->relname, ".py")) {
+				file->flags |= PYSCRIPTFILE;
+		} else if(BLI_testextensie(file->relname, ".txt")) {
+				file->flags |= TEXTFILE;
+		} else if( BLI_testextensie(file->relname, ".ttf")
+					|| BLI_testextensie(file->relname, ".ttc")
+					|| BLI_testextensie(file->relname, ".pfb")
+					|| BLI_testextensie(file->relname, ".otf")
+					|| BLI_testextensie(file->relname, ".otc")) {
+				file->flags |= FTFONTFILE;			
+		} else if (has_quicktime){
+			if(		BLI_testextensie(file->relname, ".jpg")
+				||	BLI_testextensie(file->relname, ".jpeg")
+				||	BLI_testextensie(file->relname, ".tga")
+				||	BLI_testextensie(file->relname, ".rgb")
+				||	BLI_testextensie(file->relname, ".bmp")
+				||	BLI_testextensie(file->relname, ".png")
+				||	BLI_testextensie(file->relname, ".iff")
+				||	BLI_testextensie(file->relname, ".lbm")
+				||	BLI_testextensie(file->relname, ".gif")
+				||	BLI_testextensie(file->relname, ".psd")
+				||	BLI_testextensie(file->relname, ".tif")
+				||	BLI_testextensie(file->relname, ".tiff")
+				||	BLI_testextensie(file->relname, ".pct")
+				||	BLI_testextensie(file->relname, ".pict")
+				||	BLI_testextensie(file->relname, ".pntg") //macpaint
+				||	BLI_testextensie(file->relname, ".qtif")
+				||	BLI_testextensie(file->relname, ".sgi")) {
+				file->flags |= IMAGEFILE;			
 			}
+			else if(BLI_testextensie(file->relname, ".avi")
+				||	BLI_testextensie(file->relname, ".flc")
+				||	BLI_testextensie(file->relname, ".mov")
+				||	BLI_testextensie(file->relname, ".movie")
+				||	BLI_testextensie(file->relname, ".mp4")
+				||	BLI_testextensie(file->relname, ".m4v")
+				||	BLI_testextensie(file->relname, ".mv")) {
+				file->flags |= MOVIEFILE;			
+			}
+			else if(BLI_testextensie(file->relname, ".wav")) {
+				file->flags |= SOUNDFILE;
+			}
+		} else { // no quicktime
+			if(BLI_testextensie(file->relname, ".jpg")
+				||	BLI_testextensie(file->relname, ".tga")
+				||	BLI_testextensie(file->relname, ".rgb")
+				||	BLI_testextensie(file->relname, ".bmp")
+				||	BLI_testextensie(file->relname, ".png")
+				||	BLI_testextensie(file->relname, ".iff")
+				||	BLI_testextensie(file->relname, ".tif")
+				||	BLI_testextensie(file->relname, ".tiff")
+				||	BLI_testextensie(file->relname, ".lbm")
+				||	BLI_testextensie(file->relname, ".sgi")) {
+				file->flags |= IMAGEFILE;			
+			}
+			else if(BLI_testextensie(file->relname, ".avi")
+				||	BLI_testextensie(file->relname, ".mp4")
+				||	BLI_testextensie(file->relname, ".mv")) {
+				file->flags |= MOVIEFILE;			
+			}
+			else if(BLI_testextensie(file->relname, ".wav")) {
+				file->flags |= SOUNDFILE;
+			}				
 		}
 	}
 }

Modified: branches/imgbrowser-elubie/source/blender/src/header_filesel.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/src/header_filesel.c	2007-06-19 18:40:17 UTC (rev 10973)
+++ branches/imgbrowser-elubie/source/blender/src/header_filesel.c	2007-06-19 19:03:12 UTC (rev 10974)
@@ -140,20 +140,19 @@
 
 	xco+=90;
 
-	if(sfile->type==FILE_LOADLIB) {
-		uiBlockBeginAlign(block);
-		uiDefButBitS(block, TOGN, FILE_LINK, B_REDR, "Append",		xco+=XIC,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Copies selected data into current project");
-		uiDefButBitS(block, TOG, FILE_LINK, B_REDR, "Link",	xco+=100,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Creates a link to selected data from current project");
-		uiBlockEndAlign(block);
-		uiBlockBeginAlign(block);
-		uiDefButBitS(block, TOG, FILE_AUTOSELECT, B_REDR, "Autosel", xco+=125,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects");
-		uiDefButBitS(block, TOG, FILE_ACTIVELAY, B_REDR, "Active Layer", xco+=65,0,80,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) in active layer");
-		uiDefButBitS(block, TOG, FILE_ATCURSOR, B_REDR, "At Cursor", xco+=80,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) at cursor, use centroid if more than one object is selected");
-		uiBlockEndAlign(block);
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOGN, FILE_LINK, B_REDR, "Append",		xco+=XIC,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Copies selected data into current project");
+	uiDefButBitS(block, TOG, FILE_LINK, B_REDR, "Link",	xco+=100,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Creates a link to selected data from current project");
+	uiBlockEndAlign(block);
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOG, FILE_AUTOSELECT, B_REDR, "Autosel", xco+=125,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects");
+	uiDefButBitS(block, TOG, FILE_ACTIVELAY, B_REDR, "Active Layer", xco+=65,0,80,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) in active layer");

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list