diff options
| -rw-r--r-- | a11y/ChangeLog | 10 | ||||
| -rw-r--r-- | a11y/widgets/Makefile.am | 2 | ||||
| -rw-r--r-- | a11y/widgets/ea-expander.c | 165 | ||||
| -rw-r--r-- | a11y/widgets/ea-expander.h | 50 | ||||
| -rw-r--r-- | a11y/widgets/ea-widgets.c | 7 | ||||
| -rw-r--r-- | a11y/widgets/ea-widgets.h | 1 |
6 files changed, 235 insertions, 0 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 795179aa1e..82db5cf0bd 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,13 @@ +2006-04-27 Boby Wang <boby.wang@sun.com> + + Fix for #332821 + + * widgets/Makefile.am: + * widgets/ea-expander.[ch]: + Add two new files to implement the accessibility of EExpander. + * widgets/ea-widgets.[ch]:(e_expander_a11y_init): + Implement the accessibility of EExpander. + 2006-04-24 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> reviewed by: Harish Krishnaswamy <kharish@novell.com> diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am index 81a21330fa..8d32666f88 100644 --- a/a11y/widgets/Makefile.am +++ b/a11y/widgets/Makefile.am @@ -22,6 +22,8 @@ libevolution_widgets_a11y_la_SOURCES = \ ea-calendar-cell.h \ ea-combo-button.c \ ea-combo-button.h \ + ea-expander.c \ + ea-expander.h \ ea-widgets.c \ ea-widgets.h diff --git a/a11y/widgets/ea-expander.c b/a11y/widgets/ea-expander.c new file mode 100644 index 0000000000..965c738b03 --- /dev/null +++ b/a11y/widgets/ea-expander.c @@ -0,0 +1,165 @@ +/* Evolution Accessibility: ea-expander.c + * + * Copyright (C) 2006 Novell, 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: Boby Wang <boby.wang@sun.com> Sun Microsystem Inc., 2006 + * + */ + +#include <config.h> +#include "ea-expander.h" +#include <gtk/gtkbutton.h> +#include <glib/gi18n.h> + +static AtkObjectClass *parent_class; +static GType parent_type; + +/* Action IDs */ +enum { + ACTIVATE, + LAST_ACTION +}; + +static G_CONST_RETURN gchar* +ea_expander_get_name (AtkObject *a11y) +{ + return _("Toggle Attachment Bar"); +} + +/* Action interface */ +static G_CONST_RETURN gchar * +ea_expander_action_get_name (AtkAction *action, gint i) +{ + switch (i) + { + case ACTIVATE: + return _("activate"); + default: + return NULL; + } +} + +static gboolean +ea_expander_do_action (AtkAction *action, gint i) +{ + GtkWidget *widget; + EExpander *expander; + + widget = GTK_ACCESSIBLE (action)->widget; + if (!widget || !GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget)) + return FALSE; + + expander = E_EXPANDER (widget); + + switch (i) + { + case ACTIVATE: + g_signal_emit_by_name (expander, "activate"); + return TRUE; + default: + return FALSE; + } +} + +static gint +ea_expander_get_n_actions (AtkAction *action) +{ + return LAST_ACTION; +} + +static void +atk_action_interface_init (AtkActionIface *iface) +{ + g_return_if_fail (iface != NULL); + + iface->do_action = ea_expander_do_action; + iface->get_n_actions = ea_expander_get_n_actions; + iface->get_name = ea_expander_action_get_name; +} + +static void +ea_expander_class_init (EaExpanderClass *klass) +{ + AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); + + parent_class = g_type_class_ref (parent_type); + + atk_object_class->get_name = ea_expander_get_name; +} + +static void +ea_expander_init (EaExpander *a11y) +{ + /* Empty */ +} + +GType +ea_expander_get_type (void) +{ + static GType type = 0; + + if (!type) { + AtkObjectFactory *factory; + GTypeQuery query; + + GTypeInfo info = { + sizeof (EaExpanderClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) ea_expander_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class data */ + sizeof (EaExpander), + 0, + (GInstanceInitFunc) ea_expander_init, + NULL /* value_tree */ + }; + + static const GInterfaceInfo atk_action_info = { + (GInterfaceInitFunc) atk_action_interface_init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; + + factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_BIN); + parent_type = atk_object_factory_get_accessible_type (factory); + g_type_query (parent_type, &query); + + info.class_size = query.class_size; + info.instance_size = query.instance_size; + + type = g_type_register_static (parent_type, "EaExpander", &info, 0); + g_type_add_interface_static (type, ATK_TYPE_ACTION, + &atk_action_info); + } + + return type; +} + +AtkObject * +ea_expander_new (GtkWidget *widget) +{ + EaExpander *a11y; + + a11y = g_object_new (ea_expander_get_type (), NULL); + + GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget); + ATK_OBJECT (a11y)->role = ATK_ROLE_TOGGLE_BUTTON; + + return ATK_OBJECT (a11y); +} + diff --git a/a11y/widgets/ea-expander.h b/a11y/widgets/ea-expander.h new file mode 100644 index 0000000000..ab36aba6e7 --- /dev/null +++ b/a11y/widgets/ea-expander.h @@ -0,0 +1,50 @@ +/* Evolution Accessibility: ea-expander.h + * + * Copyright (C) 2006 Novell, 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: Boby Wang <boby.wang@sun.com> Sun Microsystem Inc., 2006 + * + */ + +#ifndef _EA_EXPANDER_H_ +#define _EA_EXPANDER_H_ + +#include <gtk/gtkaccessible.h> +#include <misc/e-expander.h> + +#define EA_TYPE_EXPANDER (ea_expander_get_type ()) +#define EA_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_EXPANDER, EaExpander)) +#define EA_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass,), EA_TYPE_EXPANDER, EaExpanderClass)) +#define EA_IS_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_EXPANDER)) +#define EA_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_EXPANDER_CLASS)) + +typedef struct _EaExpander EaExpander; +typedef struct _EaExpanderClass EaExpanderClass; + +struct _EaExpander { + GtkAccessible object; +}; + +struct _EaExpanderClass { + GtkAccessibleClass parent_class; +}; + +/* Standard Glib function */ +GType ea_expander_get_type (void); +AtkObject* ea_expander_new (GtkWidget *expander); + +#endif /* ! _EA_EXPANDER_H */_ diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c index 372783b92d..fb7ee0f075 100644 --- a/a11y/widgets/ea-widgets.c +++ b/a11y/widgets/ea-widgets.c @@ -26,10 +26,12 @@ #include "ea-factory.h" #include "widgets/ea-calendar-item.h" #include "widgets/ea-combo-button.h" +#include "widgets/ea-expander.h" #include "ea-widgets.h" EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_ITEM, ea_calendar_item, ea_calendar_item_new) EA_FACTORY (EA_TYPE_COMBO_BUTTON, ea_combo_button, ea_combo_button_new) +EA_FACTORY (EA_TYPE_EXPANDER, ea_expander, ea_expander_new) void e_calendar_item_a11y_init (void) { @@ -40,3 +42,8 @@ void e_combo_button_a11y_init (void) { EA_SET_FACTORY (e_combo_button_get_type (), ea_combo_button); } + +void e_expander_a11y_init (void) +{ + EA_SET_FACTORY (e_expander_get_type (), ea_expander); +} diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h index fc8e7f1b90..27098d8b16 100644 --- a/a11y/widgets/ea-widgets.h +++ b/a11y/widgets/ea-widgets.h @@ -31,5 +31,6 @@ void e_calendar_item_a11y_init (void); void e_combo_button_a11y_init (void); +void e_expander_a11y_init (void); #endif /* _EA_WIDGETS_H__ */ |