Changeset 2622

Timestamp:

08/03/07 16:08:48 (6 years ago)

Author:

chris

Message:

Launch the appropriate apps when clicking the summaries on the home page

Location:

trunk/src/target/OM-2007.2/applications/openmoko-today2

Files:

• ChangeLog (modified) (1 diff)
• libtaku/launcher-util.c (modified) (1 diff)
• libtaku/launcher-util.h (modified) (2 diffs)
• src/today-main.c (modified) (5 diffs)
• src/today-pim-journal.c (modified) (3 diffs)
• src/today-pim-summary.c (modified) (4 diffs)
• src/today-utils.c (modified) (2 diffs)
• src/today-utils.h (modified) (2 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog

@@ +1 @@
+2007-08-03  Chris Lord,,,  <chris@openedhand.com>
+
+        * libtaku/launcher-util.c: (launcher_start):
+        * libtaku/launcher-util.h:
+        Make the LauncherData const, it isn't changed
+
+        * src/today-main.c: (today_dial_button_clicked_cb),
+        (today_contacts_button_clicked_cb),
+        (today_messages_button_clicked_cb),
+        (today_dates_button_clicked_cb), (main):
+        * src/today-pim-journal.c: (today_pim_journal_header_clicked_cb),
+        (today_pim_journal_selection_changed_cb),
+        (today_pim_journal_box_new):
+        * src/today-pim-summary.c: (today_pim_summary_header_clicked_cb),
+        (today_pim_summary_events_selection_changed_cb),
+        (today_pim_summary_tasks_selection_changed_cb),
+        (today_pim_summary_box_new):
+        Launch the appropriate apps when clicking the summaries on the home page
+
+        * src/today-utils.c: (today_get_launcher):
+        * src/today-utils.h:
+        Make a global LauncherData filling convenience function
+
 2007-08-03  Chris Lord,,,  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.c

@@ -290 +290 @@
 /* TODO: optionally link to GtkUnique and directly handle that? */
 void
-launcher_start (GtkWidget *widget, LauncherData *data)
+launcher_start (GtkWidget *widget, const LauncherData *data)
 {
   GError *error = NULL;

trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/launcher-util.h

@@ -16 +16 @@
  * Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
+#ifndef HAVE_LAUNCHER_UTIL_H
+#define HAVE_LAUNCHER_UTIL_H
 
 #include <glib.h>
@@ -37 +40 @@
 LauncherData *launcher_parse_desktop_file (const char *filename, GError **error);
 
-void launcher_start (GtkWidget *widget, LauncherData *data);
+void launcher_start (GtkWidget *widget, const LauncherData *data);
 
 char * launcher_get_icon (GtkIconTheme *icon_theme, LauncherData *data, int size);
 
 void launcher_destroy (LauncherData *data);
+
+#endif

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

@@ -33 +33 @@
 }
 
-/* TODO: Make this less nasty */
-static LauncherData launcher_data;
-static void
-today_fill_launcher (const gchar *exec, gboolean use_sn, gboolean single)
-{
-        if (launcher_data.argv) g_free (launcher_data.argv);
-        launcher_data.argv = exec_to_argv (exec);
-        launcher_data.name = (gchar *)exec;
-        launcher_data.description = "";
-        launcher_data.icon = NULL;
-        launcher_data.categories = (char *[]){ "" };
-        launcher_data.use_sn = use_sn;
-        launcher_data.single_instance = single;
-}
-
 static void
 today_dial_button_clicked_cb (GtkToolButton *button, TodayData *data)
 {
-        today_fill_launcher ("openmoko-dialer", TRUE, TRUE);
-        launcher_start (data->window, &launcher_data);
+        launcher_start (data->window, today_get_launcher (
+                "openmoko-dialer -s", TRUE, TRUE));
 }
 
@@ -58 +43 @@
 today_contacts_button_clicked_cb (GtkToolButton *button, TodayData *data)
 {
-        today_fill_launcher ("openmoko-contacts", TRUE, TRUE);
-        launcher_start (data->window, &launcher_data);
+        launcher_start (data->window, today_get_launcher (
+                "openmoko-contacts", TRUE, TRUE));
 }
 
@@ -65 +50 @@
 today_messages_button_clicked_cb (GtkToolButton *button, TodayData *data)
 {
-        today_fill_launcher ("openmoko-messages", TRUE, TRUE);
-        launcher_start (data->window, &launcher_data);
+        launcher_start (data->window, today_get_launcher (
+                "openmoko-messages", TRUE, TRUE));
 }
 
@@ -72 +57 @@
 today_dates_button_clicked_cb (GtkToolButton *button, TodayData *data)
 {
-        today_fill_launcher ("dates", TRUE, TRUE);
-        launcher_start (data->window, &launcher_data);
+        launcher_start (data->window, today_get_launcher (
+                "dates", TRUE, TRUE));
 }
 
@@ -221 +206 @@
 #endif
         
-        launcher_data.argv = NULL;
-        
         /* Show and start */
         gtk_widget_show (data.window);

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-journal.c

@@ -1 +1 @@
 
-#include "today-pim-journal.h"
 #include <glib/gi18n.h>
 #include <moko-stock.h>
+#include <libtaku/launcher-util.h>
+#include "today-utils.h"
+#include "today-pim-journal.h"
 
 enum {
@@ -77 +79 @@
 }
 
+static void
+today_pim_journal_header_clicked_cb (GtkTreeViewColumn *column, TodayData *data)
+{
+        /* TODO: Maybe just launch dialer normally here? */
+        launcher_start (data->window, today_get_launcher (
+                "openmoko-dialer -m", TRUE, TRUE));
+}
+
+static void
+today_pim_journal_selection_changed_cb (GtkTreeSelection *selection,
+                                        TodayData *data)
+{
+        if (gtk_tree_selection_count_selected_rows (selection)) {
+                gtk_tree_selection_unselect_all (selection);
+                launcher_start (data->window, today_get_launcher (
+                        "openmoko-dialer -m", TRUE, TRUE));
+        }
+}
+
 GtkWidget *
 today_pim_journal_box_new (TodayData *data)
@@ -120 +141 @@
 
         gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), TRUE);
+        gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (treeview), TRUE);
+        
+        g_signal_connect (G_OBJECT (column), "clicked",
+                G_CALLBACK (today_pim_journal_header_clicked_cb), data);
+        g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (treeview)),
+                "changed", G_CALLBACK (today_pim_journal_selection_changed_cb),
+                data);
         
         /* Open up journal and connect to signals to find out about missed

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-pim-summary.c

@@ -4 +4 @@
 #include <libkoto/koto-task.h>
 #include <libkoto/koto-task-view.h>
+#include <libtaku/launcher-util.h>
+#include "today-utils.h"
 #include "today-pim-summary.h"
 #include "today-events-store.h"
@@ -103 +105 @@
         g_object_set (G_OBJECT (cell), "text", summary,
                 "strikethrough", done, NULL);
+}
+
+static void
+today_pim_summary_header_clicked_cb (GtkTreeViewColumn *column, TodayData *data)
+{
+        g_debug ("TODO: App to set time/date");
+}
+
+static void
+today_pim_summary_events_selection_changed_cb (GtkTreeSelection *selection,
+                                               TodayData *data)
+{
+        if (gtk_tree_selection_count_selected_rows (selection)) {
+                gtk_tree_selection_unselect_all (selection);
+                launcher_start (data->window, today_get_launcher (
+                        "openmoko-contacts", TRUE, TRUE));
+        }
+}
+
+static void
+today_pim_summary_tasks_selection_changed_cb (GtkTreeSelection *selection,
+                                               TodayData *data)
+{
+        if (gtk_tree_selection_count_selected_rows (selection)) {
+                gtk_tree_selection_unselect_all (selection);
+                launcher_start (data->window, today_get_launcher (
+                        "openmoko-tasks", TRUE, TRUE));
+        }
 }
 
@@ -148 +178 @@
         gtk_tree_view_insert_column (GTK_TREE_VIEW (events_tree), column, 0);   
         gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (events_tree), TRUE);
+        gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (events_tree), TRUE);
 
         today_pim_summary_update_date (column);
@@ -166 +197 @@
                 G_CALLBACK (today_pim_summary_row_deleted_cb), data);
         
+        g_signal_connect (G_OBJECT (column), "clicked",
+                G_CALLBACK (today_pim_summary_header_clicked_cb), data);
+        g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (
+                GTK_TREE_VIEW (events_tree))), "changed", G_CALLBACK (
+                        today_pim_summary_events_selection_changed_cb), data);
+        g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (
+                GTK_TREE_VIEW (tasks_tree))), "changed", G_CALLBACK (
+                        today_pim_summary_tasks_selection_changed_cb), data);
+
         today_pim_summary_show_notice (data);
 

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.c

@@ -22 +22 @@
  */
 
-/**
- * e_cal_component_list_free:
- * @list: the list ECalComooment to free
- *
- * Free a list of ECalComponent
- */
 #include <string.h>
+#include <gtk/gtk.h>
+#include <libtaku/launcher-util.h>
 #include "today-utils.h"
-#include <libical/icalcomponent.h>
-
-#define LOG_ERROR \
-g_warning ("Got error '%s', code '%d'", \
-           error->message, error->code);
-
-#define FREE_ERROR g_error_free (error) ; error = NULL ;
-
-static ECal *calendar_db = NULL;
-static ECal *tasks_db = NULL;
-
-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);
-}
-
-/*
- * 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
- */
-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 ;
-}
-
-GList*
-today_clone_icalcomponent_list (const GList *a_list)
-{
-  GList *result=NULL, *cur=NULL ;
-
-  for (cur =(GList*)a_list ; cur ; cur = cur->next)
-  {
-    if (!icalcomponent_isa_component (cur->data))
-      continue ;
-    result = g_list_prepend (result, icalcomponent_new_clone (cur->data)) ;
-  }
-  return result ;
-}
-
-/**
- * today_get_today_events:
- *
- * Return value:  a list of ECalComponents, of type VEVENT
- * or VTODO
- * must be freed with e_cal_component_list_free()
- */
-GList *
-today_get_today_events ()
-{
-  GList *result=NULL, *ical_comps=NULL, *ical_comps2=NULL;
-  GError *error = NULL;
-  gchar *query = NULL;
-
-  if (!calendar_db)
-  {
-    calendar_db = e_cal_new_system_calendar ();
-    g_return_val_if_fail (calendar_db, NULL);
-
-    if (!e_cal_open (calendar_db, TRUE, &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 (calendar_db, query, &ical_comps, &error);
-  g_free (query) ;
-  query = NULL ;
-  if (error)
-  {
-    LOG_ERROR;
-    FREE_ERROR;
-  }
-
-  if (!tasks_db)
-  {
-    tasks_db = e_cal_new_system_tasks ();
-    g_return_val_if_fail (tasks_db, NULL);
-    if (!e_cal_open (tasks_db, TRUE, &error))
-    {
-      g_warning ("failed to open the tasks");
-    }
-    if (error)
-    {
-      LOG_ERROR;
-      goto out;
-    }
-  }
-
-  query = g_strdup_printf ("#t");
-  e_cal_get_object_list (tasks_db, query, &ical_comps2, &error);
-  g_free (query) ;
-  query = NULL ;
-  if (error)
-  {
-    LOG_ERROR;
-    FREE_ERROR ;
-  }
-  ical_comps = g_list_concat (ical_comps, ical_comps2) ;
-
-  result = ical_comps;
-  ical_comps = ical_comps2 = NULL;
-
-out:
-  if (ical_comps)
-  {
-    e_cal_free_object_list (ical_comps);
-  }
-
-  if (ical_comps2)
-  {
-    e_cal_free_object_list (ical_comps);
-  }
-
-  /*
-   the calender must stay alive during the app's lifetime
-  if (ecal)
-  {
-    g_object_unref (G_OBJECT (ecal));
-  }
-  */
-
-  if (error)
-  {
-    g_error_free (error);
-  }
-  if (query)
-  {
-    g_free (query);
-  }
-  return result;
-}
-
-gboolean
-icalcomponent_has_alarm (icalcomponent *a_icalcomp)
-{
-  icalcompiter iter ;
-
-  g_return_val_if_fail (a_icalcomp, FALSE) ;
-  g_return_val_if_fail (icalcomponent_isa_component (a_icalcomp), FALSE) ;
-
-  for (iter = icalcomponent_begin_component (a_icalcomp,
-                                             ICAL_VALARM_COMPONENT);
-      icalcompiter_deref (&iter) != NULL ;
-      icalcompiter_next (&iter))
-  {
-    return TRUE ;
-  }
-  return FALSE ;
-}
 
 GtkToolItem *
@@ -249 +36 @@
         return button;
 }
+
+const LauncherData *
+today_get_launcher (const gchar *exec, gboolean use_sn, gboolean single)
+{
+        static LauncherData launcher_data;
+        static gboolean first = TRUE;
+        
+        if (first) {
+                launcher_data.argv = NULL;
+                first = FALSE;
+        }
+        
+        if (launcher_data.argv) g_free (launcher_data.argv);
+        launcher_data.argv = exec_to_argv (exec);
+        launcher_data.name = (gchar *)exec;
+        launcher_data.description = "";
+        launcher_data.icon = NULL;
+        launcher_data.categories = (char *[]){ "" };
+        launcher_data.use_sn = use_sn;
+        launcher_data.single_instance = single;
+        
+        return &launcher_data;
+}

trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-utils.h

@@ -1 @@
-/* vi: set sw=2: */
 /*
  *  Today - At a glance view of date, time, calender events, todo items and
@@ -26 +25 @@
 
 #include <glib.h>
-#include <libical/icalcomponent.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
 #include <gtk/gtk.h>
-
-GList* today_get_today_events () ;
-void e_cal_component_list_free (GList * list) ;
-gchar* icaltime_to_pretty_string (const icaltimetype *timetype) ;
-gboolean icalcomponent_has_alarm (icalcomponent *a_icalcomp) ;
-GList* today_clone_icalcomponent_list (const GList *a_list) ;
+#include <libtaku/launcher-util.h>
 
 GtkToolItem *today_toolbutton_new (const gchar *icon_name);
+const LauncherData *today_get_launcher (const gchar *exec, gboolean use_sn,
+                                        gboolean single);
 
 #endif /*__TODAY_UTILS_H__*/
-