aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--e-util/ChangeLog9
-rw-r--r--e-util/e-popup.c56
-rw-r--r--e-util/e-popup.h8
3 files changed, 52 insertions, 21 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index e003553d5a..e4165eba04 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-06 Not Zed <NotZed@Ximian.com>
+
+ * e-popup.c (e_popup_create_menu): only take one mask parameter,
+ and implement EPopupItem->enable to do what the other mask did.
+ (ep_activate): if this is a toggle or radiobutton, set the active
+ state on the item->type.
+ (e_popup_create_menu): if a menu image starts with gtk-, then
+ assume it is a gtk stock image instead.
+
2004-08-27 Not Zed <NotZed@Ximian.com>
* e-passwords.c (e_passwords_ask_password): return cancelled if
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index c8d7f79ce0..25a3a0bdc8 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -254,7 +254,22 @@ ep_cmp(const void *ap, const void *bp)
static void
ep_activate(GtkWidget *w, struct _item_node *inode)
{
- inode->item->activate(inode->menu->popup, inode->item, inode->menu->data);
+ EPopupItem *item = inode->item;
+ guint32 type = item->type & E_POPUP_TYPE_MASK;
+
+ /* this is a bit hackish, use the item->type to transmit the
+ active state, presumes we can write to this memory ... The
+ alternative is the EMenu idea of different callbacks, but
+ thats painful for breaking type-safety on callbacks */
+
+ if (type == E_POPUP_TOGGLE || type == E_POPUP_RADIO) {
+ if (gtk_check_menu_item_get_active((GtkCheckMenuItem *)w))
+ item->type |= E_POPUP_ACTIVE;
+ else
+ item->type &= ~E_POPUP_ACTIVE;
+ }
+
+ item->activate(inode->menu->popup, item, inode->menu->data);
}
/**
@@ -262,18 +277,18 @@ ep_activate(GtkWidget *w, struct _item_node *inode)
* @emp: An EPopup derived object.
* @target: popup target, if set, then factories will be invoked.
* This is then owned by the menu.
- * @hide_mask: used to hide menu items, not sure of it's utility,
- * since you could just 'not add them' in the first place. Saves
- * copying logic anyway.
- * @disable_mask: used to disable menu items.
+ * @mask: If supplied, overrides the target specified mask or provides
+ * a mask if no target is supplied. Used to enable or show menu
+ * items.
*
* All of the menu items registered on @emp are sorted by path, and
* then converted into a menu heirarchy.
*
+ *
* Return value: A GtkMenu which can be popped up when ready.
**/
GtkMenu *
-e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 hide_mask, guint32 disable_mask)
+e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 mask)
{
struct _EPopupPrivate *p = emp->priv;
struct _menu_node *mnode, *nnode;
@@ -288,6 +303,9 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 hide_mask, guint3
emp->target = target;
ep_add_static_items(emp);
+ if (target && mask == 0)
+ mask = target->mask;
+
/* FIXME: need to override old ones with new names */
mnode = (struct _menu_node *)p->menus.head;
nnode = mnode->next;
@@ -320,9 +338,9 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 hide_mask, guint3
/* for bar's, the mask is exclusive or */
if (item->visible) {
if ((item->type & E_POPUP_TYPE_MASK) == E_POPUP_BAR) {
- if ((item->visible & hide_mask) == item->visible)
+ if ((item->visible & mask) == item->visible)
continue;
- } else if (item->visible & hide_mask)
+ } else if (item->visible & mask)
continue;
}
@@ -341,10 +359,15 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 hide_mask, guint3
if (item->image) {
GdkPixbuf *pixbuf;
GtkWidget *image;
-
- pixbuf = e_icon_factory_get_icon ((char *)item->image, E_ICON_SIZE_MENU);
- image = gtk_image_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
+
+ /* work-around e-icon-factory not doing GTK_STOCK stuff */
+ if (strncmp((char *)item->image, "gtk-", 4) == 0) {
+ image = gtk_image_new_from_stock((char *)item->image, GTK_ICON_SIZE_MENU);
+ } else {
+ pixbuf = e_icon_factory_get_icon((char *)item->image, E_ICON_SIZE_MENU);
+ image = gtk_image_new_from_pixbuf(pixbuf);
+ g_object_unref(pixbuf);
+ }
gtk_widget_show(image);
menuitem = (GtkMenuItem *)gtk_image_menu_item_new();
@@ -394,7 +417,7 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 hide_mask, guint3
gtk_menu_shell_append((GtkMenuShell *)thismenu, (GtkWidget *)menuitem);
- if (item->visible & disable_mask)
+ if (item->enable & mask)
gtk_widget_set_sensitive((GtkWidget *)menuitem, FALSE);
gtk_widget_show((GtkWidget *)menuitem);
@@ -425,8 +448,7 @@ ep_popup_done(GtkWidget *w, EPopup *emp)
* considered a valid pointer.
* @target: If set, the target of the selection. Static menu
* items will be added. The target will be freed once complete.
- * @hide_mask:
- * @disable_mask:
+ * @mask: Enable/disable and visibility mask.
*
* Like popup_create_menu, but automatically sets up the menu
* so that it is destroyed once a selection takes place, and
@@ -436,11 +458,11 @@ ep_popup_done(GtkWidget *w, EPopup *emp)
* Return value: A menu, to popup.
**/
GtkMenu *
-e_popup_create_menu_once(EPopup *emp, EPopupTarget *target, guint32 hide_mask, guint32 disable_mask)
+e_popup_create_menu_once(EPopup *emp, EPopupTarget *target, guint32 mask)
{
GtkMenu *menu;
- menu = e_popup_create_menu(emp, target, hide_mask, disable_mask);
+ menu = e_popup_create_menu(emp, target, mask);
g_signal_connect(menu, "selection_done", G_CALLBACK(ep_popup_done), emp);
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 70729f211e..dca73d79b7 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -115,8 +115,8 @@ struct _EPopupItem {
EPopupActivateFunc activate;
void *user_data; /* user data, not passed directly to @activate */
void *image; /* char* for item type, GtkWidget * for image type */
- guint32 visible; /* visibility mask */
- guint32 enable; /* sensitivity mask, unimplemented */
+ guint32 visible; /* visibility mask */
+ guint32 enable; /* sensitivity mask */
};
/**
@@ -202,8 +202,8 @@ void e_popup_add_items(EPopup *, GSList *items, EPopupItemsFunc freefunc, void *
void e_popup_add_static_items(EPopup *emp, EPopupTarget *target);
/* do not call e_popup_create_menu, it can leak structures if not used right */
-struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 hide_mask, guint32 disable_mask);
-struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 hide_mask, guint32 disable_mask);
+struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask);
+struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask);
void *e_popup_target_new(EPopup *, int type, size_t size);
void e_popup_target_free(EPopup *, void *);
generated by cgit (git 2.34.1) at 2024-12-25 23:46:02 +0800