Changeset 1413

Timestamp:

03/19/07 23:26:32 (6 years ago)

Author:

dodji

Message:

Show todo items and alarms. Use them icons for that.

• applications/openmoko-today/src/today-events-area.c: move utils functions into applications/openmoko-today/src/today-utils.[c|h]. Get todo items as well. Render todo items, events, and alarmed event using the theme icons.
• applications/openmoko-today/src/today-utils.c: move util functions in here

Location:

trunk/src/target/OM-2007/applications/openmoko-today

Files:

• ChangeLog (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/today-events-area.c (modified) (4 diffs)
• src/today-main.c (modified) (5 diffs)
• src/today-utils.c (added)
• src/today-utils.h (added)
• tests/Makefile.am (modified) (1 diff)
• tests/ecal-test.c (modified) (4 diffs)

trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog

@@ +1 @@
+Mon, 19 Mar 2007 19:59:27 +0100 Dodji Seketeli
+
+        * applications/openmoko-today/src/today-events-area.c:
+          move utils functions into
+          applications/openmoko-today/src/today-utils.[c|h].
+          Get todo items as well.
+          Render todo items, events, and alarmed event using
+          the theme icons.
+        * applications/openmoko-today/src/today-utils.c: move util functions in
+          here
+
 Mon, 19 Mar 2007 15:29:03 +0000 Thomas Wood
 

trunk/src/target/OM-2007/applications/openmoko-today/src/Makefile.am

@@ -9 +9 @@
 bin_PROGRAMS          = today
 
-today_SOURCES         = today-main.c today-events-area.h today-events-area.c
+today_SOURCES         = today-main.c \
+today-events-area.h today-events-area.c \
+today-utils.h today-utils.c
 
 today_LDADD          = @TODAY_LIBS@

trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c

@@ -29 +29 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtktable.h>
+#include <gtk/gtkimage.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtklabel.h>
@@ -576 +577 @@
 }
 
-/*
- * if the timetype is today, then only display it's hour part,
- * without the seconds
- * If it's not today, then only display it's date part, without the year
- */
-static gchar*
-icaltime_to_pretty_string (const icaltimetype *timetype)
-{
-#define TMP_STR_LEN 10
-    icaltimetype today ;
-    gboolean     hour_only              = FALSE ;
-    gboolean     date_only              = FALSE ;
-    gchar        *result                = NULL  ;
-    gchar        tmp_str[TMP_STR_LEN+1]         ;
-    struct tm    native_tm                      ;
-
-    g_return_val_if_fail (timetype, NULL) ;
-
-    today = icaltime_today () ;
-    if (!icaltime_compare_date_only (*timetype, today))
-    {
-        hour_only = TRUE ;
-    }
-    else
-    {
-        date_only = TRUE ;
-    }
-    if (hour_only)
-    {
-        result = g_strdup_printf ("%d:%d", timetype->hour, timetype->minute) ;
-    }
-    else if (date_only)
-    {
-        native_tm = icaltimetype_to_tm ((icaltimetype*)timetype) ;
-        memset (tmp_str, 0, TMP_STR_LEN+1) ;
-        strftime (tmp_str, TMP_STR_LEN, "%d/%b", &native_tm) ;
-        result = g_strdup (tmp_str) ;
-    }
-    return result ;
-}
-
 static void
 render_event (TodayEventsArea *a_this,
               GList *a_event)
 {
-  GtkWidget *infoline ;
-  GtkWidget *label ;
-  GtkWidget *event_box ;
+  GtkWidget *infoline, *label, *event_box, *icon ;
   ECalComponentText text ;
-  ECalComponentDateTime start_date ;
-  ECalComponent *event ;
-  int event_index ;
-  gchar *tmp_str, *tmp_str2 ;
+  ECalComponentDateTime date ;
+  ECalComponent *event=NULL ;
+  int event_index=0 ;
+  gchar *tmp_str=NULL, *tmp_str2=NULL ;
+  gboolean has_alarm=FALSE, is_todo=FALSE, is_event=FALSE ;
 
   g_return_if_fail (a_this
@@ -643 +602 @@
   g_return_if_fail (event_index >= 0) ;
 
+  /*does the comp has an alarm ?*/
+  has_alarm = e_cal_component_has_alarms (event) ;
+
+  /*is the comp a todo item ? */
+  is_todo = (e_cal_component_get_vtype (event) == E_CAL_COMPONENT_TODO);
+
+  /*is the comp a calendar event ?*/
+  is_event = (e_cal_component_get_vtype (event) == E_CAL_COMPONENT_EVENT);
+
+  /*a comp must be either a calendar event or a todo item*/
+  g_return_if_fail (is_event != is_todo) ;
+
   /*get the event summary*/
   e_cal_component_get_summary (event, &text) ;
 
   /*get the event starting date*/
-  e_cal_component_get_dtstart (event, &start_date) ;
-  tmp_str = icaltime_to_pretty_string (start_date.value) ;
-  e_cal_component_free_datetime (&start_date) ;
+  if (is_event)
+    e_cal_component_get_dtstart (event, &date) ;
+  else if (is_todo)
+  {
+    e_cal_component_get_due (event, &date) ;
+  }
+
+  if (date.value)
+  {
+    tmp_str = icaltime_to_pretty_string (date.value) ;
+    e_cal_component_free_datetime (&date) ;
+  }
 
   /*build event infoline*/
-  tmp_str2 = g_strdup_printf ("%s %s", text.value, tmp_str) ;
-  g_free (tmp_str) ;
+  if (tmp_str)
+  {
+    tmp_str2 = g_strdup_printf ("%s %s", text.value, tmp_str) ;
+    g_free (tmp_str) ;
+  }
+  else
+  {
+    tmp_str2 = g_strdup_printf ("%s", text.value) ;
+  }
   label = gtk_label_new (tmp_str2) ;
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0) ;
@@ -661 +648 @@
   gtk_widget_show (infoline) ;
   gtk_box_pack_start_defaults (GTK_BOX (infoline), label) ;
+  icon = gtk_image_new () ;
+  if (is_event)
+  {
+    gtk_image_set_from_stock (GTK_IMAGE (icon),
+                              "openmoko-today-event",
+                              GTK_ICON_SIZE_MENU);
+  }
+  else if (is_todo)
+  {
+    gtk_image_set_from_stock (GTK_IMAGE (icon),
+                              "openmoko-today-todo",
+                              GTK_ICON_SIZE_MENU);
+  }
+  else if (has_alarm)
+  {
+    gtk_image_set_from_stock (GTK_IMAGE (icon),
+                              "openmoko-today-bell",
+                              GTK_ICON_SIZE_MENU);
+  }
+  gtk_misc_set_alignment (GTK_MISC (icon), 0, 0);
+  gtk_widget_show_all (icon) ;
+  gtk_box_pack_start_defaults (GTK_BOX (infoline), icon) ;
   event_box = gtk_event_box_new () ;
   gtk_widget_show (event_box) ;

trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c

@@ -26 +26 @@
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
 #include <gtk/gtk.h>
 #include <libmokoui/moko-window.h>
 #include <libmokoui/moko-pixmap-button.h>
 #include "today-events-area.h"
+#include "today-utils.h"
 
 #define LOG_ERROR \
@@ -82 +81 @@
 }
 
-/**
- * e_cal_component_list_free:
- * @list: the list ECalComooment to free
- *
- * Free a list of ECalComponent
- */
-static void
-e_cal_component_list_free (GList * list)
-{
-  GList *cur = NULL;
-
-  for (cur = list; cur; cur = cur->next)
-  {
-    /*if an element of the list is not of type ECalComponent, leak it */
-    if (cur->data && E_IS_CAL_COMPONENT (cur->data))
-    {
-      g_object_unref (G_OBJECT (cur->data));
-      cur->data = NULL;
-    }
-    else
-    {
-      g_warning ("cur->data is not of type ECalComponent !");
-    }
-  }
-  g_list_free (list);
-}
-
-/**
- * today_get_today_events:
- *
- * Return value:  a list of ECalComponents, of type VEVENT
- * must be freed with e_cal_component_list_free()
- */
-static GList *
-today_get_today_events ()
-{
-  GList *result = NULL;
-  GList *ical_comps = NULL;
-  GList *ecal_comps = NULL;
-  GList *cur = NULL;
-  ECal *ecal = NULL;
-  GError *error = NULL;
-  gchar *query = NULL;
-
-  ecal = e_cal_new_system_calendar ();
-  g_return_val_if_fail (ecal, NULL);
-
-  if (!e_cal_open (ecal, FALSE, &error))
-  {
-    g_warning ("failed to open the calendar");
-  }
-
-  if (error)
-  {
-    LOG_ERROR;
-    goto out;
-  }
-
-  /*
-  query = g_strdup_printf ("(occur-in-time-range? "
-                               "(time-day-begin (time-now)) "
-                               "(time-day-end   (time-now)) "
-                           ")");
-   */
-  query = g_strdup_printf ("#t");
-  e_cal_get_object_list (ecal, query, &ical_comps, &error);
-  if (error)
-  {
-    LOG_ERROR;
-    goto out;
-  }
-
-  /*
-   * build a list of ECalComponent, out of the list of icalcomponents
-   * when an icalcomponent is set to an ECalComponent, the later
-   * becomes responsible of freeing the former's memory
-   */
-  for (cur = ical_comps; cur; cur = cur->next)
-  {
-    ECalComponent *c = NULL;
-    if (!cur->data)
-      continue;
-
-    c = e_cal_component_new ();
-    if (!e_cal_component_set_icalcomponent (c, cur->data))
-    {
-      icalcomponent_free (cur->data);
-      cur->data = NULL;
-      continue;
-    }
-
-    ecal_comps = g_list_prepend (ecal_comps, c);
-    cur->data = NULL;
-  }
-  result = ecal_comps;
-  ecal_comps = NULL;
-
-out:
-  if (ical_comps)
-  {
-    e_cal_free_object_list (ical_comps);
-  }
-
-  if (ecal_comps)
-  {
-    e_cal_component_list_free (ecal_comps);
-  }
-  ecal_comps = NULL;
-
-  /*
-   the calender must stay alive during the app's lifetime
-  if (ecal)
-  {
-    g_object_unref (G_OBJECT (ecal));
-  }
-  */
-
-  if (error)
-  {
-    g_error_free (error);
-  }
-
-  g_free (query);
-
-  return result;
-}
-
-
 /* information lines */
 
@@ -236 +107 @@
   gtk_image_set_from_stock (GTK_IMAGE (icon), stock_id, GTK_ICON_SIZE_MENU);
   gtk_misc_set_alignment (GTK_MISC (icon), 0, 0);
+  gtk_widget_show (icon) ;
   gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
@@ -248 +120 @@
 }
 
-
 /* launcher buttons */
 
@@ -254 +125 @@
  * callback for luncher buttons
  */
-static void
+void
 today_launcher_clicked_cb (GtkWidget *button, gchar *command)
 {

trunk/src/target/OM-2007/applications/openmoko-today/tests/Makefile.am

@@ -5 +5 @@
 
 eventsareatest_SOURCES     = events-area-test.c \
-$(top_srcdir)/src/today-events-area.c
+$(top_srcdir)/src/today-events-area.c \
+$(top_srcdir)/src/today-utils.c
 
 eventsareatest_LDADD       = @TODAY_LIBS@

trunk/src/target/OM-2007/applications/openmoko-today/tests/ecal-test.c

@@ +1 @@
+/* vi:set sw=2: */
 /*
  *  Today - At a glance view of date, time, calender events, todo items and
@@ -46 +47 @@
 display_events (GList *a_events/*list of icalcomponents*/)
 {
-    GList          *cur         = NULL ;
-    ECalComponent  *cal_comp    = NULL ;
-    char           *event_str   = NULL ;
+  GList          *cur         = NULL ;
+  ECalComponent  *cal_comp    = NULL ;
+  char           *event_str   = NULL ;
+  char           *categories  = NULL ;
 
-    if (!a_events) {
-        g_message ("No events") ;
-        return ;
+  if (!a_events)
+  {
+    g_message ("No events") ;
+    return ;
+  }
+  cal_comp = e_cal_component_new () ;
+  g_return_if_fail (cal_comp) ;
+
+  for (cur = a_events ; cur ; cur = cur->next)
+  {
+    if (!cur->data) {continue;}
+    e_cal_component_set_icalcomponent (cal_comp, cur->data) ;
+    if (e_cal_component_get_vtype (cal_comp) != E_CAL_COMPONENT_EVENT)
+    {
+      g_warning ("component is not an event, rather of type %d",
+          e_cal_component_get_vtype (cal_comp));
+      continue ;
     }
-    cal_comp = e_cal_component_new () ;
-    g_return_if_fail (cal_comp) ;
-
-    for (cur = a_events ; cur ; cur = cur->next) {
-        if (!cur->data) {continue;}
-        e_cal_component_set_icalcomponent (cal_comp, cur->data) ;
-        if (e_cal_component_get_vtype (cal_comp) != E_CAL_COMPONENT_EVENT) {
-            g_warning ("component is not an event, rather of type %d",
-                       e_cal_component_get_vtype (cal_comp));
-            continue ;
-        }
-        event_str = e_cal_component_get_as_string (cal_comp) ;
-        if (event_str) {
-            g_message ("Got event '%s'", event_str) ;
-            g_free (event_str) ;
-        }
+    event_str = e_cal_component_get_as_string (cal_comp) ;
+    if (event_str)
+    {
+      g_message ("Got event '%s'", event_str) ;
+      g_free (event_str) ;
     }
+    e_cal_component_get_categories (cal_comp, &categories) ;
+    if (categories)
+    {
+      g_message ("event's categs: '%s'\n", categories) ;
+      //g_free (categories) ;
+      categories = NULL ;
+    }
+    else
+    {
+      g_message ("no associated category") ;
+    }
+  }
 }
 
@@ -102 +119 @@
     if (ret) {goto out ;}
 
+    /*
     query = g_strdup_printf ("(occur-in-time-range? "
                                  "(time-day-begin (time-now)) "
                                  "(time-day-end   (time-now))"
                              ")");
+
+    */
+    query = g_strdup_printf ("#t") ;
 
     printf ("Issuing query: '%s'\n", query) ;
@@ -124 +145 @@
 
 out:
+    /*
     if (cal) {
         g_object_unref (G_OBJECT (cal)) ;
     }
+    */
     if (objects) {
-        e_cal_free_object_list (objects) ;
+        g_list_free (objects) ;
     }
     if (query) {