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. r3311 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer src/phone-kit ([EMAIL PROTECTED])
2. r3312 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
3. r3313 - in
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2: .
src ([EMAIL PROTECTED])
4. r3314 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-31 16:59:56 +0100 (Wed, 31 Oct 2007)
New Revision: 3311
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
Log:
* src/dialer/Makefile.am:
* src/phone-kit/Makefile.am:
Add missing Makefile.am files to repository
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-31 13:49:04 UTC (rev 3310)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-31 15:59:56 UTC (rev 3311)
@@ -1,3 +1,10 @@
+2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/dialer/Makefile.am:
+ * src/phone-kit/Makefile.am:
+
+ Add missing Makefile.am files to repository
+
2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
* configure.ac:
Added:
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
2007-10-31 13:49:04 UTC (rev 3310)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/Makefile.am
2007-10-31 15:59:56 UTC (rev 3311)
@@ -0,0 +1,14 @@
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CFLAGS = -Wall @DIALER_CFLAGS@
+
+INCLUDES = -I$(top_srcdir)/src/common
+
+bin_PROGRAMS = openmoko-dialer
+
+openmoko_dialer_SOURCES = \
+ moko-history.c moko-history.h \
+ moko-keypad.c moko-keypad.h \
+ moko-tips.c moko-tips.h \
+ dialer-main.c
+
+openmoko_dialer_LDADD = @DIALER_LIBS@
$(top_srcdir)/src/common/libdialer-common.a
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
2007-10-31 13:49:04 UTC (rev 3310)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/Makefile.am
2007-10-31 15:59:56 UTC (rev 3311)
@@ -0,0 +1,24 @@
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CFLAGS = -Wall @DIALER_CFLAGS@
+
+INCLUDES = -I$(top_srcdir)/src/common
+
+bin_PROGRAMS = phone-kit
+
+phone_kit_SOURCES = \
+ dialer-main.c \
+ moko-dialer.c moko-dialer.h \
+ moko-notify.c moko-notify.h \
+ moko-sound.c moko-sound.h \
+ moko-talking.c moko-talking.h
+
+phone_kit_LDADD = @DIALER_LIBS@ $(top_srcdir)/src/common/libdialer-common.a
+
+
+moko-dialer-glue.h: moko-dialer-dbus.xml
+ $(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool
--prefix=moko_dialer --mode=glib-server --output=$@ $<
+
+BUILT_SOURCES = moko-dialer-glue.h
+
+EXTRA_DIST = moko-dialer-dbus.xml
+
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-31 17:02:35 +0100 (Wed, 31 Oct 2007)
New Revision: 3312
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
Log:
* src/dialer/dialer-main.c: Added to repository
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-31 15:59:56 UTC (rev 3311)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-31 16:02:35 UTC (rev 3312)
@@ -1,5 +1,9 @@
2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
+ * src/dialer/dialer-main.c: Added to repository
+
+2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
+
* src/dialer/Makefile.am:
* src/phone-kit/Makefile.am:
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2007-10-31 15:59:56 UTC (rev 3311)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2007-10-31 16:02:35 UTC (rev 3312)
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2007 Openmoko, Inc.
+ *
+ * Authored by OpenedHand Ltd <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
+#include <moko-stock.h>
+
+// #include "moko-dialer.h"
+#include "moko-keypad.h"
+
+static gboolean show_dialer;
+static gboolean show_missed;
+static gchar *number = NULL;
+
+static GOptionEntry entries[] = {
+ {"show-dialer", 's', 0, G_OPTION_ARG_NONE, &show_dialer,
+ "Show the dialer at startup", "N"},
+
+ {"show-missed", 'm', 0, G_OPTION_ARG_NONE, &show_missed,
+ "Show the history window filtered by the missed, none.", "N"},
+
+ {"dial", 'd', 0, G_OPTION_ARG_STRING, &number,
+ "Dial the specified number.", "N"},
+
+ {NULL}
+};
+
+/* Callbacks from widgets */
+#if 0
+
+static void
+on_keypad_dial_clicked (MokoKeypad *keypad,
+ const gchar *number,
+ MokoDialer *dialer)
+{
+ GtkWidget *dlg;
+ MokoDialerPrivate *priv;
+ MokoContactEntry *entry = NULL;
+
+ g_return_if_fail (MOKO_IS_DIALER (dialer));
+ priv = dialer->priv;
+
+ if (!number) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 1);
+ moko_history_set_filter (MOKO_HISTORY (priv->history),
HISTORY_FILTER_DIALED);
+ return;
+ }
+
+ /* check current dialer state */
+ if (0 || priv->status != DIALER_STATUS_NORMAL)
+ {
+ gchar *strings[] = {
+ "Normal",
+ "Incoming Call",
+ "Dialing",
+ "Outgoing Call"
+ };
+ dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ "Cannot dial when dialer is busy.\nCurrent status = %s",
strings[priv->status]);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+
+ g_warning ("Cannot dial when dialer is busy: %d\n", priv->status);
+
+ return;
+ }
+ priv->status = DIALER_STATUS_DIALING;
+
+ /* check for network connection */
+ if (priv->registered != MOKO_GSMD_CONNECTION_NETREG_HOME
+ && priv->registered != MOKO_GSMD_CONNECTION_NETREG_ROAMING
+ && priv->registered != MOKO_GSMD_CONNECTION_NETREG_DENIED)
+ {
+ gchar *strings[] = {
+ "None",
+ "Home network registered",
+ "Searching for network",
+ "Network registration denied",
+ "",
+ "Roaming network registered"
+ };
+
+ dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ "Cannot dial number. %s", strings[priv->registered]);
+ gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+
+ /* no point continuing if we're not connected to a network! */
+ priv->status = DIALER_STATUS_NORMAL;
+ return;
+ }
+
+ entry = moko_contacts_lookup (moko_contacts_get_default (), number);
+
+ /* Prepare a voice journal entry */
+ if (priv->journal)
+ {
+ priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
+ moko_journal_entry_set_direction (priv->entry, DIRECTION_OUT);
+ 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);
+ if (entry && entry->contact->uid)
+ moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
+ }
+ moko_talking_outgoing_call (MOKO_TALKING (priv->talking), number, entry);
+
+ gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), priv->talking,
+ gtk_image_new_from_file (PKGDATADIR"/phone.png"),
+ 0);
+ gtk_container_child_set (GTK_CONTAINER (priv->notebook), priv->talking,
+ "tab-expand", TRUE,
+ NULL);
+
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 0);
+
+ gtk_window_present (GTK_WINDOW (priv->window));
+
+ moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), TRUE);
+
+ moko_gsmd_connection_voice_dial (priv->connection, number);
+
+ g_signal_emit (G_OBJECT (dialer), dialer_signals[OUTGOING_CALL], 0, number);
+}
+
+static void
+on_history_dial_number (MokoHistory *history,
+ const gchar *number,
+ MokoDialer *dialer)
+{
+ on_keypad_dial_clicked (NULL, number, dialer);
+}
+
+
+#endif
+int main (int argc, char **argv)
+{
+
+ if (argc != 1)
+ {
+ /* Add init code. */
+ GError *error = NULL;
+ GOptionContext *context = g_option_context_new ("");
+
+ g_option_context_add_main_entries (context, entries, NULL);
+ g_option_context_add_group (context, gtk_get_option_group (TRUE));
+ g_option_context_parse (context, &argc, &argv, &error);
+
+ g_option_context_free (context);
+ }
+
+
+ /* Initialize Threading & GTK+ */
+ gtk_init (&argc, &argv);
+ moko_stock_register ();
+
+
+ /* application object */
+ g_set_application_name ("OpenMoko Dialer");
+#if 0
+ if (show_missed)
+ moko_dialer_show_missed_calls (dialer, NULL);
+ else if (show_dialer)
+ moko_dialer_show_dialer (dialer, NULL);
+#endif
+ gtk_main ();
+
+ return 0;
+}
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-31 17:40:21 +0100 (Wed, 31 Oct 2007)
New Revision: 3313
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
Log:
* configure.ac:
* src/Makefile.am:
Remove libnotify dependency
* src/worldclock-main.c: (zoom_map), (settings_clicked_cb),
(map_button_press_event_cb), (main):
Add a digital clock option to the settings dialog, put the world map in
an aspect frame, add a callback when the map is clicked
Modified: trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
2007-10-31 16:02:35 UTC (rev 3312)
+++ trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
2007-10-31 16:40:21 UTC (rev 3313)
@@ -1,3 +1,14 @@
+2007-10-31 Chris Lord <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * src/Makefile.am:
+ Remove libnotify dependency
+
+ * src/worldclock-main.c: (zoom_map), (settings_clicked_cb),
+ (map_button_press_event_cb), (main):
+ Add a digital clock option to the settings dialog, put the world map in
+ an aspect frame, add a callback when the map is clicked
+
2007-10-29 Chris Lord <[EMAIL PROTECTED]>
* Makefile.am:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/configure.ac
2007-10-31 16:02:35 UTC (rev 3312)
+++ trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/configure.ac
2007-10-31 16:40:21 UTC (rev 3313)
@@ -13,7 +13,7 @@
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
PKG_CHECK_MODULES(MOKOUI, libmokoui2 >= 0.3)
PKG_CHECK_MODULES(JANA, libjana libjana-ecal libjana-gtk)
-PKG_CHECK_MODULES(NOTIFY, libnotify >= 0.4)
+#PKG_CHECK_MODULES(NOTIFY, libnotify >= 0.4)
AC_OUTPUT([
Makefile
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/Makefile.am
2007-10-31 16:02:35 UTC (rev 3312)
+++
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/Makefile.am
2007-10-31 16:40:21 UTC (rev 3313)
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" $(GTK_CFLAGS) $(JANA_CFLAGS)
$(MOKOUI_CFLAGS) $(NOTIFY_CFLAGS) -Wall
-AM_LDFLAGS = $(GTK_LIBS) $(JANA_LIBS) $(MOKOUI_LIBS) $(NOTIFY_LIBS)
+AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" $(GTK_CFLAGS) $(JANA_CFLAGS)
$(MOKOUI_CFLAGS) -Wall
+AM_LDFLAGS = $(GTK_LIBS) $(JANA_LIBS) $(MOKOUI_LIBS)
bin_PROGRAMS=openmoko-worldclock
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
2007-10-31 16:02:35 UTC (rev 3312)
+++
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
2007-10-31 16:40:21 UTC (rev 3313)
@@ -26,11 +26,15 @@
#include <sys/time.h>
#include "worldclock-data.h"
+#define GCONF_POKY_INTERFACE_PREFIX "/desktop/poky/interface"
+#define GCONF_POKY_DIGITAL "/digital_clock"
+
static gchar *location;
typedef struct {
GtkWidget *window;
GtkWidget *map;
+ GtkWidget *map_aspect;
GtkWidget *load_window;
GtkWidget *load_bar;
@@ -54,14 +58,14 @@
{
if (data->zoom_level <= 0.95) {
data->zoom_level = 1;
- gtk_widget_set_size_request (data->map, -1, -1);
+ gtk_widget_set_size_request (data->map_aspect, -1, -1);
} else {
gint width, height;
gtk_window_get_size (GTK_WINDOW (data->window),
&width, &height);
- gtk_widget_set_size_request (data->map,
- width * data->zoom_level,
- height * data->zoom_level);
+ width *= data->zoom_level;
+ gtk_widget_set_size_request (data->map_aspect,
+ width, (height > (width/2)) ? -1 : width / 2);
}
}
@@ -112,7 +116,7 @@
static void
settings_clicked_cb (GtkToolButton *button, WorldClockData *data)
{
- GtkWidget *time_dialog, *datetime;
+ GtkWidget *time_dialog, *datetime, *check;
gchar *location;
JanaTime *time;
@@ -139,9 +143,19 @@
increment_time_timeout, datetime);
#endif
- gtk_container_add (GTK_CONTAINER (
- GTK_DIALOG (time_dialog)->vbox), datetime);
+ check = gtk_check_button_new_with_label ("Use a digital clock");
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
+ gconf_client_get_bool (gconf_client_get_default (),
+ GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_DIGITAL, NULL));
+
+ gtk_container_set_border_width (GTK_CONTAINER (time_dialog), 6);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (time_dialog)->vbox), 12);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (time_dialog)->vbox),
+ datetime, FALSE, TRUE, 0);
gtk_widget_show (datetime);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (time_dialog)->vbox),
+ check, FALSE, TRUE, 0);
+ gtk_widget_show (check);
gtk_dialog_run (GTK_DIALOG (time_dialog));
@@ -166,6 +180,10 @@
g_object_unref (time);
}
+ gconf_client_set_bool (gconf_client_get_default (),
+ GCONF_POKY_INTERFACE_PREFIX GCONF_POKY_DIGITAL,
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)), NULL);
+
gtk_widget_destroy (time_dialog);
}
@@ -246,6 +264,18 @@
}
}
+static gboolean
+map_button_press_event_cb (JanaGtkWorldMap *map, GdkEventButton *event,
+ WorldClockData *data)
+{
+ gdouble lat, lon;
+
+ jana_gtk_world_map_get_latlon (map, event->x, event->y, &lat, &lon);
+ g_message ("Map clicked at latitude, longitude: %lg, %lg", lat, lon);
+
+ return FALSE;
+}
+
int
main (int argc, char **argv)
{
@@ -291,9 +321,18 @@
/* Create scrolling map */
data.map = jana_gtk_world_map_new ();
add_marks (&data);
+ gtk_widget_add_events (GTK_WIDGET (data.map), GDK_BUTTON_PRESS_MASK);
+ g_signal_connect (data.map, "button-press-event",
+ G_CALLBACK (map_button_press_event_cb), NULL);
+
+ data.map_aspect = gtk_aspect_frame_new (NULL, 0.5, 0.5, 2.0, FALSE);
+ gtk_frame_set_shadow_type (GTK_FRAME (
+ data.map_aspect), GTK_SHADOW_NONE);
+ gtk_container_add (GTK_CONTAINER (data.map_aspect), data.map);
+
scroll = moko_finger_scroll_new ();
moko_finger_scroll_add_with_viewport (MOKO_FINGER_SCROLL (scroll),
- data.map);
+ data.map_aspect);
g_object_set (G_OBJECT (scroll), "mode", MOKO_FINGER_SCROLL_MODE_PUSH,
NULL);
gtk_widget_show_all (scroll);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-31 17:56:00 +0100 (Wed, 31 Oct 2007)
New Revision: 3314
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
* src/phone-kit/moko-dialer.c: (moko_dialer_hung_up),
(moko_dialer_rejected), (on_talking_reject_call),
(moko_dialer_init):
* src/phone-kit/moko-talking.c: (moko_talking_incoming_call),
(moko_talking_outgoing_call), (moko_talking_accepted_call),
(on_answer_clicked), (on_reject_clicked),
(moko_talking_class_init), (moko_talking_init):
Present a window for incoming call notification
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-31 16:40:21 UTC (rev 3313)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-31 16:56:00 UTC (rev 3314)
@@ -1,3 +1,15 @@
+2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/phone-kit/moko-dialer.c: (moko_dialer_hung_up),
+ (moko_dialer_rejected), (on_talking_reject_call),
+ (moko_dialer_init):
+ * src/phone-kit/moko-talking.c: (moko_talking_incoming_call),
+ (moko_talking_outgoing_call), (moko_talking_accepted_call),
+ (on_answer_clicked), (on_reject_clicked),
+ (moko_talking_class_init), (moko_talking_init):
+
+ Present a window for incoming call notification
+
2007-10-31 Thomas Wood <[EMAIL PROTECTED]>
* src/dialer/dialer-main.c: Added to repository
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2007-10-31 16:40:21 UTC (rev 3313)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2007-10-31 16:56:00 UTC (rev 3314)
@@ -47,14 +47,8 @@
gint status;
gchar *incoming_clip;
- /* Main Widgets */
- GtkWidget *window;
- GtkWidget *notebook;
-
- /* Pages of the notebook */
+ /* handles user interaction */
GtkWidget *talking;
- GtkWidget *keypad;
- GtkWidget *history;
/* Special objects */
MokoGsmdConnection *connection;
@@ -152,9 +146,6 @@
priv->status = DIALER_STATUS_NORMAL;
- if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) == 3)
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
-
moko_gsmd_connection_voice_hangup (priv->connection);
g_signal_emit (G_OBJECT (dialer), dialer_signals[HUNG_UP], 0);
@@ -167,17 +158,14 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
-
+
priv->status = DIALER_STATUS_NORMAL;
/* Stop the notification */
- moko_notify_stop (priv->notify);
+ moko_notify_stop (priv->notify);
- if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) == 3)
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
-
- moko_gsmd_connection_voice_hangup (priv->connection);
-
+ moko_gsmd_connection_voice_hangup (priv->connection);
+
g_signal_emit (G_OBJECT (dialer), dialer_signals[REJECTED], 0);
}
@@ -235,9 +223,7 @@
moko_gsmd_connection_voice_hangup (priv->connection);
priv->status = DIALER_STATUS_NORMAL;
-
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
-
+
/* Finalise and add the journal entry */
if (priv->journal && priv->entry)
{
@@ -266,7 +252,6 @@
moko_gsmd_connection_voice_hangup (priv->connection);
priv->status = DIALER_STATUS_NORMAL;
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
g_signal_emit (G_OBJECT (dialer), dialer_signals[HUNG_UP], 0);
}
@@ -385,16 +370,6 @@
/* Set up the user interface */
moko_talking_incoming_call (MOKO_TALKING (priv->talking), NULL, NULL);
- gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), priv->talking,
- gtk_image_new_from_file (PKGDATADIR"/phone.png"),
- 0);
- gtk_container_child_set (GTK_CONTAINER (priv->notebook), priv->talking,
- "tab-expand", TRUE,
- NULL);
- gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 0);
-
- gtk_window_present (GTK_WINDOW (priv->window));
-
/* Start the notification */
moko_notify_start (priv->notify);
@@ -688,21 +663,8 @@
/* Load the notification object */
priv->notify = moko_notify_new ();
- /* Create the window */
- priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- g_signal_connect (G_OBJECT (priv->window), "delete-event",
- (GCallback) gtk_widget_hide_on_delete, NULL);
- gtk_window_set_title (GTK_WINDOW (priv->window), "Dialer");
- /* Notebook */
- priv->notebook = gtk_notebook_new ();
- gtk_notebook_set_tab_pos (GTK_NOTEBOOK (priv->notebook), GTK_POS_BOTTOM);
- gtk_container_add (GTK_CONTAINER (priv->window), priv->notebook);
-
- /* Talking: We don't actually add it to the notebook yet, as it is only added
- * as/when needed. Therefore we just create it, and ref it (so it will
- * survive reparenting.
- */
+ /* Talking: This is the object that handles interaction with the user */
priv->talking = moko_talking_new (priv->journal);
g_object_ref (G_OBJECT (priv->talking));
gtk_widget_show_all (priv->talking);
@@ -716,7 +678,20 @@
G_CALLBACK (on_talking_silence), (gpointer)dialer);
g_signal_connect (G_OBJECT (priv->talking), "speaker_toggle",
G_CALLBACK (on_talking_speaker_toggle), (gpointer)dialer);
+
+ /* Create the window */
#if 0
+ priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ g_signal_connect (G_OBJECT (priv->window), "delete-event",
+ (GCallback) gtk_widget_hide_on_delete, NULL);
+ gtk_window_set_title (GTK_WINDOW (priv->window), "Dialer");
+
+ /* Notebook */
+ priv->notebook = gtk_notebook_new ();
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK (priv->notebook), GTK_POS_BOTTOM);
+ gtk_container_add (GTK_CONTAINER (priv->window), priv->notebook);
+
+
/* Keypad */
priv->keypad = moko_keypad_new ();
g_signal_connect (G_OBJECT (priv->keypad), "dial_number",
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
2007-10-31 16:40:21 UTC (rev 3313)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2007-10-31 16:56:00 UTC (rev 3314)
@@ -25,7 +25,7 @@
#include "moko-sound.h"
#include "moko-talking.h"
-G_DEFINE_TYPE (MokoTalking, moko_talking, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (MokoTalking, moko_talking, GTK_TYPE_WIDGET)
#define MOKO_TALKING_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
MOKO_TYPE_TALKING, MokoTalkingPrivate))
@@ -36,6 +36,8 @@
{
MokoJournal *journal;
+ GtkWidget *window;
+
GtkWidget *incoming_bar;
GtkWidget *main_bar;
@@ -138,10 +140,12 @@
gtk_label_set_text (GTK_LABEL (priv->status), number);
gtk_image_set_from_file (GTK_IMAGE (priv->person),
PKGDATADIR"/unkown.png");
- g_source_remove (priv->timeout);
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
(GSourceFunc)incoming_timeout,
(gpointer)talking);
+ gtk_window_present (GTK_WINDOW (priv->window));
}
static gboolean
@@ -194,13 +198,14 @@
else
gtk_image_set_from_file (GTK_IMAGE (priv->person),
PKGDATADIR"/unkown.png");
-
- g_source_remove (priv->timeout);
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
(GSourceFunc)outgoing_timeout,
(gpointer)talking);
g_free (markup);
+ gtk_window_present (GTK_WINDOW (priv->window));
}
static gboolean
@@ -272,7 +277,8 @@
/* We don't change the status or person widgets, as incoming call has already
* set them for us.
*/
- g_source_remove (priv->timeout);
+ if (priv->timeout)
+ g_source_remove (priv->timeout);
priv->timeout = g_timeout_add (1000,
(GSourceFunc)talking_timeout,
(gpointer)talking);
@@ -292,6 +298,7 @@
on_reject_clicked (GtkToolButton *button, MokoTalking *talking)
{
g_source_remove (talking->priv->timeout);
+ gtk_widget_hide (talking->priv->window);
g_signal_emit (G_OBJECT (talking), talking_signals[REJECT_CALL], 0);
}
@@ -394,15 +401,17 @@
moko_talking_init (MokoTalking *talking)
{
MokoTalkingPrivate *priv;
- GtkWidget *toolbar, *image, *vbox, *hbox, *label, *align, *frame;
+ GtkWidget *toolbar, *image, *vbox, *hbox, *label, *align, *frame, *main_vbox;
GtkWidget *duration;
GtkToolItem *item;
gint i;
priv = talking->priv = MOKO_TALKING_GET_PRIVATE (talking);
+
+ main_vbox = gtk_vbox_new (FALSE, 0);
priv->incoming_bar = toolbar = gtk_toolbar_new ();
- gtk_box_pack_start (GTK_BOX (talking), toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
item = gtk_tool_button_new_from_stock (MOKO_STOCK_CALL_ANSWER);
gtk_tool_item_set_expand (item, TRUE);
@@ -425,7 +434,7 @@
/* Outgoing call and talking share the same toolbar */
priv->main_bar = toolbar = gtk_toolbar_new ();
- gtk_box_pack_start (GTK_BOX (talking), toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
item = gtk_toggle_tool_button_new_from_stock (MOKO_STOCK_SPEAKER);
gtk_tool_item_set_expand (item, TRUE);
@@ -442,7 +451,7 @@
/* The title label and image */
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- gtk_box_pack_start (GTK_BOX (talking), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
priv->title = label = gtk_label_new ("Incoming Call");
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
@@ -460,7 +469,7 @@
/* The status area */
align = gtk_alignment_new (0.5, 0.5, 1, 0 );
- gtk_box_pack_start (GTK_BOX (talking), align, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
frame = gtk_frame_new (NULL);
gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
@@ -508,6 +517,10 @@
}
+ priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_show_all (main_vbox);
+ gtk_container_add (GTK_CONTAINER (priv->window), main_vbox);
+
}
GtkWidget*
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
