r2172 - in trunk/src/target/OM-2007/applications/openmoko-today: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-06-06 12:37:53 +0200 (Wed, 06 Jun 2007)
New Revision: 2172

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
* src/today-events-area.c: (get_property), (init_left_hand_side): Add icon to
events area
* src/today-main.c: (today_launcher_button_new): Fix launchers


Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-06-06 09:39:52 UTC (rev 2171)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-06-06 10:37:53 UTC (rev 2172)
@@ -1,5 +1,11 @@
 2007-06-06  Thomas Wood  <thomas at openedhand.com>
 
+	* src/today-events-area.c: (get_property), (init_left_hand_side): Add icon to
+	events area
+	* src/today-main.c: (today_launcher_button_new): Fix launchers
+
+2007-06-06  Thomas Wood  <thomas at openedhand.com>
+
 	* src/today-main.c: (today_infoline_new), (child_setup),
 	(today_launcher_clicked_cb), (create_ui):
 	Use argv array to start applications. Open the dialer with --show-missed when

Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c	2007-06-06 09:39:52 UTC (rev 2171)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c	2007-06-06 10:37:53 UTC (rev 2172)
@@ -26,12 +26,7 @@
 /*#include <libecal/e-cal-time-util.h>*/
 #include <libecal/e-cal-view.h>
 #include <libical/icalcomponent.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "today-utils.h"
 #include "today-events-area.h"
 #include <math.h>
@@ -419,7 +414,7 @@
   g_return_if_fail (a_this && TODAY_IS_EVENTS_AREA (a_this)) ;
   g_return_if_fail (a_val && a_pspec) ;
 
-  area = TODAY_EVENTS_AREA (area) ;
+  area = TODAY_EVENTS_AREA (a_this) ;
 
   switch (a_prop_id)
   {
@@ -521,6 +516,9 @@
 static void
 init_left_hand_side (TodayEventsArea *a_this)
 {
+  GtkWidget *vbox, *image;
+  GdkPixbuf *icon;
+
   g_return_if_fail (a_this
                     && TODAY_IS_EVENTS_AREA (a_this)
                     && a_this->priv) ;
@@ -543,9 +541,18 @@
                     G_CALLBACK (on_button_pressed_in_left_cb),
                     a_this) ;
   a_this->priv->paging_info = gtk_label_new ("0/0") ;
-  gtk_container_add (GTK_CONTAINER (a_this->priv->left_event_box),
-                     a_this->priv->paging_info) ;
 
+  icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "openmoko-sketchbook", 32, 0, NULL);
+  image = gtk_image_new_from_pixbuf (icon);
+  g_object_unref (icon);
+
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), a_this->priv->paging_info, FALSE, FALSE, 6);
+
+
+  gtk_container_add (GTK_CONTAINER (a_this->priv->left_event_box), vbox);
+
   a_this->priv->left = gtk_vbox_new (TRUE, 0) ;
   gtk_box_pack_start (GTK_BOX (a_this->priv->left),
                       a_this->priv->left_event_box,

Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-06-06 09:39:52 UTC (rev 2171)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-06-06 10:37:53 UTC (rev 2172)
@@ -214,11 +214,12 @@
  * Return value: The parent widget of the new widgets
  */
 static GtkWidget *
-today_launcher_button_new (gchar * exec)
+today_launcher_button_new (gchar *exec)
 {
   GtkWidget *button = moko_pixmap_button_new ();
   GdkPixbuf *pb;
   GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
+  gchar **argv;
 
   if (gtk_icon_theme_has_icon (icon_theme, exec))
   {
@@ -234,10 +235,13 @@
   g_object_unref (pb);
   gtk_widget_set_name (button, "mokofingertoolbox-toolbutton");
 
+  /* FIXME: this is less than ideal */
+  argv = g_malloc0 (2);
+  argv[0] = exec;
   g_signal_connect (G_OBJECT (button),
                     "clicked",
                     G_CALLBACK (today_launcher_clicked_cb),
-                    exec);
+                    argv);
   return button;
 }