merge lp:~charlesk/ido/switch to add GtkSwitchMenuItem

6 files changed, 199 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index e69de29..a3995c7 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,2 @@
+12.10.0:
+ * new widget IdoSwitchMenuItem
diff --git a/configure.ac b/configure.ac
index 6e350b9..0ef71bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 #
 # shamelessly stolen from clutter-gtk
 #
-m4_define([ido_major_version], [0])
-m4_define([ido_minor_version], [3])
-m4_define([ido_micro_version], [4])
+m4_define([ido_major_version], [12])
+m4_define([ido_minor_version], [10])
+m4_define([ido_micro_version], [0])
 
 m4_define([ido_api_version],
           [ido_major_version.ido_minor_version])
@@ -78,6 +78,8 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
+GLIB_REQUIRED_VERSION=2.32.0
+
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
     [Which version of gtk to use @<:@default=3@:>@])],
@@ -86,9 +88,11 @@ AC_ARG_WITH([gtk],
 AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
 
 if test "x$with_gtk" = "x2"; then
-  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.19.7)
+  PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.19.7
+                          glib-2.0 >= GLIB_REQUIRED_VERSION])
 else
-  PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.0)
+  PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0
+                          glib-2.0 >= GLIB_REQUIRED_VERSION])
   AC_DEFINE_UNQUOTED(USE_GTK3, , [Use GTK3])
 fi
 AC_SUBST(GTK_CFLAGS)
diff --git a/example/menus.c b/example/menus.c
index b563eaf..12a2284 100644
--- a/example/menus.c
+++ b/example/menus.c
@@ -3,6 +3,7 @@
 #include "idoscalemenuitem.h"
 #include "idocalendarmenuitem.h"
 #include "idoentrymenuitem.h"
+#include "idoswitchmenuitem.h"
 #include "config.h"
 
 static void
@@ -27,6 +28,7 @@ main (int argc, char *argv[])
   GtkWidget *root;
   GtkWidget *menubar;
   GtkWidget *image;
+  GtkWidget *label;
 
   g_unsetenv ("UBUNTU_MENUPROXY");
 
@@ -76,6 +78,12 @@ main (int argc, char *argv[])
   menuitem = ido_entry_menu_item_new ();
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
+  menuitem = ido_switch_menu_item_new ();
+  label = gtk_label_new ("This is a switch");
+  gtk_widget_show(label);
+  gtk_container_add (ido_switch_menu_item_get_content_area(IDO_SWITCH_MENU_ITEM(menuitem)), label);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
   menuitem = ido_calendar_menu_item_new ();
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b849bf5..6ddebb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,7 @@ sources_h =				\
 	idomessagedialog.h		\
 	idorange.h			\
 	idoscalemenuitem.h		\
+	idoswitchmenuitem.h		\
 	idotimeline.h			\
 	libido.h 
 
@@ -67,6 +68,7 @@ libido_0_1_la_SOURCES =			\
 	idomessagedialog.c		\
 	idorange.c			\
 	idoscalemenuitem.c		\
+	idoswitchmenuitem.c		\
 	idotimeline.c                   
 
 libido3_0_1_la_SOURCES = $(libido_0_1_la_SOURCES)
@@ -79,6 +81,7 @@ libidoinclude_HEADERS =			\
 	idomessagedialog.h		\
 	idorange.h			\
 	idoscalemenuitem.h		\
+	idoswitchmenuitem.h		\
 	idotimeline.h			\
 	libido.h
 
diff --git a/src/idoswitchmenuitem.c b/src/idoswitchmenuitem.c
new file mode 100644
index 0000000..3831336
--- /dev/null
+++ b/src/idoswitchmenuitem.c
@@ -0,0 +1,120 @@
+/*
+ * A GtkCheckMenuItem that uses a GtkSwitch to show its 'active' property
+ *
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include "config.h"
+
+#include "idoswitchmenuitem.h"
+
+static gboolean ido_switch_menu_button_release_event (GtkWidget      * widget,
+                                                      GdkEventButton * event);
+
+
+struct _IdoSwitchMenuItemPrivate
+{
+  GtkWidget * box;
+  GtkWidget * content_area;
+  GtkWidget * switch_w;
+};
+
+/***
+****  Life Cycle
+***/
+
+G_DEFINE_TYPE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM)
+
+static void
+ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass)
+{
+  GObjectClass * gobject_class;
+  GtkWidgetClass * widget_class;
+  GtkCheckMenuItemClass * check_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  g_type_class_add_private (gobject_class, sizeof (IdoSwitchMenuItemPrivate));
+
+  widget_class = GTK_WIDGET_CLASS (klass);
+  widget_class->button_release_event = ido_switch_menu_button_release_event;
+
+  check_class = GTK_CHECK_MENU_ITEM_CLASS (klass);
+  check_class->draw_indicator = NULL;
+}
+
+static void
+ido_switch_menu_item_init (IdoSwitchMenuItem *item)
+{
+  IdoSwitchMenuItemPrivate *priv;
+
+  priv = item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItemPrivate);
+  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  priv->content_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  priv->switch_w = gtk_switch_new ();
+
+  gtk_box_pack_start (GTK_BOX (priv->box), priv->content_area, TRUE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (priv->box), priv->switch_w, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (item), priv->box);
+  gtk_widget_show_all (priv->box);
+
+  g_object_bind_property (item, "active",
+                          priv->switch_w, "active",
+                          G_BINDING_SYNC_CREATE);
+}
+
+/***
+**** Don't popdown the menu immediately after clicking on a switch...
+**** wait a moment so the user can see the GtkSwitch be toggled.
+***/
+
+static gboolean
+popdown_later_cb (gpointer widget)
+{
+  GtkWidget * parent = gtk_widget_get_parent (widget);
+  if (GTK_IS_MENU (parent))
+    {
+      gtk_menu_shell_deactivate (GTK_MENU_SHELL(parent));
+    }
+  g_object_unref (widget);
+  return FALSE; /* only call this cb once */
+}
+
+static gboolean
+ido_switch_menu_button_release_event (GtkWidget * widget, GdkEventButton * event)
+{
+  gtk_menu_item_activate (GTK_MENU_ITEM(widget));
+  g_timeout_add (500, popdown_later_cb, g_object_ref(widget));
+  return TRUE; /* stop the event so that it doesn't trigger popdown() */
+}
+
+/***
+**** Public API
+***/
+
+GtkWidget *
+ido_switch_menu_item_new (void)
+{
+  return g_object_new (IDO_TYPE_SWITCH_MENU_ITEM, NULL);
+}
+
+GtkContainer *
+ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item)
+{
+  g_return_val_if_fail (IDO_IS_SWITCH_MENU_ITEM(item), NULL);
+
+  return GTK_CONTAINER (item->priv->content_area);
+}
diff --git a/src/idoswitchmenuitem.h b/src/idoswitchmenuitem.h
new file mode 100644
index 0000000..7e7e2d2
--- /dev/null
+++ b/src/idoswitchmenuitem.h
@@ -0,0 +1,57 @@
+/*
+ * A GtkCheckMenuItem that uses a GtkSwitch to show its 'active' property.
+ *
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef __IDO_SWITCH_MENU_ITEM_H__
+#define __IDO_SWITCH_MENU_ITEM_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define IDO_TYPE_SWITCH_MENU_ITEM         (ido_switch_menu_item_get_type ())
+#define IDO_SWITCH_MENU_ITEM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItem))
+#define IDO_SWITCH_MENU_ITEM_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItemClass))
+#define IDO_IS_SWITCH_MENU_ITEM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), IDO_TYPE_SWITCH_MENU_ITEM))
+#define IDO_IS_SWITCH_MENU_ITEM_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), IDO_TYPE_SWITCH_MENU_ITEM))
+#define IDO_SWITCH_MENU_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItemClass))
+
+typedef struct _IdoSwitchMenuItem        IdoSwitchMenuItem;
+typedef struct _IdoSwitchMenuItemClass   IdoSwitchMenuItemClass;
+typedef struct _IdoSwitchMenuItemPrivate IdoSwitchMenuItemPrivate;
+
+struct _IdoSwitchMenuItem
+{
+  GtkCheckMenuItem parent_instance;
+
+  IdoSwitchMenuItemPrivate *priv;
+};
+
+struct _IdoSwitchMenuItemClass
+{
+  GtkCheckMenuItemClass parent_class;
+};
+
+GType         ido_switch_menu_item_get_type         (void) G_GNUC_CONST;
+GtkWidget    *ido_switch_menu_item_new              (void);
+GtkContainer *ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item);
+
+G_END_DECLS
+
+#endif /* __IDO_SWITCH_MENU_ITEM_H__ */