MinicardViewModel -> ReflowAdapter name change. (get_card_list): same.

2001-05-15  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel
	-> ReflowAdapter name change.
	(get_card_list): same.
	(e_minicard_view_drag_begin): same.
	(supported_fields_cb): model -> adapter.
	(adapter_changed): hook up signals and set the empty message on
	our adapter.
	(e_minicard_view_set_arg): add support for "adapter", and set
	model -> adapter.
	(e_minicard_view_get_arg): same.
	(disconnect_signals): no more status_message.
	(do_remove): track to use adapter.
	(e_minicard_view_class_init): add adapter arg, and remove
	status_message.
	(e_minicard_view_init): all the code here is in adapter_changed
	now.

	* gui/widgets/e-minicard-view.h (struct _EMinicardView):
	EMinicardViewModel -> EAddressbookReflowAdapter.
	(struct _EMinicardViewClass): get rid of status_message.

	* gui/widgets/e-minicard-view-widget.c
	(e_minicard_view_widget_class_init): remove the status_message
	signal.
	(e_minicard_view_widget_new): take the adapter as our argument,
	and store it away for when we create the view.
	(e_minicard_view_widget_realize): when we create the view just set
	the adapter field on it.  also, don't connect to status_message.

	* gui/widgets/e-minicard-view-widget.h (struct
	_EMinicardViewWidget): add our adapter here, so we can pass it
	into the view when we create it.
	(struct _EMinicardViewWidgetClass): remove status_message.

	* gui/widgets/e-addressbook-view.c (status_message): new function,
	no more propagating status messages!
	(e_addressbook_view_init): create our model and conenct to its
	status_message signal.
	(book_writable_cb): set "editable" on the model, not our object.
	(e_addressbook_view_set_arg): same, but with "book" and "query" as
	well.
	(create_minicard_view): create our reflow adapter and pass it to
	the minicard view widget.  also, call e_reflow_model_changed so
	it'll pick up any already present cards.
	(table_double_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
	(get_card_list_1): remove the cast, since we don't need it any
	longer.
	(table_right_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
	(table_drag_data_get): same.
	(create_table_view): create the table adapter, and use it as our
	ETableModel.
	(change_view_type): remove the status_message hook up and setting
	of query/book/editable.
	(e_addressbook_view_stop): just call e_addressbook_model_stop here
	instead of switching on the view type.

	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
	our EAddressbookModel.

	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the
	adapter files, and remove e-minicard-view-model.[ch].

	* gui/widgets/e-minicard-view-model.[ch]: removed.

	* gui/widgets/e-addressbook-table-adapter.c: new file.

	* gui/widgets/e-addressbook-table-adapter.h: new file.

	* gui/widgets/e-addressbook-reflow-adapter.c: new file.

	* gui/widgets/e-addressbook-reflow-adapter.h: new file.

	* gui/widgets/e-addressbook-model.c: rework this class to now
	subclass from ETableModel anymore.  It not subclasses from
	GtkObject, and we use table and reflow adapters to get at the
	data.

	* gui/widgets/e-addressbook-model.h: same.

svn path=/trunk/; revision=9837

1 files changed, 0 insertions, 71 deletions

diff --git a/addressbook/gui/widgets/e-minicard-view-model.h b/addressbook/gui/widgets/e-minicard-view-model.h
deleted file mode 100644
index c958a81690..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-model.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_MINICARD_VIEW_MODEL_H_
-#define _E_MINICARD_VIEW_MODEL_H_
-
-#include <gal/widgets/e-reflow-model.h>
-#include <gal/widgets/e-selection-model.h>
-#include "e-minicard.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card.h"
-
-#define E_MINICARD_VIEW_MODEL_TYPE        (e_minicard_view_model_get_type ())
-#define E_MINICARD_VIEW_MODEL(o)          (GTK_CHECK_CAST ((o), E_MINICARD_VIEW_MODEL_TYPE, EMinicardViewModel))
-#define E_MINICARD_VIEW_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_MINICARD_VIEW_MODEL_TYPE, EMinicardViewModelClass))
-#define E_IS_MINICARD_VIEW_MODEL(o)       (GTK_CHECK_TYPE ((o), E_MINICARD_VIEW_MODEL_TYPE))
-#define E_IS_MINICARD_VIEW_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_MINICARD_VIEW_MODEL_TYPE))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct _EMinicardViewModel EMinicardViewModel;
-typedef struct _EMinicardViewModelClass EMinicardViewModelClass;
-
-struct _EMinicardViewModel {
-	EReflowModel parent;
-
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	ECard **data;
-	int data_count;
-	int allocated_count;
-
-	int create_card_id, remove_card_id, modify_card_id, status_message_id;
-
-	guint editable : 1;
-	guint first_get_view : 1;
-};
-
-
-struct _EMinicardViewModelClass {
-	EReflowModelClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message) (EMinicardViewModel *model, const gchar *message);
-	gint (* drag_begin) (EMinicardViewModel *model, GdkEvent *event);
-};
-
-
-GtkType       e_minicard_view_model_get_type     (void);
-EReflowModel *e_minicard_view_model_new          (void);
-
-/* Returns object with ref count of 1. */
-ECard        *e_minicard_view_model_get_card     (EMinicardViewModel *model,
-						  int                 row);
-void          e_minicard_view_model_stop         (EMinicardViewModel *model);
-gint          e_minicard_view_model_right_click  (EMinicardViewModel *emvm,
-						  GdkEvent           *event,
-						  ESelectionModel    *selection);
-
-#endif /* _E_MINICARD_VIEW_MODEL_H_ */