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. r4308 - in
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: .
data/gtk-2.0 src ([EMAIL PROTECTED])
2. r4309 - in
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: .
data/gtk-2.0 ([EMAIL PROTECTED])
3. r4310 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/common ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-04-04 14:02:33 +0200 (Fri, 04 Apr 2008)
New Revision: 4308
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
2008-04-04 Thomas Wood <[EMAIL PROTECTED]>
* data/gtk-2.0/openmoko-dialer: Add borders to keypad buttons
* src/moko-draw.c: (moko_draw_box): Implement border option
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
2008-04-03 16:37:21 UTC (rev 4307)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
2008-04-04 12:02:33 UTC (rev 4308)
@@ -1,3 +1,8 @@
+2008-04-04 Thomas Wood <[EMAIL PROTECTED]>
+
+ * data/gtk-2.0/openmoko-dialer: Add borders to keypad buttons
+ * src/moko-draw.c: (moko_draw_box): Implement border option
+
2008-04-03 Thomas Wood <[EMAIL PROTECTED]>
* data/matchbox/closebutton.xpm:
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
===================================================================
---
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
2008-04-03 16:37:21 UTC (rev 4307)
+++
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
2008-04-04 12:02:33 UTC (rev 4308)
@@ -12,3 +12,9 @@
widget "*.MokoDialerTextview" style "mokodialertextview"
widget "*.MokoTips*" style "mokodialertextview"
+style "dialpad" {
+ engine "moko-engine" {
+ border = TRUE
+ }
+}
+widget_class "*MokoKeypad*" style "dialpad"
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
2008-04-03 16:37:21 UTC (rev 4307)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
2008-04-04 12:02:33 UTC (rev 4308)
@@ -68,6 +68,15 @@
else
gc = style->bg_gc[state_type];
+ if (MOKO_RC_STYLE (style->rc_style)->has_border)
+ {
+ gdk_draw_rectangle (window, style->dark_gc[state_type], TRUE,
+ x, y, width, height);
+ x += 2;
+ y += 2;
+ width -= 4;
+ height -= 4;
+ }
gdk_draw_rectangle (window, gc, TRUE, x, y, width, height);
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-04 14:12:50 +0200 (Fri, 04 Apr 2008)
New Revision: 4309
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
Log:
2008-04-04 Thomas Wood <[EMAIL PROTECTED]>
* data/gtk-2.0/gtkrc: Darken "base" widgets.
Fix toolbar button prelight issues
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
2008-04-04 12:02:33 UTC (rev 4308)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
2008-04-04 12:12:50 UTC (rev 4309)
@@ -1,5 +1,10 @@
2008-04-04 Thomas Wood <[EMAIL PROTECTED]>
+ * data/gtk-2.0/gtkrc: Darken "base" widgets.
+ Fix toolbar button prelight issues
+
+2008-04-04 Thomas Wood <[EMAIL PROTECTED]>
+
* data/gtk-2.0/openmoko-dialer: Add borders to keypad buttons
* src/moko-draw.c: (moko_draw_box): Implement border option
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
2008-04-04 12:02:33 UTC (rev 4308)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
2008-04-04 12:12:50 UTC (rev 4309)
@@ -14,7 +14,7 @@
gtk-icon-sizes =
"gtk-button=32,32:gtk-small-toolbar=48,48:gtk-large-toolbar=48,48"
# Set the default gtk-color-scheme property
-gtk_color_scheme =
"fg_color:#fff;bg_color:#333;base_color:#fff;text_color:#000;selected_bg_color:#ff7d00;selected_fg_color:#000"
+gtk_color_scheme =
"fg_color:#fff;bg_color:#333;base_color:#aaa;text_color:#000;selected_bg_color:#ff7d00;selected_fg_color:#000"
style "default"
{
@@ -43,8 +43,8 @@
GtkScrollbar::stepper_spacing = 0
GtkSpinButton::shadow_type = GTK_SHADOW_NONE
GtkTreeView::allow_rules = 1
- GtkTreeView::even_row_color = "#fff"
- GtkTreeView::odd_row_color = "#e7e7e7"
+ GtkTreeView::even_row_color = "#aaa"
+ GtkTreeView::odd_row_color = "#999"
GtkTreeView::vertical_separator = 6
GtkWidget::focus_line_width = 2
GtkWidget::focus_padding = 0
@@ -88,7 +88,7 @@
bg[NORMAL] = lighter (@bg_color)
bg[PRELIGHT] = lighter (@bg_color)
}
-class "GtkButton" style "button"
+widget_class "*GtkButton" style "button"
style "button-with-indicator"
{
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-04-04 18:55:32 +0200 (Fri, 04 Apr 2008)
New Revision: 4310
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c
Log:
openmoko-dialer2: cannot display Contact name in Call history (Erin Yueh)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-04 12:12:50 UTC (rev 4309)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-04 16:55:32 UTC (rev 4310)
@@ -1,3 +1,9 @@
+2008-04-05 Erin Yueh <[EMAIL PROTECTED]>
+
+ * src/common/moko-contacts.c: (moko_contacts_add_contact),
(moko_contacts_init)
+
+ bug#1305: cannot display Contact name in Call history
+
2008-03-31 Thomas Wood <[EMAIL PROTECTED]>
* src/dialer/dialer-main.c: (main):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c
2008-04-04 12:12:50 UTC (rev 4309)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-contacts.c
2008-04-04 16:55:32 UTC (rev 4310)
@@ -48,7 +48,7 @@
GList *contacts;
GList *entries;
GHashTable *prefixes;
-
+ GHashTable *uids;
Digit *start;
};
@@ -251,25 +251,32 @@
{
MokoContactsPrivate *priv;
MokoContact *m_contact = NULL;
- const gchar *name;
+ const gchar *name, *uid;
GList *attributes, *params, *numbers;
g_return_if_fail (MOKO_IS_CONTACTS (contacts));
g_return_if_fail (E_IS_CONTACT (e_contact));
priv = contacts->priv;
+ uid = e_contact_get_const (e_contact, E_CONTACT_UID);
+ if (g_hash_table_lookup (priv->uids, uid))
+ return;
+
name = e_contact_get_const (e_contact, E_CONTACT_FULL_NAME);
if (!name || (g_utf8_strlen (name, -1) <= 0))
name = "Unknown";
-
+
/* Create the contact & append to the list */
m_contact = g_new0 (MokoContact, 1);
m_contact->name = g_strdup (name);
- m_contact->uid = e_contact_get (e_contact, E_CONTACT_UID);
+ m_contact->uid = g_strdup (uid);
m_contact->photo = NULL;
priv->contacts = g_list_append (priv->contacts, m_contact);
-
+ g_hash_table_insert (priv->uids,
+ g_strdup (uid),
+ m_contact);
+
/* Now go through the numbers,creating MokoNumber for them */
for (attributes = e_vcard_get_attributes (E_VCARD(e_contact)); attributes;
attributes = attributes->next)
{
@@ -367,6 +374,7 @@
priv = MOKO_CONTACTS (contacts)->priv;
g_hash_table_destroy (priv->prefixes);
+ g_hash_table_destroy (priv->uids);
for (l = priv->contacts; l != NULL; l = l->next)
{
@@ -420,6 +428,7 @@
EBook *book;
EBookView *view;
EBookQuery *query;
+ GList *contact, *c;
priv = contacts->priv = MOKO_CONTACTS_GET_PRIVATE (contacts);
@@ -428,7 +437,8 @@
priv->start = NULL;
priv->prefixes = g_hash_table_new ((GHashFunc)g_str_hash,
(GEqualFunc)g_str_equal);
-
+ priv->uids = g_hash_table_new ((GHashFunc)g_str_hash,
+ (GEqualFunc)g_str_equal);
query = e_book_query_any_field_contains ("");
/* Open the system book and check that it is valid */
@@ -438,10 +448,23 @@
g_warning ("Failed to create system book\n");
return;
}
+
if (!e_book_open (book, FALSE, NULL))
{
g_warning ("Failed to open system book\n");
return;
+ }
+
+ if (!e_book_get_contacts (book, query, &contact, NULL))
+ {
+ g_warning ("Failed to get contacts from system book\n");
+ return;
+ }
+
+ /* Go through the contacts, creating the contact structs, and entry
structs*/
+ for (c = contact; c != NULL; c = c->next)
+ {
+ moko_contacts_add_contact (contacts, E_CONTACT (c->data));
}
/* Connect to the ebookviews signals */
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
