** Fixes bug #542125

2008-07-18  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #542125

	** This set of changes migrates CompEditor, CompEditorPage and the
	   various subclasses from using BonoboUI to GtkUIManager for menus
	   and toolbars.  It also substantially cleans up the code and
	   streamlines the CompEditorPage API, making more effective use
	   of GObject properties.

	Core changes:
	* gui/dialogs/comp-editor-page.c:
	* gui/dialogs/comp-editor-page.h:
	* gui/dialogs/comp-editor.c:
	* gui/dialogs/comp-editor.h:
	* gui/dialogs/event-editor.c:
	* gui/dialogs/event-editor.h:
	* gui/dialogs/event-page.c:
	* gui/dialogs/event-page.h:
	* gui/dialogs/memo-editor.c:
	* gui/dialogs/memo-editor.h:
	* gui/dialogs/memo-page.c:
	* gui/dialogs/memo-page.h:
	* gui/dialogs/recurrence-page.c:
	* gui/dialogs/recurrence-page.h:
	* gui/dialogs/schedule-page.c:
	* gui/dialogs/schedule-page.h:
	* gui/dialogs/task-details-page.c:
	* gui/dialogs/task-details-page.h:
	* gui/dialogs/task-editor.c:
	* gui/dialogs/task-editor.h:
	* gui/dialogs/task-page.c:
	* gui/dialogs/task-page.h:

	Supporting changes:
	* gui/calendar-component.c:
	* gui/comp-editor-factory.c:
	* gui/e-cal-popup.c:
	* gui/e-calendar-table.c:
	* gui/e-calendar-view.c:
	* gui/e-comp-editor-registry.c:
	* gui/e-memo-table.c:
	* gui/e-tasks.c:
	* gui/gnome-cal.c:
	* gui/memos-component.c:
	* gui/tasks-component.c:
	* gui/dialogs/alarm-dialog.c:
	* gui/dialogs/comp-editor-util.c:

	* art/Makefile.am:
	Move query-free-busy.png to data/icons.


svn path=/trunk/; revision=35753

1 files changed, 101 insertions, 73 deletions

diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 4c445dfe5f..786c937d98 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -22,42 +22,56 @@
 #define COMP_EDITOR_H
 
 #include <gtk/gtk.h>
-#include <bonobo/bonobo-window.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
 #include <libecal/e-cal.h>
 #include "../itip-utils.h"
 #include "comp-editor-page.h"
 
-G_BEGIN_DECLS
-
-
+/* Standard GObject macros */
+#define TYPE_COMP_EDITOR \
+	(comp_editor_get_type ())
+#define COMP_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), TYPE_COMP_EDITOR, CompEditor))
+#define COMP_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), TYPE_COMP_EDITOR, CompEditorClass))
+#define IS_COMP_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), TYPE_COMP_EDITOR))
+#define IS_COMP_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), TYPE_COMP_EDITOR))
+#define COMP_EDITOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), TYPE_COMP_EDITOR, CompEditorClass))
 
-#define TYPE_COMP_EDITOR            (comp_editor_get_type ())
-#define COMP_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMP_EDITOR, CompEditor))
-#define COMP_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR, CompEditorClass))
-#define IS_COMP_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMP_EDITOR))
-#define IS_COMP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR))
+G_BEGIN_DECLS
 
+typedef struct _CompEditor CompEditor;
+typedef struct _CompEditorClass CompEditorClass;
 typedef struct _CompEditorPrivate CompEditorPrivate;
 
-typedef struct {
-	BonoboWindow object;
-
-	/* Private data */
+struct _CompEditor {
+	GtkWindow parent;
 	CompEditorPrivate *priv;
-	BonoboUIComponent *uic;
-} CompEditor;
+};
 
-typedef struct {
-	BonoboWindowClass parent_class;
+struct _CompEditorClass {
+	GtkWindowClass parent_class;
+	const gchar *help_section;
 
 	/* Virtual functions */
-	void (* set_e_cal) (CompEditor *page, ECal *client);
-	void (* edit_comp) (CompEditor *page, ECalComponent *comp);
-	void (* object_created) (CompEditor *page);
-	gboolean (* send_comp) (CompEditor *page, ECalComponentItipMethod method);
-} CompEditorClass;
+	void (*edit_comp) (CompEditor *page, ECalComponent *comp);
+	void (*object_created) (CompEditor *page);
+	gboolean (*send_comp) (CompEditor *page, ECalComponentItipMethod method);
+
+	void (*show_categories) (CompEditor *editor, gboolean visible);
+	void (*show_role) (CompEditor *editor, gboolean visible);
+	void (*show_rsvp) (CompEditor *editor, gboolean visible);
+	void (*show_status) (CompEditor *editor, gboolean visible);
+	void (*show_time_zone) (CompEditor *editor, gboolean visible);
+	void (*show_type) (CompEditor *editor, gboolean visible);
+};
 
 typedef enum {
 	COMP_EDITOR_NEW_ITEM = 1<<0,
@@ -68,55 +82,69 @@ typedef enum {
 	COMP_EDITOR_IS_SHARED = 1 << 5
 } CompEditorFlags;
 
-GType         comp_editor_get_type         (void);
-void          comp_editor_set_changed      (CompEditor             *editor,
-					    gboolean                changed);
-gboolean      comp_editor_get_changed      (CompEditor             *editor);
-void          comp_editor_set_needs_send   (CompEditor             *editor,
-					    gboolean                needs_send);
-gboolean      comp_editor_get_needs_send   (CompEditor             *editor);
-void          comp_editor_set_existing_org (CompEditor             *editor,
-					    gboolean                existing_org);
-gboolean      comp_editor_get_existing_org (CompEditor             *editor);
-void          comp_editor_set_user_org     (CompEditor             *editor,
-					    gboolean                user_org);
-gboolean      comp_editor_get_user_org     (CompEditor             *editor);
-void          comp_editor_set_group_item     (CompEditor             *editor,
-					    gboolean                is_group_item);
-gboolean      comp_editor_get_group_item     (CompEditor             *editor);
-void          comp_editor_append_page      (CompEditor             *editor,
-					    CompEditorPage         *page,
-					    const char             *label,
-					    gboolean add);
-void          comp_editor_remove_page      (CompEditor             *editor,
-					    CompEditorPage         *page);
-void          comp_editor_show_page        (CompEditor             *editor,
-					    CompEditorPage         *page);
-void          comp_editor_set_e_cal        (CompEditor             *editor,
-					    ECal              *client);
-void          comp_editor_set_help_section (CompEditor             *editor,
-					    const char             *section);
-ECal         *comp_editor_get_e_cal        (CompEditor             *editor);
-void          comp_editor_edit_comp        (CompEditor             *ee,
-					    ECalComponent           *comp);
-ECalComponent *comp_editor_get_comp        (CompEditor             *editor);
-ECalComponent *comp_editor_get_current_comp (CompEditor            *editor,
-					     gboolean              *correct);
-gboolean      comp_editor_save_comp        (CompEditor             *editor,
-					    gboolean                send);
-void          comp_editor_delete_comp      (CompEditor             *editor);
-gboolean      comp_editor_send_comp        (CompEditor             *editor,
-					    ECalComponentItipMethod  method);
-GSList        *comp_editor_get_mime_attach_list (CompEditor        *editor);
-gboolean      comp_editor_close            (CompEditor             *editor);
-void          comp_editor_focus            (CompEditor             *editor);
-
-void          comp_editor_notify_client_changed (CompEditor *editor, ECal *client);
-
-void comp_editor_sensitize_attachment_bar (CompEditor *editor, gboolean set);
-void comp_editor_set_flags (CompEditor *editor, CompEditorFlags flags);
-CompEditorFlags comp_editor_get_flags (CompEditor *editor);
-
+GType		comp_editor_get_type		(void);
+void		comp_editor_set_changed		(CompEditor *editor,
+						 gboolean changed);
+gboolean	comp_editor_get_changed		(CompEditor *editor);
+void		comp_editor_set_needs_send	(CompEditor *editor,
+						 gboolean needs_send);
+gboolean	comp_editor_get_needs_send	(CompEditor *editor);
+void		comp_editor_set_existing_org	(CompEditor *editor,
+						gboolean existing_org);
+gboolean	comp_editor_get_existing_org	(CompEditor *editor);
+void		comp_editor_set_user_org	(CompEditor *editor,
+						gboolean user_org);
+gboolean	comp_editor_get_user_org	(CompEditor *editor);
+void		comp_editor_set_group_item	(CompEditor *editor,
+						 gboolean is_group_item);
+gboolean	comp_editor_get_group_item	(CompEditor *editor);
+void		comp_editor_set_classification	(CompEditor *editor,
+						 ECalComponentClassification classification);
+ECalComponentClassification
+		comp_editor_get_classification	(CompEditor *editor);
+void		comp_editor_set_summary		(CompEditor *editor,
+						 const gchar *summary);
+const gchar *	comp_editor_get_summary		(CompEditor *editor);
+void		comp_editor_append_page		(CompEditor *editor,
+						 CompEditorPage *page,
+						 const gchar *label,
+						 gboolean add);
+void		comp_editor_remove_page		(CompEditor *editor,
+						 CompEditorPage *page);
+void		comp_editor_show_page		(CompEditor *editor,
+						 CompEditorPage *page);
+void		comp_editor_set_client		(CompEditor *editor,
+						 ECal *client);
+ECal *		comp_editor_get_client		(CompEditor *editor);
+void		comp_editor_edit_comp		(CompEditor *ee,
+						 ECalComponent *comp);
+ECalComponent *	comp_editor_get_comp		(CompEditor *editor);
+ECalComponent *	comp_editor_get_current_comp	(CompEditor *editor,
+						 gboolean *correct);
+gboolean	comp_editor_save_comp		(CompEditor *editor,
+						 gboolean send);
+void		comp_editor_delete_comp		(CompEditor *editor);
+gboolean	comp_editor_send_comp		(CompEditor *editor,
+						 ECalComponentItipMethod method);
+GSList *	comp_editor_get_mime_attach_list(CompEditor *editor);
+gboolean	comp_editor_close		(CompEditor *editor);
+
+
+void		comp_editor_sensitize_attachment_bar
+						(CompEditor *editor,
+						 gboolean set);
+void		comp_editor_set_flags		(CompEditor *editor,
+						 CompEditorFlags flags);
+CompEditorFlags
+		comp_editor_get_flags		(CompEditor *editor);
+GtkUIManager *	comp_editor_get_ui_manager	(CompEditor *editor);
+GtkAction *	comp_editor_get_action		(CompEditor *editor,
+						 const gchar *action_name);
+GtkActionGroup *
+		comp_editor_get_action_group	(CompEditor *editor,
+                                            	 const gchar *group_name);
+GtkWidget *	comp_editor_get_managed_widget	(CompEditor *editor,
+						 const gchar *widget_path);
 
 G_END_DECLS