r3829 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . data src/dialer src/phone-kit
chris at sita.openmoko.org
chris at sita.openmoko.org
Mon Jan 14 16:53:04 CET 2008
Author: chris
Date: 2008-01-14 16:53:02 +0100 (Mon, 14 Jan 2008)
New Revision: 3829
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unknown.png
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unkown.png
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
Patch by: Roman Moracvik <roman.moravcik at gmail.com>, bug #1157
* configure.ac:
* src/dialer/Makefile.am:
Add libjana-gtk to dependencies
* data/Makefile.am:
* src/phone-kit/moko-talking.c: (moko_talking_set_clip),
(moko_talking_incoming_call), (moko_talking_outgoing_call):
Rename unkown.png -> unknown.png
* src/dialer/moko-history.c: (history_add_entry),
(moko_history_load_entries), (moko_history_init):
Use JanaGtkCellRendererNote to display more details in the dialer
history
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2008-01-14 15:53:02 UTC (rev 3829)
@@ -1,5 +1,23 @@
2008-01-14 Chris Lord <chris at openedhand.com>
+ Patch by: Roman Moracvik <roman.moravcik at gmail.com>, bug #1157
+
+ * configure.ac:
+ * src/dialer/Makefile.am:
+ Add libjana-gtk to dependencies
+
+ * data/Makefile.am:
+ * src/phone-kit/moko-talking.c: (moko_talking_set_clip),
+ (moko_talking_incoming_call), (moko_talking_outgoing_call):
+ Rename unkown.png -> unknown.png
+
+ * src/dialer/moko-history.c: (history_add_entry),
+ (moko_history_load_entries), (moko_history_init):
+ Use JanaGtkCellRendererNote to display more details in the dialer
+ history
+
+2008-01-14 Chris Lord <chris at openedhand.com>
+
* src/phone-kit/moko-network.c: (retry_oper_get),
(retry_opers_get), (retry_get_imsi), (on_network_registered),
(net_msghandler), (phone_msghandler), (moko_network_init):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac 2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac 2008-01-14 15:53:02 UTC (rev 3829)
@@ -21,7 +21,7 @@
libmokoui2
libpulse)
-PKG_CHECK_MODULES(JANA, libjana libjana-ecal)
+PKG_CHECK_MODULES(JANA, libjana libjana-ecal libjana-gtk)
PKG_CHECK_MODULES(NOTIFY, libnotify)
old_cflags=$CFLAGS
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am 2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/Makefile.am 2008-01-14 15:53:02 UTC (rev 3829)
@@ -1,7 +1,7 @@
# A shell check command that I find convenient:
# ls -1 *.png | xargs --replace=pngimg sh -c '(grep -qw "pngimg" Makefile.am || echo "Missing pngimg")'
-dist_pkgdata_DATA =unkown.png\
+dist_pkgdata_DATA =unknown.png\
dialed.png\
missed.png\
received.png\
Copied: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unknown.png (from rev 3824, trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unkown.png)
Deleted: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/data/unkown.png
===================================================================
(Binary files differ)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am 2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am 2008-01-14 15:53:02 UTC (rev 3829)
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall @DIALER_CFLAGS@
+AM_CFLAGS = -Wall @DIALER_CFLAGS@ @JANA_CFLAGS@
INCLUDES = -I$(top_srcdir)/src/common
@@ -11,4 +11,4 @@
moko-tips.c moko-tips.h \
dialer-main.c
-openmoko_dialer_LDADD = @DIALER_LIBS@ $(top_srcdir)/src/common/libdialer-common.a
+openmoko_dialer_LDADD = @DIALER_LIBS@ @JANA_LIBS@ $(top_srcdir)/src/common/libdialer-common.a
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c 2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c 2008-01-14 15:53:02 UTC (rev 3829)
@@ -21,6 +21,8 @@
#include <gtk/gtk.h>
+#include <libjana-gtk/jana-gtk.h>
+
#include <string.h>
#include <moko-journal.h>
@@ -88,6 +90,7 @@
DSTART_COLUMN,
ICON_NAME_COLUMN,
DISPLAY_TEXT_COLUMN,
+ CALL_DETAILS_COLUMN,
CALL_TYPE_COLUMN,
ENTRY_POINTER_COLUMN
};
@@ -233,16 +236,22 @@
MokoContactEntry *contacts;
GdkPixbuf *icon = NULL;
const gchar *display_text;
- time_t dstart;
+ const gchar *details;
+ time_t dstart, dend, duration;
MessageDirection direction;
gboolean was_missed;
const MokoTime *time;
+ gchar dstart_str[256];
+ gchar duration_str[9];
gint type;
uid = moko_journal_entry_get_uid (entry);
moko_journal_entry_get_direction (entry, &direction);
time = moko_journal_entry_get_dtstart (entry);
dstart = moko_time_as_timet (time);
+ time = moko_journal_entry_get_dtend (entry);
+ dend = moko_time_as_timet (time);
+ duration = dend - dstart;
was_missed = moko_journal_voice_info_get_was_missed (entry);
number = moko_journal_voice_info_get_distant_number (entry);
@@ -279,6 +288,11 @@
display_text = number;
}
+ strftime (dstart_str, sizeof (dstart_str), "%d/%m/%Y %H:%M:%S",
+ localtime (&dstart));
+ strftime (duration_str, sizeof (duration_str), "%H:%M:%S", gmtime (&duration));
+ details = g_strdup_printf ("%s\t\t%s", dstart_str, duration_str);
+
if (display_text == NULL || uid == NULL)
{
/*g_debug ("Not adding");
@@ -289,6 +303,7 @@
DSTART_COLUMN, dstart,
ICON_NAME_COLUMN, icon,
DISPLAY_TEXT_COLUMN, display_text,
+ CALL_DETAILS_COLUMN, details,
CALL_TYPE_COLUMN, type,
ENTRY_POINTER_COLUMN, uid,
-1);
@@ -385,7 +400,6 @@
GtkListStore *store;
GtkTreeModel *sorted;
GtkTreeModel *filtered;
- GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
MokoJournalEntry *entry;
gint i, j, n_entries;
@@ -394,27 +408,24 @@
g_return_if_fail (MOKO_IS_HISTORY (history));
priv = history->priv;
- /* Create the columns */
- col = gtk_tree_view_column_new ();
+ /* Create renderer and column */
+ renderer = jana_gtk_cell_renderer_note_new ();
+ g_object_set (G_OBJECT (renderer), "show_created", FALSE,
+ "show_recipient", FALSE, NULL);
- renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_tree_view_column_pack_start (col, renderer, FALSE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "pixbuf", ICON_NAME_COLUMN,
- NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->treeview),
+ 0, NULL, renderer, "author", DISPLAY_TEXT_COLUMN, "body",
+ CALL_DETAILS_COLUMN, "icon", ICON_NAME_COLUMN, NULL);
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (col, renderer, TRUE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "text", DISPLAY_TEXT_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), col);
+ g_signal_connect (priv->treeview, "size-allocate",
+ G_CALLBACK (jana_gtk_utils_treeview_resize), renderer);
/* Set up the list store */
- store = gtk_list_store_new (6, G_TYPE_STRING,
+ store = gtk_list_store_new (7, G_TYPE_STRING,
G_TYPE_INT,
GDK_TYPE_PIXBUF,
G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_STRING);
priv->main_model = GTK_TREE_MODEL (store);
@@ -665,6 +676,7 @@
gtk_box_pack_start (GTK_BOX (history), scroll, TRUE, TRUE, 0);
treeview = priv->treeview = gtk_tree_view_new ();
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_container_add (GTK_CONTAINER (scroll), treeview);
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c 2008-01-14 15:20:00 UTC (rev 3828)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c 2008-01-14 15:53:02 UTC (rev 3829)
@@ -106,7 +106,7 @@
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->person), entry->contact->photo);
else
gtk_image_set_from_file (GTK_IMAGE (priv->person),
- PKGDATADIR"/unkown.png");
+ PKGDATADIR"/unknown.png");
g_free (markup);
}
@@ -164,7 +164,7 @@
gtk_label_set_text (GTK_LABEL (priv->status), number);
gtk_image_set_from_file (GTK_IMAGE (priv->person),
- PKGDATADIR"/unkown.png");
+ PKGDATADIR"/unknown.png");
if (priv->timeout)
g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
@@ -226,7 +226,7 @@
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->person), entry->contact->photo);
else
gtk_image_set_from_file (GTK_IMAGE (priv->person),
- PKGDATADIR"/unkown.png");
+ PKGDATADIR"/unknown.png");
if (priv->timeout)
g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
More information about the commitlog
mailing list
