aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-14 13:04:45 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-14 13:04:45 -0500
commit17c7bd1fdee7794a8c324263db5ad8a2d41fe51e (patch)
tree9f4ba977367f3b1cfaee6fde03170b95dccf93e9
parent9373536218102cb5d0e385d5ca736b5c6f88f65e (diff)
downloadayatana-ido-17c7bd1fdee7794a8c324263db5ad8a2d41fe51e.tar.gz
ayatana-ido-17c7bd1fdee7794a8c324263db5ad8a2d41fe51e.tar.bz2
ayatana-ido-17c7bd1fdee7794a8c324263db5ad8a2d41fe51e.zip
add calendar, location, and appointment menuitems to the IDO factory
-rw-r--r--src/Makefile.am4
-rw-r--r--src/idomenuitemfactory.c14
2 files changed, 17 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a4dbab..7b2e51e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,8 @@ sources_h = \
idoscalemenuitem.h \
idoswitchmenuitem.h \
idousermenuitem.h \
+ idoappointmentmenuitem.h \
+ idolocationmenuitem.h \
idotimeline.h \
libido.h \
idoactionhelper.h
@@ -72,6 +74,8 @@ libido_0_1_la_SOURCES = \
idotimeline.c \
idomenuitemfactory.c \
idoactionhelper.c \
+ idoappointmentmenuitem.c \
+ idolocationmenuitem.c \
idousermenuitem.c
libido3_0_1_la_SOURCES = $(libido_0_1_la_SOURCES)
diff --git a/src/idomenuitemfactory.c b/src/idomenuitemfactory.c
index 0ff84a8..aef08e6 100644
--- a/src/idomenuitemfactory.c
+++ b/src/idomenuitemfactory.c
@@ -20,8 +20,11 @@
#include <gtk/gtk.h>
#include <gtk/ubuntu-private.h>
-#include "idousermenuitem.h"
+#include "idoappointmentmenuitem.h"
+#include "idocalendarmenuitem.h"
+#include "idolocationmenuitem.h"
#include "idoscalemenuitem.h"
+#include "idousermenuitem.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))
@@ -49,6 +52,15 @@ ido_menu_item_factory_create_menu_item (UbuntuMenuItemFactory *factory,
if (g_str_equal (type, "indicator.user-menu-item"))
item = ido_user_menu_item_new_from_model (menuitem, actions);
+ else if (g_str_equal (type, "com.canonical.indicator.calendar"))
+ item = ido_calendar_menu_item_new_from_model (menuitem, actions);
+
+ else if (g_str_equal (type, "com.canonical.indicator.location"))
+ item = ido_location_menu_item_new_from_model (menuitem, actions);
+
+ else if (g_str_equal (type, "com.canonical.indicator.appointment"))
+ item = ido_appointment_menu_item_new_from_model (menuitem, actions);
+
else if (g_str_equal (type, "com.canonical.unity.slider"))
item = ido_scale_menu_item_new_from_model (menuitem, actions);