From: Art Cancro <ajc@citadel.org>
Date: Tue, 14 Jun 2005 01:59:46 +0000 (+0000)
Subject: * 16x16 icons in the new tree view.  Nice!
X-Git-Tag: v7.86~4841
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=9f004872461f4e5ed0b4a1ae79085cb4df707f10;p=citadel.git

* 16x16 icons in the new tree view.  Nice!
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8cc2a799e..031c8bcf0 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 611.12  2005/06/14 01:59:43  ajc
+* 16x16 icons in the new tree view.  Nice!
+
 Revision 611.11  2005/06/13 22:05:54  ajc
 * Finished the initial NanoTree integration.  TODO: use a different icon
   for each node depending on the view set for that room.
@@ -2582,3 +2585,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
+
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 7614b6074..d859aa2bc 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -32,6 +32,7 @@ struct folder {
 	int hasnewmsgs;
 	int is_mailbox;
 	int selectable;
+	int view;
 };
 
 char *viewdefs[] = {
@@ -2227,9 +2228,6 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 		"							\n"
 		"	var closedGif = 'static/folder_closed.gif';	\n"
 		"	var openGif = 'static/folder_open.gif';		\n"
-		"	var pageIcon = 'static/page16x16.gif';		\n"
-		"	var userIcon = 'static/user_16x16.gif';		\n"
-		"	var helpIcon = 'static/help_16x16.gif';		\n"
 		"							\n"
 		"	rootNode = new TreeNode(1, 'root node - hide');	\n"
 	);
@@ -2273,8 +2271,23 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 		if (has_subfolders) {
 			wprintf("new Array(closedGif, openGif)");
 		}
+		else if (fold[i].view == VIEW_ADDRESSBOOK) {
+			wprintf("'static/savecontact_16x.gif'");
+		}
+		else if (fold[i].view == VIEW_CALENDAR) {
+			wprintf("'static/calarea_16x.gif'");
+		}
+		else if (fold[i].view == VIEW_TASKS) {
+			wprintf("'static/taskmanag_16x.gif'");
+		}
+		else if (fold[i].view == VIEW_NOTES) {
+			wprintf("'static/storenotes_16x.gif'");
+		}
+		else if (fold[i].view == VIEW_MAILBOX) {
+			wprintf("'static/privatemess_16x.gif'");
+		}
 		else {
-			wprintf("pageIcon");
+			wprintf("'static/chatrooms_16x.gif'");
 		}
 		wprintf(", '");
 		urlescputs(fold[i].name);
@@ -2450,6 +2463,7 @@ void list_all_rooms_by_floor(char *viewpref) {
 		if (flags & QR_MAILBOX) {
 			fold[max_folders].is_mailbox = 1;
 		}
+		fold[max_folders].view = extract_int(buf, 6);
 		room_to_folder(fold[max_folders].name,
 				fold[max_folders].room,
 				fold[max_folders].floor,
diff --git a/webcit/static/calarea_16x.gif b/webcit/static/calarea_16x.gif
new file mode 100644
index 000000000..ac364d928
Binary files /dev/null and b/webcit/static/calarea_16x.gif differ
diff --git a/webcit/static/chatrooms_16x.gif b/webcit/static/chatrooms_16x.gif
new file mode 100644
index 000000000..ba3b5fc23
Binary files /dev/null and b/webcit/static/chatrooms_16x.gif differ
diff --git a/webcit/static/help_16x16.gif b/webcit/static/help_16x16.gif
deleted file mode 100644
index e65b68377..000000000
Binary files a/webcit/static/help_16x16.gif and /dev/null differ
diff --git a/webcit/static/privatemess_16x.gif b/webcit/static/privatemess_16x.gif
new file mode 100644
index 000000000..27fcfe049
Binary files /dev/null and b/webcit/static/privatemess_16x.gif differ
diff --git a/webcit/static/savecontact_16x.gif b/webcit/static/savecontact_16x.gif
new file mode 100644
index 000000000..51bf4878f
Binary files /dev/null and b/webcit/static/savecontact_16x.gif differ
diff --git a/webcit/static/storenotes_16x.gif b/webcit/static/storenotes_16x.gif
new file mode 100644
index 000000000..9ce5a84ca
Binary files /dev/null and b/webcit/static/storenotes_16x.gif differ
diff --git a/webcit/static/taskmanag_16x.gif b/webcit/static/taskmanag_16x.gif
new file mode 100644
index 000000000..83f9683a0
Binary files /dev/null and b/webcit/static/taskmanag_16x.gif differ
diff --git a/webcit/static/user_16x16.gif b/webcit/static/user_16x16.gif
deleted file mode 100644
index 0533d2bd3..000000000
Binary files a/webcit/static/user_16x16.gif and /dev/null differ