From bf0be373898c44e6e9898aeac5813704fca7889e Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 7 Jan 2010 09:27:01 -0600 Subject: Checkmark support --- example/simple-client.c | 2 +- src/libappindicator/app-indicator.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/example/simple-client.c b/example/simple-client.c index ea4da9d..850ef18 100644 --- a/example/simple-client.c +++ b/example/simple-client.c @@ -58,7 +58,7 @@ main (int argc, char ** argv) G_CALLBACK (item_clicked_cb), "1"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - item = gtk_menu_item_new_with_label ("2"); + item = gtk_check_menu_item_new_with_label ("2"); g_signal_connect (item, "activate", G_CALLBACK (item_clicked_cb), "2"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index bb68cb2..8e03e07 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -686,15 +686,29 @@ container_iterate (GtkWidget *widget, if (GTK_IS_SEPARATOR_MENU_ITEM (widget)) { + label = gtk_menu_item_get_label (GTK_MENU_ITEM (widget)); + dbusmenu_menuitem_property_set (child, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); } else { - label = gtk_menu_item_get_label (GTK_MENU_ITEM (widget)); + if (GTK_IS_CHECK_MENU_ITEM (widget)) + { + label = gtk_menu_item_get_label (GTK_MENU_ITEM (widget)); + + dbusmenu_menuitem_property_set (child, + "type", + DBUSMENU_MENUITEM_TOGGLE_CHECK); - if (GTK_IS_IMAGE_MENU_ITEM (widget)) + dbusmenu_menuitem_property_set (child, + DBUSMENU_MENUITEM_PROP_LABEL, + label); + + label_set = TRUE; + } + else if (GTK_IS_IMAGE_MENU_ITEM (widget)) { GtkWidget *image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (widget)); -- cgit v1.2.3 From 6bde6a4be29ba003b483b9db76226a95419ce115 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 7 Jan 2010 10:26:42 -0600 Subject: More checkbox related updates. --- src/libappindicator/app-indicator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 8e03e07..ee3fd7c 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -686,8 +686,6 @@ container_iterate (GtkWidget *widget, if (GTK_IS_SEPARATOR_MENU_ITEM (widget)) { - label = gtk_menu_item_get_label (GTK_MENU_ITEM (widget)); - dbusmenu_menuitem_property_set (child, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); @@ -699,13 +697,17 @@ container_iterate (GtkWidget *widget, label = gtk_menu_item_get_label (GTK_MENU_ITEM (widget)); dbusmenu_menuitem_property_set (child, - "type", + DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, DBUSMENU_MENUITEM_TOGGLE_CHECK); dbusmenu_menuitem_property_set (child, DBUSMENU_MENUITEM_PROP_LABEL, label); + dbusmenu_menuitem_property_set (child, + DBUSMENU_MENUITEM_PROP_TOGGLE_CHECKED, + "checked"); + label_set = TRUE; } else if (GTK_IS_IMAGE_MENU_ITEM (widget)) -- cgit v1.2.3 From a60f25e5ca657a7c781bed90fd67020c7caa2320 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 7 Jan 2010 13:01:01 -0600 Subject: Toggle events --- example/simple-client.c | 4 ++-- src/libappindicator/app-indicator.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/example/simple-client.c b/example/simple-client.c index 850ef18..8ce9fba 100644 --- a/example/simple-client.c +++ b/example/simple-client.c @@ -53,12 +53,12 @@ main (int argc, char ** argv) app_indicator_set_attention_icon(ci, "indicator-messages-new"); menu = gtk_menu_new (); - GtkWidget *item = gtk_menu_item_new_with_label ("1"); + GtkWidget *item = gtk_check_menu_item_new_with_label ("1"); g_signal_connect (item, "activate", G_CALLBACK (item_clicked_cb), "1"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - item = gtk_check_menu_item_new_with_label ("2"); + item = gtk_radio_menu_item_new_with_label (NULL, "2"); g_signal_connect (item, "activate", G_CALLBACK (item_clicked_cb), "2"); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index ee3fd7c..ec598db 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -659,6 +659,14 @@ activate_menuitem (DbusmenuMenuitem *mi, gpointer user_data) gtk_menu_item_activate (GTK_MENU_ITEM (widget)); } +static void +widget_toggled (GtkWidget *widget, DbusmenuMenuitem *mi) +{ + dbusmenu_menuitem_property_set (mi, + DBUSMENU_MENUITEM_PROP_TOGGLE_CHECKED, + gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); +} + static void menuitem_iterate (GtkWidget *widget, gpointer data) @@ -694,21 +702,29 @@ container_iterate (GtkWidget *widget, { if (GTK_IS_CHECK_MENU_ITEM (widget)) { + GtkCheckMenuItem *check; + + check = GTK_CHECK_MENU_ITEM (widget); label = gtk_menu_item_get_label (GTK_MENU_ITEM (widget)); dbusmenu_menuitem_property_set (child, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, - DBUSMENU_MENUITEM_TOGGLE_CHECK); + GTK_IS_RADIO_MENU_ITEM (widget) ? DBUSMENU_MENUITEM_TOGGLE_RADIO : DBUSMENU_MENUITEM_TOGGLE_CHECK); dbusmenu_menuitem_property_set (child, DBUSMENU_MENUITEM_PROP_LABEL, label); + label_set = TRUE; + dbusmenu_menuitem_property_set (child, DBUSMENU_MENUITEM_PROP_TOGGLE_CHECKED, - "checked"); + gtk_check_menu_item_get_active (check) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); - label_set = TRUE; + g_signal_connect (widget, + "toggled", + G_CALLBACK (widget_toggled), + child); } else if (GTK_IS_IMAGE_MENU_ITEM (widget)) { -- cgit v1.2.3