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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Mon Mar 19 16:33:19 CET 2007


Author: thomas
Date: 2007-03-19 16:33:18 +0100 (Mon, 19 Mar 2007)
New Revision: 1408

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
* src/today-main.c: Use MokoPixmapButton for launchers


Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-03-19 14:25:57 UTC (rev 1407)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-03-19 15:33:18 UTC (rev 1408)
@@ -1,3 +1,7 @@
+Mon, 19 Mar 2007 15:29:03 +0000 Thomas Wood
+
+	* src/today-main.c: Use MokoPixmapButton for launchers
+
 Thu, 15 Mar 2007 23:20:45 +0100 Dodji Seketeli
 
 	* applications/openmoko-today/src/today-events-area.c,h:

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-03-19 14:25:57 UTC (rev 1407)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-03-19 15:33:18 UTC (rev 1408)
@@ -28,6 +28,7 @@
 #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"
 
 #define LOG_ERROR \
@@ -279,19 +280,19 @@
 static GtkWidget *
 today_launcher_button_new (gchar * icon, gchar * exec)
 {
-  GtkWidget *button = gtk_button_new ();
+  GtkWidget *button = moko_pixmap_button_new ();
+  GdkPixbuf *pb = gtk_widget_render_icon (button, icon, GTK_ICON_SIZE_BUTTON, "");
 
-  gtk_container_add (GTK_CONTAINER (button),
-                     gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON));
-  // FIXME: need to set the correct size to prevent the button looking squashed.
-  // Possibly use MokoPixmapButton instead of GtkButton
+  /* libmokoui api really needs fixing... */
+  moko_pixmap_button_set_finger_toolbox_btn_center_image_pixbuf (
+      MOKO_PIXMAP_BUTTON (button), pb);
+  g_object_unref (pb);
   gtk_widget_set_name (button, "mokofingertoolbox-toolbutton");
 
   g_signal_connect (G_OBJECT (button),
                     "clicked",
                     G_CALLBACK (today_launcher_clicked_cb),
                     exec);
-
   return button;
 }
 





More information about the commitlog mailing list