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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-03-27 17:44:17 +0200 (Tue, 27 Mar 2007)
New Revision: 1519

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
Log:
* src/today-events-area.c: (update_paging_info): Set page numbers
rather than number of events on pager widget


Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-03-27 14:27:57 UTC (rev 1518)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-03-27 15:44:17 UTC (rev 1519)
@@ -1,5 +1,10 @@
-2007-03-26  Thomas Wood  <thomas at openedhand.com>
+Tue, 27 Mar 2007 16:41:20 +0100 Thomas Wood
 
+	* src/today-events-area.c: (update_paging_info): Set page numbers
+	rather than number of events on pager widget
+
+Mon, 26 Mar 2007 11:12:04 +0100 Thomas Wood
+
 	* src/Makefile.am: Change binary name to openmoko-today to be more
 	consistent with other openmoko applications
 

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-27 14:27:57 UTC (rev 1518)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c	2007-03-27 15:44:17 UTC (rev 1519)
@@ -34,6 +34,7 @@
 #include <gtk/gtklabel.h>
 #include "today-utils.h"
 #include "today-events-area.h"
+#include <math.h>
 
 
 struct _TodayEventsAreaPrivate {
@@ -596,9 +597,15 @@
   g_return_val_if_fail (a_this->priv->cur_event, FALSE) ;
   g_return_val_if_fail (a_this->priv->events, FALSE) ;
 
+  /* Set the page label to display the current and number of pages */
+
+  gdouble num = a_this->priv->max_visible_events;
+  int num_pages = ceil (a_this->priv->nb_events / num);
+  int curr_page = a_this->priv->cur_event_index / num + 1;
+
   str = g_strdup_printf ("%d/%d",
-                         a_this->priv->cur_event_index + 1,
-                         a_this->priv->nb_events) ;
+                         curr_page,
+                          num_pages) ;
 
   gtk_label_set_text (GTK_LABEL (a_this->priv->paging_info), str) ;
   g_free (str) ;