From 7a5ecfbb6c09b5350e5ce0600f42098eb6a2f5de Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 13 Nov 2003 05:56:14 +0000 Subject: New signal "component_changed". (class_init): Install. (switch_view): * e-shell-window.c: New signal "component_changed". (class_init): Install. (switch_view): Emit. (e_shell_window_new): Call e_user_creatable_items_handler_attach_menus() to attach the "New..." menus. (e_shell_window_peek_current_component_id): New. (e_shell_window_peek_shell): Add precondition. (e_shell_window_peek_current_component_id): Likewise. (e_shell_window_peek_bonobo_ui_component): Likewise. * e-user-creatable-items-handler.c: New. * e-user-creatable-items-handler.h: New. * e-shell-window.h: #include . * e-shell.c (struct _EShellPrivate): Add member user_creatable_items_handler. (e_shell_get_user_creatable_items_handler): Remove. (e_shell_peek_user_creatable_items_handler): New. * Evolution-Component.idl (GNOME.Evolution.RequestCreateItem): New method. (GNOME.Evolution.creatableItems): New attribute. * e-shell-user-creatable-items-handler.c: Remove. * e-shell-user-creatable-items-handler.h: Remove. svn path=/trunk/; revision=23314 --- shell/ChangeLog | 32 ++ shell/Evolution-Component.idl | 23 + shell/Makefile.am | 3 +- shell/e-shell-user-creatable-items-handler.c | 800 --------------------------- shell/e-shell-user-creatable-items-handler.h | 74 --- shell/e-shell-window.c | 37 ++ shell/e-shell-window.h | 8 +- shell/e-shell.c | 28 +- shell/e-shell.h | 6 +- shell/e-user-creatable-items-handler.c | 788 ++++++++++++++++++++++++++ shell/e-user-creatable-items-handler.h | 73 +++ 11 files changed, 982 insertions(+), 890 deletions(-) delete mode 100644 shell/e-shell-user-creatable-items-handler.c delete mode 100644 shell/e-shell-user-creatable-items-handler.h create mode 100644 shell/e-user-creatable-items-handler.c create mode 100644 shell/e-user-creatable-items-handler.h diff --git a/shell/ChangeLog b/shell/ChangeLog index 07b908529a..93bfd273f8 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,35 @@ +2003-11-13 Ettore Perazzoli + + * e-shell-window.c: New signal "component_changed". + (class_init): Install. + (switch_view): Emit. + (e_shell_window_new): Call + e_user_creatable_items_handler_attach_menus() to attach the + "New..." menus. + (e_shell_window_peek_current_component_id): New. + (e_shell_window_peek_shell): Add precondition. + (e_shell_window_peek_current_component_id): Likewise. + (e_shell_window_peek_bonobo_ui_component): Likewise. + + * e-user-creatable-items-handler.c: New. + * e-user-creatable-items-handler.h: New. + + * e-shell-window.h: #include . + + * e-shell.c (struct _EShellPrivate): Add member + user_creatable_items_handler. + (e_shell_get_user_creatable_items_handler): Remove. + (e_shell_peek_user_creatable_items_handler): New. + + * Evolution.idl: Don't #include Evolution-ShellComponent.idl. + + * Evolution-Component.idl (GNOME.Evolution.RequestCreateItem): New + method. + (GNOME.Evolution.creatableItems): New attribute. + + * e-shell-user-creatable-items-handler.c: Remove. + * e-shell-user-creatable-items-handler.h: Remove. + 2003-11-12 Ettore Perazzoli * e-shell-window.c (e_shell_window_switch_to_component): Call diff --git a/shell/Evolution-Component.idl b/shell/Evolution-Component.idl index c8159ff8fa..8c225ee357 100644 --- a/shell/Evolution-Component.idl +++ b/shell/Evolution-Component.idl @@ -13,6 +13,18 @@ module GNOME { module Evolution { + /* A type of item that the component can create when asked by the user, + e.g. a mail message or an appointment. */ + struct CreatableItemType { + string id; + string description; + string menuDescription; + string tooltip; + char menuShortcut; + string iconName; + }; + typedef sequence CreatableItemTypeList; + interface Component : Bonobo::Unknown { exception Failed {}; @@ -34,6 +46,17 @@ module Evolution { is FALSE) */ void interactive (in boolean now_interactive, in unsigned long new_view_xid); + + + /*** The following stuff is needed to build the "New" toolbar + item as well as the "File -> New" submenu. ***/ + + /* List of creatable items. */ + readonly attribute CreatableItemTypeList userCreatableItems; + + /* Pop up a new editing dialog for the item with the specified + @item_type_name. */ + void requestCreateItem (in string item_type_name); }; }; diff --git a/shell/Makefile.am b/shell/Makefile.am index ffb11d12db..f34e837465 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -204,7 +204,6 @@ evolution_SOURCES = \ e-shell-settings-dialog.h \ e-shell-startup-wizard.c \ e-shell-startup-wizard.h \ - e-shell-user-creatable-items-handler.h \ e-shell-view.h \ e-shell-window-commands.c \ e-shell-window-commands.h \ @@ -214,6 +213,8 @@ evolution_SOURCES = \ e-shell.h \ e-sidebar.c \ e-sidebar.h \ + e-user-creatable-items-handler.c \ + e-user-creatable-items-handler.h \ e-task-bar.c \ e-task-bar.h \ e-task-widget.c \ diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c deleted file mode 100644 index 73747eb3a2..0000000000 --- a/shell/e-shell-user-creatable-items-handler.c +++ /dev/null @@ -1,800 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-user-creatable-items-handler.c - * - * Copyright (C) 2001 Ximian, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Author: Ettore Perazzoli - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "e-shell-user-creatable-items-handler.h" - -#include "e-shell-corba-icon-utils.h" - -#include "widgets/misc/e-combo-button.h" - -#include "e-util/e-corba-utils.h" - -#include - -#include -#include - -#include - -#include -#include - -#include -#include -#include - - -#define PARENT_TYPE G_TYPE_OBJECT -static GObjectClass *parent_class = NULL; - - -#define VERB_PREFIX "ShellUserCreatableItemVerb" - -#define EVOLUTION_MAIL_OAFIID "OAFIID:GNOME_Evolution_Mail_ShellComponent" - -#define SHELL_VIEW_KEY "EShellUserCreatableItemsHandler:shell_view" -#define COMBO_BUTTON_WIDGET_KEY "EShellUserCreatableItemsHandler:combo_button" -#define TOOLTIPS_KEY "EShellUserCreatableItemsHandler:tooltips" - -struct _Component { - EvolutionShellComponentClient *component_client; - - GNOME_Evolution_UserCreatableItemTypeList *type_list; -}; -typedef struct _Component Component; - -/* Representation of a single menu item. */ -struct _MenuItem { - const char *label; - char shortcut; - char *verb; - char *tooltip; - GdkPixbuf *icon; - char *component_id; - char *folder_type; -}; -typedef struct _MenuItem MenuItem; - -struct _EShellUserCreatableItemsHandlerPrivate { - /* The components that register user creatable items. */ - GSList *components; /* Component */ - - /* The "New ..." menu items. */ - GSList *menu_items; /* MenuItem */ - - /* The default item (the mailer's "message" item). To be used when the - component in the view we are in doesn't provide a default user - creatable type. This pointer always points to one of the menu items - in ->menu_items. */ - const MenuItem *default_menu_item; -}; - - -/* Component struct handling. */ - -static Component * -component_new (const char *id, - EvolutionShellComponentClient *client) -{ - CORBA_Environment ev; - Component *new; - GNOME_Evolution_ShellComponent objref; - - new = g_new (Component, 1); - - new->component_client = client; - g_object_ref (client); - - CORBA_exception_init (&ev); - - objref = evolution_shell_component_client_corba_objref (client); - new->type_list = GNOME_Evolution_ShellComponent__get_userCreatableItemTypes (objref, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) - new->type_list = NULL; - - CORBA_exception_free (&ev); - - return new; -} - -static void -component_free (Component *component) -{ - g_object_unref (component->component_client); - - if (component->type_list != NULL) - CORBA_free (component->type_list); - - g_free (component); -} - - -/* Helper functions. */ - -static gboolean -item_is_default (const MenuItem *item, - const char *folder_type, - const char *component_id) -{ - if (component_id == NULL || folder_type == NULL) - return FALSE; - - if (item->folder_type != NULL && *item->folder_type != 0) { - if (strcmp (item->folder_type, folder_type) == 0) - return TRUE; - else - return FALSE; - } - - if (strcmp (item->component_id, component_id) == 0) - return TRUE; - else - return FALSE; -} - -static char * -create_verb_from_component_number_and_type_id (int component_num, - const char *type_id) -{ - return g_strdup_printf (VERB_PREFIX ":%d:%s", component_num, type_id); -} - - -/* Setting up menu items for the "File -> New" submenu and the "New" toolbar - button. */ - -static void -ensure_menu_items (EShellUserCreatableItemsHandler *handler) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - GSList *menu_items; - GSList *p; - int component_num; - const char *default_verb; - - priv = handler->priv; - if (priv->menu_items != NULL) - return; - - menu_items = NULL; - component_num = 0; - default_verb = NULL; - for (p = priv->components; p != NULL; p = p->next) { - const Component *component; - int i; - - component = (const Component *) p->data; - if (component->type_list != NULL) { - for (i = 0; i < component->type_list->_length; i ++) { - const GNOME_Evolution_UserCreatableItemType *type; - MenuItem *item; - - type = (const GNOME_Evolution_UserCreatableItemType *) component->type_list->_buffer + i; - - item = g_new (MenuItem, 1); - item->label = type->menuDescription; - item->shortcut = type->menuShortcut; - item->verb = create_verb_from_component_number_and_type_id (component_num, type->id); - item->tooltip = type->tooltip; - item->component_id = g_strdup (evolution_shell_component_client_get_id (component->component_client)); - item->folder_type = g_strdup (type->folderType); - - if (strcmp (item->component_id, EVOLUTION_MAIL_OAFIID) == 0 - && strcmp (type->id, "message") == 0) - default_verb = item->verb; - - if (type->icon.width == 0 || type->icon.height == 0) - item->icon = NULL; - else - item->icon = e_new_gdk_pixbuf_from_corba_icon (& type->icon, 16, 16); - - menu_items = g_slist_prepend (menu_items, item); - } - } - - component_num ++; - } - - priv->menu_items = menu_items; - - priv->default_menu_item = NULL; - if (default_verb != NULL) { - for (p = priv->menu_items; p != NULL; p = p->next) { - const MenuItem *item; - - item = (const MenuItem *) p->data; - if (strcmp (item->verb, default_verb) == 0) - priv->default_menu_item = item; - } - } -} - -static void -free_menu_items (GSList *menu_items) -{ - GSList *p; - - if (menu_items == NULL) - return; - - for (p = menu_items; p != NULL; p = p->next) { - MenuItem *item; - - item = (MenuItem *) p->data; - g_free (item->verb); - - if (item->icon != NULL) - g_object_unref (item->icon); - - g_free (item->component_id); - g_free (item->folder_type); - - g_free (item); - } - - g_slist_free (menu_items); -} - -static const MenuItem * -get_default_action_for_view (EShellUserCreatableItemsHandler *handler, - EShellView *shell_view) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - const char *view_component_id; - const GSList *p; - - priv = handler->priv; - - view_component_id = e_shell_view_get_current_component_id (shell_view); - if (view_component_id == NULL) - return priv->default_menu_item; - - for (p = priv->menu_items; p != NULL; p = p->next) { - const MenuItem *item; - - item = (const MenuItem *) p->data; - if (item_is_default (item, - e_shell_view_get_current_folder_type (shell_view), - e_shell_view_get_current_component_id (shell_view))) - return item; - } - - return priv->default_menu_item; -} - - -/* The XML description for "File -> New". */ - -/* This adds a menu item for @item. If @first is true, the keyboard shortcut - is going to be "Control-N" instead of whatever the component defines. */ -static void -append_xml_for_menu_item (GString *xml, - const MenuItem *item, - gboolean first) -{ - char *encoded_label; - char *encoded_tooltip; - - encoded_label = bonobo_ui_util_encode_str (item->label); - g_string_append_printf (xml, "verb, item->verb, encoded_label); - - if (first) - g_string_append_printf (xml, " accel=\"*Control*N\""); - else if (item->shortcut != '\0') - g_string_append_printf (xml, " accel=\"*Control**Shift*%c\"", item->shortcut); - - if (item->icon != NULL) { - char *icon_xml; - - icon_xml = bonobo_ui_util_pixbuf_to_xml (item->icon); - g_string_append_printf (xml, " pixtype=\"pixbuf\" pixname=\"%s\"", icon_xml); - g_free (icon_xml); - } - - encoded_tooltip = bonobo_ui_util_encode_str (item->tooltip); - g_string_append_printf (xml, " tip=\"%s\"", encoded_tooltip); - - g_string_append (xml, "/> "); - - g_free (encoded_label); - g_free (encoded_tooltip); -} - -static int -item_types_sort_func (const void *a, - const void *b) -{ - const MenuItem *item_a; - const MenuItem *item_b; - const char *p1, *p2; - - item_a = (const MenuItem *) a; - item_b = (const MenuItem *) b; - - p1 = item_a->label; - p2 = item_b->label; - - while (*p1 != '\0' && *p2 != '\0') { - if (*p1 == '_') { - p1 ++; - continue; - } - - if (*p2 == '_') { - p2 ++; - continue; - } - - if (toupper ((int) *p1) < toupper ((int) *p2)) - return -1; - else if (toupper ((int) *p1) > toupper ((int) *p2)) - return +1; - - p1 ++, p2 ++; - } - - if (*p1 == '\0') { - if (*p2 == '\0') - return 0; - else - return -1; - } else { - return +1; - } -} - -static char * -create_menu_xml (EShellUserCreatableItemsHandler *handler, - const char *folder_type, - const char *component_id) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - GString *xml; - GSList *p; - GSList *non_default_items; - char *retval; - - priv = handler->priv; - - ensure_menu_items (handler); - - xml = g_string_new (""); - - g_string_append (xml, ""); - g_string_append (xml, ""); - - /* 1. Add all the elements that are default for this component. (Note - that we don't need to do any sorting since the items are already - sorted alphabetically.) */ - - if (component_id != NULL) { - gboolean first = TRUE; - - for (p = priv->menu_items; p != NULL; p = p->next) { - const MenuItem *item; - - item = (const MenuItem *) p->data; - if (item_is_default (item, folder_type, component_id)) { - append_xml_for_menu_item (xml, item, first); - first = FALSE; - } - } - } - - /* 2. Add a separator. */ - - if (component_id != NULL) - g_string_append_printf (xml, - ""); - - /* 3. Add the elements that are not default for this component. */ - - non_default_items = NULL; - for (p = priv->menu_items; p != NULL; p = p->next) { - const MenuItem *item; - - item = (const MenuItem *) p->data; - if (! item_is_default (item, folder_type, component_id)) - non_default_items = g_slist_prepend (non_default_items, (void *) item); - } - - non_default_items = g_slist_sort (non_default_items, item_types_sort_func); - for (p = non_default_items; p != NULL; p = p->next) - append_xml_for_menu_item (xml, (const MenuItem *) p->data, FALSE); - g_slist_free (non_default_items); - - /* Done... */ - - g_string_append (xml, ""); /* EShellUserCreatableItemsPlaceholder */ - g_string_append (xml, ""); /* ComponentItems */ - - retval = xml->str; - g_string_free (xml, FALSE); - - return retval; -} - - -/* Verb handling. */ - -static void -execute_verb (EShellUserCreatableItemsHandler *handler, - EShellView *shell_view, - const char *verb_name) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - const Component *component; - int component_number; - const char *p; - const char *id; - GSList *component_list_item; - int i; - - priv = handler->priv; - - p = strchr (verb_name, ':'); - g_assert (p != NULL); - component_number = atoi (p + 1); - - p = strchr (p + 1, ':'); - g_assert (p != NULL); - id = p + 1; - - component_list_item = g_slist_nth (priv->components, component_number); - g_assert (component_list_item != NULL); - - component = (const Component *) component_list_item->data; - - if (component->type_list == NULL) - return; - - for (i = 0; i < component->type_list->_length; i ++) { - if (strcmp (component->type_list->_buffer[i].id, id) == 0) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - GNOME_Evolution_ShellComponent_userCreateNewItem - (evolution_shell_component_client_corba_objref (component->component_client), - id, - e_safe_corba_string (e_shell_view_get_current_physical_uri (shell_view)), - e_safe_corba_string (e_shell_view_get_current_folder_type (shell_view)), - &ev); - - if (ev._major != CORBA_NO_EXCEPTION) - g_warning ("Error in userCreateNewItem -- %s", BONOBO_EX_REPOID (&ev)); - - CORBA_exception_free (&ev); - return; - } - } -} - -static void -verb_fn (BonoboUIComponent *ui_component, - void *data, - const char *verb_name) -{ - EShellUserCreatableItemsHandler *handler; - EShellView *shell_view; - - shell_view = g_object_get_data (G_OBJECT (ui_component), SHELL_VIEW_KEY); - g_assert (E_IS_SHELL_VIEW (shell_view)); - - handler = E_SHELL_USER_CREATABLE_ITEMS_HANDLER (data); - - execute_verb (handler, shell_view, verb_name); -} - -static void -add_verbs (EShellUserCreatableItemsHandler *handler, - EShellView *shell_view) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - BonoboUIComponent *ui_component; - int component_num; - GSList *p; - - priv = handler->priv; - - ui_component = e_shell_view_get_bonobo_ui_component (shell_view); - g_object_set_data (G_OBJECT (ui_component), SHELL_VIEW_KEY, shell_view); - - component_num = 0; - for (p = priv->components; p != NULL; p = p->next) { - const Component *component; - int i; - - component = (const Component *) p->data; - - if (component->type_list != NULL) { - for (i = 0; i < component->type_list->_length; i ++) { - char *verb_name; - - verb_name = create_verb_from_component_number_and_type_id - (component_num, component->type_list->_buffer[i].id); - - bonobo_ui_component_add_verb (ui_component, verb_name, verb_fn, handler); - - g_free (verb_name); - } - } - - component_num ++; - } -} - - -/* The "New" button in the toolbar. */ - -static void -combo_button_activate_default_callback (EComboButton *combo_button, - void *data) -{ - EShellView *shell_view; - EShellUserCreatableItemsHandler *handler; - const MenuItem *menu_item; - - shell_view = E_SHELL_VIEW (data); - handler = e_shell_get_user_creatable_items_handler (e_shell_view_get_shell (shell_view)); - - menu_item = get_default_action_for_view (handler, shell_view); - execute_verb (handler, shell_view, menu_item->verb); -} - -static void -setup_toolbar_button (EShellUserCreatableItemsHandler *handler, - EShellView *shell_view) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - BonoboUIComponent *ui_component; - GtkWidget *combo_button; - GtkWidget *menu; - GtkTooltips *tooltips; - BonoboControl *control; - - priv = handler->priv; - - menu = gtk_menu_new (); - - combo_button = e_combo_button_new (); - e_combo_button_set_menu (E_COMBO_BUTTON (combo_button), GTK_MENU (menu)); - e_combo_button_set_label (E_COMBO_BUTTON (combo_button), _("New")); - gtk_widget_show (combo_button); - - g_signal_connect (combo_button, "activate_default", - G_CALLBACK (combo_button_activate_default_callback), - shell_view); - - ui_component = e_shell_view_get_bonobo_ui_component (shell_view); - bonobo_window_add_popup (BONOBO_WINDOW (shell_view), GTK_MENU (menu), "/popups/NewPopup"); - - control = bonobo_control_new (combo_button); - - bonobo_ui_component_object_set (ui_component, "/Toolbar/NewComboButton", - BONOBO_OBJREF (control), NULL); - - bonobo_object_unref (control); - - g_object_set_data (G_OBJECT (shell_view), COMBO_BUTTON_WIDGET_KEY, combo_button); - - tooltips = gtk_tooltips_new (); - g_object_set_data (G_OBJECT (combo_button), TOOLTIPS_KEY, tooltips); -} - - -/* This handles the menus for a given EShellView. We have to rebuild the menu - and set the toolbar button every time the view changes, and clean up when - the view is destroyed. */ - -static void -shell_view_view_changed_callback (EShellView *shell_view, - const char *evolution_path, - const char *physical_uri, - const char *folder_type, - const char *component_id, - void *data) -{ - EShellUserCreatableItemsHandler *handler; - EShellUserCreatableItemsHandlerPrivate *priv; - GtkWidget *combo_button_widget; - GtkTooltips *tooltips; - BonoboUIComponent *ui_component; - const MenuItem *default_menu_item; - char *menu_xml; - - handler = E_SHELL_USER_CREATABLE_ITEMS_HANDLER (data); - priv = handler->priv; - - combo_button_widget = g_object_get_data (G_OBJECT (shell_view), COMBO_BUTTON_WIDGET_KEY); - g_assert (E_IS_COMBO_BUTTON (combo_button_widget)); - - tooltips = g_object_get_data (G_OBJECT (combo_button_widget), TOOLTIPS_KEY); - g_assert (tooltips != NULL); - - default_menu_item = get_default_action_for_view (handler, shell_view); - if (default_menu_item == NULL) { - gtk_widget_set_sensitive (combo_button_widget, FALSE); - e_combo_button_set_label (E_COMBO_BUTTON (combo_button_widget), _("New")); - e_combo_button_set_icon (E_COMBO_BUTTON (combo_button_widget), NULL); - gtk_tooltips_set_tip (tooltips, combo_button_widget, NULL, NULL); - return; - } - - gtk_widget_set_sensitive (combo_button_widget, TRUE); - - e_combo_button_set_icon (E_COMBO_BUTTON (combo_button_widget), default_menu_item->icon); - gtk_tooltips_set_tip (tooltips, combo_button_widget, default_menu_item->tooltip, NULL); - - ui_component = e_shell_view_get_bonobo_ui_component (shell_view); - bonobo_ui_component_rm (ui_component, "/menu/File/New/ComponentItems/EShellUserCreatableItemsPlaceholder", NULL); - bonobo_ui_component_rm (ui_component, "/popups/NewPopup/ComponentItems/EShellUserCreatableItemsPlaceholder", NULL); - - menu_xml = create_menu_xml (handler, - e_shell_view_get_current_folder_type (shell_view), - e_shell_view_get_current_component_id (shell_view)); - bonobo_ui_component_set (ui_component, "/menu/File/New", menu_xml, NULL); - bonobo_ui_component_set (ui_component, "/popups/NewPopup", menu_xml, NULL); - g_free (menu_xml); -} - - -/* GObject methods. */ - -static void -impl_dispose (GObject *object) -{ - EShellUserCreatableItemsHandler *handler; - EShellUserCreatableItemsHandlerPrivate *priv; - GSList *p; - - handler = E_SHELL_USER_CREATABLE_ITEMS_HANDLER (object); - priv = handler->priv; - - for (p = priv->components; p != NULL; p = p->next) - component_free ((Component *) p->data); - - g_slist_free (priv->components); - priv->components = NULL; - - - (* G_OBJECT_CLASS (parent_class)->dispose) (object); -} - -static void -impl_finalize (GObject *object) -{ - EShellUserCreatableItemsHandler *handler; - EShellUserCreatableItemsHandlerPrivate *priv; - - handler = E_SHELL_USER_CREATABLE_ITEMS_HANDLER (object); - priv = handler->priv; - - free_menu_items (priv->menu_items); - - g_free (priv); - - (* G_OBJECT_CLASS (parent_class)->finalize) (object); -} - - -static void -class_init (GObjectClass *object_class) -{ - parent_class = g_type_class_ref(PARENT_TYPE); - - object_class->dispose = impl_dispose; - object_class->finalize = impl_finalize; -} - -static void -init (EShellUserCreatableItemsHandler *shell_user_creatable_items_handler) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - - priv = g_new (EShellUserCreatableItemsHandlerPrivate, 1); - priv->components = NULL; - priv->menu_items = NULL; - priv->default_menu_item = NULL; - - shell_user_creatable_items_handler->priv = priv; -} - - -EShellUserCreatableItemsHandler * -e_shell_user_creatable_items_handler_new (void) -{ - EShellUserCreatableItemsHandler *new; - - new = g_object_new (e_shell_user_creatable_items_handler_get_type (), NULL); - - return new; -} - -void -e_shell_user_creatable_items_handler_add_component (EShellUserCreatableItemsHandler *handler, - const char *id, - EvolutionShellComponentClient *shell_component_client) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - - g_return_if_fail (handler != NULL); - g_return_if_fail (E_IS_SHELL_USER_CREATABLE_ITEMS_HANDLER (handler)); - g_return_if_fail (shell_component_client != NULL); - g_return_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (shell_component_client)); - - priv = handler->priv; - - priv->components = g_slist_prepend (priv->components, component_new (id, shell_component_client)); -} - - -/** - * e_shell_user_creatable_items_handler_attach_menus: - * @handler: - * @shell_view: - * - * Set up the menus and toolbar items for @shell_view. When the shell changes - * view, the menu and the toolbar item will update automatically (i.e. the - * actions for the current folder will go on top etc.). - **/ -void -e_shell_user_creatable_items_handler_attach_menus (EShellUserCreatableItemsHandler *handler, - EShellView *shell_view) -{ - BonoboUIComponent *ui_component; - EShellUserCreatableItemsHandlerPrivate *priv; - char *menu_xml; - - g_return_if_fail (handler != NULL); - g_return_if_fail (E_IS_SHELL_USER_CREATABLE_ITEMS_HANDLER (handler)); - g_return_if_fail (shell_view != NULL); - g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); - - priv = handler->priv; - - setup_toolbar_button (handler, shell_view); - g_signal_connect (shell_view, "view_changed", - G_CALLBACK (shell_view_view_changed_callback), handler); - - add_verbs (handler, shell_view); - menu_xml = create_menu_xml (handler, - e_shell_view_get_current_component_id (shell_view), - e_shell_view_get_current_folder_type (shell_view)); - - ui_component = e_shell_view_get_bonobo_ui_component (shell_view); - bonobo_ui_component_set (ui_component, "/menu/File/New", menu_xml, NULL); - bonobo_ui_component_set (ui_component, "/popups/NewPopup", menu_xml, NULL); - - g_free (menu_xml); -} - - -E_MAKE_TYPE (e_shell_user_creatable_items_handler, - "EShellUserCreatableItemsHandler", EShellUserCreatableItemsHandler, - class_init, init, PARENT_TYPE) diff --git a/shell/e-shell-user-creatable-items-handler.h b/shell/e-shell-user-creatable-items-handler.h deleted file mode 100644 index 228603573a..0000000000 --- a/shell/e-shell-user-creatable-items-handler.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-user-creatable-items-handler.h - * - * Copyright (C) 2001 Ximian, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Author: Ettore Perazzoli - */ - -#ifndef _E_SHELL_USER_CREATABLE_ITEMS_HANDLER_H_ -#define _E_SHELL_USER_CREATABLE_ITEMS_HANDLER_H_ - -#include "evolution-shell-component-client.h" - -#include -#include - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - -#define E_TYPE_SHELL_USER_CREATABLE_ITEMS_HANDLER (e_shell_user_creatable_items_handler_get_type ()) -#define E_SHELL_USER_CREATABLE_ITEMS_HANDLER(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL_USER_CREATABLE_ITEMS_HANDLER, EShellUserCreatableItemsHandler)) -#define E_SHELL_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_USER_CREATABLE_ITEMS_HANDLER, EShellUserCreatableItemsHandlerClass)) -#define E_IS_SHELL_USER_CREATABLE_ITEMS_HANDLER(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_USER_CREATABLE_ITEMS_HANDLER)) -#define E_IS_SHELL_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_USER_CREATABLE_ITEMS_HANDLER)) - - -typedef struct _EShellUserCreatableItemsHandler EShellUserCreatableItemsHandler; -typedef struct _EShellUserCreatableItemsHandlerPrivate EShellUserCreatableItemsHandlerPrivate; -typedef struct _EShellUserCreatableItemsHandlerClass EShellUserCreatableItemsHandlerClass; - -#include "e-shell-view.h" - -struct _EShellUserCreatableItemsHandler { - GObject parent; - - EShellUserCreatableItemsHandlerPrivate *priv; -}; - -struct _EShellUserCreatableItemsHandlerClass { - GObjectClass parent_class; -}; - - -GtkType e_shell_user_creatable_items_handler_get_type (void); -EShellUserCreatableItemsHandler *e_shell_user_creatable_items_handler_new (void); - -void e_shell_user_creatable_items_handler_add_component (EShellUserCreatableItemsHandler *handler, - const char *id, - EvolutionShellComponentClient *shell_component_client); - -void e_shell_user_creatable_items_handler_attach_menus (EShellUserCreatableItemsHandler *handler, - EShellView *shell_view); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _E_SHELL_USER_CREATABLE_ITEMS_HANDLER_H_ */ diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 586f7e6419..903c091447 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -28,6 +28,7 @@ #include "e-component-registry.h" #include "e-shell-window-commands.h" +#include "e-shell-marshal.h" #include "e-sidebar.h" #include "e-util/e-lang-utils.h" @@ -91,6 +92,14 @@ struct _EShellWindowPrivate { }; +enum { + COMPONENT_CHANGED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + + /* ComponentView handling. */ static ComponentView * @@ -253,6 +262,8 @@ switch_view (EShellWindow *window, ComponentView *component_view) NULL); g_object_unref (gconf_client); + + g_signal_emit (window, signals[COMPONENT_CHANGED], 0); } @@ -375,6 +386,14 @@ class_init (EShellWindowClass *class) object_class->finalize = impl_finalize; parent_class = g_type_class_peek_parent (class); + + signals[COMPONENT_CHANGED] = g_signal_new ("component_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EShellWindowClass, component_changed), + NULL, NULL, + e_shell_marshal_NONE__NONE, + G_TYPE_NONE, 0); } static void @@ -447,6 +466,8 @@ e_shell_window_new (EShell *shell, } } + e_user_creatable_items_handler_attach_menus (e_shell_peek_user_creatable_items_handler (shell), window); + return GTK_WIDGET (window); } @@ -482,9 +503,23 @@ e_shell_window_switch_to_component (EShellWindow *window, const char *component_ } +const char * +e_shell_window_peek_current_component_id (EShellWindow *window) +{ + g_return_val_if_fail (E_IS_SHELL_WINDOW (window), NULL); + + if (window->priv->current_view == NULL) + return NULL; + + return window->priv->current_view->component_id; +} + + EShell * e_shell_window_peek_shell (EShellWindow *window) { + g_return_val_if_fail (E_IS_SHELL_WINDOW (window), NULL); + return window->priv->shell; } @@ -492,6 +527,8 @@ e_shell_window_peek_shell (EShellWindow *window) BonoboUIComponent * e_shell_window_peek_bonobo_ui_component (EShellWindow *window) { + g_return_val_if_fail (E_IS_SHELL_WINDOW (window), NULL); + return window->priv->ui_component; } diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index 2d1848b034..01c231c329 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -24,6 +24,7 @@ #define _E_SHELL_WINDOW_H_ #include +#include #define E_TYPE_SHELL_WINDOW (e_shell_window_get_type ()) #define E_SHELL_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_WINDOW, EShellWindow)) @@ -44,6 +45,8 @@ struct _EShellWindow { struct _EShellWindowClass { BonoboWindowClass parent_class; + + void (* component_changed) (EShellWindow *window); }; @@ -55,8 +58,9 @@ GType e_shell_window_get_type (void); GtkWidget *e_shell_window_new (EShell *shell, const char *component_id); -void e_shell_window_switch_to_component (EShellWindow *shell, - const char *component_id); +void e_shell_window_switch_to_component (EShellWindow *shell, + const char *component_id); +const char *e_shell_window_peek_current_component_id (EShellWindow *shell); EShell *e_shell_window_peek_shell (EShellWindow *window); BonoboUIComponent *e_shell_window_peek_bonobo_ui_component (EShellWindow *window); diff --git a/shell/e-shell.c b/shell/e-shell.c index d4b8fdf131..e69b04a0a3 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -78,6 +78,7 @@ struct _EShellPrivate { GList *windows; + EUserCreatableItemsHandler *user_creatable_items_handler; EUriSchemaRegistry *uri_schema_registry; EComponentRegistry *component_registry; @@ -354,6 +355,11 @@ impl_dispose (GObject *object) priv->is_initialized = FALSE; + if (priv->user_creatable_items_handler != NULL) { + g_object_unref (priv->user_creatable_items_handler); + priv->user_creatable_items_handler = NULL; + } + if (priv->uri_schema_registry != NULL) { g_object_unref (priv->uri_schema_registry); priv->uri_schema_registry = NULL; @@ -460,8 +466,9 @@ e_shell_init (EShell *shell) EShellPrivate *priv; priv = g_new0 (EShellPrivate, 1); - priv->line_status = E_SHELL_LINE_STATUS_OFFLINE; - priv->component_registry = e_component_registry_new (); + priv->line_status = E_SHELL_LINE_STATUS_OFFLINE; + priv->component_registry = e_component_registry_new (); + priv->user_creatable_items_handler = e_user_creatable_items_handler_new (priv->component_registry); shell->priv = priv; } @@ -866,14 +873,6 @@ e_shell_show_settings (EShell *shell, } -EShellUserCreatableItemsHandler * -e_shell_get_user_creatable_items_handler (EShell *shell) -{ - g_assert_not_reached (); /* FIXME */ - return NULL; -} - - const char * e_shell_construct_result_to_string (EShellConstructResult result) { @@ -954,4 +953,13 @@ e_shell_prepare_for_quit (EShell *shell) } +EUserCreatableItemsHandler * +e_shell_peek_user_creatable_items_handler (EShell *shell) +{ + g_return_val_if_fail (E_IS_SHELL (shell), NULL); + + return shell->priv->user_creatable_items_handler; +} + + BONOBO_TYPE_FUNC_FULL (EShell, GNOME_Evolution_Shell, PARENT_TYPE, e_shell) diff --git a/shell/e-shell.h b/shell/e-shell.h index add8c3e425..9d75a86baa 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -38,9 +38,9 @@ typedef struct _EShellClass EShellClass; #include "Evolution.h" #include "e-component-registry.h" -#include "e-shell-user-creatable-items-handler.h" #include "e-shell-window.h" #include "e-uri-schema-registry.h" +#include "e-user-creatable-items-handler.h" #define E_TYPE_SHELL (e_shell_get_type ()) @@ -124,12 +124,12 @@ void e_shell_show_settings (EShell *shell, const char *type, EShellWindow *shell_window); -EShellUserCreatableItemsHandler *e_shell_get_user_creatable_items_handler (EShell *shell); - gboolean e_shell_prepare_for_quit (EShell *shell); const char *e_shell_construct_result_to_string (EShellConstructResult result); +EUserCreatableItemsHandler *e_shell_peek_user_creatable_items_handler (EShell *shell); + #ifdef __cplusplus } diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c new file mode 100644 index 0000000000..a524886993 --- /dev/null +++ b/shell/e-user-creatable-items-handler.c @@ -0,0 +1,788 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* e-shell-user-creatable-items-handler.c + * + * Copyright (C) 2001 Ximian, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Ettore Perazzoli + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "e-user-creatable-items-handler.h" + +#include "e-shell-utils.h" + +#include "widgets/misc/e-combo-button.h" + +#include "e-util/e-corba-utils.h" + +#include + +#include +#include + +#include + +#include +#include + +#include +#include +#include + + +#define PARENT_TYPE G_TYPE_OBJECT +static GObjectClass *parent_class = NULL; + + +#define VERB_PREFIX "ShellUserCreatableItemVerb" + +#define EVOLUTION_MAIL_OAFIID "OAFIID:GNOME_Evolution_Mail_ShellComponent" + +#define SHELL_WINDOW_KEY "EUserCreatableItemsHandler:shell_window" +#define COMBO_BUTTON_WIDGET_KEY "EUserCreatableItemsHandler:combo_button" +#define TOOLTIPS_KEY "EUserCreatableItemsHandler:tooltips" + +struct _Component { + char *id; + GNOME_Evolution_Component component; + GNOME_Evolution_CreatableItemTypeList *type_list; +}; +typedef struct _Component Component; + +/* Representation of a single menu item. */ +struct _MenuItem { + const char *label; + char shortcut; + char *verb; + char *tooltip; + char *component_id; + GdkPixbuf *icon; +}; +typedef struct _MenuItem MenuItem; + +struct _EUserCreatableItemsHandlerPrivate { + /* The components that register user creatable items. */ + GSList *components; /* Component */ + + /* The "New ..." menu items. */ + GSList *menu_items; /* MenuItem */ + + /* The default item (the mailer's "message" item). To be used when the + component in the view we are in doesn't provide a default user + creatable type. This pointer always points to one of the menu items + in ->menu_items. */ + const MenuItem *default_menu_item; +}; + + +/* Component struct handling. */ + +static Component * +component_new (const char *id, + GNOME_Evolution_Component component) +{ + CORBA_Environment ev; + Component *new; + + CORBA_exception_init (&ev); + + new = g_new (Component, 1); + new->id = g_strdup (id); + + new->type_list = GNOME_Evolution_Component__get_userCreatableItems (component, &ev); + if (BONOBO_EX (&ev)) + new->type_list = NULL; + + new->component = component; + Bonobo_Unknown_ref (new->component, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) + new->type_list = NULL; + + CORBA_exception_free (&ev); + + return new; +} + +static void +component_free (Component *component) +{ + CORBA_Environment ev; + + CORBA_exception_init (&ev); + + Bonobo_Unknown_unref (component->component, &ev); + + g_free (component->id); + + if (component->type_list != NULL) + CORBA_free (component->type_list); + + CORBA_exception_free (&ev); + + g_free (component); +} + +static void +get_components_from_registry (EUserCreatableItemsHandler *handler, + EComponentRegistry *registry) +{ + GSList *registry_list = e_component_registry_peek_list (registry); + GSList *p; + + for (p = registry_list; p != NULL; p = p->next) { + EComponentInfo *info = p->data; + Component *component; + + e_component_registry_activate (registry, info->id, NULL); + + if (info->iface != CORBA_OBJECT_NIL) + component = component_new (info->id, info->iface); + + handler->priv->components = g_slist_prepend (handler->priv->components, component); + } +} + + +/* Helper functions. */ + +static gboolean +item_is_default (const MenuItem *item, + const char *component_id) +{ + if (component_id == NULL) + return FALSE; + + if (strcmp (item->component_id, component_id) == 0) + return TRUE; + else + return FALSE; +} + +static char * +create_verb_from_component_number_and_type_id (int component_num, + const char *type_id) +{ + return g_strdup_printf (VERB_PREFIX ":%d:%s", component_num, type_id); +} + + +/* Setting up menu items for the "File -> New" submenu and the "New" toolbar + button. */ + +static void +ensure_menu_items (EUserCreatableItemsHandler *handler) +{ + EUserCreatableItemsHandlerPrivate *priv; + GSList *menu_items; + GSList *p; + int component_num; + const char *default_verb; + + priv = handler->priv; + if (priv->menu_items != NULL) + return; + + menu_items = NULL; + component_num = 0; + default_verb = NULL; + for (p = priv->components; p != NULL; p = p->next) { + const Component *component; + int i; + + component = (const Component *) p->data; + if (component->type_list != NULL) { + for (i = 0; i < component->type_list->_length; i ++) { + const GNOME_Evolution_CreatableItemType *type; + MenuItem *item; + + type = (const GNOME_Evolution_CreatableItemType *) component->type_list->_buffer + i; + + item = g_new (MenuItem, 1); + item->label = type->menuDescription; + item->shortcut = type->menuShortcut; + item->verb = create_verb_from_component_number_and_type_id (component_num, type->id); + item->tooltip = type->tooltip; + item->component_id = g_strdup (component->id); + + if (strcmp (item->component_id, EVOLUTION_MAIL_OAFIID) == 0 + && strcmp (type->id, "message") == 0) + default_verb = item->verb; + + if (type->iconName == "") { + item->icon = NULL; + } else { + char *icon_path = e_shell_get_icon_path (type->iconName, TRUE); + item->icon = gdk_pixbuf_new_from_file (icon_path, NULL); + g_free (icon_path); + } + + menu_items = g_slist_prepend (menu_items, item); + } + } + + component_num ++; + } + + priv->menu_items = menu_items; + + priv->default_menu_item = NULL; + if (default_verb != NULL) { + for (p = priv->menu_items; p != NULL; p = p->next) { + const MenuItem *item; + + item = (const MenuItem *) p->data; + if (strcmp (item->verb, default_verb) == 0) + priv->default_menu_item = item; + } + } +} + +static void +free_menu_items (GSList *menu_items) +{ + GSList *p; + + if (menu_items == NULL) + return; + + for (p = menu_items; p != NULL; p = p->next) { + MenuItem *item; + + item = (MenuItem *) p->data; + g_free (item->verb); + + if (item->icon != NULL) + g_object_unref (item->icon); + + g_free (item->component_id); + g_free (item); + } + + g_slist_free (menu_items); +} + +static const MenuItem * +get_default_action_for_view (EUserCreatableItemsHandler *handler, + EShellWindow *window) +{ + EUserCreatableItemsHandlerPrivate *priv; + const char *window_component_id; + const GSList *p; + + priv = handler->priv; + + window_component_id = e_shell_window_peek_current_component_id (window); + if (window_component_id == NULL) + return priv->default_menu_item; + + for (p = priv->menu_items; p != NULL; p = p->next) { + const MenuItem *item; + + item = (const MenuItem *) p->data; + if (item_is_default (item, window_component_id)) + return item; + } + + return priv->default_menu_item; +} + + +/* The XML description for "File -> New". */ + +/* This adds a menu item for @item. If @first is true, the keyboard shortcut + is going to be "Control-N" instead of whatever the component defines. */ +static void +append_xml_for_menu_item (GString *xml, + const MenuItem *item, + gboolean first) +{ + char *encoded_label; + char *encoded_tooltip; + + encoded_label = bonobo_ui_util_encode_str (item->label); + g_string_append_printf (xml, "verb, item->verb, encoded_label); + + if (first) + g_string_append_printf (xml, " accel=\"*Control*N\""); + else if (item->shortcut != '\0') + g_string_append_printf (xml, " accel=\"*Control**Shift*%c\"", item->shortcut); + + if (item->icon != NULL) { + char *icon_xml; + + icon_xml = bonobo_ui_util_pixbuf_to_xml (item->icon); + g_string_append_printf (xml, " pixtype=\"pixbuf\" pixname=\"%s\"", icon_xml); + g_free (icon_xml); + } + + encoded_tooltip = bonobo_ui_util_encode_str (item->tooltip); + g_string_append_printf (xml, " tip=\"%s\"", encoded_tooltip); + + g_string_append (xml, "/> "); + + g_free (encoded_label); + g_free (encoded_tooltip); +} + +static int +item_types_sort_func (const void *a, + const void *b) +{ + const MenuItem *item_a; + const MenuItem *item_b; + const char *p1, *p2; + + item_a = (const MenuItem *) a; + item_b = (const MenuItem *) b; + + p1 = item_a->label; + p2 = item_b->label; + + while (*p1 != '\0' && *p2 != '\0') { + if (*p1 == '_') { + p1 ++; + continue; + } + + if (*p2 == '_') { + p2 ++; + continue; + } + + if (toupper ((int) *p1) < toupper ((int) *p2)) + return -1; + else if (toupper ((int) *p1) > toupper ((int) *p2)) + return +1; + + p1 ++, p2 ++; + } + + if (*p1 == '\0') { + if (*p2 == '\0') + return 0; + else + return -1; + } else { + return +1; + } +} + +static char * +create_menu_xml (EUserCreatableItemsHandler *handler, + const char *component_id) +{ + EUserCreatableItemsHandlerPrivate *priv; + GString *xml; + GSList *p; + GSList *non_default_items; + char *retval; + + priv = handler->priv; + + ensure_menu_items (handler); + + xml = g_string_new (""); + + g_string_append (xml, ""); + g_string_append (xml, ""); + + /* 1. Add all the elements that are default for this component. (Note + that we don't need to do any sorting since the items are already + sorted alphabetically.) */ + + if (component_id != NULL) { + gboolean first = TRUE; + + for (p = priv->menu_items; p != NULL; p = p->next) { + const MenuItem *item; + + item = (const MenuItem *) p->data; + if (item_is_default (item, component_id)) { + append_xml_for_menu_item (xml, item, first); + first = FALSE; + } + } + } + + /* 2. Add a separator. */ + + if (component_id != NULL) + g_string_append_printf (xml, + ""); + + /* 3. Add the elements that are not default for this component. */ + + non_default_items = NULL; + for (p = priv->menu_items; p != NULL; p = p->next) { + const MenuItem *item; + + item = (const MenuItem *) p->data; + if (! item_is_default (item, component_id)) + non_default_items = g_slist_prepend (non_default_items, (void *) item); + } + + non_default_items = g_slist_sort (non_default_items, item_types_sort_func); + for (p = non_default_items; p != NULL; p = p->next) + append_xml_for_menu_item (xml, (const MenuItem *) p->data, FALSE); + g_slist_free (non_default_items); + + /* Done... */ + + g_string_append (xml, ""); /* EUserCreatableItemsPlaceholder */ + g_string_append (xml, ""); /* ComponentItems */ + + retval = xml->str; + g_string_free (xml, FALSE); + + return retval; +} + + +/* Verb handling. */ + +static void +execute_verb (EUserCreatableItemsHandler *handler, + EShellWindow *window, + const char *verb_name) +{ + EUserCreatableItemsHandlerPrivate *priv; + const Component *component; + int component_number; + const char *p; + const char *id; + GSList *component_list_item; + int i; + + priv = handler->priv; + + p = strchr (verb_name, ':'); + g_assert (p != NULL); + component_number = atoi (p + 1); + + p = strchr (p + 1, ':'); + g_assert (p != NULL); + id = p + 1; + + component_list_item = g_slist_nth (priv->components, component_number); + g_assert (component_list_item != NULL); + + component = (const Component *) component_list_item->data; + + if (component->type_list == NULL) + return; + + for (i = 0; i < component->type_list->_length; i ++) { + if (strcmp (component->type_list->_buffer[i].id, id) == 0) { + CORBA_Environment ev; + + CORBA_exception_init (&ev); + + GNOME_Evolution_Component_requestCreateItem (component->component, id, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) + g_warning ("Error in requestCreateItem -- %s", BONOBO_EX_REPOID (&ev)); + + CORBA_exception_free (&ev); + return; + } + } +} + +static void +verb_fn (BonoboUIComponent *ui_component, + void *data, + const char *verb_name) +{ + EUserCreatableItemsHandler *handler; + EShellWindow *shell_window; + + shell_window = g_object_get_data (G_OBJECT (ui_component), SHELL_WINDOW_KEY); + g_assert (E_IS_SHELL_WINDOW (shell_window)); + + handler = E_USER_CREATABLE_ITEMS_HANDLER (data); + + execute_verb (handler, shell_window, verb_name); +} + +static void +add_verbs (EUserCreatableItemsHandler *handler, + EShellWindow *window) +{ + EUserCreatableItemsHandlerPrivate *priv; + BonoboUIComponent *ui_component; + int component_num; + GSList *p; + + priv = handler->priv; + + ui_component = e_shell_window_peek_bonobo_ui_component (window); + g_object_set_data (G_OBJECT (ui_component), SHELL_WINDOW_KEY, window); + + component_num = 0; + for (p = priv->components; p != NULL; p = p->next) { + const Component *component; + int i; + + component = (const Component *) p->data; + + if (component->type_list != NULL) { + for (i = 0; i < component->type_list->_length; i ++) { + char *verb_name; + + verb_name = create_verb_from_component_number_and_type_id + (component_num, component->type_list->_buffer[i].id); + + bonobo_ui_component_add_verb (ui_component, verb_name, verb_fn, handler); + + g_free (verb_name); + } + } + + component_num ++; + } +} + + +/* The "New" button in the toolbar. */ + +static void +combo_button_activate_default_callback (EComboButton *combo_button, + void *data) +{ + EShellWindow *shell_window; + EUserCreatableItemsHandler *handler; + const MenuItem *menu_item; + + shell_window = E_SHELL_WINDOW (data); + handler = e_shell_peek_user_creatable_items_handler (e_shell_window_peek_shell (shell_window)); + + menu_item = get_default_action_for_view (handler, shell_window); + execute_verb (handler, shell_window, menu_item->verb); +} + +static void +setup_toolbar_button (EUserCreatableItemsHandler *handler, + EShellWindow *window) +{ + EUserCreatableItemsHandlerPrivate *priv; + BonoboUIComponent *ui_component; + GtkWidget *combo_button; + GtkWidget *menu; + GtkTooltips *tooltips; + BonoboControl *control; + + priv = handler->priv; + + menu = gtk_menu_new (); + + combo_button = e_combo_button_new (); + e_combo_button_set_menu (E_COMBO_BUTTON (combo_button), GTK_MENU (menu)); + e_combo_button_set_label (E_COMBO_BUTTON (combo_button), _("New")); + gtk_widget_show (combo_button); + + g_signal_connect (combo_button, "activate_default", G_CALLBACK (combo_button_activate_default_callback), window); + + ui_component = e_shell_window_peek_bonobo_ui_component (window); + bonobo_window_add_popup (BONOBO_WINDOW (window), GTK_MENU (menu), "/popups/NewPopup"); + + control = bonobo_control_new (combo_button); + + bonobo_ui_component_object_set (ui_component, "/Toolbar/NewComboButton", + BONOBO_OBJREF (control), NULL); + + bonobo_object_unref (control); + + g_object_set_data (G_OBJECT (window), COMBO_BUTTON_WIDGET_KEY, combo_button); + + tooltips = gtk_tooltips_new (); + g_object_set_data (G_OBJECT (combo_button), TOOLTIPS_KEY, tooltips); +} + + +static void +update_for_window (EUserCreatableItemsHandler *handler, + EShellWindow *window) +{ + GtkWidget *combo_button_widget; + GtkTooltips *tooltips; + BonoboUIComponent *ui_component; + const MenuItem *default_menu_item; + char *menu_xml; + + combo_button_widget = g_object_get_data (G_OBJECT (window), COMBO_BUTTON_WIDGET_KEY); + g_assert (E_IS_COMBO_BUTTON (combo_button_widget)); + + tooltips = g_object_get_data (G_OBJECT (combo_button_widget), TOOLTIPS_KEY); + g_assert (tooltips != NULL); + + default_menu_item = get_default_action_for_view (handler, window); + if (default_menu_item == NULL) { + gtk_widget_set_sensitive (combo_button_widget, FALSE); + e_combo_button_set_label (E_COMBO_BUTTON (combo_button_widget), _("New")); + e_combo_button_set_icon (E_COMBO_BUTTON (combo_button_widget), NULL); + gtk_tooltips_set_tip (tooltips, combo_button_widget, NULL, NULL); + return; + } + + gtk_widget_set_sensitive (combo_button_widget, TRUE); + + e_combo_button_set_icon (E_COMBO_BUTTON (combo_button_widget), default_menu_item->icon); + gtk_tooltips_set_tip (tooltips, combo_button_widget, default_menu_item->tooltip, NULL); + + ui_component = e_shell_window_peek_bonobo_ui_component (window); + bonobo_ui_component_rm (ui_component, "/menu/File/New/ComponentItems/EUserCreatableItemsPlaceholder", NULL); + bonobo_ui_component_rm (ui_component, "/popups/NewPopup/ComponentItems/EUserCreatableItemsPlaceholder", NULL); + + menu_xml = create_menu_xml (handler, e_shell_window_peek_current_component_id (window)); + + bonobo_ui_component_set (ui_component, "/menu/File/New", menu_xml, NULL); + bonobo_ui_component_set (ui_component, "/popups/NewPopup", menu_xml, NULL); + g_free (menu_xml); +} + + +/* This handles the menus for a given EShellWindow. We have to rebuild the menu + and set the toolbar button every time the view changes, and clean up when + the view is destroyed. */ + +static void +shell_window_component_changed_callback (EShellWindow *shell_window, + EUserCreatableItemsHandler *handler) +{ + update_for_window (handler, shell_window); +} + + +/* GObject methods. */ + +static void +impl_dispose (GObject *object) +{ + EUserCreatableItemsHandler *handler; + EUserCreatableItemsHandlerPrivate *priv; + GSList *p; + + handler = E_USER_CREATABLE_ITEMS_HANDLER (object); + priv = handler->priv; + + for (p = priv->components; p != NULL; p = p->next) + component_free ((Component *) p->data); + + g_slist_free (priv->components); + priv->components = NULL; + + + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + EUserCreatableItemsHandler *handler; + EUserCreatableItemsHandlerPrivate *priv; + + handler = E_USER_CREATABLE_ITEMS_HANDLER (object); + priv = handler->priv; + + free_menu_items (priv->menu_items); + + g_free (priv); + + (* G_OBJECT_CLASS (parent_class)->finalize) (object); +} + + +static void +class_init (GObjectClass *object_class) +{ + parent_class = g_type_class_ref(PARENT_TYPE); + + object_class->dispose = impl_dispose; + object_class->finalize = impl_finalize; +} + +static void +init (EUserCreatableItemsHandler *shell_user_creatable_items_handler) +{ + EUserCreatableItemsHandlerPrivate *priv; + + priv = g_new (EUserCreatableItemsHandlerPrivate, 1); + priv->components = NULL; + priv->menu_items = NULL; + priv->default_menu_item = NULL; + + shell_user_creatable_items_handler->priv = priv; +} + + +EUserCreatableItemsHandler * +e_user_creatable_items_handler_new (EComponentRegistry *registry) +{ + EUserCreatableItemsHandler *new; + + new = g_object_new (e_user_creatable_items_handler_get_type (), NULL); + + get_components_from_registry (new, registry); + + return new; +} + + +/** + * e_user_creatable_items_handler_attach_menus: + * @handler: + * @shell_window: + * + * Set up the menus and toolbar items for @shell_window. When the shell changes + * view, the menu and the toolbar item will update automatically (i.e. the + * actions for the current folder will go on top etc.). + **/ +void +e_user_creatable_items_handler_attach_menus (EUserCreatableItemsHandler *handler, + EShellWindow *window) +{ + BonoboUIComponent *ui_component; + EUserCreatableItemsHandlerPrivate *priv; + char *menu_xml; + + g_return_if_fail (E_IS_USER_CREATABLE_ITEMS_HANDLER (handler)); + g_return_if_fail (E_IS_SHELL_WINDOW (window)); + + priv = handler->priv; + + setup_toolbar_button (handler, window); + g_signal_connect (window, "component_changed", G_CALLBACK (shell_window_component_changed_callback), handler); + + add_verbs (handler, window); + menu_xml = create_menu_xml (handler, e_shell_window_peek_current_component_id (window)); + + ui_component = e_shell_window_peek_bonobo_ui_component (window); + bonobo_ui_component_set (ui_component, "/menu/File/New", menu_xml, NULL); + bonobo_ui_component_set (ui_component, "/popups/NewPopup", menu_xml, NULL); + + g_free (menu_xml); + + update_for_window (handler, window); +} + + +E_MAKE_TYPE (e_user_creatable_items_handler, "EUserCreatableItemsHandler", EUserCreatableItemsHandler, class_init, init, PARENT_TYPE) diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h new file mode 100644 index 0000000000..d6f12e3973 --- /dev/null +++ b/shell/e-user-creatable-items-handler.h @@ -0,0 +1,73 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* e-shell-user-creatable-items-handler.h + * + * Copyright (C) 2001 Ximian, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Ettore Perazzoli + */ + +#ifndef _E_USER_CREATABLE_ITEMS_HANDLER_H_ +#define _E_USER_CREATABLE_ITEMS_HANDLER_H_ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#pragma } +#endif /* __cplusplus */ + +#define E_TYPE_USER_CREATABLE_ITEMS_HANDLER (e_user_creatable_items_handler_get_type ()) +#define E_USER_CREATABLE_ITEMS_HANDLER(obj) (GTK_CHECK_CAST ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandler)) +#define E_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandlerClass)) +#define E_IS_USER_CREATABLE_ITEMS_HANDLER(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER)) +#define E_IS_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER)) + + +typedef struct _EUserCreatableItemsHandler EUserCreatableItemsHandler; +typedef struct _EUserCreatableItemsHandlerPrivate EUserCreatableItemsHandlerPrivate; +typedef struct _EUserCreatableItemsHandlerClass EUserCreatableItemsHandlerClass; + + +#include "e-shell-window.h" + + +struct _EUserCreatableItemsHandler { + GObject parent; + + EUserCreatableItemsHandlerPrivate *priv; +}; + +struct _EUserCreatableItemsHandlerClass { + GObjectClass parent_class; +}; + + +GtkType e_user_creatable_items_handler_get_type (void); +EUserCreatableItemsHandler *e_user_creatable_items_handler_new (EComponentRegistry *registry); + +void e_user_creatable_items_handler_add_component (EUserCreatableItemsHandler *handler, + const char *id, + GNOME_Evolution_Component component); +void e_user_creatable_items_handler_attach_menus (EUserCreatableItemsHandler *handler, + EShellWindow *window); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* _E_USER_CREATABLE_ITEMS_HANDLER_H_ */ -- cgit