New files with a derivative of ESearchBar that generates sexps for

2001-07-27  Federico Mena Quintero  <federico@ximian.com>

	* gui/cal-search-bar.[ch]: New files with a derivative of
	ESearchBar that generates sexps for calendar queries directly.

	* gui/gnome-cal.c (setup_widgets): Use CalSearchBar instead of
	ESearchBar.

	* gui/e-calendar-table.h (ECalendarTable): Removed the ->colors
	array since it is handled by ETableExtras now.

	* gui/e-calendar-table.[ch]: Removed the subset_model.  Now we use
	the live query facility to filter tasks.  Removed the filter
	function stuff as well.

	* gui/e-tasks.c (e_tasks_construct): Use
	calendar_model_set_cal_client() directly instead of
	e_calendar_table_set_model().
	(setup_widgets): Create a calendar search bar for the tasks
	component.
	(search_bar_sexp_changed_cb): Set the query sexp on the table model.
	(e_tasks_on_filter_selected): Regenerate the query from the
	selected category and the current sexp.
	(update_query): New convenience function to recompute the real
	query sexp.

	* gui/gnome-cal.c (gnome_calendar_construct): Likewise.

	* gui/e-calendar-table.c (e_calendar_table_set_cal_client):
	Removed function; people are now supposed to get the model from
	the calendar table and operate on it.

	* gui/calendar-commands.c (verbs): Consistency fixes with the XML
	file.
	(pixmaps): Likewise.

	* gui/Makefile.am (evolution_calendar_SOURCES): Added
	cal-search-bar.[ch] to the list of sources.

2001-07-20  Federico Mena Quintero  <federico@ximian.com>

	* idl/evolution-calendar.idl (CompEditorFactory): New interface to
	a centralized factory for calendar component editors.  Has
	editExisting() and editNew() methods to edit an existing component
	from a URI/UID pair, and to create a new component in a calendar
	that is in a particular URI, respectively.

	* gui/comp-editor-factory.[ch]: Implementation files for the
	component editor factory.

	* gui/GNOME_Evolution_Calendar.oaf.in: Added the CompEditorFactory
	stuff.

	* gui/Makefile.am (evolution_calendar_SOURCES): Added
	comp-editor-factory.[ch] to the list of sources.

svn path=/trunk/; revision=11455

1 files changed, 1 insertions, 35 deletions

diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index 5ab32f3c18..c7e83e5d80 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -39,14 +39,6 @@ extern "C" {
  * Used for calendar events and tasks.
  */
 
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_TABLE_COLOR_OVERDUE,
-	
-	E_CALENDAR_TABLE_COLOR_LAST
-} ECalendarTableColors;
-
 
 #define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
 #define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
@@ -57,29 +49,14 @@ typedef struct _ECalendarTable       ECalendarTable;
 typedef struct _ECalendarTableClass  ECalendarTableClass;
 
 
-typedef gboolean (*ECalendarTableFilterFunc)	(ECalendarTable *cal_table,
-						 CalComponent   *comp,
-						 gpointer	 data);
-
 struct _ECalendarTable
 {
 	GtkTable table;
 
-	/* This is the underlying model which contains all the tasks/events. */
+	/* The model that we use */
 	CalendarModel *model;
 
-	/* This is the model that we use when filtering the tasks/events. */
-	ETableModel *subset_model;
-	
 	GtkWidget *etable;
-	
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_TABLE_COLOR_LAST];
-
-	/* Data for filtering the Tasks. */
-	ECalendarTableFilterFunc filter_func;
-	gpointer filter_data;
-	GDestroyNotify filter_data_destroy;
 
 	/* The ECell used to view & edit dates. */
 	ECellDateEdit *dates_cell;
@@ -101,9 +78,6 @@ GtkWidget* e_calendar_table_new			(void);
 
 CalendarModel *e_calendar_table_get_model	(ECalendarTable *cal_table);
 
-void	   e_calendar_table_set_cal_client	(ECalendarTable *cal_table,
-						 CalClient	*client);
-
 ETable *e_calendar_table_get_table (ECalendarTable *cal_table);
 
 void e_calendar_table_delete_selected (ECalendarTable *cal_table);
@@ -120,14 +94,6 @@ void	   e_calendar_table_load_state		(ECalendarTable *cal_table,
 void	   e_calendar_table_save_state		(ECalendarTable *cal_table,
 						 gchar		*filename);
 
-void	   e_calendar_table_set_filter_func	(ECalendarTable *cal_table,
-						 ECalendarTableFilterFunc filter_func,
-						 gpointer	 filter_data,
-						 GDestroyNotify  filter_data_destroy);
-gboolean   e_calendar_table_filter_by_category  (ECalendarTable *cal_table,
-						 CalComponent	*comp,
-						 gpointer	 filter_data);
-
 
 #ifdef __cplusplus
 }