Add more beautiful art from Miggue, the Diego Rivera of the next

2000-04-07  Miguel de Icaza  <miguel@gnu.org>

	* message-list.c (states_pixmaps): Add more beautiful art from
	Miggue, the Diego Rivera of the next millenium.
	(message_list_init_header): Use the beautiful art.

	* pixmaps: Miguel rediscovers the "transparent" concept.

svn path=/trunk/; revision=2335

9 files changed, 211 insertions, 120 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0c8813036e..c63fb5aa0a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-07  Miguel de Icaza  <miguel@gnu.org>
+
+	* message-list.c (states_pixmaps): Add more beautiful art from
+	Miggue, the Diego Rivera of the next millenium.
+	(message_list_init_header): Use the beautiful art.
+
+	* pixmaps: Miguel rediscovers the "transparent" concept.
+
 2000-04-07  Matt Loper  <matt@helixcode.com>
 
 	* folder-browser.c (folder_browser_destroy): Unref the shell
diff --git a/mail/message-list.c b/mail/message-list.c
index a5ede2071f..862077d3de 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -297,15 +297,18 @@ static struct {
 	char **image_base;
 	GdkPixbuf  *pixbuf;
 } states_pixmaps [] = {
-	{ envelope_opened_xpm, NULL },
-	{ envelope_closed_xpm, NULL },
-	{ empty_xpm,           NULL },
-	{ attachment_xpm,      NULL },
-	{ NULL,                NULL },
+	{ envelope_opened_xpm,   NULL },
+	{ envelope_closed_xpm,   NULL },
+	{ empty_xpm,             NULL },
+	{ attachment_xpm,        NULL },
+	{ attachment_header_xpm, NULL },
+	{ online_status_xpm,     NULL },
+	{ message_status_xpm,    NULL },
+	{ NULL,                  NULL },
 };
 
 static void
-load_internal_images (void)
+message_list_init_images (void)
 {
 	int i;
 
@@ -317,7 +320,7 @@ load_internal_images (void)
 	
 	for (i = 0; states_pixmaps [i].image_base; i++){
 		states_pixmaps [i].pixbuf = gdk_pixbuf_new_from_xpm_data (
-			states_pixmaps [i].image_base);
+			(const char **) states_pixmaps [i].image_base);
 	}
 }
 
@@ -327,8 +330,6 @@ message_list_init_renderers (MessageList *message_list)
 	g_assert (message_list);
 	g_assert (message_list->table_model);
 
-	load_internal_images ();
-	
 	message_list->render_text = e_cell_text_new (
 		message_list->table_model,
 		NULL, GTK_JUSTIFY_LEFT);
@@ -385,64 +386,75 @@ message_list_init_header (MessageList *message_list)
 	gtk_object_sink (GTK_OBJECT (message_list->header_model));
 
 	message_list->table_cols [COL_ONLINE_STATUS] =
-		e_table_col_new (COL_ONLINE_STATUS, _("Online status"),
-				 COL_CHECK_BOX_WIDTH, COL_CHECK_BOX_WIDTH,
-				 message_list->render_online_status,
-				 g_int_compare, FALSE);
-
+		e_table_col_new_with_pixbuf (
+			COL_ONLINE_STATUS, states_pixmaps [5].pixbuf,
+			COL_CHECK_BOX_WIDTH, COL_CHECK_BOX_WIDTH,
+			message_list->render_online_status,
+			g_int_compare, FALSE);
+	
 	message_list->table_cols [COL_MESSAGE_STATUS] =
-		e_table_col_new (COL_MESSAGE_STATUS, _("Message status"),
-				 COL_CHECK_BOX_WIDTH, COL_CHECK_BOX_WIDTH,
-				 message_list->render_message_status,
-				 g_int_compare, FALSE);
+		e_table_col_new_with_pixbuf (
+			COL_MESSAGE_STATUS, states_pixmaps [0].pixbuf,
+			COL_CHECK_BOX_WIDTH, COL_CHECK_BOX_WIDTH,
+			message_list->render_message_status, 
+			g_int_compare, FALSE);
 
 	message_list->table_cols [COL_PRIORITY] =
-		e_table_col_new (COL_PRIORITY, _("Priority"),
-				 COL_CHECK_BOX_WIDTH, COL_CHECK_BOX_WIDTH,
-				 message_list->render_priority,
-				 g_int_compare, FALSE);
+		e_table_col_new (
+			COL_PRIORITY, _("Priority"),
+			COL_CHECK_BOX_WIDTH, COL_CHECK_BOX_WIDTH,
+			message_list->render_priority,
+			g_int_compare, FALSE);
 	
 	message_list->table_cols [COL_ATTACHMENT] =
-		e_table_col_new (COL_ATTACHMENT, _("Attachment"),
-				 COL_ICON_WIDTH, COL_ICON_WIDTH,
-				 message_list->render_attachment,
-				 g_int_compare, FALSE);
+		e_table_col_new_with_pixbuf (
+			COL_ATTACHMENT, states_pixmaps [4].pixbuf,
+			COL_ICON_WIDTH, COL_ICON_WIDTH,
+			message_list->render_attachment,
+			g_int_compare, FALSE);
 
 	message_list->table_cols [COL_FROM] =
-		e_table_col_new (COL_FROM, _("From"),
-				 COL_FROM_WIDTH, COL_FROM_WIDTH_MIN,
-				 message_list->render_text,
-				 g_str_compare, TRUE);
+		e_table_col_new (
+			COL_FROM, _("From"),
+			COL_FROM_WIDTH, COL_FROM_WIDTH_MIN,
+			message_list->render_text,
+			g_str_compare, TRUE);
 
 	message_list->table_cols [COL_SUBJECT] =
-		e_table_col_new (COL_SUBJECT, _("Subject"),
-				 COL_SUBJECT_WIDTH, COL_SUBJECT_WIDTH_MIN,
-				 message_list->render_text,
-				 g_str_compare, TRUE);
+		e_table_col_new (
+			COL_SUBJECT, _("Subject"),
+			COL_SUBJECT_WIDTH, COL_SUBJECT_WIDTH_MIN,
+			message_list->render_text,
+			g_str_compare, TRUE);
 
 	message_list->table_cols [COL_SENT] =
-		e_table_col_new (COL_SENT, _("Sent"),
-				 COL_SENT_WIDTH, COL_SENT_WIDTH_MIN,
-				 message_list->render_text,
-				 g_str_compare, TRUE);
-
+		e_table_col_new (
+			COL_SENT, _("Sent"),
+			COL_SENT_WIDTH, COL_SENT_WIDTH_MIN,
+			message_list->render_text,
+			g_str_compare, TRUE);
+	
 	message_list->table_cols [COL_RECEIVE] =
-		e_table_col_new (COL_RECEIVE, _("Receive"),
-				 COL_RECEIVE_WIDTH, COL_RECEIVE_WIDTH_MIN,
-				 message_list->render_text,
-				 g_str_compare, TRUE);
+		e_table_col_new (
+			COL_RECEIVE, _("Receive"),
+			COL_RECEIVE_WIDTH, COL_RECEIVE_WIDTH_MIN,
+			message_list->render_text,
+			g_str_compare, TRUE);
+
 	message_list->table_cols [COL_TO] =
-		e_table_col_new (COL_TO, _("To"),
-				 COL_TO_WIDTH, COL_TO_WIDTH_MIN,
-				 message_list->render_text,
-				 g_str_compare, TRUE);
+		e_table_col_new (
+			COL_TO, _("To"),
+			COL_TO_WIDTH, COL_TO_WIDTH_MIN,
+			message_list->render_text,
+			g_str_compare, TRUE);
 
 	message_list->table_cols [COL_SIZE] =
-		e_table_col_new (COL_SIZE, _("Size"),
-				 COL_SIZE_WIDTH, COL_SIZE_WIDTH_MIN,
-				 message_list->render_text,
-				 g_str_compare, TRUE);
-
+		e_table_col_new (
+			COL_SIZE, _("Size"),
+			COL_SIZE_WIDTH, COL_SIZE_WIDTH_MIN,
+			message_list->render_text,
+			g_str_compare, TRUE);
+	
 	/*
 	 * Dummy init: It setups the headers to match the order in which
 	 * they are defined.  In the future e-table widget will take care
@@ -462,7 +474,7 @@ message_list_get_layout (MessageList *message_list)
 		return g_strdup ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> <column> 5 </column> <column> 6 </column> <column> 7 </column> <column> 8 </column> <column> 9 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"1\"> <leaf column=\"5\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>");
 	else {
 		/* Message status, From, Sent, Subject */
-		return g_strdup ("<ETableSpecification> <columns-shown> <column> 1 </column> <column> 4 </column> <column> 6 </column> <column> 5 </column> </columns-shown> <grouping> </grouping> </ETableSpecification>");
+		return g_strdup ("<ETableSpecification> <columns-shown> <column> 1 </column> <column> 4 </column> <column> 5 </column> </columns-shown> <grouping> </grouping> </ETableSpecification>");
 	}
 }
 
@@ -587,6 +599,8 @@ message_list_class_init (GtkObjectClass *object_class)
 	object_class->destroy = message_list_destroy;
 
 	message_list_corba_class_init ();
+
+	message_list_init_images ();
 }
 
 static void
diff --git a/mail/pixmaps.h b/mail/pixmaps.h
index 2d11733bbb..f41e3e0086 100644
--- a/mail/pixmaps.h
+++ b/mail/pixmaps.h
@@ -5,6 +5,9 @@
 #include "pixmaps/envelope-closed.xpm"
 #include "pixmaps/empty.xpm"
 #include "pixmaps/attachment.xpm"
+#include "pixmaps/attachment-header.xpm"
+#include "pixmaps/online-status.xpm"
+#include "pixmaps/message-status.xpm"
 
 #endif /* EVOLUTION_PIXMAPS_H */
 
diff --git a/mail/pixmaps/attachment-header.xpm b/mail/pixmaps/attachment-header.xpm
new file mode 100644
index 0000000000..d3b0f96301
--- /dev/null
+++ b/mail/pixmaps/attachment-header.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * attachment_header_xpm[] = {
+"16 16 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"                ",
+"                ",
+"                ",
+"      ..        ",
+" +   ..  .....  ",
+"    ..  ..   .  ",
+"    .  ..    .  ",
+"   .. .     ..  ",
+"   .  .     .   ",
+"  ..       .    ",
+"  .      ..     ",
+"  .     ..      ",
+"  .......       ",
+"                ",
+"                ",
+"                "};
diff --git a/mail/pixmaps/attachment.xpm b/mail/pixmaps/attachment.xpm
index 45e2dfb134..f154cceb18 100644
--- a/mail/pixmaps/attachment.xpm
+++ b/mail/pixmaps/attachment.xpm
@@ -1,22 +1,21 @@
 /* XPM */
 static char * attachment_xpm[] = {
-"16 16 3 1",
+"16 16 2 1",
 " 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"................",
-".......++.......",
-"....+..+.+......",
-"....+.+..++.....",
-"....+.+...+.....",
-"....+.+...+.....",
-"....+.+...+.....",
-"....+.+...+.....",
-"....+.+...+.....",
-"....+.....+.....",
-"....+.....+.....",
-"....++...++.....",
-".....++.++......",
-".......++.......",
-"................",
-"................"};
+".	c #000000",
+"                ",
+"       ..       ",
+"    .  . .      ",
+"    . .  ..     ",
+"    . .   .     ",
+"    . .   .     ",
+"    . .   .     ",
+"    . .   .     ",
+"    . .   .     ",
+"    .     .     ",
+"    .     .     ",
+"    ..   ..     ",
+"     .. ..      ",
+"       ..       ",
+"                ",
+"                "};
diff --git a/mail/pixmaps/envelope-closed.xpm b/mail/pixmaps/envelope-closed.xpm
index be3b6e1a34..060b659c78 100644
--- a/mail/pixmaps/envelope-closed.xpm
+++ b/mail/pixmaps/envelope-closed.xpm
@@ -2,9 +2,9 @@
 static char * envelope_closed_xpm[] = {
 "16 16 46 1",
 " 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #837D71",
+".	c #000000",
+"+	c #837D71",
+"@	c #FFFFFF",
 "#	c #4E4B42",
 "$	c #767165",
 "%	c #FFFEFE",
@@ -48,18 +48,18 @@ static char * envelope_closed_xpm[] = {
 "f	c #CAC1AD",
 "g	c #4E4B43",
 "                ",
-" ...............",
-" ...............",
-" ...............",
-" ...............",
-" ..+++++++++++..",
-" .+@.........#+.",
-" .+.$%&.&*&=-;+.",
-" .+.&>%&,&')'!+.",
-" .+.&&~{&])&^!+.",
-" .+.&/().)_=:<+.",
-" .+.[}&&)]]|1<+.",
-" .+.2&^3456789+.",
-" .+0abbbcddefg+.",
-" ..+++++++++++..",
-" ..............."};
+"                ",
+"                ",
+"                ",
+"                ",
+"   ...........  ",
+"  .+@@@@@@@@@#. ",
+"  .@$%&@&*&=-;. ",
+"  .@&>%&,&')'!. ",
+"  .@&&~{&])&^!. ",
+"  .@&/()@)_=:<. ",
+"  .@[}&&)]]|1<. ",
+"  .@2&^3456789. ",
+"  .0abbbcddefg. ",
+"   ...........  ",
+"                "};
diff --git a/mail/pixmaps/envelope-opened.xpm b/mail/pixmaps/envelope-opened.xpm
index 4894e21a78..40de0d743d 100644
--- a/mail/pixmaps/envelope-opened.xpm
+++ b/mail/pixmaps/envelope-opened.xpm
@@ -2,21 +2,21 @@
 static char * envelope_opened_xpm[] = {
 "16 16 55 1",
 " 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"@	c #F4EDDD",
-"#	c #F1EBDB",
-"$	c #F1EAD8",
-"%	c #EAE3CB",
-"&	c #F4EAD5",
-"*	c #F1E6CF",
-"=	c #DDD4BE",
-"-	c #ECE3CD",
-";	c #D3CAB6",
-">	c #C1C1C1",
-",	c #BDBDBD",
-"'	c #BFBFBF",
-")	c #12110F",
+".	c #000000",
+"+	c #F4EDDD",
+"@	c #F1EBDB",
+"#	c #F1EAD8",
+"$	c #EAE3CB",
+"%	c #F4EAD5",
+"&	c #F1E6CF",
+"*	c #DDD4BE",
+"=	c #ECE3CD",
+"-	c #D3CAB6",
+";	c #C1C1C1",
+">	c #BDBDBD",
+",	c #BFBFBF",
+"'	c #12110F",
+")	c #FFFFFF",
 "!	c #514D45",
 "~	c #767165",
 "{	c #D0C7B2",
@@ -57,18 +57,18 @@ static char * envelope_opened_xpm[] = {
 "o	c #CAC1AD",
 "p	c #1E1D1A",
 "                ",
-" ...............",
-" .....+++++.....",
-" ....+@#$$%+....",
-" ...+&*****=+...",
-" ..+-*******;+..",
-" .++>,,,,,,,')+.",
-" .+.!.......~{+.",
-" .+.]^...../(_+.",
-" .+.]]:<<[}]|_+.",
-" .+.]12]]]3456+.",
-" .+.78]]]990a6+.",
-" .+.b]|cdefg0h+.",
-" .+ijkkklmmnop+.",
-" ..+++++++++++..",
-" ..............."};
+"                ",
+"      .....     ",
+"     .+@##$.    ",
+"    .%&&&&&*.   ",
+"   .=&&&&&&&-.  ",
+"  ..;>>>>>>>,'. ",
+"  .)!)))))))~{. ",
+"  .)]^)))))/(_. ",
+"  .)]]:<<[}]|_. ",
+"  .)]12]]]3456. ",
+"  .)78]]]990a6. ",
+"  .)b]|cdefg0h. ",
+"  .ijkkklmmnop. ",
+"   ...........  ",
+"                "};
diff --git a/mail/pixmaps/message-status.xpm b/mail/pixmaps/message-status.xpm
new file mode 100644
index 0000000000..a0c4414f3f
--- /dev/null
+++ b/mail/pixmaps/message-status.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * message_status_xpm[] = {
+"16 16 3 1",
+" 	c None",
+".	c #09B0F2",
+"+	c #33A8D6",
+"                ",
+"       ..       ",
+"       ..       ",
+"      ++++      ",
+"      ++++      ",
+"      ++++      ",
+"  +++++++++++   ",
+"..+++++..++++.. ",
+"..+++++..++++.. ",
+"  +++++++++++   ",
+"      ++++      ",
+"      ++++      ",
+"      ++++      ",
+"       ..       ",
+"       ..       ",
+"                "};
diff --git a/mail/pixmaps/online-status.xpm b/mail/pixmaps/online-status.xpm
new file mode 100644
index 0000000000..88009ea480
--- /dev/null
+++ b/mail/pixmaps/online-status.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * online_status_xpm[] = {
+"16 16 4 1",
+" 	c None",
+".	c #000000",
+"+	c #9B9B9B",
+"@	c #5CE537",
+"                ",
+"  .             ",
+"  .             ",
+"  .             ",
+"  .  +........+ ",
+"  .  .++++++++. ",
+"  .. .++++++@+. ",
+"   ...++++++++. ",
+"  .. .++++++++. ",
+"  .  .++++++++. ",
+"  .  +........+ ",
+"  .             ",
+"  .             ",
+"  .             ",
+"  .             ",
+"                "};