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. r3217 - in
trunk/src/target/OM-2007.2/libraries/libmokojournal2: .
mokojournal ([EMAIL PROTECTED])
2. r3218 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r3219 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r3220 - in
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard:
32x32/stock 48x48/stock ([EMAIL PROTECTED])
5. r3221 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
6. r3222 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-18 12:17:51 +0200 (Thu, 18 Oct 2007)
New Revision: 3217
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
Log:
Patch by: Roman Moravcik <[EMAIL PROTECTED]>
* mokojournal/moko-journal.{c,h}: (moko_journal_entry_get_dtend),
(moko_journal_entry_set_dtend): Added new MokoJournal property
dtend.
Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-10-18 06:35:38 UTC (rev 3216)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
2007-10-18 10:17:51 UTC (rev 3217)
@@ -1,3 +1,11 @@
+2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ Patch by: Roman Moravcik <[EMAIL PROTECTED]>
+
+ * mokojournal/moko-journal.{c,h}: (moko_journal_entry_get_dtend),
+ (moko_journal_entry_set_dtend): Added new MokoJournal property
+ dtend.
+
2007-10-08 Thomas Wood <[EMAIL PROTECTED]>
* doc/reference/Makefile.am: Fix spurious += to single =
@@ -140,3 +148,5 @@
* tests/test-delete-uid.c: (main):
* tests/test-delete.c: (main):
Initial Import from splitting openmoko-libs.
+
+/* vim: set noexpandtab sw=8 sts=8 ts=8: */
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
2007-10-18 06:35:38 UTC (rev 3216)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
2007-10-18 10:17:51 UTC (rev 3217)
@@ -664,6 +664,13 @@
prop = icalproperty_new_dtstart (date->t) ;
icalcomponent_add_property (comp, prop) ;
+ /*add dtend*/
+ date = moko_journal_entry_get_dtend (a_entry) ;
+ if (!date)
+ goto out ;
+ prop = icalproperty_new_dtend (date->t) ;
+ icalcomponent_add_property (comp, prop) ;
+
/*add location start*/
struct icalgeotype geo;
if (moko_journal_entry_get_start_location (a_entry,
(MokoLocation*)(void*)&geo))
@@ -880,6 +887,12 @@
(entry,
moko_time_new_from_icaltimetype (icalproperty_get_dtstart (prop)));
}
+ else if (icalproperty_isa (prop) == ICAL_DTEND_PROPERTY)
+ {
+ moko_journal_entry_set_dtend
+ (entry,
+ moko_time_new_from_icaltimetype (icalproperty_get_dtend (prop)));
+ }
else if (icalproperty_isa (prop) == ICAL_GEO_PROPERTY)
{
struct icalgeotype geo = icalproperty_get_geo (prop);
@@ -1756,6 +1769,26 @@
}
/**
+ * moko_journal_entry_get_dtend:
+ * @entry: the current instance of journal entry
+ *
+ * get the ending date associated to the journal entry
+ *
+ * Return value: an icaltimetype representing the ending date expected.
+ * It can be NULL. Client code must not deallocate it.
+ */
+const MokoTime*
+moko_journal_entry_get_dtend (MokoJournalEntry *a_entry)
+{
+ g_return_val_if_fail (a_entry, NULL) ;
+
+ if (!a_entry->dtend)
+ a_entry->dtend = moko_time_new_today () ;
+
+ return a_entry->dtend ;
+}
+
+/**
* moko_journal_entry_get_start_location:
* @a_entry: the current instance of journal entry
* @a_location: the requested location
@@ -1858,6 +1891,26 @@
}
/**
+ * moko_journal_entry_set_dtend:
+ * @entry: the current instance of journal entry
+ * @dtstart: the new ending date associated to the journal entry.
+ */
+void
+moko_journal_entry_set_dtend (MokoJournalEntry *a_entry, MokoTime* a_dtend)
+{
+ g_return_if_fail (a_entry) ;
+
+ if (a_entry->dtend)
+ {
+ moko_time_free (a_entry->dtend) ;
+ a_entry->dtend = NULL ;
+ }
+
+ if (a_dtend)
+ a_entry->dtend = a_dtend ;
+}
+
+/**
* moko_journal_entry_get_source:
* @a_entry: the current instance of journal entry
*
Modified:
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
2007-10-18 06:35:38 UTC (rev 3216)
+++
trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
2007-10-18 10:17:51 UTC (rev 3217)
@@ -162,6 +162,9 @@
const MokoTime * moko_journal_entry_get_dtstart
(MokoJournalEntry *entry);
void moko_journal_entry_set_dtstart
(MokoJournalEntry *entry,
MokoTime
*dtstart);
+const MokoTime * moko_journal_entry_get_dtend
(MokoJournalEntry *entry);
+void moko_journal_entry_set_dtend
(MokoJournalEntry *entry,
+ MokoTime
*dtend);
G_CONST_RETURN gchar *moko_journal_entry_get_source
(MokoJournalEntry *entry);
void moko_journal_entry_set_source
(MokoJournalEntry *entry,
const gchar
*source);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-18 12:28:56 +0200 (Thu, 18 Oct 2007)
New Revision: 3218
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
Patch by: Roman Moravcik <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_keypad_dial_clicked),
(on_talking_accepted_call), (on_talking_reject_call),
(on_incoming_call), (on_call_progress_changed):
Set value of MokoJournal properties dtstart and dtend
to indicate begin and end of call. When call was rejected
or missed dtstart will has the same value as dtend.
* src/moko-talking.c: (moko_talking_incoming_call),
(moko_talking_outgoing_call), (talking_timeout),
(moko_talking_accepted_call), (on_cancel_clicked),
(moko_init_tlking): Implemented displaying of call
duration.
Closes bug 936 - Dialer doesn't display duration of call during call
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 10:17:51 UTC (rev 3217)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 10:28:56 UTC (rev 3218)
@@ -1,3 +1,22 @@
+2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ Patch by: Roman Moravcik <[EMAIL PROTECTED]>
+
+ * src/moko-dialer.c: (on_keypad_dial_clicked),
+ (on_talking_accepted_call), (on_talking_reject_call),
+ (on_incoming_call), (on_call_progress_changed):
+ Set value of MokoJournal properties dtstart and dtend
+ to indicate begin and end of call. When call was rejected
+ or missed dtstart will has the same value as dtend.
+
+ * src/moko-talking.c: (moko_talking_incoming_call),
+ (moko_talking_outgoing_call), (talking_timeout),
+ (moko_talking_accepted_call), (on_cancel_clicked),
+ (moko_init_tlking): Implemented displaying of call
+ duration.
+
+ Closes bug 936 - Dialer doesn't display duration of call during call
+
2007-10-16 Daniel Willmann <[EMAIL PROTECTED]>
* src/moko-sound.{c,h}: Add GSM speaker out sound profile
@@ -1026,3 +1045,4 @@
* src/moko-dialer.h:
Intial Import
+/* vi: set noexpandtab sw=8 sts=8 ts=8: */
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-10-18 10:17:51 UTC (rev 3217)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-10-18 10:28:56 UTC (rev 3218)
@@ -293,9 +293,7 @@
if (priv->journal)
{
priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
- priv->time = moko_time_new_today ();
moko_journal_entry_set_direction (priv->entry, DIRECTION_OUT);
- moko_journal_entry_set_dtstart (priv->entry, priv->time);
moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
moko_journal_entry_set_gsm_location (priv->entry, &priv->gsm_location);
moko_journal_voice_info_set_distant_number (priv->entry, number);
@@ -365,15 +363,6 @@
/* Stop the notification */
moko_notify_stop (priv->notify);
- /* Finalise and add the journal entry */
- if (priv->journal && priv->entry)
- {
- moko_journal_add_entry (priv->journal, priv->entry);
- moko_journal_write_to_storage (priv->journal);
- priv->entry = NULL;
- priv->time = NULL;
- }
-
g_signal_emit (G_OBJECT (dialer), dialer_signals[TALKING], 0);
}
@@ -392,8 +381,11 @@
gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
/* Finalise and add the journal entry */
- if (priv->entry)
+ if (priv->journal && priv->entry)
{
+ priv->time = moko_time_new_today ();
+ moko_journal_entry_set_dtstart (priv->entry, priv->time);
+ moko_journal_entry_set_dtend (priv->entry, priv->time);
moko_journal_voice_info_set_was_missed (priv->entry, TRUE);
moko_journal_add_entry (priv->journal, priv->entry);
moko_journal_write_to_storage (priv->journal);
@@ -541,9 +533,7 @@
if (priv->journal)
{
priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
- priv->time = moko_time_new_today ();
moko_journal_entry_set_direction (priv->entry, DIRECTION_IN);
- moko_journal_entry_set_dtstart (priv->entry, priv->time);
moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
moko_journal_entry_set_gsm_location (priv->entry, &priv->gsm_location);
}
@@ -620,7 +610,6 @@
MokoDialer *dialer)
{
MokoDialerPrivate *priv;
- MessageDirection dir;
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
@@ -629,13 +618,17 @@
{
case MOKO_GSMD_PROG_DISCONNECT:
case MOKO_GSMD_PROG_RELEASE:
- moko_dialer_hung_up (dialer);
- moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
+ /* Finalise and add the journal entry */
if (priv->journal && priv->entry)
{
- moko_journal_entry_get_direction (priv->entry, &dir);
- if (dir == DIRECTION_IN)
+ priv->time = moko_time_new_today ();
+ moko_journal_entry_set_dtend (priv->entry, priv->time);
+
+ if (priv->status == DIALER_STATUS_INCOMING)
+ {
+ moko_journal_entry_set_dtstart (priv->entry, priv->time);
moko_journal_voice_info_set_was_missed (priv->entry, TRUE);
+ }
moko_journal_add_entry (priv->journal, priv->entry);
moko_journal_write_to_storage (priv->journal);
@@ -643,6 +636,9 @@
priv->time = NULL;
}
+ moko_dialer_hung_up (dialer);
+ moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
+
if (priv->incoming_clip)
g_free (priv->incoming_clip);
priv->incoming_clip = NULL;
@@ -662,6 +658,13 @@
moko_dialer_talking (dialer);
moko_talking_accepted_call (MOKO_TALKING (priv->talking), NULL, NULL);
moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), TRUE);
+
+ /* Update a journal entry */
+ if (priv->journal && priv->entry)
+ {
+ priv->time = moko_time_new_today ();
+ moko_journal_entry_set_dtstart (priv->entry, priv->time);
+ }
g_debug ("mokogsmd connected");
break;
case MOKO_GSMD_PROG_SETUP:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-10-18 10:17:51 UTC (rev 3217)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-10-18 10:28:56 UTC (rev 3218)
@@ -39,6 +39,7 @@
GtkWidget *main_bar;
GtkWidget *title;
+ GtkWidget *duration;
GtkWidget *icon;
GtkWidget *person;
@@ -48,6 +49,7 @@
GdkPixbuf *incoming[4];
GdkPixbuf *outgoing[4];
+ GTimer *dtimer;
guint timeout;
};
@@ -128,6 +130,7 @@
gtk_widget_show (priv->incoming_bar);
gtk_label_set_text (GTK_LABEL (priv->title), "Incoming Call");
+ gtk_label_set_text (GTK_LABEL (priv->duration), "");
gtk_image_set_from_file (GTK_IMAGE (priv->icon),
PKGDATADIR"/incoming_3.png");
@@ -181,6 +184,7 @@
markup = g_strdup (number);
gtk_label_set_text (GTK_LABEL (priv->title), "Outgoing Call");
+ gtk_label_set_text (GTK_LABEL (priv->duration), "");
gtk_label_set_markup (GTK_LABEL (priv->status), markup);
@@ -202,11 +206,26 @@
talking_timeout (MokoTalking *talking)
{
MokoTalkingPrivate *priv;
+ gdouble elapsed;
+ gint hour, min, sec;
+ gchar *markup = NULL;
static gint i = 0;
g_return_val_if_fail (MOKO_IS_TALKING (talking), FALSE);
priv = talking->priv;
+ if (priv->dtimer)
+ {
+ elapsed = g_timer_elapsed(priv->dtimer, NULL);
+
+ hour = (gint) (elapsed / 3600);
+ min = (gint) ((elapsed - 3600 * hour) / 60);
+ sec = (gint) (elapsed - 3600 * hour - 60 * min);
+
+ markup = g_strdup_printf ("%02d:%02d:%02d", hour, min, sec);
+ gtk_label_set_markup (GTK_LABEL (priv->duration), markup);
+ }
+
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon),
priv->talking[i]);
@@ -214,6 +233,7 @@
if (i == 5)
i = 0;
+ g_free(markup);
return TRUE;
}
@@ -239,9 +259,15 @@
markup = g_strdup (number);
gtk_label_set_text (GTK_LABEL (priv->title), "Talking");
+ gtk_label_set_text (GTK_LABEL (priv->duration), "00:00:00");
gtk_image_set_from_file (GTK_IMAGE (priv->icon),
PKGDATADIR"/talking_3.png");
+ /* start call duration timer */
+ if (priv->dtimer)
+ g_timer_destroy(priv->dtimer);
+ priv->dtimer = g_timer_new();
+
/* We don't change the status or person widgets, as incoming call has already
* set them for us.
*/
@@ -278,6 +304,10 @@
static void
on_cancel_clicked (GtkToolButton *button, MokoTalking *talking)
{
+ /* stop call duration timer */
+ if (talking->priv->dtimer)
+ g_timer_destroy(talking->priv->dtimer);
+
g_source_remove (talking->priv->timeout);
moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
g_signal_emit (G_OBJECT (talking), talking_signals[CANCEL_CALL], 0);
@@ -364,6 +394,7 @@
{
MokoTalkingPrivate *priv;
GtkWidget *toolbar, *image, *vbox, *hbox, *label, *align, *frame;
+ GtkWidget *duration;
GtkToolItem *item;
GdkPixbuf *icon;
gint i;
@@ -448,6 +479,10 @@
priv->icon = image = gtk_image_new ();
gtk_container_add (GTK_CONTAINER (align), image);
+ priv->duration = duration = gtk_label_new ("00:00:00");
+ gtk_misc_set_alignment (GTK_MISC (duration), 0.5, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), duration, FALSE, FALSE, 0);
+
/* The status area */
align = gtk_alignment_new (0.5, 0.5, 1, 0 );
gtk_box_pack_start (GTK_BOX (talking), align, TRUE, TRUE, 0);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-18 16:17:37 +0200 (Thu, 18 Oct 2007)
New Revision: 3219
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
Log:
* src/moko-dialer-textview.c: (moko_dialer_textview_set_color): Use the
pixel size of the text to calculate font level in the number display.
Fixes bug 868 - Resizing of number display is wrong
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 10:28:56 UTC (rev 3218)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 14:17:37 UTC (rev 3219)
@@ -1,5 +1,12 @@
2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+ * src/moko-dialer-textview.c: (moko_dialer_textview_set_color): Use the
+ pixel size of the text to calculate font level in the number display.
+
+ Fixes bug 868 - Resizing of number display is wrong
+
+2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+
Patch by: Roman Moravcik <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_keypad_dial_clicked),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
2007-10-18 10:28:56 UTC (rev 3218)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
2007-10-18 14:17:37 UTC (rev 3219)
@@ -160,7 +160,6 @@
{
GtkTextBuffer *buffer;
- gint len;
GtkTextIter start, cursoriter_1, cursoriter;
GtkTextIter end;
gint small = 10, medium = 10, large = 10;
@@ -204,26 +203,54 @@
gtk_widget_style_get (GTK_WIDGET (moko_dialer_textview), "medium_font",
&medium, NULL);
gtk_widget_style_get (GTK_WIDGET (moko_dialer_textview), "large_font",
&large, NULL);
+ PangoLayout *pl;
+ gchar *text;
+ int pl_w, pl_h, textview_w, textview_h;
+ GdkWindow *textview_window;
+ gboolean centre_v = TRUE;
+ g_object_get (G_OBJECT (buffer), "text", &text, NULL);
- len = gtk_text_buffer_get_char_count (buffer);
- if (len >= 12 && len <= 64)
+ /* create a pango layout to try different text sizes on */
+ pl = pango_layout_new (gtk_widget_get_pango_context (GTK_WIDGET
(moko_dialer_textview)));
+ pango_layout_set_text (pl, text, -1);
+
+ /* get the textview width */
+ textview_window = gtk_text_view_get_window (GTK_TEXT_VIEW
(moko_dialer_textview), GTK_TEXT_WINDOW_WIDGET);
+ gdk_drawable_get_size (textview_window, &textview_w, &textview_h);
+
+ /* try large size */
+ pango_font_description_set_size (moko_dialer_textview->font_desc_textview,
large * PANGO_SCALE);
+ pango_layout_set_font_description (pl,
moko_dialer_textview->font_desc_textview);
+ pango_layout_get_pixel_size (pl, &pl_w, &pl_h);
+
+ if (pl_w >= textview_w)
{
- if (moko_dialer_textview->font_desc_textview)
- pango_font_description_set_size (moko_dialer_textview->
- font_desc_textview, small *
PANGO_SCALE);
+ /* try medium size */
+ pango_font_description_set_size (moko_dialer_textview->font_desc_textview,
medium * PANGO_SCALE);
+ pango_layout_set_font_description (pl,
moko_dialer_textview->font_desc_textview);
+ pango_layout_get_pixel_size (pl, &pl_w, &pl_h);
+
+ /* set size to small if medium does not fit */
+ if (pl_w >= textview_w)
+ {
+ pango_font_description_set_size
(moko_dialer_textview->font_desc_textview, small * PANGO_SCALE);
+ centre_v = FALSE;
+ }
}
- else if (len >= 9 && len < 12)
+
+ /* we only want to centre the text vertically for large and medium fonts */
+ if (centre_v)
{
- if (moko_dialer_textview->font_desc_textview)
- pango_font_description_set_size (moko_dialer_textview->
- font_desc_textview, medium *
PANGO_SCALE);
+ int padding = 0;
+ padding = MAX(0, (textview_h - pl_h) / 2);
+ gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW
(moko_dialer_textview), padding);
+ gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW
(moko_dialer_textview), padding);
}
- else if (len >= 0 && len < 9)
+ else
{
- if (moko_dialer_textview->font_desc_textview)
- pango_font_description_set_size (moko_dialer_textview->
- font_desc_textview, large *
PANGO_SCALE);
+ gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW
(moko_dialer_textview), 0);
+ gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW
(moko_dialer_textview), 0);
}
gtk_widget_modify_font (GTK_WIDGET (moko_dialer_textview),
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-18 16:51:18 +0200 (Thu, 18 Oct 2007)
New Revision: 3220
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/stock/stock_calendar-view-month.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/stock/stock_calendar-view-work-week.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/stock/stock_calendar-view-month.png
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/stock/stock_calendar-view-work-week.png
Log:
* Add replacement icons for month and week views
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/stock/stock_calendar-view-month.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/32x32/stock/stock_calendar-view-work-week.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/stock/stock_calendar-view-month.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007.2/artwork/icons/openmoko-standard/48x48/stock/stock_calendar-view-work-week.png
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-18 16:56:58 +0200 (Thu, 18 Oct 2007)
New Revision: 3221
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c:
(moko_finger_scroll_motion_notify_cb):
Call gtk_widget_get_pointer in the correct place to avoid missing
motion events, as spotted by Frank Li
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-18
14:51:18 UTC (rev 3220)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-18
14:56:58 UTC (rev 3221)
@@ -1,3 +1,10 @@
+2007-10-18 Chris Lord <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-finger-scroll.c:
+ (moko_finger_scroll_motion_notify_cb):
+ Call gtk_widget_get_pointer in the correct place to avoid missing
+ motion events, as spotted by Frank Li
+
2007-10-15 Chris Lord <[EMAIL PROTECTED]>
* libmokoui/moko-finger-scroll.c:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-18 14:51:18 UTC (rev 3220)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-18 14:56:58 UTC (rev 3221)
@@ -417,6 +417,8 @@
gint dnd_threshold;
gdouble x, y;
+ gdk_window_get_pointer (GTK_WIDGET (scroll)->window, NULL, NULL, 0);
+
if ((!priv->enabled) || (!priv->clicked) ||
((event->time == priv->last_time) &&
(event->type == priv->last_type))) return TRUE;
@@ -482,8 +484,6 @@
gdk_event_free ((GdkEvent *)event);
}
- gdk_window_get_pointer (GTK_WIDGET (scroll)->window, NULL, NULL, 0);
-
return TRUE;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-18 17:25:37 +0200 (Thu, 18 Oct 2007)
New Revision: 3222
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
* src/moko-talking.c: (moko_talking_init): Use stock items for
talking/incoming/outgoing page toolbars
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 14:56:58 UTC (rev 3221)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-18 15:25:37 UTC (rev 3222)
@@ -1,5 +1,10 @@
2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+ * src/moko-talking.c: (moko_talking_init): Use stock items for
+ talking/incoming/outgoing page toolbars
+
+2007-10-18 Thomas Wood <[EMAIL PROTECTED]>
+
* src/moko-dialer-textview.c: (moko_dialer_textview_set_color): Use the
pixel size of the text to calculate font level in the number display.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-10-18 14:56:58 UTC (rev 3221)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-10-18 15:25:37 UTC (rev 3222)
@@ -20,6 +20,7 @@
#include <gtk/gtk.h>
#include <moko-journal.h>
+#include <moko-stock.h>
#include "moko-sound.h"
#include "moko-talking.h"
@@ -396,7 +397,6 @@
GtkWidget *toolbar, *image, *vbox, *hbox, *label, *align, *frame;
GtkWidget *duration;
GtkToolItem *item;
- GdkPixbuf *icon;
gint i;
priv = talking->priv = MOKO_TALKING_GET_PRIVATE (talking);
@@ -405,63 +405,40 @@
gtk_widget_set_no_show_all (priv->incoming_bar, TRUE);
gtk_box_pack_start (GTK_BOX (talking), toolbar, FALSE, FALSE, 0);
- icon = gdk_pixbuf_new_from_file (PKGDATADIR"/answer.png", NULL);
- image = gtk_image_new_from_pixbuf (icon);
- item = gtk_tool_button_new (image, "Answer");
- gtk_widget_show_all (GTK_WIDGET (item));
+ item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_ANSWER);
gtk_tool_item_set_expand (item, TRUE);
- g_signal_connect (G_OBJECT (item), "clicked",
- G_CALLBACK (on_answer_clicked), (gpointer)talking);
+ g_signal_connect (item, "clicked", G_CALLBACK (on_answer_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
1);
-
- image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PAUSE,
- GTK_ICON_SIZE_LARGE_TOOLBAR);
- item = gtk_tool_button_new (image, "Reject");
- gtk_widget_show_all (GTK_WIDGET (item));
+
+ item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_IGNORE);
gtk_tool_item_set_expand (item, TRUE);
- g_signal_connect (G_OBJECT (item), "clicked",
- G_CALLBACK (on_silence_clicked), (gpointer)talking);
+ g_signal_connect (item, "clicked", G_CALLBACK (on_silence_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
-
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
3);
-
- icon = gdk_pixbuf_new_from_file (PKGDATADIR"/cancel.png", NULL);
- image = gtk_image_new_from_pixbuf (icon);
- item = gtk_tool_button_new (image, "Reject");
- gtk_widget_show_all (GTK_WIDGET (item));
+
+ item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_REJECT);
gtk_tool_item_set_expand (item, TRUE);
- g_signal_connect (G_OBJECT (item), "clicked",
- G_CALLBACK (on_reject_clicked), (gpointer)talking);
+ g_signal_connect (item, "clicked", G_CALLBACK (on_reject_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4);
-
+
/* Outgoing call and talking share the same toolbar */
priv->main_bar = toolbar = gtk_toolbar_new ();
gtk_widget_set_no_show_all (priv->main_bar, TRUE);
gtk_box_pack_start (GTK_BOX (talking), toolbar, FALSE, FALSE, 0);
- icon = gdk_pixbuf_new_from_file (PKGDATADIR"/speaker.png", NULL);
- image = gtk_image_new_from_pixbuf (icon);
- item = gtk_toggle_tool_button_new ();
- gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item), image);
- gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), "Speaker Phone");
- gtk_widget_show_all (GTK_WIDGET (item));
+ item = gtk_toggle_tool_button_new_from_stock (MOKO_STOCK_SPEAKER);
gtk_tool_item_set_expand (item, TRUE);
- g_signal_connect (G_OBJECT (item), "toggled",
- G_CALLBACK (on_speaker_toggled), (gpointer)talking);
+ g_signal_connect (item, "toggled", G_CALLBACK (on_speaker_toggled), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
1);
- icon = gdk_pixbuf_new_from_file (PKGDATADIR"/cancel.png", NULL);
- image = gtk_image_new_from_pixbuf (icon);
- item = gtk_tool_button_new (image, "Cancel");
- gtk_widget_show_all (GTK_WIDGET (item));
+ item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_HANGUP);
gtk_tool_item_set_expand (item, TRUE);
- g_signal_connect (G_OBJECT (item), "clicked",
- G_CALLBACK (on_cancel_clicked), (gpointer)talking);
+ g_signal_connect (item, "clicked", G_CALLBACK (on_cancel_clicked), talking);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
/* The title label and image */
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
