diff options
-rw-r--r-- | a11y/ChangeLog | 32 | ||||
-rw-r--r-- | a11y/addressbook/ea-addressbook-view.c | 2 | ||||
-rw-r--r-- | a11y/addressbook/ea-addressbook-view.h | 2 | ||||
-rw-r--r-- | a11y/addressbook/ea-addressbook.c | 10 | ||||
-rw-r--r-- | a11y/addressbook/ea-minicard-view.c | 290 | ||||
-rw-r--r-- | a11y/addressbook/ea-minicard.c | 163 |
6 files changed, 447 insertions, 52 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 7f0d2ad3bb..d0adf0c6dc 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,35 @@ +2004-11-08 Steven Zhang <steven.zhang@sun.com> + + Implement accessible feature for e-minicard and e-mini-card-view. + Add get_n_children, ref_child, ref_state_set, atk_selection_interface, + and action_interface for ea-minicard-view and ea-minicard + + *ea-minicard-view.c: + (ea_minicard_view_get_n_children), + (ea_minicard_view_ref_child), + (ea_minicard_view_ref_state_set), + (atk_selection_interface_init), + (selection_interface_add_selection), + (selection_interface_clear_selection), + (selection_interface_ref_selection), + (selection_interface_get_selection_count), + (selection_interface_is_child_selected), + (atk_action_interface_init), + (atk_action_interface_do_action), + (atk_action_interface_get_n_action), + (atk_action_interface_get_description), + (atk_action_interface_get_name). + + *ea-minicard.c: + (ea_minicard_get_n_children), + (ea_minicard_ref_child), + (ea_minicard_ref_state_set), + (atk_action_interface_init), + (atk_action_interface_do_action), + (atk_action_interface_get_n_action), + (atk_action_interface_get_description), + (atk_action_interface_get_name). + 2004-11-01 Li Yuan <li.yuan@sun.com> * calendar/ea-day-view.c: (ea_day_view_get_name): diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index 89f0532786..1d26767a79 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -104,7 +104,7 @@ ea_ab_view_get_description (AtkObject *accessible) } AtkObject* -ea_ab_view_new (GtkWidget *obj) +ea_ab_view_new (GObject *obj) { GObject *object; AtkObject *accessible; diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h index 7513ac03ad..94f6b2b452 100644 --- a/a11y/addressbook/ea-addressbook-view.h +++ b/a11y/addressbook/ea-addressbook-view.h @@ -51,7 +51,7 @@ struct _EaABViewClass }; GType ea_ab_view_get_type (void); -AtkObject* ea_ab_view_new(GtkWidget *obj); +AtkObject* ea_ab_view_new(GObject *obj); #ifdef __cplusplus } diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index d3f67be719..9580b40adf 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -74,13 +74,13 @@ ea_addressbook_focus_watcher (GSignalInvocationHint *ihint, object = g_value_get_object (param_values + 0); event = g_value_get_boxed (param_values + 1); - if (E_IS_MINICARD(object)) { + if (E_IS_MINICARD (object)) { EMinicard *minicard = E_MINICARD (object); - GnomeCanvasItem *item = GNOME_CANVAS_ITEM(object); - ea_event = atk_gobject_accessible_for_object(minicard); + GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object); + ea_event = atk_gobject_accessible_for_object (ATK_OBJECT (minicard)); if (event->type == GDK_FOCUS_CHANGE) { - if ((event->focus_change.in) && (E_IS_MINICARD(item->canvas->focused_item))) - atk_focus_tracker_notify(ea_event); + if ((event->focus_change.in) && (E_IS_MINICARD (item->canvas->focused_item))) + atk_focus_tracker_notify (ea_event); } } diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index a9ba5f126f..e6c499983a 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -2,7 +2,7 @@ /* * ea-minicard-view.c * Copyright (C) 2000 Ximian, Inc. - * Author: Leon Zhang < leon.zhang@sun.com> + * Author: Leon Zhang < leon.zhang@sun.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -22,14 +22,46 @@ #include <config.h> #include <libgnome/gnome-i18n.h> #include <string.h> +#include <gtk/gtkaccessible.h> +#include <glib/gstrfuncs.h> +#include <libgnome/gnome-i18n.h> #include "ea-minicard.h" #include "ea-minicard-view.h" +#include "eab-gui-util.h" +#include "e-addressbook-view.h" + +static const char * action_name[] = { + N_("New Contact"), + N_("New Contact List") +}; + static G_CONST_RETURN gchar* ea_minicard_view_get_name (AtkObject *accessible); static G_CONST_RETURN gchar* ea_minicard_view_get_description (AtkObject *accessible); static void ea_minicard_view_class_init (EaMinicardViewClass *klass); +static gint ea_minicard_view_get_n_children (AtkObject *obj); +static AtkObject *ea_minicard_view_ref_child (AtkObject *obj, gint i); + +static AtkStateSet *ea_minicard_view_ref_state_set(AtkObject *obj); + +static void atk_selection_interface_init (AtkSelectionIface *iface); +static gboolean selection_interface_add_selection (AtkSelection *selection, + gint i); +static gboolean selection_interface_clear_selection (AtkSelection *selection); +static AtkObject* selection_interface_ref_selection (AtkSelection *selection, + gint i); +static gint selection_interface_get_selection_count (AtkSelection *selection); +static gboolean selection_interface_is_child_selected (AtkSelection *selection, + gint i); + +static void atk_action_interface_init (AtkActionIface *iface); +static gboolean atk_action_interface_do_action (AtkAction *iface, gint i); +static gint atk_action_interface_get_n_action (AtkAction *iface); +static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i); +static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i); + static gpointer parent_class = NULL; GType @@ -54,6 +86,18 @@ ea_minicard_view_get_type (void) NULL /* value table */ }; + static const GInterfaceInfo atk_selection_info = { + (GInterfaceInitFunc) atk_selection_interface_init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; + + static const GInterfaceInfo atk_action_info = { + (GInterfaceInitFunc) atk_action_interface_init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; + /* * Figure out the size of the class and instance * we are run-time deriving from (GailWidget, in this case) */ @@ -68,6 +112,11 @@ ea_minicard_view_get_type (void) type = g_type_register_static (derived_atk_type, "EaMinicardView", &tinfo, 0); + g_type_add_interface_static (type, ATK_TYPE_SELECTION, + &atk_selection_info); + g_type_add_interface_static (type, ATK_TYPE_ACTION, + &atk_action_info); + } return type; @@ -82,21 +131,24 @@ ea_minicard_view_class_init (EaMinicardViewClass *klass) class->get_name = ea_minicard_view_get_name; class->get_description = ea_minicard_view_get_description; + class->ref_state_set = ea_minicard_view_ref_state_set; + class->get_n_children = ea_minicard_view_get_n_children; + class->ref_child = ea_minicard_view_ref_child; } static G_CONST_RETURN gchar* ea_minicard_view_get_name (AtkObject *accessible) { - static gchar name[100]; + gchar name[100]; GString *new_str = g_string_new (NULL); gchar str[10]; EReflow *reflow; - g_return_val_if_fail (EA_IS_MINICARD_VIEW(accessible), NULL); + g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL); memset (name, '\0', 100); memset (str, '\0', 10); - reflow = E_REFLOW(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible))); + reflow = E_REFLOW(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible))); sprintf (str, "%d", reflow->count); g_string_append (new_str, _("current addressbook folder ")); g_string_append (new_str, (reflow->count) > 1 ? _("have ") : _("has ")); @@ -106,7 +158,8 @@ ea_minicard_view_get_name (AtkObject *accessible) strcpy (name, new_str->str); g_string_free (new_str, TRUE); - return name; + ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name); + return accessible->name; } static G_CONST_RETURN gchar* @@ -129,6 +182,231 @@ ea_minicard_view_new (GObject *obj) object = g_object_new (EA_TYPE_MINICARD_VIEW, NULL); accessible = ATK_OBJECT (object); atk_object_initialize (accessible, obj); - accessible->role = ATK_ROLE_PANEL; + accessible->role = ATK_ROLE_UNKNOWN; return accessible; } + +static gint +ea_minicard_view_get_n_children (AtkObject *accessible) +{ + EReflow *reflow; + + gint child_num = 0; + + g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), -1); + + reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible))); + + if (!reflow) + return -1; + + child_num = reflow->count; + + return child_num; +} + +static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj) +{ + AtkStateSet *state_set = NULL; + GObject *gobj = NULL; + + state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj); + if( !state_set ) + return NULL; + gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj)); + if( !gobj ) + return NULL; + + atk_state_set_add_state (state_set, ATK_STATE_ENABLED); + atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE); + atk_state_set_add_state (state_set, ATK_STATE_SHOWING); + + return state_set; +} + +static AtkObject * +ea_minicard_view_ref_child (AtkObject *accessible, gint index) +{ + EReflow *reflow; + gint child_num; + AtkObject *atk_object = NULL; + EMinicard *card = NULL; + + g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL); + + child_num = atk_object_get_n_accessible_children (accessible); + if (child_num <= 0 || index < 0 || index >= child_num) + return NULL; + + reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible))); + if (!reflow) + return NULL; + if (!reflow->items ) + return NULL; + /* a minicard */ + if (index < child_num) { + card = E_MINICARD (reflow->items[index]); + atk_object = atk_gobject_accessible_for_object (G_OBJECT (card)); + } else { + return NULL; + } + + g_object_ref (atk_object); + return atk_object; +} + +/* atkselection interface */ + +static void +atk_selection_interface_init (AtkSelectionIface *iface) +{ + g_return_if_fail (iface != NULL); + + iface->add_selection = selection_interface_add_selection; + iface->clear_selection = selection_interface_clear_selection; + iface->ref_selection = selection_interface_ref_selection; + iface->get_selection_count = selection_interface_get_selection_count; + iface->is_child_selected = selection_interface_is_child_selected; +} + +static gboolean +selection_interface_add_selection (AtkSelection *selection, gint i) +{ + AtkGObjectAccessible *atk_gobj= NULL; + EReflow *reflow = NULL; + + atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection); + reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj)); + + if (!reflow) + return FALSE; + + selection_interface_clear_selection (selection); + e_selection_model_select_single_row (reflow->selection, i); + + return TRUE; +} + +static gboolean +selection_interface_clear_selection (AtkSelection *selection) +{ + AtkGObjectAccessible *atk_gobj = NULL; + EReflow *reflow = NULL; + + atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection); + reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj)); + + if( !reflow ) + return FALSE; + + e_selection_model_clear (reflow->selection); + + return TRUE; +} + +static AtkObject* +selection_interface_ref_selection (AtkSelection *selection, gint i) +{ + return ea_minicard_view_ref_child (ATK_OBJECT (selection), i); +} + +static gint +selection_interface_get_selection_count (AtkSelection *selection) +{ + AtkGObjectAccessible *atk_gobj = NULL; + EReflow *reflow = NULL; + + atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection); + reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj)); + + if (!reflow ) + return FALSE; + + return e_selection_model_selected_count (reflow->selection); +} + +static gboolean +selection_interface_is_child_selected (AtkSelection *selection, gint i) +{ + AtkGObjectAccessible *atk_gobj = NULL; + EReflow *reflow = NULL; + + atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection); + reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj)); + + if( !reflow ) + return FALSE; + + return e_selection_model_is_row_selected (reflow->selection, i); +} + +static void atk_action_interface_init (AtkActionIface *iface) +{ + g_return_if_fail (iface != NULL); + + iface->do_action = atk_action_interface_do_action; + iface->get_n_actions = atk_action_interface_get_n_action; + iface->get_description = atk_action_interface_get_description; + iface->get_name = atk_action_interface_get_name; +} + +static gboolean atk_action_interface_do_action (AtkAction *action, gint i) +{ + gboolean return_value = TRUE; + EMinicardView *card_view; + EContact *contact = e_contact_new(); + + AtkGObjectAccessible *atk_gobj= NULL; + EReflow *reflow = NULL; + EBook *book; + + atk_gobj = ATK_GOBJECT_ACCESSIBLE (action); + reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj)); + + if (reflow == NULL) + return FALSE; + + card_view = E_MINICARD_VIEW (reflow); + g_object_get(card_view, + "book", &book, + NULL); + g_assert (E_IS_BOOK (book)); + + switch (i) { + case 0: + /* New Contact */ + eab_show_contact_editor (book, contact, TRUE, TRUE); + break; + case 1: + /* New Contact List */ + eab_show_contact_list_editor (book, contact, TRUE, TRUE); + break; + default: + return_value = FALSE; + break; + } + g_object_unref (book); + g_object_unref (contact); + return return_value; +} + +static gint atk_action_interface_get_n_action (AtkAction *iface) +{ + return G_N_ELEMENTS (action_name); +} + +static G_CONST_RETURN gchar* +atk_action_interface_get_description (AtkAction *iface, gint i) +{ + return atk_action_interface_get_name (iface, i); +} + +static G_CONST_RETURN gchar* +atk_action_interface_get_name (AtkAction *iface, gint i) +{ + if( i >= G_N_ELEMENTS (action_name) || i < 0) + return NULL; + + return action_name[i]; +} + diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index c49f759d58..d7b61cfd8d 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -24,12 +24,29 @@ #include <string.h> #include <libgnome/gnome-i18n.h> #include "ea-minicard.h" +#include "ea-minicard-view.h" +#include "e-minicard.h" + +static const char * action_name[] = { + N_("Open") +}; static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible); static G_CONST_RETURN gchar* ea_minicard_get_description (AtkObject *accessible); static void ea_minicard_class_init (EaMinicardClass *klass); +static gint ea_minicard_get_n_children (AtkObject *obj); +static AtkObject* ea_minicard_ref_child(AtkObject *obj, gint i); + +static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj); + +static void atk_action_interface_init (AtkActionIface *iface); +static gboolean atk_action_interface_do_action (AtkAction *iface, gint i); +static gint atk_action_interface_get_n_action (AtkAction *iface); +static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i); +static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i); + static gpointer parent_class = NULL; GType @@ -54,6 +71,12 @@ ea_minicard_get_type (void) NULL /* value table */ }; + static const GInterfaceInfo atk_action_info = { + (GInterfaceInitFunc) atk_action_interface_init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; + /* * Figure out the size of the class and instance * we are run-time deriving from (GailWidget, in this case) @@ -69,6 +92,8 @@ ea_minicard_get_type (void) type = g_type_register_static ( derived_atk_type, "EaMinicard", &tinfo, 0); + g_type_add_interface_static (type, ATK_TYPE_ACTION, + &atk_action_info); } return type; @@ -83,6 +108,9 @@ ea_minicard_class_init (EaMinicardClass *klass) class->get_name = ea_minicard_get_name; class->get_description = ea_minicard_get_description; + class->ref_state_set = ea_minicard_ref_state_set; + class->get_n_children = ea_minicard_get_n_children; + class->ref_child = ea_minicard_ref_child; } /* @@ -93,21 +121,23 @@ static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible) { #define BUFFERSIZE 500 + static gchar name[BUFFERSIZE]; GString *new_str = g_string_new (NULL); gchar *string; EMinicard *card; - GList *list; g_return_val_if_fail (EA_IS_MINICARD(accessible), NULL); memset (name, '\0', BUFFERSIZE); - g_string_append (new_str, _("contact's header: ")); - card = E_MINICARD(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible))); g_object_get (card->header_text, "text", &string, NULL); + if (e_contact_get (card->contact, E_CONTACT_IS_LIST)) + g_string_append (new_str, _("Contact List: ")); + else g_string_append (new_str, _("Contact: ")); + /* get header of current card */ g_string_append (new_str, string); g_free (string); @@ -118,43 +148,12 @@ ea_minicard_get_name (AtkObject *accessible) return name; } - g_string_append (new_str, " "); - - for ( list = card->fields; list; list = g_list_next( list ) ) { - gchar *f, *fn; - EMinicardLabel *label; - - label = E_MINICARD_LABEL (E_MINICARD_FIELD (list->data)->label); - - /* get field name */ - g_object_get (label->fieldname, "text", &fn, NULL); - g_string_append (new_str, fn); - g_free (fn); - - if (new_str->len >= BUFFERSIZE) { - strncpy(name, new_str->str, BUFFERSIZE); - return name; - } - - g_string_append (new_str, " "); - - /* get field */ - g_object_get (label->field, "text", &f, NULL); - g_string_append (new_str, f); - g_free (f); - - if (new_str->len >= BUFFERSIZE) { - strncpy (name, new_str->str, BUFFERSIZE); - return name; - } - - g_string_append (new_str, " "); - } - strcpy (name, new_str->str); g_string_free (new_str, TRUE); - return name; + ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name); + + return accessible->name; } static G_CONST_RETURN gchar* @@ -162,7 +161,7 @@ ea_minicard_get_description (AtkObject *accessible) { if (accessible->description) return accessible->description; - + return _("evolution minicard"); } @@ -179,6 +178,92 @@ ea_minicard_new (GObject *obj) accessible = ATK_OBJECT (object); atk_object_initialize (accessible, obj); - accessible->role = ATK_ROLE_PANEL; + accessible->role = ATK_ROLE_UNKNOWN; return accessible; } + +static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj) +{ + AtkStateSet *state_set = NULL; + GObject *gobj = NULL; + + state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj); + if( !state_set ) + return NULL; + gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj)); + if( !gobj ) + return NULL; + + atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE); + atk_state_set_add_state (state_set, ATK_STATE_ENABLED); + atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE); + atk_state_set_add_state (state_set, ATK_STATE_SHOWING); + + return state_set; +} + +static gint +ea_minicard_get_n_children (AtkObject *accessible) +{ + return 0; +} + +static AtkObject * +ea_minicard_ref_child (AtkObject *accessible, gint index) +{ + return NULL; +} + +static void atk_action_interface_init (AtkActionIface *iface) +{ + g_return_if_fail (iface != NULL); + + iface->do_action = atk_action_interface_do_action; + iface->get_n_actions = atk_action_interface_get_n_action; + iface->get_description = atk_action_interface_get_description; + iface->get_name = atk_action_interface_get_name; +} + +static gboolean atk_action_interface_do_action (AtkAction *iface, gint i) +{ + EMinicard *minicard = NULL; + + minicard = E_MINICARD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (iface))); + if( minicard == NULL ) + return FALSE; + + if( i >= G_N_ELEMENTS (action_name) || i < 0 ) + return FALSE; + + switch (i) { + // open card + case 0: + e_minicard_activiate_editor (minicard); + break; + default: + return FALSE; + } + + return TRUE; +} + +static gint atk_action_interface_get_n_action (AtkAction *iface) +{ + return G_N_ELEMENTS (action_name); +} + +static G_CONST_RETURN gchar* +atk_action_interface_get_description (AtkAction *iface, gint i) +{ + return atk_action_interface_get_name (iface, i); +} + +static G_CONST_RETURN gchar* +atk_action_interface_get_name (AtkAction *iface, gint i) +{ + if( i >= G_N_ELEMENTS (action_name) || i < 0) + return NULL; + + return action_name[i]; +} + |