show size

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@397 b9cfdab3-6d41-4d17-bbe4-086880011989

include/Mw/Icon.h

@@ -77,7 +77,6 @@ MWDECL char* MwIconUp[];
  */
 MWDECL char* MwIconWarning[];
 
-
 #ifdef __cplusplus
 }
 #endif

include/Mw/TypeDefs.h

@@ -156,6 +156,7 @@ struct _MwSizeHints {
 struct _MwDirectoryEntry {
 	char*	 name;
 	int	 type;
+	MwOffset size;
 };
 
 #define MwCursorDataHeight 16

src/directory.c

@@ -71,6 +71,12 @@ MwDirectoryEntry* MwDirectoryRead(void* handle) {
 	} else {
 		entry->type = MwDIRECTORY_FILE;
 	}
+	entry->size = 0;
+
+	entry->size = entry->size << 32;
+	entry->size |= dir->ffd.nFileSizeHigh;
+	entry->size = entry->size << 32;
+	entry->size |= dir->ffd.nFileSizeLow;
 #else
 	struct dirent* d;
 	struct stat    s;
@@ -92,6 +98,7 @@ MwDirectoryEntry* MwDirectoryRead(void* handle) {
 	} else {
 		entry->type = MwDIRECTORY_FILE;
 	}
+	entry->size = s.st_size;
 
 	free(p);
 #endif

src/filechooser.c

@@ -249,6 +249,8 @@ static void scan(MwWidget handle, const char* path) {
 	MwDirectoryEntry** entries = NULL;
 	int		   i;
 	char**		   names = NULL;
+	char**		   dates = NULL;
+	char**		   sizes = NULL;
 	MwLLPixmap*	   icons = NULL;
 	if(dir != NULL) {
 		MwDirectoryEntry* entry;
@@ -264,26 +266,56 @@ static void scan(MwWidget handle, const char* path) {
 
 	MwListBoxReset(fc->files);
 	MwListBoxInsert(fc->files, -1, NULL, "Name", "Date modified", "Size", NULL);
-	MwListBoxSetWidth(fc->files, 0, -128 - 64);
+	MwListBoxSetWidth(fc->files, 0, -128 - 96);
 	MwListBoxSetWidth(fc->files, 1, 128);
 	MwListBoxSetWidth(fc->files, 2, 0);
 
 	icons = NULL;
 	names = NULL;
+	dates = NULL;
+	sizes = NULL;
 	for(i = 0; i < arrlen(entries); i++) {
 		if(strcmp(entries[i]->name, ".") == 0 || strcmp(entries[i]->name, "..") == 0) continue;
 		if(entries[i]->type == MwDIRECTORY_DIRECTORY) {
 			arrput(names, entries[i]->name);
+			arrput(dates, NULL);
+			arrput(sizes, NULL);
 			arrput(icons, fc->dir);
 		}
 	}
 	for(i = 0; i < arrlen(entries); i++) {
 		if(entries[i]->type == MwDIRECTORY_FILE) {
+			char* date = malloc(128);
+			char* size = malloc(128);
+
+			memset(date, 0, 128);
+			memset(size, 0, 128);
+
+			if(entries[i]->size / 1024 == 0) {
+				sprintf(size, "%d", (int)entries[i]->size);
+			} else if(entries[i]->size / 1024 / 1024 == 0) {
+				sprintf(size, "%.1fK", (double)entries[i]->size / 1024);
+			} else if(entries[i]->size / 1024 / 1024 / 1024 == 0) {
+				sprintf(size, "%.1fM", (double)entries[i]->size / 1024 / 1024);
+			} else {
+				sprintf(size, "%.1fG", (double)entries[i]->size / 1024 / 1024 / 1024);
+			}
+
 			arrput(names, entries[i]->name);
+			arrput(dates, date);
+			arrput(sizes, size);
 			arrput(icons, fc->file);
 		}
 	}
-	MwListBoxInsertMultiple(fc->files, -1, arrlen(names), icons, names, NULL);
+	MwListBoxInsertMultiple(fc->files, -1, arrlen(names), icons, names, dates, sizes, NULL);
+	for(i = 0; i < arrlen(dates); i++) {
+		if(dates[i] != NULL) free(dates[i]);
+	}
+	for(i = 0; i < arrlen(sizes); i++) {
+		if(sizes[i] != NULL) free(sizes[i]);
+	}
+	arrfree(sizes);
+	arrfree(dates);
 	arrfree(names);
 	arrfree(icons);
 

src/icon/back.c

@@ -32,5 +32,4 @@ char *MwIconBack[] = {
     "OOO      .oOOOOOOOOO",
     "OOOO  OOOOOOOOOOOOOO",
     "OOOOO OOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOO"
+    "OOOOOOOOOOOOOOOOOOOO"};
-};

src/icon/computer.c

@@ -29,5 +29,4 @@ char *MwIconComputer[] = {
     "#o+++XXXXXXX+###",
     "+X+++++++++.X###",
     " +XXXXXXXXX+ +##",
-"X ......... X###"
+    "X ......... X###"};
-};

src/icon/directory.c

@@ -28,5 +28,4 @@ char *MwIconDirectory[] = {
     "@@@  XoOOo X .@@",
     "@@@@@  Xoo X ..@",
     "@@@@@@@  X X ..@",
-"@@@@@@@@@   ..@@"
+    "@@@@@@@@@   ..@@"};
-};

src/icon/error.c

@@ -45,5 +45,4 @@ char *MwIconError[] = {
     "  ooo ..## @     o ....###   ..#",
     "## oo .### @@@@ooo ...#####...##",
     "##   ..#### ooooo ...###########",
-"###....#####     ..#############"
+    "###....#####     ..#############"};
-};

src/icon/file.c

@@ -28,5 +28,4 @@ char *MwIconFile[] = {
     "o++++++++++.@@@@",
     "o++++++++++.@@@@",
     "o++++++++++.@@@@",
-"@X......... @@@@"
+    "@X......... @@@@"};
-};

src/icon/forward.c

@@ -32,5 +32,4 @@ char *MwIconForward[] = {
     "OOOOOOOOOo.      OOO",
     "OOOOOOOOOOOOOO  OOOO",
     "OOOOOOOOOOOOOO OOOOO",
-"OOOOOOOOOOOOOOOOOOOO"
+    "OOOOOOOOOOOOOOOOOOOO"};
-};

src/icon/info.c

@@ -40,5 +40,4 @@ char *MwIconInfo[] = {
     "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
     "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
     "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
-};

src/icon/news.c

@@ -42,5 +42,4 @@ char *MwIconNews[] = {
     "OOOOOOOOOOOOOOOOO     OOOOOOOOOO",
     "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
     "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+    "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"};
-};

src/icon/note.c

@@ -44,5 +44,4 @@ char *MwIconNote[] = {
     "@@@@@@@@       X+X+X+  @@@@@@@@@",
     "@@@@@@@@@  X++  X+X  @@@@@@@@@@@",
     "@@@@@@@@@@   X     @@@@@@@@@@@@@",
-"@@@@@@@@@@@@     @@@@@@@@@@@@@@@"
+    "@@@@@@@@@@@@     @@@@@@@@@@@@@@@"};
-};

src/icon/question.c

@@ -42,5 +42,4 @@ char *MwIconQuestion[] = {
     "OOOOOOOOOOOO....  oooOOOOOOOOOOO",
     "OOOOOOOOOOOOO.   ooooOOOOOOOOOOO",
     "OOOOOOOOOOOOOOooooooOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOooooOOOOOOOOOOOOO"
+    "OOOOOOOOOOOOOOOooooOOOOOOOOOOOOO"};
-};

src/icon/search.c

@@ -33,5 +33,4 @@ char *MwIconSearch[] = {
     ".OOOOOooooOOOOOOo ++",
     ".OOOOOOOOOOOOOOOo ++",
     "..oooooooooooooo. ++",
-"++                ++"
+    "++                ++"};
-};

src/icon/up.c

@@ -29,5 +29,4 @@ char *MwIconUp[] = {
     "....................",
     "....................",
     "....................",
-"...................."
+    "...................."};
-};

src/icon/warning.c

@@ -42,5 +42,4 @@ char *MwIconWarning[] = {
     "OXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..",
     "OOXXXXXXXXXXXXXXXXXXXXXXXXXXX...",
     "OOOO...........................O",
-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+    "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"};
-};