# HG changeset patch # User Gary Kramlich # Date 1126927430 0 # Node ID 5c8210f7cbe257f22150194b994c35c9d8f6c03e # Parent 11d30825c1bb78eec61160557a7b384e2a94e191 [gaim-migrate @ 13813] Here is my menu tray widget. It needs a bit of work yet and is only capable of displaying status information at the moment. Integration coming in my next commit... committer: Tailor Script diff -r 11d30825c1bb -r 5c8210f7cbe2 src/Makefile.am --- a/src/Makefile.am Sat Sep 17 03:00:12 2005 +0000 +++ b/src/Makefile.am Sat Sep 17 03:23:50 2005 +0000 @@ -257,6 +257,7 @@ gtkimhtmltoolbar.c \ gtklog.c \ gtkmain.c \ + gtkmenutray.c \ gtknotify.c \ gtkplugin.c \ gtkpluginpref.c \ @@ -300,6 +301,7 @@ gtkimhtml.h \ gtkimhtmltoolbar.h \ gtklog.h \ + gtkmenutray.h \ gtknotify.h \ gtkplugin.h \ gtkpluginpref.h \ diff -r 11d30825c1bb -r 5c8210f7cbe2 src/Makefile.mingw --- a/src/Makefile.mingw Sat Sep 17 03:00:12 2005 +0000 +++ b/src/Makefile.mingw Sat Sep 17 03:23:50 2005 +0000 @@ -105,6 +105,7 @@ gtkimhtmltoolbar.c \ gtklog.c \ gtkmain.c \ + gtkmenutray.c \ gtknotify.c \ gtkplugin.c \ gtkpluginpref.c \ diff -r 11d30825c1bb -r 5c8210f7cbe2 src/gtkmenutray.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gtkmenutray.c Sat Sep 17 03:23:50 2005 +0000 @@ -0,0 +1,204 @@ +/* + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ +#include "gtkmenutray.h" + +#define GAIM_GTK_MENU_TRAY_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTrayPriv)) + +/****************************************************************************** + * Structs + *****************************************************************************/ +typedef struct { + GtkWidget *tray; +} GaimGtkMenuTrayPriv; + +/****************************************************************************** + * Enums + *****************************************************************************/ +enum { + PROP_ZERO = 0, + PROP_BOX +}; + +/****************************************************************************** + * Globals + *****************************************************************************/ +static GObjectClass *parent_class = NULL; + +/****************************************************************************** + * Internal Stuff + *****************************************************************************/ + +/****************************************************************************** + * Item Stuff + *****************************************************************************/ +static void +gaim_gtk_menu_tray_select(GtkItem *item) { + /* this may look like nothing, but it's really overriding the + * GtkMenuItem's select function so that it doesn't get highlighted like + * a normal menu item would. + */ +} + +static void +gaim_gtk_menu_tray_deselect(GtkItem *item) { + /* Probably not necessary, but I'd rather be safe than sorry. We're + * overridding the select, so it makes sense to override deselect as well. + */ +} + +/****************************************************************************** + * Widget Stuff + *****************************************************************************/ + +/****************************************************************************** + * Object Stuff + *****************************************************************************/ +static void +gaim_gtk_menu_tray_get_property(GObject *obj, guint param_id, GValue *value, + GParamSpec *pspec) +{ + GaimGtkMenuTray *menu_tray = GAIM_GTK_MENU_TRAY(obj); + + switch(param_id) { + case PROP_BOX: + g_value_set_object(value, gaim_gtk_menu_tray_get_box(menu_tray)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec); + break; + } +} + +static void +gaim_gtk_menu_tray_finalize(GObject *obj) { + GaimGtkMenuTrayPriv *priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(obj); + + if(GTK_IS_WIDGET(priv->tray)) + gtk_widget_destroy(GTK_WIDGET(priv->tray)); + + G_OBJECT_CLASS(parent_class)->finalize(obj); +} + +static void +gaim_gtk_menu_tray_class_init(GaimGtkMenuTrayClass *klass) { + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkItemClass *item_class = GTK_ITEM_CLASS(klass); + GParamSpec *pspec; + + parent_class = g_type_class_peek_parent(klass); + + object_class->finalize = gaim_gtk_menu_tray_finalize; + object_class->get_property = gaim_gtk_menu_tray_get_property; + + item_class->select = gaim_gtk_menu_tray_select; + item_class->deselect = gaim_gtk_menu_tray_deselect; + + g_type_class_add_private(klass, sizeof(GaimGtkMenuTrayPriv)); + + pspec = g_param_spec_object("box", "The box", + "The box", + GTK_TYPE_BOX, + G_PARAM_READABLE); + g_object_class_install_property(object_class, PROP_BOX, pspec); +} + +static void +gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { + GaimGtkMenuTrayPriv *priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); + + gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); + + if(!GTK_IS_WIDGET(priv->tray)) + priv->tray = gtk_hbox_new(FALSE, 0); + + gtk_container_add(GTK_CONTAINER(menu_tray), priv->tray); + + gtk_widget_show(priv->tray); +} + +/****************************************************************************** + * API + *****************************************************************************/ +GType +gaim_gtk_menu_tray_get_gtype(void) { + static GType type = 0; + + if(type == 0) { + static const GTypeInfo info = { + sizeof(GaimGtkMenuTrayClass), + NULL, + NULL, + (GClassInitFunc)gaim_gtk_menu_tray_class_init, + NULL, + NULL, + sizeof(GaimGtkMenuTray), + 0, + (GInstanceInitFunc)gaim_gtk_menu_tray_init, + NULL + }; + + type = g_type_register_static(GTK_TYPE_MENU_ITEM, + "GaimGtkMenuTray", + &info, 0); + } + + return type; +} + +GtkWidget * +gaim_gtk_menu_tray_new() { + return g_object_new(GAIM_GTK_TYPE_MENU_TRAY, NULL); +} + +GtkWidget * +gaim_gtk_menu_tray_get_box(GaimGtkMenuTray *menu_tray) { + GaimGtkMenuTrayPriv *priv; + + g_return_val_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray), NULL); + + priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); + + return priv->tray; +} + +void +gaim_gtk_menu_tray_append(GaimGtkMenuTray *menu_tray, GtkWidget *widget) { + GaimGtkMenuTrayPriv *priv; + + g_return_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray)); + g_return_if_fail(GTK_IS_WIDGET(widget)); + + priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); + + gtk_box_pack_end(GTK_BOX(priv->tray), widget, FALSE, FALSE, 0); +} + +void +gaim_gtk_menu_tray_prepend(GaimGtkMenuTray *menu_tray, GtkWidget *widget) { + GaimGtkMenuTrayPriv *priv; + + g_return_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray)); + g_return_if_fail(GTK_IS_WIDGET(widget)); + + priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); + + gtk_box_pack_start(GTK_BOX(priv->tray), widget, FALSE, FALSE, 0); +} diff -r 11d30825c1bb -r 5c8210f7cbe2 src/gtkmenutray.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gtkmenutray.h Sat Sep 17 03:23:50 2005 +0000 @@ -0,0 +1,93 @@ +/** + * @file gtkmenutray.h GTK+ Tray menu item + * @ingroup gtkui + * + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ +#ifndef GAIM_GTK_MENU_TRAY_H +#define GAIM_GTK_MENU_TRAY_H + +#include +#include + +#define GAIM_GTK_TYPE_MENU_TRAY (gaim_gtk_menu_tray_get_gtype()) +#define GAIM_GTK_MENU_TRAY(obj) (GTK_CHECK_CAST((obj), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTray)) +#define GAIM_GTK_MENU_TRAY_CLASS(klass) (GTK_CHECK_CLASS_CAST((klass), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTrayClass)) +#define GAIM_GTK_IS_MENU_TRAY(obj) (GTK_CHECK_TYPE((obj), GAIM_GTK_TYPE_MENU_TRAY)) +#define GAIM_GTK_IS_MENU_TRAY_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GAIM_GTK_TYPE_MENU_TRAY)) +#define GAIM_GTK_MENU_TRAY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTrayClass)) + +typedef struct _GaimGtkMenuTray GaimGtkMenuTray; +typedef struct _GaimGtkMenuTrayClass GaimGtkMenuTrayClass; + +/** A GaimGtkMenuTray */ +struct _GaimGtkMenuTray { + GtkMenuItem gparent; /**< The parent instance */ +}; + +/** A GaimGtkMenuTrayClass */ +struct _GaimGtkMenuTrayClass { + GtkMenuItemClass gparent; /**< The parent class */ +}; + +G_BEGIN_DECLS + +/** + * Registers the GaimGtkMenuTray class if necessary and returns the + * type ID assigned to it. + * + * @return The GaimGtkMenuTray type ID + */ +GType gaim_gtk_menu_tray_get_gtype(void); + +/** + * Creates a new GaimGtkMenuTray + * + * @return A new GaimGtkMenuTray + */ +GtkWidget *gaim_gtk_menu_tray_new(); + +/** + * Gets the box for the GaimGtkMenuTray + * + * @param menu_tray The GaimGtkMenuTray + * + * @return The box that this menu tray is using + */ +GtkWidget *gaim_gtk_menu_tray_get_box(GaimGtkMenuTray *menu_tray); + +/** + * Appends a widget into the tray + * + * @param menu_tray The tray + * @param widget The widget + */ +void gaim_gtk_menu_tray_append(GaimGtkMenuTray *menu_tray, GtkWidget *widget); + +/** + * Prepends a widget into the tray + * + * @param menu_tray The try + * @param widget The widget + */ +void gaim_gtk_menu_tray_prepend(GaimGtkMenuTray *menu_tray, GtkWidget *widget); + +G_END_DECLS + +#endif /* GAIM_GTK_MENU_TRAY_H */