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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-03-15 13:11:46 +0100 (Thu, 15 Mar 2007)
New Revision: 1371

Modified:
   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:
* openmoko-today/src/today-main.c: Pack the event area without an extra icon and
  set some size and theme properties.
* openmoko-today/src/today-events-area.c: Set an appropriate widget name for the
  left hand side area (for use by the theme)


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-03-15 11:52:57 UTC (rev 1370)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c	2007-03-15 12:11:46 UTC (rev 1371)
@@ -300,6 +300,16 @@
     clear_left_hand_side (a_this) ;
 
   a_this->priv->left_event_box = gtk_event_box_new ();
+
+  if (a_this->priv->max_visible_events > 0
+      && (a_this->priv->nb_events / a_this->priv->max_visible_events) > 1)
+     gtk_widget_set_name (a_this->priv->left_event_box, "today-events-area-postit-multi");
+  else
+     gtk_widget_set_name (a_this->priv->left_event_box, "today-events-area-postit-single");
+
+  // FIXME: get this size from the style... somehow
+  gtk_widget_set_size_request (a_this->priv->left_event_box, 51, 131);
+
   gtk_widget_add_events (a_this->priv->left_event_box,
                          GDK_BUTTON_PRESS_MASK) ;
   g_signal_connect (G_OBJECT (a_this->priv->left_event_box),
@@ -315,9 +325,10 @@
                       a_this->priv->left_event_box,
                       FALSE, FALSE, 0) ;
 
-  gtk_table_attach_defaults (GTK_TABLE (a_this),
+  gtk_table_attach (GTK_TABLE (a_this),
                              a_this->priv->left,
-                             0, 1, 0, 1) ;
+                             0, 1, 0, 1,
+                             GTK_FILL, GTK_FILL, 0, 0) ;
   gtk_widget_show_all (a_this->priv->left) ;
 }
 

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-15 11:52:57 UTC (rev 1370)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-03-15 12:11:46 UTC (rev 1371)
@@ -227,7 +227,7 @@
   eventbox = gtk_event_box_new ();
   gtk_container_set_border_width (GTK_CONTAINER (eventbox), 6);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_hbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (eventbox), hbox);
 
   icon = gtk_image_new ();
@@ -235,6 +235,10 @@
   gtk_misc_set_alignment (GTK_MISC (icon), 0, 0);
   gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
+  // FIXME: get this from the style... somehow
+  gtk_widget_set_size_request (icon, 51, -1);
+
+
   label = gtk_label_new (message);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
@@ -276,13 +280,13 @@
 today_launcher_button_new (gchar * icon, gchar * exec)
 {
   GtkWidget *button = gtk_button_new ();
-  if (exec) {/*unused parameter, to be used in the future*/}
 
   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
+  gtk_widget_set_name (button, "mokofingertoolbox-toolbutton");
 
-  gtk_widget_set_name (button, "today-launcher-button");
-
   g_signal_connect (G_OBJECT (button),
                     "clicked",
                     G_CALLBACK (today_launcher_clicked_cb),
@@ -292,32 +296,22 @@
 }
 
 /**
- * today_events_infolines_new:
+ * today_setup_events_area:
  *
- * Return value: a GtkWidget showing the
- * events of the day
+ * Return value: The widget to use as the events area
+ *
  */
 GtkWidget *
-today_events_infolines_new (const gchar *stock_id)
+today_setup_events_area (const gchar *stock_id)
 {
-  GtkWidget        *events_area, *icon, *hbox ;
+  GtkWidget        *events_area;
   GList            *events;
 
-
-  hbox = gtk_hbox_new (FALSE, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6) ;
-
-  icon = gtk_image_new ();
-  gtk_image_set_from_stock (GTK_IMAGE (icon), stock_id, GTK_ICON_SIZE_MENU);
-  gtk_misc_set_alignment (GTK_MISC (icon), 0, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
-
   events = today_get_today_events () ;
   events_area = today_events_area_new () ;
   today_events_area_set_events (TODAY_EVENTS_AREA (events_area), events) ;
-  gtk_box_pack_start (GTK_BOX (hbox), events_area, FALSE, FALSE, 0);
 
-  return hbox;
+  return events_area;
 }
 
 static void
@@ -375,7 +369,7 @@
   gtk_box_pack_start (GTK_BOX (vbox), infoline, FALSE, FALSE, 0);
 
   /* upcoming events */
-  infoline = today_events_infolines_new (GTK_STOCK_NO);
+  infoline = today_setup_events_area (GTK_STOCK_NO);
   gtk_box_pack_start (GTK_BOX (vbox), infoline, FALSE, FALSE, 0);
 
   /* shurtcut buttons */