Remove the check because it makes it look like the task is already

2000-11-21  Federico Mena Quintero  <federico@helixcode.com>

	* gui/task.xpm: Remove the check because it makes it look like the
	task is already completed.  This fixes bug #819.

	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.

	* gui/task-*.xpm: Made the things look like little spiral-bound
	notebooks.

	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default
	column order be icon/completed/summary.

2000-11-21  Federico Mena Quintero  <federico@helixcode.com>

svn path=/trunk/; revision=6646

6 files changed, 101 insertions, 55 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a65d14b8b9..949ac42a8b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,18 @@
 2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
 
+	* gui/task.xpm: Remove the check because it makes it look like the
+	task is already completed.  This fixes bug #819.
+
+	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.
+
+	* gui/task-*.xpm: Made the things look like little spiral-bound
+	notebooks.
+
+	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default
+	column order be icon/completed/summary.
+
+2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
+
 	* gui/calendar-model.c (calendar_model_is_cell_editable): The icon
 	column is not editable!
 
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 7f7b25ada8..abdad0e24d 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -154,8 +154,8 @@ e_calendar_table_class_init (ECalendarTableClass *class)
         "<ETableColumn model_col=\"14\" pixbuf=\"complete\"              expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"checkbox\" compare=\"integer\"/>" \
 	"<ETableState>" 				\
                 "<column source=\"13\"/>"               \
-                "<column source= \"9\"/>"               \
                 "<column source=\"14\"/>"               \
+                "<column source= \"9\"/>"               \
         	"<grouping> </grouping>"		\
 	"</ETableState>"				\
 	"</ETableSpecification>"
diff --git a/calendar/gui/task-assigned-to.xpm b/calendar/gui/task-assigned-to.xpm
index 082be648bb..d60eeafa2d 100644
--- a/calendar/gui/task-assigned-to.xpm
+++ b/calendar/gui/task-assigned-to.xpm
@@ -12,19 +12,19 @@ static char * task_assigned_to_xpm[] = {
 "*	c #768E76",
 "=	c #5E705E",
 "-	c #EEEEEE",
-"                ",
+"   . . . . .    ",
 "  ...........   ",
-" .++++++++++@.  ",
-" .+#########$.  ",
-" .+%%%%%%%..$.  ",
-" .+#######.&..  ",
-" .+%%......&&.  ",
-" .+##.&&&&&&&&. ",
-" .+%%.&*&*&*&*&.",
-" .+##.========. ",
-" .+%%......==.  ",
-" .+#######.=..  ",
-" .+%%%%%%%..$.  ",
-" .-$$$$$$$$$$.  ",
+" .+.+.+.+.+.@.  ",
+" .+.#.#.#.#.$.  ",
+" .+%%%%%%%%%$.  ",
+" .+#######..$.  ",
+" .+%%%%%%%.&..  ",
+" .+##......&&.  ",
+" .+%%.&&&&&&&&. ",
+" .+##.&*&*&*&*&.",
+" .+%%.========. ",
+" .+##......==.  ",
+" .+%%%%%%%.=..  ",
+" .-$$$$$$$..$.  ",
 "  ...........   ",
 "                "};
diff --git a/calendar/gui/task-assigned.xpm b/calendar/gui/task-assigned.xpm
index 9a66304103..9b245c0c49 100644
--- a/calendar/gui/task-assigned.xpm
+++ b/calendar/gui/task-assigned.xpm
@@ -12,19 +12,19 @@ static char * task_assigned_xpm[] = {
 "*	c #CC9933",
 "=	c #996600",
 "-	c #EEEEEE",
-"                ",
+"   . . . . .    ",
 "  ...........   ",
-" .++++++++++@.  ",
+" .+.+.+.+.+.@.  ",
+" .+.#.#.#.#.$.  ",
+" .+%%%%%%%%%$.  ",
 " .+##..#####$.  ",
 " .+%%.&.%%%%$.  ",
 "......&&.###$.  ",
 ".&&&&&&&&.%%$.  ",
 ".&*&*&*&*&.#$.  ",
-".========.#%$.  ",
+".========.%%$.  ",
 "......==.###$.  ",
-" .###.=.#%%%$.  ",
-" .+##..#####$.  ",
-" .+%%##%%%%%$.  ",
-" .-$$$$$$$$$$.  ",
+" .+%%.=.%%%%$.  ",
+" .-$$..$$$$$$.  ",
 "  ...........   ",
 "                "};
diff --git a/calendar/gui/task-recurring.xpm b/calendar/gui/task-recurring.xpm
index 29b78d84c7..634cd87a84 100644
--- a/calendar/gui/task-recurring.xpm
+++ b/calendar/gui/task-recurring.xpm
@@ -1,21 +1,59 @@
 /* XPM */
 static char * task_recurring_xpm[] = {
-"16 16 2 1",
+"16 16 40 1",
 " 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #F3F3F3",
+"#	c #CCCCCC",
+"$	c #B2B2B2",
+"%	c #ECECEC",
+"&	c #BFBFC3",
+"*	c #A2A2B0",
+"=	c #454572",
+"-	c #9898A9",
+";	c #85859C",
+">	c #333366",
+",	c #4F4F79",
+"'	c #B3B3C3",
+")	c #A3A3B7",
+"!	c #9696AD",
+"~	c #464672",
+"{	c #7F7F99",
+"]	c #C9C9CA",
+"^	c #3D3D6D",
+"/	c #3B3B6B",
+"(	c #A4A4B8",
+"_	c #B5B5C4",
+":	c #D1D1D8",
+"<	c #9191A4",
+"[	c #B5B5BD",
+"}	c #9F9FAE",
+"|	c #4A4A76",
+"1	c #40406F",
+"2	c #E9E9E9",
+"3	c #8F8FA9",
+"4	c #9D9DAC",
+"5	c #9090A4",
+"6	c #55557F",
+"7	c #ADADBE",
+"8	c #484875",
+"9	c #B9B9C7",
+"0	c #DCDCE0",
+"a	c #EEEEEE",
+"   . . . . .    ",
+"  ...........   ",
+" .+.+.+.+.+.@.  ",
+" .+.#.#.#.#.$.  ",
+" .+%%%%%%%%%$.  ",
+" .+&*=-#;>>,$.  ",
+" .+'>)%%!>>'$.  ",
+" .+~{]##;^/~$.  ",
+" .+>(%%%_:(>$.  ",
+" .+><[}###<>$.  ",
+" .+|^1!%%23|$.  ",
+" .+4>>;##5>4$.  ",
+" .+6>>!%7890$.  ",
+" .a$$$$$$$$$$.  ",
+"  ...........   ",
 "                "};
diff --git a/calendar/gui/task.xpm b/calendar/gui/task.xpm
index 84f5cf5e65..4a53c3e9ab 100644
--- a/calendar/gui/task.xpm
+++ b/calendar/gui/task.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * task_xpm[] = {
-"16 16 13 1",
+"16 16 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF",
@@ -8,25 +8,20 @@ static char * task_xpm[] = {
 "#	c #CCCCCC",
 "$	c #B2B2B2",
 "%	c #ECECEC",
-"&	c #993333",
-"*	c #660000",
-"=	c #999999",
-"-	c #666666",
-";	c #663333",
-">	c #EEEEEE",
-"                ",
+"&	c #EEEEEE",
+"   . . . . .    ",
 "  ...........   ",
-" .++++++++++@.  ",
+" .+.+.+.+.+.@.  ",
+" .+.#.#.#.#.$.  ",
+" .+%%%%%%%%%$.  ",
+" .+#########$.  ",
+" .+%%%%%%%%%$.  ",
 " .+#########$.  ",
 " .+%%%%%%%%%$.  ",
-" .+#######&*$.  ",
-" .+%%%%%%&*=$.  ",
-" .+#&=##&*-#$.  ",
-" .+%&&%&*=#%$.  ",
-" .+#;&&*-=##$.  ",
-" .+%-&*-=%%%$.  ",
-" .+#=--=####$.  ",
+" .+#########$.  ",
+" .+%%%%%%%%%$.  ",
+" .+#########$.  ",
 " .+%%%%%%%%%$.  ",
-" .>$$$$$$$$$$.  ",
+" .&$$$$$$$$$$.  ",
 "  ...........   ",
 "                "};