From e8d6f8c723401c5251fff6192872fecbca8aaa7c Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 31 Jul 2002 20:54:48 +0000 Subject: (ensure_menu_items): Don't sort the menu_items here. (create_menu_xml): Instead, sort here, and only sort the non-default section of the menu. (get_default_action_for_view): Just get the first item that is default; since we don't sort anymore, this works. (find_menu_item_for_verb): Removed since it is not used anymore. svn path=/trunk/; revision=17659 --- shell/ChangeLog | 10 ++ shell/e-shell-user-creatable-items-handler.c | 190 +++++++++++---------------- 2 files changed, 90 insertions(+), 110 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index 81133e81e3..fa1a36bfcb 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2002-07-31 Ettore Perazzoli + + * e-shell-user-creatable-items-handler.c (ensure_menu_items): + Don't sort the menu_items here. + (create_menu_xml): Instead, sort here, and only sort the + non-default section of the menu. + (get_default_action_for_view): Just get the first item that is + default; since we don't sort anymore, this works. + (find_menu_item_for_verb): Removed since it is not used anymore. + 2002-07-31 Ettore Perazzoli * evolution-test-component.c (register_component): Pass NULL for diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c index a10b755329..9e427f5b9f 100644 --- a/shell/e-shell-user-creatable-items-handler.c +++ b/shell/e-shell-user-creatable-items-handler.c @@ -133,6 +133,27 @@ component_free (Component *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) @@ -144,49 +165,6 @@ create_verb_from_component_number_and_type_id (int component_num, /* Setting up menu items for the "File -> New" submenu and the "New" toolbar button. */ -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 void ensure_menu_items (EShellUserCreatableItemsHandler *handler) { @@ -239,10 +217,7 @@ ensure_menu_items (EShellUserCreatableItemsHandler *handler) component_num ++; } - if (menu_items == NULL) - priv->menu_items = NULL; - else - priv->menu_items = g_slist_sort (menu_items, item_types_sort_func); + priv->menu_items = menu_items; priv->default_menu_item = NULL; if (default_verb != NULL) { @@ -281,26 +256,6 @@ free_menu_items (GSList *menu_items) g_slist_free (menu_items); } -static const MenuItem * -find_menu_item_for_verb (EShellUserCreatableItemsHandler *handler, - const char *verb) -{ - EShellUserCreatableItemsHandlerPrivate *priv; - GSList *p; - - priv = handler->priv; - - for (p = priv->menu_items; p != NULL; p = p->next) { - const MenuItem *item; - - item = (const MenuItem *) p->data; - if (strcmp (item->verb, verb) == 0) - return item; - } - - return NULL; -} - static const MenuItem * get_default_action_for_view (EShellUserCreatableItemsHandler *handler, EShellView *shell_view) @@ -308,40 +263,21 @@ get_default_action_for_view (EShellUserCreatableItemsHandler *handler, EShellUserCreatableItemsHandlerPrivate *priv; const char *view_component_id; const GSList *p; - int component_num; priv = handler->priv; - /* FIXME-1.2: This should be based on the folder type not the component - that handles it. For this, we are going to have to make the IDL a - little more complex. Also, this is a pretty brutal and ugly hack. */ - view_component_id = e_shell_view_get_current_component_id (shell_view); if (view_component_id == NULL) return NULL; - for (p = priv->components, component_num = 0; p != NULL; p = p->next, component_num ++) { - const Component *component; - const GNOME_Evolution_UserCreatableItemType *type; - const char *component_id; - - component = (const Component *) p->data; - if (component->type_list->_length == 0) - continue; - - type = & component->type_list->_buffer[0]; - component_id = evolution_shell_component_client_get_id (component->component_client); - - if (strcmp (component_id, view_component_id) == 0) { - const MenuItem *item; - char *verb; - - verb = create_verb_from_component_number_and_type_id (component_num, type->id); - item = find_menu_item_for_verb (handler, verb); - g_free (verb); + 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; @@ -382,25 +318,47 @@ append_xml_for_menu_item (GString *xml, g_free (encoded_tooltip); } -static gboolean -item_is_default (const MenuItem *item, - const char *folder_type, - const char *component_id) +static int +item_types_sort_func (const void *a, + const void *b) { - if (component_id == NULL || folder_type == NULL) - return FALSE; + const MenuItem *item_a; + const MenuItem *item_b; + const char *p1, *p2; - if (item->folder_type != NULL && *item->folder_type != 0) { - if (strcmp (item->folder_type, folder_type) == 0) - return TRUE; - else - return FALSE; + 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 (strcmp (item->component_id, component_id) == 0) - return TRUE; - else - return FALSE; + if (*p1 == '\0') { + if (*p2 == '\0') + return 0; + else + return -1; + } else { + return +1; + } } static char * @@ -411,6 +369,7 @@ create_menu_xml (EShellUserCreatableItemsHandler *handler, EShellUserCreatableItemsHandlerPrivate *priv; GString *xml; GSList *p; + GSList *non_default_items; char *retval; priv = handler->priv; @@ -423,8 +382,9 @@ create_menu_xml (EShellUserCreatableItemsHandler *handler, 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.) */ + that we don't need to do any sorting since the items are already + sorted alphabetically.) */ + if (component_id != NULL) { gboolean first = TRUE; @@ -440,18 +400,28 @@ create_menu_xml (EShellUserCreatableItemsHandler *handler, } /* 2. Add a separator. */ + if (component_id != NULL) g_string_sprintfa (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)) - append_xml_for_menu_item (xml, item, FALSE); + 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 */ -- cgit