Send commitlog mailing list submissions to
        [email protected]

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r1369 - trunk/oe/packages/openocd ([EMAIL PROTECTED])
   2. r1370 -
      trunk/src/target/OM-2007/applications/openmoko-today/src
      ([EMAIL PROTECTED])
   3. r1371 -
      trunk/src/target/OM-2007/applications/openmoko-today/src
      ([EMAIL PROTECTED])
   4. r1372 -
      trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0
      ([EMAIL PROTECTED])
   5. r1373 - in
      trunk/src/target/OM-2007/applications/openmoko-today: . src
      ([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-03-15 12:08:51 +0100 (Thu, 15 Mar 2007)
New Revision: 1369

Modified:
   trunk/oe/packages/openocd/openocd-native_130.bb
   trunk/oe/packages/openocd/openocd-native_svn.bb
   trunk/oe/packages/openocd/openocd_130.bb
   trunk/oe/packages/openocd/openocd_svn.bb
Log:
we want to have the _native_ openocd in the deploy directory, not the target 
crosscompiled one (Noted by XorA)


Modified: trunk/oe/packages/openocd/openocd-native_130.bb
===================================================================
--- trunk/oe/packages/openocd/openocd-native_130.bb     2007-03-15 07:22:59 UTC 
(rev 1368)
+++ trunk/oe/packages/openocd/openocd-native_130.bb     2007-03-15 11:08:51 UTC 
(rev 1369)
@@ -9,3 +9,9 @@
     install -m 0755 src/openocd ${STAGING_BINDIR_NATIVE}
 }
 
+do_deploy() {
+       install -d ${DEPLOY_DIR_IMAGE}
+       install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
+}
+
+addtask deploy before do_package after do_install

Modified: trunk/oe/packages/openocd/openocd-native_svn.bb
===================================================================
--- trunk/oe/packages/openocd/openocd-native_svn.bb     2007-03-15 07:22:59 UTC 
(rev 1368)
+++ trunk/oe/packages/openocd/openocd-native_svn.bb     2007-03-15 11:08:51 UTC 
(rev 1369)
@@ -9,3 +9,9 @@
     install -m 0755 src/openocd ${STAGING_BINDIR_NATIVE}
 }
 
+do_deploy() {
+       install -d ${DEPLOY_DIR_IMAGE}
+       install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
+}
+
+addtask deploy before do_package after do_install

Modified: trunk/oe/packages/openocd/openocd_130.bb
===================================================================
--- trunk/oe/packages/openocd/openocd_130.bb    2007-03-15 07:22:59 UTC (rev 
1368)
+++ trunk/oe/packages/openocd/openocd_130.bb    2007-03-15 11:08:51 UTC (rev 
1369)
@@ -13,10 +13,3 @@
 S = "${WORKDIR}/openocd/trunk"
 
 EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"  
-
-do_deploy() {
-       install -d ${DEPLOY_DIR_IMAGE}
-       install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
-}
-
-addtask deploy before do_package after do_install

Modified: trunk/oe/packages/openocd/openocd_svn.bb
===================================================================
--- trunk/oe/packages/openocd/openocd_svn.bb    2007-03-15 07:22:59 UTC (rev 
1368)
+++ trunk/oe/packages/openocd/openocd_svn.bb    2007-03-15 11:08:51 UTC (rev 
1369)
@@ -11,10 +11,3 @@
 S = "${WORKDIR}/openocd/trunk"
 
 EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"  
-
-do_deploy() {
-       install -d ${DEPLOY_DIR_IMAGE}
-       install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
-}
-
-addtask deploy before do_package after do_install




--- End Message ---
--- Begin Message ---
Author: dodji
Date: 2007-03-15 12:52:57 +0100 (Thu, 15 Mar 2007)
New Revision: 1370

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.h
Log:
Expose meaning signals, support on demand page switching

        * src/today-events-area.c,h: expose signals
          event-added, event-selected, page-switched.
          Make the internals use these.
          added today_events_area_switch_to_prev_page() and
          today_events_area_switch_to_next_page().


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:08:51 UTC (rev 1369)
+++ 
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c    
    2007-03-15 11:52:57 UTC (rev 1370)
@@ -1,3 +1,5 @@
+/* vi:set sw=2: */
+
 /*
  *  Today - At a glance view of date, time, calender events, todo items and
  *  other images.
@@ -45,6 +47,16 @@
   int nb_events ;
 };
 
+enum TodayEventsAreaSignals
+{
+  EVENTS_ADDED_SIGNAL,
+  EVENT_SELECTED_SIGNAL,
+  PAGE_SWITCHED_SIGNAL,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] ;
+
 static void     today_events_area_finalize  (GObject *a_obj);
 static void     today_events_area_init      (TodayEventsArea *a_this);
 static void     clear_right_hand_side       (TodayEventsArea *a_this);
@@ -63,7 +75,8 @@
 static void     render_events_page_auto     (TodayEventsArea *a_this) ;
 static void     e_cal_component_list_free   (GList * list) ;
 static gchar*   icaltime_to_pretty_string   (const icaltimetype *timetype) ;
-static int      get_list_elem_index         (GList *a_elem) ;
+static void     event_selected_signal       (TodayEventsArea *a_this,
+                                             guint a_index) ;
 
 G_DEFINE_TYPE (TodayEventsArea, today_events_area, GTK_TYPE_TABLE)
 
@@ -75,6 +88,38 @@
   object_class = G_OBJECT_CLASS (a_class);
   object_class->finalize = today_events_area_finalize;
   g_type_class_add_private (object_class, sizeof (TodayEventsAreaPrivate));
+
+  a_class->event_selected = event_selected_signal ;
+
+  signals[EVENTS_ADDED_SIGNAL] =
+    g_signal_new ("event-added",
+                  TODAY_TYPE_EVENTS_AREA,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (TodayEventsAreaClass, events_added),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__POINTER,
+                  G_TYPE_NONE,
+                  1, G_TYPE_POINTER) ;
+
+  signals[EVENT_SELECTED_SIGNAL] =
+    g_signal_new ("event-selected",
+                   TODAY_TYPE_EVENTS_AREA,
+                   G_SIGNAL_RUN_FIRST,
+                   G_STRUCT_OFFSET (TodayEventsAreaClass, event_selected),
+                   NULL, NULL,
+                   g_cclosure_marshal_VOID__UINT,
+                   G_TYPE_NONE,
+                   1, G_TYPE_UINT) ;
+
+  signals[PAGE_SWITCHED_SIGNAL] =
+    g_signal_new ("page-switched",
+                  TODAY_TYPE_EVENTS_AREA,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (TodayEventsAreaClass, page_switched),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__UINT,
+                  G_TYPE_NONE,
+                  1, G_TYPE_UINT) ;
 }
 
 static void
@@ -123,7 +168,7 @@
     if (a_event_box) {/*keep compiler happy*/}
 
     if (a_button->type == GDK_BUTTON_PRESS)
-      today_events_area_select_next_event (a_area) ;
+      today_events_area_switch_to_next_page (a_area) ;
 
     return FALSE ;
 }
@@ -134,7 +179,6 @@
                                   TodayEventsArea *a_area)
 {
   int event_index = 0 ;
-  GList *event_elem = NULL ;
 
   g_return_val_if_fail (a_area && TODAY_IS_EVENTS_AREA (a_area), FALSE) ;
 
@@ -143,8 +187,9 @@
 
   event_index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a_event_box),
                                                     "event-index")) ;
-  event_elem = g_list_nth (a_area->priv->events, event_index) ;
-  select_event (a_area, event_elem) ;
+  g_return_val_if_fail (event_index >= 0, FALSE) ;
+  g_signal_emit (G_OBJECT (a_area),
+                 signals[EVENT_SELECTED_SIGNAL], 0, event_index) ;
 
   return FALSE;
 }
@@ -157,6 +202,19 @@
  * <private api>
  **********************/
 
+static void
+event_selected_signal (TodayEventsArea *a_this,
+                       guint a_index)
+{
+  GList *elem ;
+
+  g_return_if_fail (a_this && TODAY_IS_EVENTS_AREA (a_this)
+                    && a_this->priv) ;
+
+  elem = g_list_nth (a_this->priv->events, a_index) ;
+  select_event (a_this, elem) ;
+}
+
 /**
  * e_cal_component_list_free:
  * @list: the list ECalComooment to free
@@ -327,12 +385,18 @@
   {
     return NULL ;
   }
-  event_index = get_list_elem_index (a_event) ;
+  event_index = g_list_position (a_this->priv->events,
+                                 a_event) ;
   g_return_val_if_fail (event_index >= 0, NULL) ;
 
   a_this->priv->cur_event = a_event ;
   a_this->priv->cur_event_index = event_index ;
 
+  /*
+   * if the index of the current event is out of the range of the
+   * currently visible page, move the range of the page and re-render the
+   * page so that the current event becomes visible
+   */
   if ((a_this->priv->page_start_index + a_this->priv->max_visible_events
       <= a_this->priv->cur_event_index)
       ||
@@ -341,6 +405,7 @@
     render_events_page_auto (a_this) ;
   }
 
+  /*update the left hand side page info label*/
   update_paging_info (a_this) ;
 
   return a_event;
@@ -388,18 +453,6 @@
     return result ;
 }
 
-static int
-get_list_elem_index (GList *a_elem)
-{
-  int nb = -1 ;
-  GList *cur = NULL ;
-
-  for (cur = a_elem ; cur ; cur = cur->prev)
-    ++nb ;
-
-  return nb ;
-}
-
 static void
 render_event (TodayEventsArea *a_this,
               GList *a_event)
@@ -423,7 +476,7 @@
 
   event = a_event->data ;
   g_return_if_fail (E_IS_CAL_COMPONENT (event)) ;
-  event_index = get_list_elem_index (a_event) ;
+  event_index = g_list_position (a_this->priv->events, a_event) ;
   g_return_if_fail (event_index >= 0) ;
 
   /*get the event summary*/
@@ -461,6 +514,7 @@
 {
   GList *cur = NULL ;
   int nb_rendered = 0 ;
+  int prev_page_start_index = 0 ;
 
   g_return_if_fail (a_this
                     && TODAY_IS_EVENTS_AREA (a_this)
@@ -471,6 +525,8 @@
   if (!a_this->priv->events)
     return ;
 
+  prev_page_start_index = a_this->priv->page_start_index ;
+
   if (a_from)
   {
     a_this->priv->page_start = a_from ;
@@ -482,7 +538,7 @@
   g_return_if_fail (a_this->priv->page_start) ;
 
   a_this->priv->page_start_index =
-    get_list_elem_index (a_this->priv->page_start) ;
+    g_list_position (a_this->priv->events, a_this->priv->page_start) ;
 
   init_right_hand_side (a_this) ;
   for (cur = a_this->priv->page_start ;
@@ -491,14 +547,24 @@
   {
     render_event (a_this, cur) ;
   }
+
+  /*if we rendered a new page, tell the world about it*/
+  if (a_this->priv->page_start_index != prev_page_start_index)
+  {
+    int page_num = (a_this->priv->page_start_index+1) %
+                      a_this->priv->max_visible_events ;
+    g_signal_emit (G_OBJECT (a_this), signals[PAGE_SWITCHED_SIGNAL], 0,
+                   page_num) ;
+  }
 }
 
 static void
 render_events_page_auto (TodayEventsArea *a_this)
 {
-  int page_end=0 ;
-  int page_start=0 ;
+  int page_end = 0 ;
+  int page_start = 0 ;
   GList *from = NULL ;
+
   g_return_if_fail (a_this
                     && TODAY_IS_EVENTS_AREA (a_this)
                     && a_this->priv) ;
@@ -527,6 +593,7 @@
     }
   }
 
+  /*now we have a decent page range. We can just render the page*/
   from = g_list_nth (a_this->priv->events, page_start) ;
   g_return_if_fail (from) ;
   render_events_page (a_this, from) ;
@@ -631,6 +698,25 @@
 }
 
 ECalComponent*
+today_events_area_get_event_from_index (TodayEventsArea *a_this,
+                                        int a_index)
+{
+  GList *elem ;
+  g_return_val_if_fail (a_this &&
+                        TODAY_IS_EVENTS_AREA (a_this) &&
+                        a_this->priv,
+                        NULL);
+  g_return_val_if_fail (a_this->priv->events, NULL) ;
+
+  elem = g_list_nth (a_this->priv->events, a_index) ;
+  if (elem)
+  {
+    return elem->data ;
+  }
+  return NULL ;
+}
+
+ECalComponent*
 today_events_area_select_next_event (TodayEventsArea *a_this)
 {
   GList *result = NULL ;
@@ -669,28 +755,6 @@
   return result->data ;
 }
 
-ECalComponent*
-today_events_area_goto_next_page (TodayEventsArea *a_this)
-{
-  int start_index = 0 ;
-  GList *page_start = NULL, *event = NULL;
-
-  g_return_val_if_fail (a_this &&
-                        TODAY_IS_EVENTS_AREA (a_this) &&
-                        a_this->priv,
-                        NULL);
-
-  start_index = get_list_elem_index (a_this->priv->page_start) ;
-  start_index += a_this->priv->max_visible_events ;
-  page_start = g_list_nth (a_this->priv->events, start_index) ;
-  if (!page_start)
-    page_start = a_this->priv->events ;
-  event = select_event (a_this, page_start) ;
-  if (!event)
-    return NULL ;
-  return event->data ;
-}
-
 void
 today_events_area_set_max_visible_events (TodayEventsArea *a_this,
                                           int a_max)
@@ -713,6 +777,57 @@
   return a_this->priv->max_visible_events ;
 }
 
+void
+today_events_area_switch_to_next_page (TodayEventsArea *a_this)
+{
+  GList *event_elem ;
+  int event_index ;
+
+  g_return_if_fail (a_this &&
+                    TODAY_IS_EVENTS_AREA (a_this) &&
+                    a_this->priv);
+  g_return_if_fail (a_this->priv->events) ;
+
+  if (a_this->priv->nb_events <= a_this->priv->max_visible_events)
+    return ;
+
+  event_index = a_this->priv->cur_event_index ;
+  event_index += a_this->priv->max_visible_events ;
+
+  event_elem = g_list_nth (a_this->priv->events, event_index) ;
+  if (!event_elem)
+    event_elem = a_this->priv->events ;
+
+  select_event (a_this, event_elem) ;
+}
+
+void
+today_events_area_switch_to_prev_page (TodayEventsArea *a_this)
+{
+  GList *event_elem ;
+  int event_index ;
+
+  g_return_if_fail (a_this &&
+                    TODAY_IS_EVENTS_AREA (a_this) &&
+                    a_this->priv);
+  g_return_if_fail (a_this->priv->events) ;
+
+  if (a_this->priv->nb_events <= a_this->priv->max_visible_events)
+    return ;
+
+  event_index = a_this->priv->cur_event_index ;
+  if (event_index > a_this->priv->max_visible_events)
+    event_index -= a_this->priv->max_visible_events ;
+  else
+    event_index = a_this->priv->nb_events - a_this->priv->max_visible_events-1;
+  event_index = MAX (event_index, 0) ;
+
+  event_elem = g_list_nth (a_this->priv->events, event_index) ;
+  g_return_if_fail (event_elem) ;
+
+  select_event (a_this, event_elem) ;
+}
+
 /**********************
  * </public api>
  **********************/

Modified: 
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.h    
    2007-03-15 11:08:51 UTC (rev 1369)
+++ 
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.h    
    2007-03-15 11:52:57 UTC (rev 1370)
@@ -1,3 +1,5 @@
+/* vi:set sw=2: */
+
 /*
  *  Today - At a glance view of date, time, calender events, todo items and
  *  other images.
@@ -47,23 +49,34 @@
 
 struct _TodayEventsAreaClass {
   GtkTableClass parent_class;
+
+  /*
+   * <noticeable events>
+   */
+  void (*events_added) (TodayEventsArea *self, GList *events) ;
+  void (*event_selected) (TodayEventsArea *self, guint event_index) ;
+  void (*page_switched) (TodayEventsArea *self, guint page_index) ;
+  /*
+   * </noticeable events>
+   */
 };
 
 GType          today_events_area_get_type (void);
 GtkWidget*     today_events_area_new ();
-void           today_events_area_set_events (TodayEventsArea *a_this,
+void           today_events_area_set_events (TodayEventsArea *self,
                                              GList *a_events);
-GList*         today_events_area_get_events (TodayEventsArea *a_this);
-int            today_events_area_get_nb_events (TodayEventsArea *a_this);
-ECalComponent* today_events_area_get_cur_event (TodayEventsArea *a_this);
-int            today_events_area_get_cur_event_index (TodayEventsArea *a_this);
-ECalComponent* today_events_area_select_next_event (TodayEventsArea *a_this) ;
-ECalComponent* today_events_area_goto_next_page (TodayEventsArea *a_this) ;
-void           today_events_area_set_max_visible_events
-                                                    (TodayEventsArea *a_this,
-                                                     int a_max) ;
-int            today_events_area_get_max_visible_events
-                                                    (TodayEventsArea *a_this) ;
+GList*         today_events_area_get_events (TodayEventsArea *self);
+int            today_events_area_get_nb_events (TodayEventsArea *self);
+ECalComponent* today_events_area_get_cur_event (TodayEventsArea *self);
+int            today_events_area_get_cur_event_index (TodayEventsArea *self);
+ECalComponent* today_events_area_get_event_from_index (TodayEventsArea *self,
+                                                       int index) ;
+ECalComponent* today_events_area_select_next_event (TodayEventsArea *self) ;
+void           today_events_area_set_max_visible_events (TodayEventsArea *self,
+                                                         int max) ;
+int            today_events_area_get_max_visible_events (TodayEventsArea 
*self);
+void           today_events_area_switch_to_next_page (TodayEventsArea *self) ;
+void           today_events_area_switch_to_prev_page (TodayEventsArea *self) ;
 
 G_END_DECLS
 




--- End Message ---
--- Begin Message ---
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 */




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-03-15 13:27:32 +0100 (Thu, 15 Mar 2007)
New Revision: 1372

Added:
   
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_post_it_multiple.png
   
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_post_it_single.png
   
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-today
Modified:
   trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
Log:
* Add images and a gtkrc for openmoko-today


Added: 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_post_it_multiple.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_post_it_multiple.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_post_it_single.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/btn_post_it_single.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc     
2007-03-15 12:11:46 UTC (rev 1371)
+++ trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/gtkrc     
2007-03-15 12:27:32 UTC (rev 1372)
@@ -125,3 +125,4 @@
 include "mokoicons"
 
 include "contactspane"
+include "openmoko-today"

Added: 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-today
===================================================================
--- 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-today
    2007-03-15 12:11:46 UTC (rev 1371)
+++ 
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/openmoko-today
    2007-03-15 12:27:32 UTC (rev 1372)
@@ -0,0 +1,25 @@
+
+style "multi-postit" {
+   engine "pixmap" {
+        image {
+            function        = FLATBOX
+            state           = NORMAL
+            file            = "btn_post_it_multiple.png"
+        }
+   }
+   bg_pixmap[NORMAL] = "btn_post_it_multiple.png"
+}
+
+widget "*today-multi-postit" style "multi-postit"
+
+style "multi-postit" {
+   engine "pixmap" {
+        image {
+            function        = BOX
+            state           = NORMAL
+            file            = "btn_post_it_multiple.png"
+        }
+   }
+}
+
+widget "*today-events-area-postit-multi" style "multi-postit"




--- End Message ---
--- Begin Message ---
Author: dodji
Date: 2007-03-15 13:50:49 +0100 (Thu, 15 Mar 2007)
New Revision: 1373

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
Log:
Emit the events-added signal

        * src/today-events-area.c: don't forget to emit the signal
          events-added, when edited.


Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog      
2007-03-15 12:27:32 UTC (rev 1372)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog      
2007-03-15 12:50:49 UTC (rev 1373)
@@ -1,3 +1,17 @@
+Thu, 15 Mar 2007 13:43:47 +0100 Dodji Seketeli
+
+       * src/today-events-area.c: don't forget to emit the signal
+         events-added, when edited.
+
+Thu, 15 Mar 2007 12:44:51 +0100 Dodji Seketeli
+
+       * src/today-events-area.c,h: expose signals
+         event-added, event-selected, page-switched.
+         Make the internals use these.
+          added today_events_area_switch_to_prev_page() and
+         today_events_area_switch_to_next_page().
+
+
 Tue, 13 Mar 2007 17:53:33 +0100 Dodji Seketeli <[EMAIL PROTECTED]>
 
        * autogen.sh: remove my specific --prefix

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 12:27:32 UTC (rev 1372)
+++ 
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c    
    2007-03-15 12:50:49 UTC (rev 1373)
@@ -665,6 +665,8 @@
    */
   render_events_page (a_this, a_events) ;
   update_paging_info (a_this) ;
+  g_signal_emit (G_OBJECT (a_this), signals[EVENTS_ADDED_SIGNAL], 0,
+                 a_events) ;
 }
 
 GList*




--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to