moved #include <cal-client/cal-client.h> to the .h file.

2001-01-14  Damon Chaplin  <damon@helixcode.com>

	* gui/dialogs/task-editor.[hc]: moved #include
	<cal-client/cal-client.h> to the .h file.

	* gui/e-tasks.c: load & save the Tasks folders' ETable layout.
	Added an option menu to filter tasks by category.

	* gui/gnome-cal.c: use the "Tasks" folder for the TaskPad.
	(We may make the actual tasks folder shown a per-calendar option.)

	* gui/tasks-control.c (tasks_control_new_task_cmd): added support for
	the New Task icon on the toolbar.

	* gui/e-calendar-table.[hc]: we now use an ETableSubsetVariable model
	to filter the tasks by a category. And tidied up a little.

	* gui/calendar-model.[hc]: added way to get all the categories used by
	the tasks, so we can show an option menu of them. Also a signal which
	is emitted when they are changed.
	Also allows a default category to be set, which is used to initialize
	the 'click-to-add' row.
	Also made sure the initialize_value()/get_value() functions don't
	return NULL since that can cause a SEGV.

	* gui/e-week-view.c:
	* gui/e-day-view.c: set the "fill_color_rgba" arg of the EText items
	to black since it doesn't seem to set up a default color properly.
	Hopefully this fixes the bug on Solaris where the items appear with
	strange colors.

	* gui/widget-util.c (date_edit_new): use the calendar_config function
	to set most of the options. It wasn't setting the 12/24 hour option
	before.

	* gui/dialogs/task-editor-dialog.glade: added "Undefined" priority.

svn path=/trunk/; revision=7483

5 files changed, 19 insertions, 15 deletions

diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
index 272fa48e55..ea4adcc5e2 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ b/calendar/gui/dialogs/task-editor-dialog.glade
@@ -401,6 +401,7 @@ Cancelled
 	    <items>High
 Normal
 Low
+Undefined
 </items>
 	    <initial_choice>0</initial_choice>
 	    <child>
@@ -484,6 +485,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>contacts-button</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -522,6 +524,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>categories-button</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
index 20f7db3014..052fe951dd 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ b/calendar/gui/dialogs/task-editor-dialog.glade.h
@@ -10,22 +10,20 @@ gchar *s = N_("Sta_rt Date:");
 gchar *s = N_("_Due Date:");
 gchar *s = N_("% Comp_lete:");
 gchar *s = N_("_Status:");
-gchar *s = N_("Not Started\n"
-              "In Progress\n"
-              "Completed\n"
-              "Cancelled\n"
-              "");
+gchar *s = N_("Not Started");
+gchar *s = N_("In Progress");
+gchar *s = N_("Completed");
+gchar *s = N_("Cancelled");
 gchar *s = N_("_Priority:");
-gchar *s = N_("High\n"
-              "Normal\n"
-              "Low\n"
-              "");
+gchar *s = N_("High");
+gchar *s = N_("Normal");
+gchar *s = N_("Low");
+gchar *s = N_("Undefined");
 gchar *s = N_("C_lassification:");
-gchar *s = N_("None\n"
-              "Public\n"
-              "Private\n"
-              "Confidential\n"
-              "");
+gchar *s = N_("None");
+gchar *s = N_("Public");
+gchar *s = N_("Private");
+gchar *s = N_("Confidential");
 gchar *s = N_("_Contacts...");
 gchar *s = N_("Ca_tegories...");
 gchar *s = N_("Task");
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 288244802e..cca8298713 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -36,7 +36,6 @@
 #include <e-util/e-dialog-widgets.h>
 #include <widgets/misc/e-dateedit.h>
 #include <cal-util/timeutil.h>
-#include <cal-client/cal-client.h>
 #include "task-editor.h"
 #include "../calendar-config.h"
 #include "../widget-util.h"
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
index a53d29c2a2..c74e979dff 100644
--- a/calendar/gui/dialogs/task-editor.h
+++ b/calendar/gui/dialogs/task-editor.h
@@ -27,6 +27,7 @@
 #include <gtk/gtkobject.h>
 #include <libgnome/gnome-defs.h>
 #include <bonobo.h>
+#include <cal-client/cal-client.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index 272fa48e55..ea4adcc5e2 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -401,6 +401,7 @@ Cancelled
 	    <items>High
 Normal
 Low
+Undefined
 </items>
 	    <initial_choice>0</initial_choice>
 	    <child>
@@ -484,6 +485,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>contacts-button</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -522,6 +524,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>categories-button</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>