diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-24 21:17:11 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-24 21:17:11 +0800 |
commit | 2ef1b5bf42b5d429e00f94710458f237d18315b2 (patch) | |
tree | fbeb4821b6190841688e5e52aa0a964d8db6b7ab /a11y | |
parent | fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e (diff) | |
download | gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.tar gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.tar.gz gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.tar.bz2 gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.tar.lz gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.tar.xz gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.tar.zst gsoc2013-evolution-2ef1b5bf42b5d429e00f94710458f237d18315b2.zip |
Progress update:
- Get the "New" button and menu working.
- Add a GtkMenuToolButton subclass called EMenuToolButton, which does
some behind-the-scenes stuff to make the "New" button work properly.
- Kill EComboButton and its associated a11y widget.
svn path=/branches/kill-bonobo/; revision=36045
Diffstat (limited to 'a11y')
-rw-r--r-- | a11y/widgets/Makefile.am | 2 | ||||
-rw-r--r-- | a11y/widgets/ea-combo-button.c | 169 | ||||
-rw-r--r-- | a11y/widgets/ea-combo-button.h | 35 | ||||
-rw-r--r-- | a11y/widgets/ea-widgets.c | 7 | ||||
-rw-r--r-- | a11y/widgets/ea-widgets.h | 1 |
5 files changed, 0 insertions, 214 deletions
diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am index e157f82188..e7d10dc516 100644 --- a/a11y/widgets/Makefile.am +++ b/a11y/widgets/Makefile.am @@ -20,8 +20,6 @@ libevolution_widgets_a11y_la_SOURCES = \ ea-calendar-item.h \ ea-calendar-cell.c \ ea-calendar-cell.h \ - ea-combo-button.c \ - ea-combo-button.h \ ea-expander.c \ ea-expander.h \ ea-widgets.c \ diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c deleted file mode 100644 index 9886cc4221..0000000000 --- a/a11y/widgets/ea-combo-button.c +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Authors: Harry Lu <harry.lu@sun.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - */ - -#include <config.h> -#include "ea-combo-button.h" -#include <gtk/gtk.h> -#include <glib/gi18n.h> - -static AtkObjectClass *parent_class; -static GType parent_type; - -/*Action IDs */ -enum { - ACTIVATE_DEFAULT, - POPUP_MENU, - LAST_ACTION -}; - -/* Static functions */ -static G_CONST_RETURN gchar* -ea_combo_button_get_name (AtkObject *a11y) -{ - GtkWidget *widget; - GtkWidget *label; - EComboButton *button; - - widget = GTK_ACCESSIBLE (a11y)->widget; - if (!widget) - return NULL; - - button = E_COMBO_BUTTON (widget); - label = e_combo_button_get_label (button); - if (label) - return gtk_label_get_text (GTK_LABEL (label)); - - return _("Combo Button"); -} - -/* Action interface */ -static G_CONST_RETURN gchar * -ea_combo_button_action_get_name (AtkAction *action, gint i) -{ - switch (i) - { - case ACTIVATE_DEFAULT: - return _("Activate Default"); - case POPUP_MENU: - return _("Popup Menu"); - default: - return NULL; - } -} - -static gboolean -ea_combo_button_do_action (AtkAction *action, - gint i) -{ - GtkWidget *widget; - EComboButton *button; - - widget = GTK_ACCESSIBLE (action)->widget; - if (!widget || !GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget)) - return FALSE; - - button = E_COMBO_BUTTON (widget); - - switch (i) - { - case ACTIVATE_DEFAULT: - g_signal_emit_by_name (button, "activate_default"); - return TRUE; - case POPUP_MENU: - return e_combo_button_popup_menu (button); - default: - return FALSE; - } -} - -static gint -ea_combo_button_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_combo_button_do_action; - iface->get_n_actions = ea_combo_button_get_n_actions; - iface->get_name = ea_combo_button_action_get_name; -} - -static void -ea_combo_button_class_init (EaComboButtonClass *klass) -{ - AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); - - parent_class = g_type_class_ref (parent_type); - - atk_object_class->get_name = ea_combo_button_get_name; -} - -static void -ea_combo_button_init (EaComboButton *a11y) -{ - /* Empty for now */ -} - -GType -ea_combo_button_get_type (void) -{ - static GType type = 0; - - if (!type) { - AtkObjectFactory *factory; - GTypeQuery query; - - GTypeInfo info = { - sizeof (EaComboButtonClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) ea_combo_button_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EaComboButton), - 0, - (GInstanceInitFunc) ea_combo_button_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_BUTTON); - 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, "EaComboButton", &info, 0); - g_type_add_interface_static (type, ATK_TYPE_ACTION, - &atk_action_info); - - } - - return type; -} - -AtkObject * -ea_combo_button_new (GtkWidget *widget) -{ - EaComboButton *a11y; - - a11y = g_object_new (ea_combo_button_get_type (), NULL); - - GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget); - ATK_OBJECT (a11y)->role = ATK_ROLE_PUSH_BUTTON; - - return ATK_OBJECT (a11y); -} diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h deleted file mode 100644 index 339c697e4a..0000000000 --- a/a11y/widgets/ea-combo-button.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Authors: Harry Lu <harry.lu@sun.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - */ - -#ifndef __EA_COMBO_BUTTON_H_ -#define __EA_COMBO_BUTTON_H_ - -#include <gtk/gtk.h> -#include <misc/e-combo-button.h> - -#define EA_TYPE_COMBO_BUTTON (ea_combo_button_get_type ()) -#define EA_COMBO_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_COMBO_BUTTON, EaComboButton)) -#define EA_COMBO_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_COMBO_BUTTON, EaComboButtonClass)) -#define EA_IS_COMBO_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_COMBO_BUTTON)) -#define EA_IS_COMBO_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_COMBO_BUTTON)) - -typedef struct _EaComboButton EaComboButton; -typedef struct _EaComboButtonClass EaComboButtonClass; - -struct _EaComboButton { - GtkAccessible object; -}; - -struct _EaComboButtonClass { - GtkAccessibleClass parent_class; -}; - - -/* Standard Glib function */ -GType ea_combo_button_get_type (void); -AtkObject *ea_combo_button_new (GtkWidget *combo_button); - -#endif /* ! __EA_COMBO_BUTTON_H_ */ diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c index 6949afb7d0..9143492adc 100644 --- a/a11y/widgets/ea-widgets.c +++ b/a11y/widgets/ea-widgets.c @@ -25,12 +25,10 @@ #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) @@ -38,11 +36,6 @@ void e_calendar_item_a11y_init (void) EA_SET_FACTORY (e_calendar_item_get_type (), ea_calendar_item); } -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 877da03051..7b8b3d8513 100644 --- a/a11y/widgets/ea-widgets.h +++ b/a11y/widgets/ea-widgets.h @@ -30,7 +30,6 @@ #define _EA_WIDGETS_H__ void e_calendar_item_a11y_init (void); -void e_combo_button_a11y_init (void); void e_expander_a11y_init (void); #endif /* _EA_WIDGETS_H__ */ |