X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=ede;a=blobdiff_plain;f=libede%2Fsrc%2FFileSystemBox.ec;h=cdd7aa2ddca7717bf37e11b58c2462e3fc1d08e4;hp=741fa74820886365a606a8338e7e4860b0a9be7a;hb=ce190f57ece361a88d3aa4827041b8136863a385;hpb=547e25f5bb64e30ec1b7e0d0e0e7114084d3d8cd diff --git a/libede/src/FileSystemBox.ec b/libede/src/FileSystemBox.ec index 741fa74..cdd7aa2 100644 --- a/libede/src/FileSystemBox.ec +++ b/libede/src/FileSystemBox.ec @@ -50,7 +50,7 @@ static char * fileIconNames[] = "" }; -public enum ExplorerFileType +public enum _FileType { none, @@ -65,7 +65,6 @@ public enum ExplorerFileType treeLoader, lineNumbers; - /*property char * { set @@ -74,17 +73,17 @@ public enum ExplorerFileType } }*/ - public property bool isFolderType + public property bool isFolder { get { return this >= folder && this <= share; } } - public property bool isFileType + public property bool isFile { get { return this >= normalFile && this <= opticalMediaImageFile; } } - ExplorerFileType ::SelectByExtension(char * extension) + _FileType ::SelectByExtension(char * extension) { if(!strcmpi(extension, "ews")) return ewsFile; @@ -142,12 +141,12 @@ class ExplorerControl : Window { bool previewPictures; - BitmapResource fileIcons[ExplorerFileType]; + BitmapResource fileIcons[_FileType]; ExplorerControl() { - ExplorerFileType c; - for(c = 0; c < ExplorerFileType::enumSize; c++) + _FileType c; + for(c = 0; c < _FileType::enumSize; c++) { fileIcons[c] = BitmapResource { fileIconNames[c], alphaBlend = true }; AddResource(fileIcons[c]); @@ -1010,7 +1009,7 @@ public class ExplorerFileItem : struct char * name; char * info; char * extension; - ExplorerFileType type; + _FileType type; int indent; Bitmap bitmap; @@ -1180,7 +1179,7 @@ ExplorerFileItem MakeFileItem(const FileAttribs attribs, const char * fileName, //strupr(extension); strlwr(extension); - item.type = ExplorerFileType::SelectByExtension(extension); + item.type = _FileType::SelectByExtension(extension); } if(attribs.isDrive && @@ -1223,7 +1222,7 @@ public class FileSystemNode : struct char * info; DataRow row; OldList children; - ExplorerFileType type; + _FileType type; FileSystemNode parent; FileStats stats; @@ -1439,7 +1438,7 @@ FileSystemNode MakeFileNode(const FileStats stats, const char * name) { char extension[MAX_EXTENSION]; GetExtension(fileTreeNode.name, extension); - fileTreeNode.type = ExplorerFileType::SelectByExtension(extension); + fileTreeNode.type = _FileType::SelectByExtension(extension); } return fileTreeNode; }