Changeset 2104

Timestamp:

05/30/07 18:20:53 (6 years ago)

Author:

thomas

Message:

• src/today-main.c: (today_infoline_new),

(today_launcher_button_new), (today_setup_events_area),
(create_ui): Use correct icons in Missed Calls/Unread? Messages lines

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• src/today-main.c (modified) (7 diffs)

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

@@ +1 @@
+2007-05-30  Thomas Wood  <thomas@openedhand.com>
+
+        * src/today-main.c: (today_infoline_new),
+        (today_launcher_button_new), (today_setup_events_area),
+        (create_ui): Use correct icons in Missed Calls/Unread Messages lines
+
 2007-05-09  Thomas Wood  <thomas@openedhand.com>
 

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

@@ -90 +90 @@
 
 static GtkWidget *
-today_infoline_new (gchar * stock_id, gchar * message)
+today_infoline_new (gchar * exec, gchar * message)
 {
   GtkWidget *eventbox, *hbox, *icon, *label;
+  GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
+  GdkPixbuf *pb;
 
   eventbox = gtk_event_box_new ();
@@ -101 +103 @@
   gtk_container_add (GTK_CONTAINER (eventbox), hbox);
 
-  icon = gtk_image_new ();
-  gtk_image_set_from_stock (GTK_IMAGE (icon), stock_id, GTK_ICON_SIZE_MENU);
+  if (gtk_icon_theme_has_icon (icon_theme, exec))
+  {
+    pb = gtk_icon_theme_load_icon (icon_theme, exec, 32, GTK_ICON_LOOKUP_NO_SVG, NULL);
+  }
+  else
+  {
+    pb = gtk_icon_theme_load_icon (icon_theme, GTK_STOCK_MISSING_IMAGE, 32, GTK_ICON_LOOKUP_NO_SVG, NULL);
+  }
+  icon = gtk_image_new_from_pixbuf (pb);
+  g_object_unref (pb);
   gtk_misc_set_alignment (GTK_MISC (icon), 0, 0);
   gtk_widget_show (icon) ;
@@ -152 +162 @@
   GdkPixbuf *pb;
   GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
-
-  /* libmokoui api really needs fixing... */
 
   if (gtk_icon_theme_has_icon (icon_theme, exec))
@@ -201 +209 @@
 {
   GtkWidget *window, *vbox;
-  GtkWidget *date, *time_label;
+  GtkWidget *date;
   GtkWidget *message;
 
@@ -231 +239 @@
   alignment = gtk_alignment_new (1, 0, 0, 0);
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 0, 12);
-  date = gtk_label_new ("MON 15/JAN/2007");
+  date = gtk_label_new (NULL);
   gtk_container_add (GTK_CONTAINER (alignment), date);
   gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
@@ -247 +255 @@
 
   /* unread messages */
-  infoline = today_infoline_new (GTK_STOCK_YES, "Unread Messages (5)");
+  infoline = today_infoline_new ("openmoko-messages", "Unread Messages");
   gtk_box_pack_start (GTK_BOX (vbox), infoline, FALSE, FALSE, 0);
 
   /* missed calls */
-  infoline = today_infoline_new (GTK_STOCK_NO, "Missed Calls (1)");
+  infoline = today_infoline_new ("openmoko-dialer", "Missed Calls");
   gtk_box_pack_start (GTK_BOX (vbox), infoline, FALSE, FALSE, 0);
 
@@ -280 +288 @@
 
 
-  /* temporary */
-  GtkSettings *settings = gtk_settings_get_default ();
-  g_object_set (G_OBJECT (settings), "gtk-theme-name", "openmoko-standard",
-                NULL);
-
   gtk_widget_show_all (window);