r3494 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-23 18:50:48 +0100 (Fri, 23 Nov 2007)
New Revision: 3494

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
Log:
* src/today-main.c: (main): Initialise OpenMoko stock items
* src/today-task-manager.c: (today_task_manager_page_create): Use
gtk_tool_button_new_from_stock when loading stock items


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-23 15:26:50 UTC (rev 3493)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-23 17:50:48 UTC (rev 3494)
@@ -1,3 +1,9 @@
+2007-11-23  Thomas Wood  <thomas at openedhand.com>
+
+	* src/today-main.c: (main): Initialise OpenMoko stock items
+	* src/today-task-manager.c: (today_task_manager_page_create): Use
+	gtk_tool_button_new_from_stock when loading stock items
+
 2007-11-22  Chris Lord  <chris at openedhand.com>
 
 	* src/today-utils.c: (today_toolbutton_new):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c	2007-11-23 15:26:50 UTC (rev 3493)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c	2007-11-23 17:50:48 UTC (rev 3494)
@@ -6,6 +6,7 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <moko-finger-scroll.h>
+#include <moko-stock.h>
 #include <libtaku/launcher-util.h>
 #include <libtaku/xutil.h>
 #include <unistd.h>
@@ -374,6 +375,9 @@
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 	g_option_context_parse (context, &argc, &argv, NULL);
 
+	/* init openmoko stock items */
+	moko_stock_register ();
+
 	/* Create widgets */
 	data.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title (GTK_WINDOW (data.window), _("Home"));

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-11-23 15:26:50 UTC (rev 3493)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-11-23 17:50:48 UTC (rev 3494)
@@ -724,7 +724,8 @@
 	gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, TRUE, 0);
 
 	/* Kill all apps button */
-	button = today_toolbutton_new (MOKO_STOCK_FOLDER_DELETE);
+	button = gtk_tool_button_new_from_stock (MOKO_STOCK_FOLDER_DELETE);
+	gtk_tool_item_set_expand (button, TRUE);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
 		gtk_separator_tool_item_new (), 0);
@@ -732,7 +733,8 @@
 		G_CALLBACK (today_task_manager_killall_clicked_cb), data);
 
 	/* Switch to app button */
-	button = today_toolbutton_new (GTK_STOCK_JUMP_TO);
+	button = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO);
+	gtk_tool_item_set_expand (button, TRUE);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
 		gtk_separator_tool_item_new (), 0);
@@ -740,7 +742,8 @@
 		G_CALLBACK (today_task_manager_raise_clicked_cb), data);
 
 	/* Kill app button */
-	button = today_toolbutton_new (GTK_STOCK_DELETE);
+	button = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
+	gtk_tool_item_set_expand (button, TRUE);
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
 	g_signal_connect (G_OBJECT (button), "clicked",
 		G_CALLBACK (today_task_manager_kill_clicked_cb), data);