Merge lp:~larsu/ido/basic-menu-item into lp:ido/14.04

[Lars Karlitski]

expose idobasicmenuitem, a normal menu item that supports non-square icons

expose idobasicmenuitem, a normal menu item that supports non-square icons

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/ido-ci/60/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-trusty-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

thanks, as the CI pointed you need to update debian/libido3-0.1-0.symbols, add it this line
"ido_basic_menu_item_new_from_model@Base 0replaceme"

review: Needs Fixing

[lp:~larsu/ido/basic-menu-item]

179. By Lars Karlitski on 2014-03-27

idobasicmenuitem: add symbol for _new_from_model()

[Lars Karlitski (larsu)]

Of course, thanks.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/ido-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-trusty-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/61/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

This works for the current use cases, but I'm not comfortable with the new assumption that every GIcon has a filename. Could you handle the case where _get_filename() returns NULL?

review: Needs Fixing

[lp:~larsu/ido/basic-menu-item]

180. By Lars Karlitski on 2014-03-28

idobasicmenuitem: check return value of gtk_icon_info_get_filename() for NULL

[Lars Karlitski (larsu)]

According to the docs, that function seems to only return NULL when GTK_ICON_LOOKUP_USE_BUILTIN was passed to gtk_icon_theme_lookup_by_gicon(). However, I couldn't bother to find out what it does in the icon-not-found case and having the check doesn't hurt, so I've added it in r180.

Thanks for the catch!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/ido-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ido-trusty-armhf-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/62/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Thanks Lars!

review: Approve

=== modified file 'debian/libido3-0.1-0.symbols'
--- debian/libido3-0.1-0.symbols	2013-11-05 11:01:43 +0000
+++ debian/libido3-0.1-0.symbols	2014-03-28 10:27:56 +0000
@@ -16,6 +16,7 @@
  ido_basic_menu_item_set_icon_from_file@Base 13.10.0+13.10.20130731
  ido_basic_menu_item_set_secondary_text@Base 13.10.0+13.10.20130731
  ido_basic_menu_item_set_text@Base 13.10.0+13.10.20130731
+ ido_basic_menu_item_new_from_model@Base 0replaceme
  ido_calendar_menu_item_clear_marks@Base 0.2.1
  ido_calendar_menu_item_get_calendar@Base 0.1.10
  ido_calendar_menu_item_get_date@Base 0.2.1

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-01-07 18:57:50 +0000
+++ src/Makefile.am	2014-03-28 10:27:56 +0000
@@ -21,6 +21,7 @@
 	idousermenuitem.h		\
 	idoappointmentmenuitem.h	\
 	idobasicmenuitem.h		\
+	idoprogressmenuitem.h		\
 	idotimestampmenuitem.h		\
 	idolocationmenuitem.h		\
 	idotimeline.h			\
@@ -88,6 +89,7 @@
 	idoplaybackmenuitem.c		\
 	idoappointmentmenuitem.c	\
 	idobasicmenuitem.c		\
+	idoprogressmenuitem.c		\
 	idotimestampmenuitem.c		\
 	idolocationmenuitem.c		\
 	idoapplicationmenuitem.c	\

=== modified file 'src/idobasicmenuitem.c'
--- src/idobasicmenuitem.c	2013-07-25 21:22:45 +0000
+++ src/idobasicmenuitem.c	2014-03-28 10:27:56 +0000
@@ -245,17 +245,35 @@
   if (p->icon != icon)
     {
       g_clear_object (&p->icon);
+      gtk_image_clear (GTK_IMAGE(p->image));
 
       if (icon == NULL)
         {
-          gtk_image_clear (GTK_IMAGE(p->image));
           gtk_widget_set_visible (p->image, FALSE);
         }
       else
         {
+          GtkIconInfo *info;
+          const gchar *filename;
+
           p->icon = g_object_ref (icon);
-          gtk_image_set_from_gicon (GTK_IMAGE(p->image), p->icon, GTK_ICON_SIZE_MENU);
-          gtk_widget_set_visible (p->image, TRUE);
+
+          info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), p->icon, 16, 0);
+          filename = gtk_icon_info_get_filename (info);
+
+          if (filename)
+            {
+              GdkPixbuf *pixbuf;
+
+              pixbuf = gdk_pixbuf_new_from_file_at_scale (filename, -1, 16, TRUE, NULL);
+              gtk_image_set_from_pixbuf (GTK_IMAGE(p->image), pixbuf);
+
+              g_object_unref (pixbuf);
+            }
+
+          gtk_widget_set_visible (p->image, filename != NULL);
+
+          g_object_unref (info);
         }
     }
 }
@@ -306,86 +324,61 @@
     }
 }
 
-/***
-****
-****  Progress Menu Item
-****
-***/
-
 static void
-on_progress_action_state_changed (IdoActionHelper * helper,
-                                  GVariant        * state,
-                                  gpointer          unused G_GNUC_UNUSED)
+ido_basic_menu_item_activate (GtkMenuItem *item,
+                              gpointer     user_data)
 {
-  IdoBasicMenuItem * ido_menu_item;
-  char * str;
-
-  ido_menu_item = IDO_BASIC_MENU_ITEM (ido_action_helper_get_widget (helper));
-
-  g_return_if_fail (ido_menu_item != NULL);
-  g_return_if_fail (g_variant_is_of_type (state, G_VARIANT_TYPE_UINT32));
-
-  str = g_strdup_printf ("%"G_GUINT32_FORMAT"%%", g_variant_get_uint32 (state));
-  ido_basic_menu_item_set_secondary_text (ido_menu_item, str);
-  g_free (str);
+  IdoActionHelper *helper = user_data;
+
+  ido_action_helper_activate (helper);
 }
 
-/**
- * ido_progress_menu_item_new_from_model:
- * @menu_item: the corresponding menuitem
- * @actions: action group to tell when this GtkMenuItem is activated
- *
- * Creates a new progress menuitem with properties initialized from
- * the menuitem's attributes.
- *
- * If the menuitem's 'action' attribute is set, trigger that action
- * in @actions when this IdoBasicMenuItem is activated.
- */
 GtkMenuItem *
-ido_progress_menu_item_new_from_model (GMenuItem    * menu_item,
-                                       GActionGroup * actions)
+ido_basic_menu_item_new_from_model (GMenuItem    * menu_item,
+                                    GActionGroup * actions)
 {
-  guint i;
-  guint n;
-  gchar * str;
-  IdoBasicMenuItem * ido_menu_item;
-  GParameter parameters[4];
-
-  /* create the ido menuitem */;
-
-  n = 0;
-
-  if (g_menu_item_get_attribute (menu_item, "label", "s", &str))
-    {
-      GParameter p = { "text", G_VALUE_INIT };
-      g_value_init (&p.value, G_TYPE_STRING);
-      g_value_take_string (&p.value, str);
-      parameters[n++] = p;
-    }
-
-  g_assert (n <= G_N_ELEMENTS (parameters));
-  ido_menu_item = g_object_newv (IDO_TYPE_BASIC_MENU_ITEM, n, parameters);
-
-  for (i=0; i<n; i++)
-    g_value_unset (&parameters[i].value);
-
-  /* give it an ActionHelper */
-
-  if (g_menu_item_get_attribute (menu_item, "action", "s", &str))
-    {
-      IdoActionHelper * helper;
-
-      helper = ido_action_helper_new (GTK_WIDGET(ido_menu_item),
-                                      actions,
-                                      str,
-                                      NULL);
-      g_signal_connect (helper, "action-state-changed",
-                        G_CALLBACK (on_progress_action_state_changed), NULL);
-      g_signal_connect_swapped (ido_menu_item, "destroy",
-                                G_CALLBACK (g_object_unref), helper);
-
-      g_free (str);
-    }
-
-  return GTK_MENU_ITEM (ido_menu_item);
+  GtkWidget *item;
+  gchar *label;
+  gchar *action;
+  GVariant *serialized_icon;
+
+  item = ido_basic_menu_item_new ();
+
+  if (g_menu_item_get_attribute (menu_item, "label", "s", &label))
+    {
+      ido_basic_menu_item_set_text (IDO_BASIC_MENU_ITEM (item), label);
+      g_free (label);
+    }
+
+  serialized_icon = g_menu_item_get_attribute_value (menu_item, "icon", NULL);
+  if (serialized_icon)
+    {
+      GIcon *icon;
+
+      icon = g_icon_deserialize (serialized_icon);
+      ido_basic_menu_item_set_icon (IDO_BASIC_MENU_ITEM (item), icon);
+
+      g_object_unref (icon);
+      g_variant_unref (serialized_icon);
+    }
+
+  if (g_menu_item_get_attribute (menu_item, "action", "s", &action))
+    {
+      IdoActionHelper *helper;
+      GVariant *target;
+
+      target = g_menu_item_get_attribute_value (menu_item, "target", NULL);
+
+      helper = ido_action_helper_new (item, actions, action, target);
+      g_signal_connect_object (item, "activate",
+                               G_CALLBACK (ido_basic_menu_item_activate), helper,
+                               0);
+      g_signal_connect_swapped (item, "destroy", G_CALLBACK (g_object_unref), helper);
+
+      if (target)
+        g_variant_unref (target);
+      g_free (action);
+    }
+
+  return GTK_MENU_ITEM (item);
 }

=== modified file 'src/idobasicmenuitem.h'
--- src/idobasicmenuitem.h	2013-07-25 20:51:57 +0000
+++ src/idobasicmenuitem.h	2014-03-28 10:27:56 +0000
@@ -64,13 +64,8 @@
 void ido_basic_menu_item_set_secondary_text      (IdoBasicMenuItem * self,
                                                   const char       * text);
 
-/**
-***
-**/
-
-GtkMenuItem * ido_progress_menu_item_new_from_model (GMenuItem    * menuitem,
-                                                     GActionGroup * actions);
-
+GtkMenuItem * ido_basic_menu_item_new_from_model (GMenuItem    * menuitem,
+                                                  GActionGroup * actions);
 
 G_END_DECLS
 

=== modified file 'src/idomenuitemfactory.c'
--- src/idomenuitemfactory.c	2013-10-22 15:38:57 +0000
+++ src/idomenuitemfactory.c	2014-03-28 10:27:56 +0000
@@ -32,6 +32,7 @@
 #include "idoapplicationmenuitem.h"
 #include "idosourcemenuitem.h"
 #include "idoswitchmenuitem.h"
+#include "idoprogressmenuitem.h"
 
 #define IDO_TYPE_MENU_ITEM_FACTORY         (ido_menu_item_factory_get_type ())
 #define IDO_MENU_ITEM_FACTORY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), IDO_TYPE_MENU_ITEM_FACTORY, IdoMenuItemFactory))
@@ -74,6 +75,9 @@
   else if (g_str_equal (type, "com.canonical.indicator.alarm"))
     item = ido_alarm_menu_item_new_from_model (menuitem, actions);
 
+  else if (g_str_equal (type, "com.canonical.indicator.basic"))
+    item = ido_basic_menu_item_new_from_model (menuitem, actions);
+
   else if (g_str_equal (type, "com.canonical.indicator.progress"))
     item = ido_progress_menu_item_new_from_model (menuitem, actions);
 

=== added file 'src/idoprogressmenuitem.c'
--- src/idoprogressmenuitem.c	1970-01-01 00:00:00 +0000
+++ src/idoprogressmenuitem.c	2014-03-28 10:27:56 +0000
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#include "idoprogressmenuitem.h"
+#include "idobasicmenuitem.h"
+#include "idoactionhelper.h"
+
+static void
+on_progress_action_state_changed (IdoActionHelper * helper,
+                                  GVariant        * state,
+                                  gpointer          unused G_GNUC_UNUSED)
+{
+  IdoBasicMenuItem * ido_menu_item;
+  char * str;
+
+  ido_menu_item = IDO_BASIC_MENU_ITEM (ido_action_helper_get_widget (helper));
+
+  g_return_if_fail (ido_menu_item != NULL);
+  g_return_if_fail (g_variant_is_of_type (state, G_VARIANT_TYPE_UINT32));
+
+  str = g_strdup_printf ("%"G_GUINT32_FORMAT"%%", g_variant_get_uint32 (state));
+  ido_basic_menu_item_set_secondary_text (ido_menu_item, str);
+  g_free (str);
+}
+
+/**
+ * ido_progress_menu_item_new_from_model:
+ * @menu_item: the corresponding menuitem
+ * @actions: action group to tell when this GtkMenuItem is activated
+ *
+ * Creates a new progress menuitem with properties initialized from
+ * the menuitem's attributes.
+ *
+ * If the menuitem's 'action' attribute is set, trigger that action
+ * in @actions when this IdoBasicMenuItem is activated.
+ */
+GtkMenuItem *
+ido_progress_menu_item_new_from_model (GMenuItem    * menu_item,
+                                       GActionGroup * actions)
+{
+  guint i;
+  guint n;
+  gchar * str;
+  IdoBasicMenuItem * ido_menu_item;
+  GParameter parameters[4];
+
+  /* create the ido menuitem */;
+
+  n = 0;
+
+  if (g_menu_item_get_attribute (menu_item, "label", "s", &str))
+    {
+      GParameter p = { "text", G_VALUE_INIT };
+      g_value_init (&p.value, G_TYPE_STRING);
+      g_value_take_string (&p.value, str);
+      parameters[n++] = p;
+    }
+
+  g_assert (n <= G_N_ELEMENTS (parameters));
+  ido_menu_item = g_object_newv (IDO_TYPE_BASIC_MENU_ITEM, n, parameters);
+
+  for (i=0; i<n; i++)
+    g_value_unset (&parameters[i].value);
+
+  /* give it an ActionHelper */
+
+  if (g_menu_item_get_attribute (menu_item, "action", "s", &str))
+    {
+      IdoActionHelper * helper;
+
+      helper = ido_action_helper_new (GTK_WIDGET(ido_menu_item),
+                                      actions,
+                                      str,
+                                      NULL);
+      g_signal_connect (helper, "action-state-changed",
+                        G_CALLBACK (on_progress_action_state_changed), NULL);
+      g_signal_connect_swapped (ido_menu_item, "destroy",
+                                G_CALLBACK (g_object_unref), helper);
+
+      g_free (str);
+    }
+
+  return GTK_MENU_ITEM (ido_menu_item);
+}
+

=== added file 'src/idoprogressmenuitem.h'
--- src/idoprogressmenuitem.h	1970-01-01 00:00:00 +0000
+++ src/idoprogressmenuitem.h	2014-03-28 10:27:56 +0000
@@ -0,0 +1,28 @@
+/**
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#ifndef __IDO_PROGRESS_MENU_ITEM_H__
+#define __IDO_PROGRESS_MENU_ITEM_H__
+
+#include <gtk/gtk.h>
+
+GtkMenuItem * ido_progress_menu_item_new_from_model (GMenuItem    * menuitem,
+                                                     GActionGroup * actions);
+
+#endif