r907 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
tony_guan at sita.openmoko.org
tony_guan at sita.openmoko.org
Thu Feb 8 09:31:19 CET 2007
Author: tony_guan
Date: 2007-02-08 09:31:09 +0100 (Thu, 08 Feb 2007)
New Revision: 907
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
bug 55, don't show dialer gui initially. Sorry for the editor format, I will handle this thing in somedays, but currently I will focus on bug 54 to enable PIN entry first.
Dear Thomas, pardon again. :)
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -640,10 +640,13 @@
itself, just insert width/height tags in
the html */
+if(photo)
if (photo)
- gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
- photo->data.inlined.length, NULL);
+ //gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
+ // photo->data.inlined.length, NULL);
+ gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL); //just temporaly modified.
+
gdk_pixbuf_loader_close (loader, NULL);
pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -273,9 +273,9 @@
g_source_add_poll (gsm_watcher, &GPfd);
- DBG_MESSAGE ("ATACH");
+// DBG_MESSAGE ("ATACH");
g_source_attach (gsm_watcher, NULL);
- DBG_MESSAGE ("ATACH OUT");
+// DBG_MESSAGE ("ATACH OUT");
DBG_LEAVE ();
return;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -28,6 +28,11 @@
#include <gtk/gtkmenu.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkvbox.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
#include "contacts.h"
#include "history.h"
#include "error.h"
@@ -36,175 +41,261 @@
#include "openmoko-dialer-window-dialer.h"
#include "openmoko-dialer-window-outgoing.h"
#include "openmoko-dialer-window-incoming.h"
-MOKO_DIALER_APP_DATA *p_dialer_data = 0;
-MOKO_DIALER_APP_DATA *
-moko_get_app_data ()
+MOKO_DIALER_APP_DATA* p_dialer_data=0;
+MOKO_DIALER_APP_DATA* moko_get_app_data()
{
- return p_dialer_data;
+return p_dialer_data;
}
-void
-gsm_incoming_call (gchar * number)
+void gsm_incoming_call(gchar * number)
{
- MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
- if (appdata)
- {
+if(appdata)
+{
//first, we should remove the "" from the number.
- char temp[20];
- int start = 0;
- int end = strlen (number);
- while (number[start] == '\"' && start < end)
- start++;
- if (end > 1)
- while (number[end - 1] == '\"' && start < end)
- end--;
+char temp[20];
+int start=0;
+int end=strlen(number);
+while(number[start]=='\"'&&start<end)start++;
+if(end>1)while(number[end-1]=='\"'&&start<end)end--;
- DBG_MESSAGE ("START=%d,END=%d", start, end);
- strcpy (temp, number + start);
- temp[end - 1] = 0;
- DBG_MESSAGE ("%s", temp);
+DBG_MESSAGE("START=%d,END=%d",start,end);
+strcpy(temp,number+start);
+temp[end-1]=0;
+DBG_MESSAGE("%s",temp);
//got the number;
- strcpy (appdata->g_peer_info.number, temp);
+strcpy(appdata->g_peer_info.number,temp);
//retrieve the contact information if any.
- contact_get_peer_info_from_number (appdata->g_contactlist.contacts,
- &(appdata->g_peer_info));
+contact_get_peer_info_from_number(appdata->g_contactlist.contacts , &(appdata->g_peer_info));
// contact_get_peer_info_from_number
//transfer the contact info
- window_incoming_prepare (appdata);
+window_incoming_prepare(appdata);
- gtk_widget_show (appdata->window_incoming);
- }
- else
- {
- DBG_ERROR ("gui failed to initialize.try another time.");
- }
+gtk_widget_show(appdata->window_incoming);
+}
+else
+{
+DBG_ERROR("gui failed to initialize.try another time.");
+}
}
-void
-gsm_peer_accept ()
+void gsm_peer_accept()
{
- MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
- DBG_ENTER ();
+MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+DBG_ENTER();
//moko_dialer_status_update_icon(appdata->status_outgoing);
- appdata->g_state.callstate = STATE_TALKING;
+appdata->g_state.callstate=STATE_TALKING;
- gtk_widget_hide (appdata->window_outgoing);
+gtk_widget_hide(appdata->window_outgoing);
//transfer the contact info
- window_talking_prepare (appdata);
+window_talking_prepare(appdata);
//start talking.
- gtk_widget_show (appdata->window_talking);
+gtk_widget_show(appdata->window_talking);
- DBG_LEAVE ();
+DBG_LEAVE();
}
-void
-gsm_peer_refuse ()
+void gsm_peer_refuse()
{
- MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
- window_outgoing_fails (appdata);
+MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+window_outgoing_fails(appdata);
}
-void
-gsm_peer_abort ()
+void gsm_peer_abort()
{
- MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
- if (appdata->window_incoming)
- gtk_widget_hide (appdata->window_incoming);
+MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+if(appdata->window_incoming)
+ gtk_widget_hide(appdata->window_incoming);
}
-void
-gsm_peer_disconnect ()
+void gsm_peer_disconnect()
{
- MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
- gsm_hangup ();
- gtk_widget_hide (appdata->window_talking);
+ MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+ gsm_hangup();
+ gtk_widget_hide(appdata->window_talking);
}
-int
-main (int argc, char **argv)
+
+
+static void
+handle_sigusr1 (int value)
{
- p_dialer_data = calloc (1, sizeof (MOKO_DIALER_APP_DATA));
- /* Initialize GTK+ */
- gtk_init (&argc, &argv);
+DBG_ENTER();
+ MOKO_DIALER_APP_DATA* p_data=moko_get_app_data();
+if(!p_data)return;
+GtkWidget* mainwindow=p_data->window_present;
+ if(mainwindow==0)
+ mainwindow=p_data->window_dialer;
+
+ if (mainwindow == NULL)
+ {
+ return;
+ }
+ gtk_window_present (GTK_WINDOW (mainwindow));
+ DBG_TRACE();
+ signal (SIGUSR1, handle_sigusr1);
+ DBG_LEAVE();
+}
+static pid_t
+testlock (char *fname)
+{
+ int fd;
+ struct flock fl;
- //init application data
- contact_init_contact_data (&(p_dialer_data->g_contactlist));
- history_init_history_data (&(p_dialer_data->g_historylist));
+ fd = open (fname, O_WRONLY, S_IWUSR);
+ if (fd < 0)
+ {
+ if (errno == ENOENT)
+ {
+ return 0;
+ }
+ else
+ {
+ perror ("Test lock open file");
+ return -1;
+ }
+ }
+ fl.l_type = F_WRLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
+ fl.l_len = 0;
- /* application object */
+ if (fcntl (fd, F_GETLK, &fl) < 0)
+ {
+ close (fd);
+ return -1;
+ }
+ close (fd);
+
+ if (fl.l_type == F_UNLCK)
+ return 0;
+
+ return fl.l_pid;
+}
+
+static void
+setlock (char *fname)
+{
+ int fd;
+ struct flock fl;
+
+ fd = open (fname, O_WRONLY|O_CREAT, S_IWUSR);
+ if (fd < 0)
+ {
+ perror ("Set lock open file");
+ return ;
+ }
+
+ fl.l_type = F_WRLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
+ fl.l_len = 0;
+
+ if (fcntl (fd, F_SETLK, &fl) < 0)
+ {
+ perror ("Lock file");
+ close (fd);
+ }
+}
+
+int main( int argc, char** argv )
+{
+ pid_t lockapp;
+
+ /* Initialize GTK+ */
+ gtk_init( &argc, &argv );
+
+if (argc != 1)
+ {
+ /* Add init code. */
+ }
+ lockapp = testlock ("/tmp/dialer.lock");
+ if (lockapp > 0)
+ {
+ kill (lockapp, SIGUSR1);
+ return 0;
+ }
+ setlock ("/tmp/dialer.lock");
+
+
+ p_dialer_data=calloc(1,sizeof(MOKO_DIALER_APP_DATA));
+
+ //init application data
+ contact_init_contact_data(&(p_dialer_data->g_contactlist));
+ history_init_history_data(&(p_dialer_data->g_historylist));
+
+
+ /* application object */
// MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
- g_set_application_name ("OpenMoko Dialer");
+ g_set_application_name( "OpenMoko Dialer" );
// gtk_main();
- GMainLoop *mainloop = 0;
- mainloop = g_main_loop_new (NULL, FALSE);
- p_dialer_data->mainloop = mainloop;
+ GMainLoop* mainloop=0;
+ mainloop = g_main_loop_new(NULL, FALSE );
+ p_dialer_data->mainloop=mainloop;
-
+signal (SIGUSR1, handle_sigusr1);
//init the dialer window
- window_dialer_init (p_dialer_data);
-// window_incoming_init(p_dialer_data);
+ window_dialer_init(p_dialer_data);
+ window_incoming_init(p_dialer_data);
+DBG_WARN("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
// window_outgoing_init(p_dialer_data);
// window_history_init(p_dialer_data);
//from now on we will not use multithreads.
- gsm_lgsm_start (mainloop);
+ gsm_lgsm_start(mainloop);
//start a timer to monitor incoming calls
//gtk_timeout_add(100,incoming_calls,0);
-
+
//instead, we add a g_source
//gdk_threads_enter();
//gtk_main ();
//gdk_threads_leave();
-
+
// GMainLoop* mainloop = g_main_loop_new(NULL, FALSE );
-
+
// [ set up a GSource ]
// [ add a GPollFD ]
// g_source_attach( gsource, NULL );
- g_main_loop_run (mainloop);
+ g_main_loop_run(mainloop);
-
-
-
-
-
//release everything
- contact_release_contact_list (&(p_dialer_data->g_contactlist));
+ contact_release_contact_list(&(p_dialer_data->g_contactlist));
- history_release_history_list (&(p_dialer_data->g_historylist));
- return 0;
+ history_release_history_list(&(p_dialer_data->g_historylist));
+ return 0;
}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-02-08 08:31:09 UTC (rev 907)
@@ -63,6 +63,7 @@
GtkWidget *window_talking;
GtkWidget *window_history;
GtkWidget *window_dialer;
+ GtkWidget *window_present;
//buttons
GtkWidget *buttonSpeaker;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -264,6 +264,28 @@
g_print ("on_dialer_panel_user_hold:%c\n", parac);
}
+void
+on_window_dialer_hide (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+appdata->window_present=0;
+
+}
+
+void
+on_window_dialer_show (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+appdata->window_present=widget;
+DBG_LEAVE();
+}
+
+
+
+
+
+
#define WINDOW_DIALER_BUTTON_SIZE_X 100
#define WINDOW_DIALER_BUTTON_SIZE_Y 100
gint
@@ -299,8 +321,15 @@
moko_finger_window_set_application_menu (window, appmenu);
// g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
+ g_signal_connect ((gpointer) window, "show",
+ G_CALLBACK (on_window_dialer_show),
+ p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_dialer_hide),
+ p_dialer_data);
+
/* contents */
vbox = gtk_vbox_new (FALSE, 0);
GtkHBox *hbox = gtk_hbox_new (FALSE, 10);
@@ -431,7 +460,10 @@
p_dialer_data->window_dialer = window;
gtk_widget_show_all (GTK_WIDGET (window));
+ gtk_widget_hide(GTK_WIDGET (window));
+
+
}
return 1;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -1,1014 +1,962 @@
-/* openmoko-dialer-window-talking.c
- *
- * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
- *
- * Copyright (C) 2006 FIC Shanghai Lab
- *
- * 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.
- *
- * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
- */
-
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
-
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenu.h>
-#include "contacts.h"
-#include "openmoko-dialer-main.h"
-#include "moko-dialer-status.h"
-#include "history.h"
-#include "openmoko-dialer-window-history.h"
-
-/**
- * @brief re-filter the treeview widget by the history type
- *
- *
- *
- * @param type HISTORY_TYPE, indicating only the history items of that type will be displayed
- * @return 1
- * @retval
- */
-
-int
-history_view_change_filter (MOKO_DIALER_APP_DATA * p_dialer_data,
- HISTORY_TYPE type)
-{
- GtkWidget *historyview;
- GtkTreePath *path;
- DBG_TRACE ();
- p_dialer_data->g_history_filter_type = type;
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER
- (p_dialer_data->g_list_store_filter));
-
- path = gtk_tree_path_new_first ();
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (p_dialer_data->treeview_history),
- path, 0, 0);
- gtk_tree_path_free (path);
-
-
- return 1;
-}
-
-void
-on_all_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
-{
- MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
- GtkWidget *label = p_dialer_data->label_filter_history;
- gtk_label_set_text (GTK_LABEL (label), "All");
- history_view_change_filter (p_dialer_data, ALL);
- history_update_counter (p_dialer_data);
-}
-
-
-void
-on_missed_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
-{
- MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
- GtkWidget *label = p_dialer_data->label_filter_history;
- gtk_label_set_text (GTK_LABEL (label), "Missed");
- history_view_change_filter (p_dialer_data, MISSED);
- history_update_counter (p_dialer_data);
-}
-
-
-void
-on_dialed_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
-{
- MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
- GtkWidget *label = p_dialer_data->label_filter_history;
- gtk_label_set_text (GTK_LABEL (label), "Dialed");
- history_view_change_filter (p_dialer_data, OUTGOING);
- history_update_counter (p_dialer_data);
-}
-
-
-void
-on_received_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
-{
- MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
- GtkWidget *label = p_dialer_data->label_filter_history;
- gtk_label_set_text (GTK_LABEL (label), "Received");
- history_view_change_filter (p_dialer_data, INCOMING);
- history_update_counter (p_dialer_data);
-}
-
-gboolean
-on_eventboxTop_button_release_event (GtkWidget * widget,
- GdkEventButton * event,
- MOKO_DIALER_APP_DATA * appdata)
-{
-
- gtk_menu_popup (GTK_MENU (appdata->menu_history), 0, 0, 0, 0, 0, 0);
-
- return FALSE;
-}
-
-void
-openmoko_history_wheel_press_left_up_cb (GtkWidget * widget,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkTreePath *path;
- GtkTreeView *treeview;
- //DBG_ENTER();
-
- treeview = GTK_TREE_VIEW (appdata->treeview_history);
- if (treeview == 0)
- return;
-
- selection = gtk_tree_view_get_selection (treeview);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- DBG_WARN ("no current selection\n");
- return;
- }
- path = gtk_tree_model_get_path (model, &iter);
- if (!gtk_tree_path_prev (path))
- {
- DBG_WARN ("no prev for the top level\n");
- gtk_tree_path_free (path);
- return;
- }
- gtk_tree_view_set_cursor (treeview, path, 0, 0);
- return;
-
-
-}
-
-void
-openmoko_history_wheel_press_right_down_cb (GtkWidget * widget,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkTreePath *path;
- GtkTreeView *treeview;
- //DBG_ENTER();
- treeview = GTK_TREE_VIEW (appdata->treeview_history);
- if (treeview == 0)
- return;
-
- selection = gtk_tree_view_get_selection (treeview);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- DBG_WARN ("no current selection\n");
- return;
- }
- if (gtk_tree_model_iter_next (model, &iter))
- {
- path = gtk_tree_model_get_path (model, &iter);
- gtk_tree_view_set_cursor (treeview, path, 0, 0);
- gtk_tree_path_free (path);
- return;
- }
-
- return;
-}
-
-
-void
-cb_tool_button_history_delete_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- GtkTreeIter iter; //iter of the filter store
- GtkTreeIter iter0; //iter of the back store
- GtkTreeModel *model;
- GtkTreeModel *model0;
- GtkTreeSelection *selection;
- GtkTreeView *treeview;
- GtkTreePath *path;
- treeview = GTK_TREE_VIEW (appdata->treeview_history);
- selection = gtk_tree_view_get_selection (treeview);
-
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- return;
- }
-
- if (appdata->g_currentselected)
- {
- DBG_MESSAGE ("to delete %s", appdata->g_currentselected->number);
- history_delete_entry (&(appdata->g_historylist),
- appdata->g_currentselected);
- }
-
- path = gtk_tree_model_get_path (model, &iter);
-
-
- model0 = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-
-
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER
- (model), &iter0, &iter);
-
- gtk_list_store_remove (GTK_LIST_STORE (model0), &iter0);
-
-
- gtk_tree_view_set_cursor (treeview, path, 0, 0);
-
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- if (!gtk_tree_path_prev (path))
- {
- gtk_tree_view_set_cursor (treeview, path, 0, 0);
- DBG_WARN ("history is empty now!");
- history_update_counter (appdata);
- }
- else
- {
- gtk_tree_view_set_cursor (treeview, path, 0, 0);
- }
- //we deleted the last one.
-
- }
-
- gtk_tree_path_free (path);
-
- return;
-
- DBG_ENTER ();
-}
-
-void
-cb_tool_button_history_call_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
-
-
-}
-
-void
-cb_tool_button_history_sms_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
-
-
-}
-
-void
-cb_tool_button_history_back_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- gtk_widget_hide (appdata->window_history);
-
-}
-
-
-void
-on_window_history_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
-
- gtk_widget_hide (appdata->wheel_history);
- gtk_widget_hide (appdata->toolbox_history);
-
-}
-
-void
-on_window_history_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
- if (appdata->wheel_history)
- gtk_widget_show (appdata->wheel_history);
-
- if (appdata->toolbox_history)
- gtk_widget_show (appdata->toolbox_history);
-
- if (appdata->history_need_to_update)
- {
- DBG_MESSAGE ("NEED TO UPDATE HISTORY");
- }
-
- DBG_LEAVE ();
-}
-
-
-
-
-gint
-window_history_init (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
-
- DBG_ENTER ();
-
-
- if (p_dialer_data->window_history == 0)
- {
-
- history_create_menu_history (p_dialer_data);
-
- MokoFingerWindow *window = NULL;
- MokoFingerToolBox *tools = NULL;
- GtkWidget *button;
- GtkWidget *image;
-
-//now the container--window
- window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- p_dialer_data->window_history = window;
-
-
- moko_finger_window_set_contents (window,
- create_window_history_content
- (p_dialer_data));
-
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_history_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_history_hide), p_dialer_data);
-
-
-
- gtk_widget_show_all (GTK_WIDGET (window));
-
-//the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
-
-
- //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
- gtk_widget_show (GTK_WIDGET (moko_finger_window_get_wheel (window)));
-
- g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
- "press_left_up",
- G_CALLBACK (openmoko_history_wheel_press_left_up_cb),
- p_dialer_data);
- g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
- "press_right_down",
- G_CALLBACK (openmoko_history_wheel_press_right_down_cb),
- p_dialer_data);
-
-
-
- tools = moko_finger_window_get_toolbox (window);
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("phone.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_history_call_clicked),
- p_dialer_data);
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("sms.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_history_sms_clicked),
- p_dialer_data);
-
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("delete.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_history_delete_clicked),
- p_dialer_data);
- gtk_widget_show (GTK_WIDGET (tools));
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("tony.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_history_back_clicked),
- p_dialer_data);
- gtk_widget_show (GTK_WIDGET (tools));
-
- p_dialer_data->wheel_history = moko_finger_window_get_wheel (window);
- p_dialer_data->toolbox_history = tools;
-
- gtk_widget_hide (window);
-
- DBG_LEAVE ();
- }
- else
- {
- //here we have to refresh it.
- DBG_TRACE ();
- }
- return 1;
-}
-
-void
-on_treeviewHistory_cursor_changed (GtkTreeView * treeview, gpointer user_data)
-{
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- HISTORY_ENTRY *p;
- int hasname;
- MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
-
- selection = gtk_tree_view_get_selection (p_dialer_data->treeview_history);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- p_dialer_data->g_currentselected = 0;
- return;
- }
-
- gtk_tree_model_get (model, &iter, COLUMN_ENTRYPOINTER, &p, -1);
-
- p_dialer_data->g_currentselected = p;
-
- gtk_tree_model_get (model, &iter, COLUMN_HASNAME, &hasname, -1);
- history_update_counter (p_dialer_data);
-
-}
-
-
-
-GtkWidget *
-create_window_history_content (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
-
- GtkWidget *treeviewHistory;
- GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
- //FIRST of all, the top title area;
- GtkWidget *eventboxTop = gtk_event_box_new ();
- gtk_widget_show (eventboxTop);
- gtk_box_pack_start (GTK_BOX (vbox), eventboxTop, FALSE, FALSE, 5);
- gtk_widget_set_size_request (eventboxTop, 480, 64);
- gtk_widget_set_name (eventboxTop, "gtkeventbox-black");
-
- GtkWidget *hbox67 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox67);
- gtk_container_add (GTK_CONTAINER (eventboxTop), hbox67);
-
- GtkWidget *eventboxLeftTop = gtk_event_box_new ();
- gtk_widget_show (eventboxLeftTop);
- gtk_box_pack_start (GTK_BOX (hbox67), eventboxLeftTop, FALSE, TRUE, 0);
- gtk_widget_set_name (eventboxLeftTop, "gtkeventbox-black");
-
-
-
- GtkWidget *imageLeftMenu = file_new_image_from_relative_path ("all.png");
- gtk_widget_show (imageLeftMenu);
- gtk_container_add (GTK_CONTAINER (eventboxLeftTop), imageLeftMenu);
-
- GtkWidget *labelHistoryTitle = gtk_label_new (("History-"));
- gtk_widget_show (labelHistoryTitle);
- gtk_box_pack_start (GTK_BOX (hbox67), labelHistoryTitle, FALSE, FALSE, 0);
- gtk_widget_set_size_request (labelHistoryTitle, 221, -1);
- gtk_label_set_justify (GTK_LABEL (labelHistoryTitle), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment (GTK_MISC (labelHistoryTitle), 1, 0.5);
-
- GtkWidget *labelFilter = gtk_label_new (("All"));
- gtk_widget_show (labelFilter);
- gtk_box_pack_start (GTK_BOX (hbox67), labelFilter, TRUE, TRUE, 0);
- gtk_misc_set_alignment (GTK_MISC (labelFilter), 0, 0.5);
- p_dialer_data->label_filter_history = labelFilter;
-
- GtkWidget *labelCounter = gtk_label_new (("1/21"));
- gtk_widget_show (labelCounter);
- gtk_box_pack_start (GTK_BOX (hbox67), labelCounter, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (labelCounter), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment (GTK_MISC (labelCounter), 0.8, 0.5);
- p_dialer_data->label_counter_history = labelCounter;
-
- g_signal_connect ((gpointer) eventboxTop, "button_release_event",
- G_CALLBACK (on_eventboxTop_button_release_event),
- p_dialer_data);
-
- GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
- gtk_alignment_set_padding (align, 0, 150, 0, 0); //FIXME too many numbers has to be retrieved from style
-
- GtkWidget *scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrolledwindow);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
- GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-
- treeviewHistory = gtk_tree_view_new ();
- gtk_container_add (GTK_CONTAINER (align), scrolledwindow);
- gtk_container_add (GTK_CONTAINER (scrolledwindow), treeviewHistory);
-
- gtk_widget_show (treeviewHistory);
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeviewHistory), FALSE);
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeviewHistory), FALSE);
-// gtk_misc_set_alignment (GTK_MISC (treeviewHistory), 0.5, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
-
-
- gtk_widget_set_name (treeviewHistory, "gtktreeview-black");
- p_dialer_data->treeview_history = treeviewHistory;
- history_build_history_list_view (p_dialer_data);
- gtk_widget_set_size_request (scrolledwindow, -1, 400);
-// gtk_misc_set_alignment (GTK_MISC (treeviewHistory),1,0.1);
-
-
- g_signal_connect ((gpointer) treeviewHistory, "cursor_changed",
- G_CALLBACK (on_treeviewHistory_cursor_changed),
- p_dialer_data);
-
-
- return vbox;
-}
-
-
-/**
- * @brief re-filter the treeview widget by current history type,a callback when the history treeview refreshes
- *
- * this callback will be called for every treemodel iters,whenever the treeview filter is refreshing
- *
- * @param model GtkTreeModel *, the background database of the treeview
- * @param iter GtkTreeIter *, the iterator of every item of the model.
- * @param data gpointer , of no use currently
- * @return boolean
- * @retval TRUE means the iter will be displayed
- * @retval FALSE means the iter will not be displayed
- */
-static gboolean
-history_view_filter_visible_function (GtkTreeModel * model,
- GtkTreeIter * iter, gpointer data)
-{
- MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) data;
- HISTORY_TYPE type;
- if (p_dialer_data->g_history_filter_type == ALL)
- return TRUE;
- gtk_tree_model_get (model, iter, COLUMN_TYPE, &type, -1);
- if (type == p_dialer_data->g_history_filter_type)
- return TRUE;
- else
- return FALSE;
-}
-
-
-
-/**
- * @brief find the treeview in the window, fill-in the data and show it on the screen.
- *
- *
- *
- * @param window GtkWidget* the window which contains the history treeview. but it's not necessarilly
- *to be a window, any widget that can help to lookup the treeview will be OK.
- * @return
- * @retval 0 error occured
- * @retval 1 everything is OK
- */
-
-gint
-history_build_history_list_view (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
- GtkListStore *list_store;
-
- GtkTreeIter iter;
- HISTORY_ENTRY *entry;
-
- //copied
- GtkTreeViewColumn *col;
- GtkCellRenderer *renderer;
-
- //GtkTreeModel *model;
- GtkWidget *contactview = NULL;
-
- //DBG_ENTER();
- //DBG_MESSAGE("History:%d",g_historylist.length);
-
- //DBG_TRACE();
- p_dialer_data->g_history_filter_type = ALL;
- contactview = p_dialer_data->treeview_history;
-
- if (contactview == NULL)
- return 0;
-//pack image and label
- col = gtk_tree_view_column_new ();
-
- gtk_tree_view_column_set_title (col, ("Title"));
- gtk_tree_view_column_set_resizable (col, TRUE);
-
-
-
- renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_tree_view_column_pack_start (col, renderer, FALSE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "pixbuf", COLUMN_TYPEICON, NULL);
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (col, renderer, FALSE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "text", COLUMN_TIME, NULL);
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (col, renderer, FALSE);
- gtk_tree_view_column_set_attributes (col, renderer,
- "text", COLUMN_SEPRATE, 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", COLUMN_NAME_NUMBER, NULL);
-
-
- gtk_tree_view_append_column (GTK_TREE_VIEW (contactview), col);
-
-
- entry = p_dialer_data->g_historylist.first;
-
- list_store = gtk_list_store_new (N_COLUMN, G_TYPE_INT, GDK_TYPE_PIXBUF,
- G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER,
- G_TYPE_INT, -1);
- //we will use a filter to facilitate the filtering in treeview without rebuilding the database.
- p_dialer_data->g_list_store_filter =
- gtk_tree_model_filter_new (GTK_TREE_MODEL (list_store), NULL);
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER
- (p_dialer_data->
- g_list_store_filter),
- history_view_filter_visible_function,
- p_dialer_data, NULL);
-
-//load the three icons to memory.
- GError *error = NULL;
- p_dialer_data->g_iconReceived = create_pixbuf ("received.png", &error);
- if (error)
- {
- DBG_WARN ("Cound not load icon :%s", error->message);
- g_error_free (error);
- p_dialer_data->g_iconReceived = NULL;
- error = NULL;
- }
-
- p_dialer_data->g_iconDialed = create_pixbuf ("dialed.png", &error);
- if (error)
- {
- DBG_WARN ("Cound not load icon :%s", error->message);
- g_error_free (error);
- p_dialer_data->g_iconDialed = NULL;
- error = NULL;
- }
-
-
- p_dialer_data->g_iconMissed = create_pixbuf ("missed.png", &error);
- if (error)
- {
- DBG_WARN ("Cound not load icon :%s", error->message);
- g_error_free (error);
- p_dialer_data->g_iconMissed = NULL;
- error = NULL;
- }
-
-
- while (entry)
- {
- //DBG_MESSAGE(entry->number);
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPE, entry->type,
- COLUMN_SEPRATE, "--", COLUMN_TIME, entry->time,
- COLUMN_DURATION, entry->durationsec,
- COLUMN_ENTRYPOINTER, entry, COLUMN_HASNAME, 0, -1);
- if (entry->name == 0)
- {
- //DBG_MESSAGE(entry->number);
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER,
- entry->number, -1);
- gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 0, -1);
- }
- else
- {
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER, entry->name,
- -1);
- gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 1, -1);
- }
- switch (entry->type)
- {
- case INCOMING:
- {
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- p_dialer_data->g_iconReceived, -1);
- // icon=gdk_pixbuf_new_from_file("./received.png",&error);
- break;
- }
- case OUTGOING:
- { // icon=gdk_pixbuf_new_from_file("./dialed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- p_dialer_data->g_iconDialed, -1);
- break;
- }
- case MISSED:
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- p_dialer_data->g_iconMissed, -1);
- break;
- }
-
- default:
-
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- p_dialer_data->g_iconMissed, -1);
- break;
- }
- }
-
-
-
- entry = entry->next;
- }
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (contactview),
- GTK_TREE_MODEL (p_dialer_data->
- g_list_store_filter));
-
- g_object_unref (list_store);
-
- return 1;
-}
-
-
-/**
- * @brief update the counter display widget - labelCounter
- *
- * @param widget GtkWidget*, any widget in the same window with treeviewHistory and labelCounter
- *
- * @return 1
- */
-gint
-history_update_counter (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
- DBG_ENTER ();
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- GtkTreePath *path;
- GtkTreeView *treeview;
- int count = 0;
- int nth = 0;
- char *pathstring;
- char display[10];
-
- treeview = GTK_TREE_VIEW (p_dialer_data->treeview_history);
- if (!p_dialer_data->treeview_history)
- {
- DBG_WARN ("COUNTER NOT READY ");
- return 0;
- }
-
-
- model = gtk_tree_view_get_model (treeview);
-
- count = gtk_tree_model_iter_n_children (model, NULL);
-
- selection = gtk_tree_view_get_selection (treeview);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- nth = 0;
- }
- else
- {
- path = gtk_tree_model_get_path (model, &iter);
- pathstring = gtk_tree_path_to_string (path);
- nth = atoi (pathstring) + 1;
- gtk_tree_path_free (path);
-
- }
-
- GtkWidget *labelcounter;
- labelcounter = p_dialer_data->label_counter_history;
- sprintf (display, "%d/%d", nth, count);
- gtk_label_set_text (GTK_LABEL (labelcounter), display);
- return 1;
-
-}
-
-GtkWidget *
-history_create_menu_history (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
- if (!p_dialer_data->menu_history)
- {
- GtkWidget *menu_history;
- GtkWidget *all_calls;
- GtkWidget *imageAll;
- GtkWidget *separator1;
- GtkWidget *missed_calls;
- GtkWidget *imageMissed;
- GtkWidget *separator3;
- GtkWidget *dialed_calls;
- GtkWidget *imageDialed;
- GtkWidget *separator2;
- GtkWidget *received_calls;
- GtkWidget *imageReceived;
-
- menu_history = gtk_menu_new ();
- gtk_container_set_border_width (GTK_CONTAINER (menu_history), 2);
-
- all_calls = gtk_image_menu_item_new_with_mnemonic (("Calls All"));
- gtk_widget_show (all_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), all_calls);
- gtk_widget_set_size_request (all_calls, 250, 60);
-
-
- imageAll = file_new_image_from_relative_path ("all.png");
- gtk_widget_show (imageAll);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (all_calls), imageAll);
-
- separator1 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator1);
- gtk_container_add (GTK_CONTAINER (menu_history), separator1);
- gtk_widget_set_size_request (separator1, 120, -1);
- gtk_widget_set_sensitive (separator1, FALSE);
-
- missed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Missed "));
- gtk_widget_show (missed_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), missed_calls);
- gtk_widget_set_size_request (missed_calls, 120, 60);
-
- //imageMissed = gtk_image_new_from_stock ("gtk-goto-bottom", GTK_ICON_SIZE_MENU);
- imageMissed = file_new_image_from_relative_path ("missed.png");
-
- gtk_widget_show (imageMissed);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (missed_calls),
- imageMissed);
-
- separator3 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator3);
- gtk_container_add (GTK_CONTAINER (menu_history), separator3);
- gtk_widget_set_size_request (separator3, 120, -1);
- gtk_widget_set_sensitive (separator3, FALSE);
-
- dialed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Dialed"));
- gtk_widget_show (dialed_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), dialed_calls);
- gtk_widget_set_size_request (dialed_calls, 120, 60);
-
- // imageDialed = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
- imageDialed = file_new_image_from_relative_path ("dialed.png");
- gtk_widget_show (imageDialed);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (dialed_calls),
- imageDialed);
-
- separator2 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator2);
- gtk_container_add (GTK_CONTAINER (menu_history), separator2);
- gtk_widget_set_size_request (separator2, 120, -1);
- gtk_widget_set_sensitive (separator2, FALSE);
-
- received_calls =
- gtk_image_menu_item_new_with_mnemonic (("Calls Received "));
- gtk_widget_show (received_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), received_calls);
- gtk_widget_set_size_request (received_calls, 120, 60);
-
-// imageReceived = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);
- imageReceived = file_new_image_from_relative_path ("received.png");
- gtk_widget_show (imageReceived);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (received_calls),
- imageReceived);
-
- g_signal_connect ((gpointer) all_calls, "activate",
- G_CALLBACK (on_all_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) missed_calls, "activate",
- G_CALLBACK (on_missed_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) dialed_calls, "activate",
- G_CALLBACK (on_dialed_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) received_calls, "activate",
- G_CALLBACK (on_received_calls_activate), p_dialer_data);
-
- p_dialer_data->menu_history = menu_history;
- return menu_history;
- }
- else
- return p_dialer_data->menu_history;
-}
-
-
-
-/**
- * @brief add an entry to the history treeview
- *
- *
- *
- * @param entry HISTORY_ENTRY *, the history entry to be added to the treeview.
- * @return
- * @retval 0 error occured
- * @retval 1 everything is OK
- */
-gint
-history_list_view_add (MOKO_DIALER_APP_DATA * appdata, HISTORY_ENTRY * entry)
-{
- DBG_ENTER ();
- if (entry == 0)
- {
- DBG_ERROR ("THE ENTRY IS ZERO");
- return 0;
- }
-
- if (appdata->treeview_history == 0)
- {
- DBG_WARN ("not ready");
- return 0;
-
- }
- //
- GtkTreeIter iter; //iter of the filter store
- GtkTreeModel *model;
- GtkListStore *list_store;
- GtkTreeView *treeview;
-
- treeview = GTK_TREE_VIEW (appdata->treeview_history);
-
- model =
- gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER
- (appdata->g_list_store_filter));
-
- list_store = GTK_LIST_STORE (model);
- //
-
-
- //DBG_MESSAGE(entry->number);
- gtk_list_store_insert (list_store, &iter, 0);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPE, entry->type,
- COLUMN_SEPRATE, "--", COLUMN_TIME, entry->time,
- COLUMN_DURATION, entry->durationsec,
- COLUMN_ENTRYPOINTER, entry, COLUMN_HASNAME, 0, -1);
- if (entry->name == 0)
- {
- //DBG_MESSAGE(entry->number);
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER, entry->number,
- -1);
- gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 0, -1);
- }
- else
- {
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER, entry->name,
- -1);
- gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 1, -1);
- }
- switch (entry->type)
- {
- case INCOMING:
- {
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconReceived, -1);
- // icon=gdk_pixbuf_new_from_file("./received.png",&error);
- break;
- }
- case OUTGOING:
- { // icon=gdk_pixbuf_new_from_file("./dialed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconDialed, -1);
- break;
- }
- case MISSED:
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconMissed, -1);
- break;
- }
-
- default:
-
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconMissed, -1);
- break;
- }
- }
- history_update_counter (appdata);
- return 1;
-}
-
-
-gint
-add_histroy_entry (MOKO_DIALER_APP_DATA * appdata, HISTORY_TYPE type,
- const char *name, const char *number, const char *id,
- char *time, char *date, int durationsec)
-{
+/* openmoko-dialer-window-talking.c
+ *
+ * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 FIC Shanghai Lab
+ *
+ * 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.
+ *
+ * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
+ */
+
+#include <libmokoui/moko-finger-tool-box.h>
+#include <libmokoui/moko-finger-window.h>
+#include <libmokoui/moko-finger-wheel.h>
+#include <libmokoui/moko-pixmap-button.h>
+
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtktreeview.h>
+#include <gtk/gtktreemodelfilter.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkmenu.h>
+#include "contacts.h"
+#include "openmoko-dialer-main.h"
+#include "moko-dialer-status.h"
+#include "history.h"
+#include "openmoko-dialer-window-history.h"
+
+/**
+ * @brief re-filter the treeview widget by the history type
+ *
+ *
+ *
+ * @param type HISTORY_TYPE, indicating only the history items of that type will be displayed
+ * @return 1
+ * @retval
+ */
+
+int history_view_change_filter(MOKO_DIALER_APP_DATA* p_dialer_data,HISTORY_TYPE type)
+{
+GtkWidget* historyview;
+GtkTreePath* path;
+DBG_TRACE();
+p_dialer_data->g_history_filter_type=type;
+gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(p_dialer_data->g_list_store_filter));
+
+path=gtk_tree_path_new_first();
+gtk_tree_view_set_cursor(GTK_TREE_VIEW(p_dialer_data->treeview_history),path,0,0);
+gtk_tree_path_free(path);
+
+
+return 1;
+}
+
+void
+on_all_calls_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ MOKO_DIALER_APP_DATA* p_dialer_data=(MOKO_DIALER_APP_DATA* )user_data;
+ GtkWidget* label=p_dialer_data->label_filter_history;
+ gtk_label_set_text(GTK_LABEL(label),"All");
+ history_view_change_filter(p_dialer_data,ALL);
+ history_update_counter(p_dialer_data);
+}
+
+
+void
+on_missed_calls_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ MOKO_DIALER_APP_DATA* p_dialer_data=(MOKO_DIALER_APP_DATA* )user_data;
+ GtkWidget* label=p_dialer_data->label_filter_history;
+ gtk_label_set_text(GTK_LABEL(label),"Missed");
+ history_view_change_filter(p_dialer_data,MISSED);
+ history_update_counter(p_dialer_data);
+}
+
+
+void
+on_dialed_calls_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ MOKO_DIALER_APP_DATA* p_dialer_data=(MOKO_DIALER_APP_DATA* )user_data;
+ GtkWidget* label=p_dialer_data->label_filter_history;
+ gtk_label_set_text(GTK_LABEL(label),"Dialed");
+ history_view_change_filter(p_dialer_data,OUTGOING);
+ history_update_counter(p_dialer_data);
+}
+
+
+void
+on_received_calls_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ MOKO_DIALER_APP_DATA* p_dialer_data=(MOKO_DIALER_APP_DATA* )user_data;
+ GtkWidget* label=p_dialer_data->label_filter_history;
+ gtk_label_set_text(GTK_LABEL(label),"Received");
+ history_view_change_filter(p_dialer_data,INCOMING);
+ history_update_counter(p_dialer_data);
+}
+
+gboolean
+on_eventboxTop_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+
+ gtk_menu_popup(GTK_MENU(appdata->menu_history),0,0,0,0,0,0);
+
+ return FALSE;
+}
+
+void
+openmoko_history_wheel_press_left_up_cb(GtkWidget *widget, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath* path;
+ GtkTreeView * treeview;
+ //DBG_ENTER();
+
+treeview=GTK_TREE_VIEW(appdata->treeview_history);
+ if(treeview==0)return ;
+
+ selection = gtk_tree_view_get_selection(treeview);
+
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ {
+ DBG_WARN("no current selection\n");
+ return ;
+ }
+ path=gtk_tree_model_get_path(model,&iter);
+ if(!gtk_tree_path_prev(path))
+ {
+ DBG_WARN("no prev for the top level\n");
+ gtk_tree_path_free(path);
+ return;
+ }
+ gtk_tree_view_set_cursor(treeview,path,0,0);
+ return ;
+
+
+}
+
+void
+openmoko_history_wheel_press_right_down_cb(GtkWidget *widget, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath* path;
+ GtkTreeView * treeview;
+ //DBG_ENTER();
+treeview=GTK_TREE_VIEW(appdata->treeview_history);
+ if(treeview==0)return ;
+
+ selection = gtk_tree_view_get_selection(treeview);
+
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ {
+ DBG_WARN("no current selection\n");
+ return ;
+ }
+ if(gtk_tree_model_iter_next(model,&iter))
+ {
+ path=gtk_tree_model_get_path(model,&iter);
+ gtk_tree_view_set_cursor(treeview,path,0,0);
+ gtk_tree_path_free(path);
+ return ;
+ }
+
+ return ;
+}
+
+
+void cb_tool_button_history_delete_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+GtkTreeIter iter; //iter of the filter store
+GtkTreeIter iter0; //iter of the back store
+GtkTreeModel* model;
+GtkTreeModel* model0;
+GtkTreeSelection * selection;
+GtkTreeView* treeview;
+GtkTreePath* path;
+treeview=GTK_TREE_VIEW(appdata->treeview_history);
+selection = gtk_tree_view_get_selection(treeview);
+
+
+if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+{
+ return;
+}
+
+if(appdata->g_currentselected)
+{
+DBG_MESSAGE("to delete %s",appdata->g_currentselected->number);
+history_delete_entry(&(appdata->g_historylist),appdata->g_currentselected);
+}
+
+path=gtk_tree_model_get_path(model,&iter);
+
+
+model0=gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
+
+
+gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model),&iter0,&iter);
+
+gtk_list_store_remove(GTK_LIST_STORE(model0),&iter0);
+
+
+gtk_tree_view_set_cursor(treeview,path,0,0);
+
+
+if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+{
+ if(!gtk_tree_path_prev(path))
+ {
+ gtk_tree_view_set_cursor(treeview,path,0,0);
+ DBG_WARN("history is empty now!");
+ history_update_counter(appdata);
+ }
+ else
+ {
+ gtk_tree_view_set_cursor(treeview,path,0,0);
+ }
+ //we deleted the last one.
+
+}
+
+gtk_tree_path_free(path);
+
+return ;
+
+ DBG_ENTER();
+}
+
+void cb_tool_button_history_call_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+ DBG_ENTER();
+
+
-//DBG_ENTER();
- //DBG_MESSAGE("History add:%s,%s,%s,%s,%s,%d",name,number,picpath,time,date,durationsec);
- HISTORY_ENTRY * pentry =
- history_add_entry (&(appdata->g_historylist), type, name, number, id,
- time, date, durationsec);
- return history_list_view_add (appdata, pentry);
-}
+}
+
+void cb_tool_button_history_sms_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+ DBG_ENTER();
+
+
+
+}
+
+void cb_tool_button_history_back_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+ gtk_widget_hide(appdata->window_history);
+
+}
+
+
+void
+on_window_history_hide (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+appdata->window_present=0;
+gtk_widget_hide(appdata->wheel_history);
+gtk_widget_hide(appdata->toolbox_history);
+
+}
+
+void
+on_window_history_show (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+appdata->window_present=widget;
+
+if(appdata->wheel_history)
+gtk_widget_show(appdata->wheel_history);
+
+if(appdata->toolbox_history)
+gtk_widget_show(appdata->toolbox_history);
+
+if(appdata->history_need_to_update)
+{
+DBG_MESSAGE("NEED TO UPDATE HISTORY");
+}
+
+DBG_LEAVE();
+}
+
+
+
+
+gint window_history_init( MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+
+DBG_ENTER();
+
+
+if(p_dialer_data->window_history==0)
+{
+
+ history_create_menu_history (p_dialer_data);
+
+ MokoFingerWindow* window=NULL;
+ MokoFingerToolBox *tools = NULL;
+ GtkWidget* button;
+ GtkWidget* image;
+
+//now the container--window
+ window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+ p_dialer_data->window_history=window;
+
+
+ moko_finger_window_set_contents(window, create_window_history_content(p_dialer_data));
+
+ g_signal_connect ((gpointer) window, "show",
+ G_CALLBACK (on_window_history_show),
+ p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_history_hide),
+ p_dialer_data);
+
+
+
+ gtk_widget_show_all( GTK_WIDGET(window) );
+
+//the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
+
+
+ //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
+ gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
+
+ g_signal_connect(G_OBJECT(moko_finger_window_get_wheel(window)),
+ "press_left_up",
+ G_CALLBACK(openmoko_history_wheel_press_left_up_cb),
+ p_dialer_data);
+ g_signal_connect(G_OBJECT(moko_finger_window_get_wheel(window)),
+ "press_right_down",
+ G_CALLBACK(openmoko_history_wheel_press_right_down_cb),
+ p_dialer_data);
+
+
+
+ tools = moko_finger_window_get_toolbox(window);
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("phone.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_history_call_clicked), p_dialer_data);
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("sms.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_history_sms_clicked), p_dialer_data);
+
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("delete.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_history_delete_clicked), p_dialer_data);
+ gtk_widget_show(GTK_WIDGET(tools));
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("tony.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_history_back_clicked), p_dialer_data);
+ gtk_widget_show(GTK_WIDGET(tools));
+
+ p_dialer_data->wheel_history=moko_finger_window_get_wheel(window);
+ p_dialer_data->toolbox_history=tools;
+
+ gtk_widget_hide(window);
+
+ DBG_LEAVE();
+}
+else
+{
+ //here we have to refresh it.
+ DBG_TRACE();
+}
+ return 1;
+}
+
+void on_treeviewHistory_cursor_changed (GtkTreeView *treeview,
+ gpointer user_data)
+{
+GtkTreeIter iter;
+GtkTreeModel* model;
+GtkTreeSelection * selection;
+HISTORY_ENTRY * p;
+int hasname;
+MOKO_DIALER_APP_DATA* p_dialer_data=(MOKO_DIALER_APP_DATA* )user_data;
+
+selection = gtk_tree_view_get_selection(p_dialer_data->treeview_history);
+
+if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ {
+ p_dialer_data->g_currentselected=0;
+ return ;
+ }
+
+gtk_tree_model_get(model,&iter,COLUMN_ENTRYPOINTER,&p,-1);
+
+ p_dialer_data->g_currentselected=p;
+
+gtk_tree_model_get(model,&iter,COLUMN_HASNAME,&hasname,-1);
+history_update_counter(p_dialer_data);
+
+}
+
+
+
+GtkWidget* create_window_history_content (MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+
+ GtkWidget *treeviewHistory;
+ GtkWidget *vbox=gtk_vbox_new(FALSE,0);
+ //FIRST of all, the top title area;
+ GtkWidget *eventboxTop = gtk_event_box_new ();
+ gtk_widget_show (eventboxTop);
+ gtk_box_pack_start(GTK_BOX(vbox),eventboxTop,FALSE,FALSE,5);
+ gtk_widget_set_size_request (eventboxTop, 480, 64);
+ gtk_widget_set_name(eventboxTop,"gtkeventbox-black");
+
+ GtkWidget * hbox67 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox67);
+ gtk_container_add (GTK_CONTAINER (eventboxTop), hbox67);
+
+ GtkWidget * eventboxLeftTop = gtk_event_box_new ();
+ gtk_widget_show (eventboxLeftTop);
+ gtk_box_pack_start (GTK_BOX (hbox67), eventboxLeftTop, FALSE, TRUE, 0);
+ gtk_widget_set_name(eventboxLeftTop,"gtkeventbox-black");
+
+
+
+ GtkWidget * imageLeftMenu =file_new_image_from_relative_path("all.png");
+ gtk_widget_show (imageLeftMenu);
+ gtk_container_add (GTK_CONTAINER (eventboxLeftTop), imageLeftMenu);
+
+ GtkWidget *labelHistoryTitle = gtk_label_new (("History-"));
+ gtk_widget_show (labelHistoryTitle);
+ gtk_box_pack_start (GTK_BOX (hbox67), labelHistoryTitle, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (labelHistoryTitle, 221, -1);
+ gtk_label_set_justify (GTK_LABEL (labelHistoryTitle), GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment (GTK_MISC (labelHistoryTitle), 1, 0.5);
+
+ GtkWidget *labelFilter = gtk_label_new (("All"));
+ gtk_widget_show (labelFilter);
+ gtk_box_pack_start (GTK_BOX (hbox67), labelFilter, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (labelFilter), 0, 0.5);
+ p_dialer_data->label_filter_history=labelFilter;
+
+ GtkWidget *labelCounter = gtk_label_new (("1/21"));
+ gtk_widget_show (labelCounter);
+ gtk_box_pack_start (GTK_BOX (hbox67), labelCounter, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (labelCounter), GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment (GTK_MISC (labelCounter), 0.8, 0.5);
+ p_dialer_data->label_counter_history=labelCounter;
+
+ g_signal_connect ((gpointer) eventboxTop, "button_release_event",
+ G_CALLBACK (on_eventboxTop_button_release_event),
+ p_dialer_data);
+
+ GtkWidget *align=gtk_alignment_new(0,0,1,1);
+ gtk_alignment_set_padding(align, 0, 150, 0, 0); //FIXME too many numbers has to be retrieved from style
+
+ GtkWidget *scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+
+ treeviewHistory = gtk_tree_view_new ();
+ gtk_container_add (GTK_CONTAINER (align), scrolledwindow);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow), treeviewHistory);
+
+ gtk_widget_show (treeviewHistory);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeviewHistory), FALSE);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeviewHistory), FALSE);
+// gtk_misc_set_alignment (GTK_MISC (treeviewHistory), 0.5, 0.5);
+ gtk_box_pack_start(GTK_BOX(vbox),align,TRUE,TRUE,0);
+
+
+ gtk_widget_set_name(treeviewHistory,"gtktreeview-black");
+ p_dialer_data->treeview_history=treeviewHistory;
+ history_build_history_list_view(p_dialer_data);
+ gtk_widget_set_size_request (scrolledwindow, -1, 400);
+// gtk_misc_set_alignment (GTK_MISC (treeviewHistory),1,0.1);
+
+
+ g_signal_connect ((gpointer) treeviewHistory, "cursor_changed",
+ G_CALLBACK (on_treeviewHistory_cursor_changed),
+ p_dialer_data);
+
+
+ return vbox;
+}
+
+
+/**
+ * @brief re-filter the treeview widget by current history type,a callback when the history treeview refreshes
+ *
+ * this callback will be called for every treemodel iters,whenever the treeview filter is refreshing
+ *
+ * @param model GtkTreeModel *, the background database of the treeview
+ * @param iter GtkTreeIter *, the iterator of every item of the model.
+ * @param data gpointer , of no use currently
+ * @return boolean
+ * @retval TRUE means the iter will be displayed
+ * @retval FALSE means the iter will not be displayed
+ */
+static gboolean history_view_filter_visible_function(GtkTreeModel *model,GtkTreeIter *iter,gpointer data)
+{
+ MOKO_DIALER_APP_DATA* p_dialer_data=(MOKO_DIALER_APP_DATA* )data;
+ HISTORY_TYPE type;
+ if(p_dialer_data->g_history_filter_type==ALL)
+ return TRUE;
+ gtk_tree_model_get(model,iter,COLUMN_TYPE,&type,-1);
+ if(type==p_dialer_data->g_history_filter_type)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+
+
+/**
+ * @brief find the treeview in the window, fill-in the data and show it on the screen.
+ *
+ *
+ *
+ * @param window GtkWidget* the window which contains the history treeview. but it's not necessarilly
+ *to be a window, any widget that can help to lookup the treeview will be OK.
+ * @return
+ * @retval 0 error occured
+ * @retval 1 everything is OK
+ */
+
+gint history_build_history_list_view(MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+ GtkListStore * list_store;
+
+ GtkTreeIter iter;
+ HISTORY_ENTRY * entry;
+
+ //copied
+ GtkTreeViewColumn *col;
+ GtkCellRenderer *renderer;
+
+ //GtkTreeModel *model;
+ GtkWidget *contactview=NULL;
+
+ //DBG_ENTER();
+ //DBG_MESSAGE("History:%d",g_historylist.length);
+
+ //DBG_TRACE();
+ p_dialer_data->g_history_filter_type=ALL;
+ contactview = p_dialer_data->treeview_history;
+
+ if(contactview == NULL)
+ return 0;
+//pack image and label
+ col = gtk_tree_view_column_new ();
+
+ gtk_tree_view_column_set_title (col, ("Title"));
+ gtk_tree_view_column_set_resizable (col, TRUE);
+
+
+
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (col, renderer, FALSE);
+ gtk_tree_view_column_set_attributes (col, renderer,
+ "pixbuf",COLUMN_TYPEICON,NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (col, renderer, FALSE);
+ gtk_tree_view_column_set_attributes(col, renderer,
+ "text",COLUMN_TIME,NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (col, renderer, FALSE);
+ gtk_tree_view_column_set_attributes(col, renderer,
+ "text",COLUMN_SEPRATE,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",COLUMN_NAME_NUMBER,NULL);
+
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (contactview), col);
+
+
+ entry=p_dialer_data->g_historylist.first;
+
+ list_store=gtk_list_store_new(N_COLUMN, G_TYPE_INT,GDK_TYPE_PIXBUF,
+ G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_INT,G_TYPE_POINTER,G_TYPE_INT,-1);
+ //we will use a filter to facilitate the filtering in treeview without rebuilding the database.
+ p_dialer_data->g_list_store_filter=gtk_tree_model_filter_new(GTK_TREE_MODEL(list_store),NULL);
+ gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(p_dialer_data->g_list_store_filter),
+ history_view_filter_visible_function,p_dialer_data,NULL);
+
+//load the three icons to memory.
+GError *error=NULL;
+ p_dialer_data->g_iconReceived=create_pixbuf("received.png",&error);
+ if(error)
+ {
+ DBG_WARN("Cound not load icon :%s",error->message);
+ g_error_free(error);
+ p_dialer_data->g_iconReceived=NULL;
+ error=NULL;
+ }
+
+ p_dialer_data->g_iconDialed=create_pixbuf("dialed.png",&error);
+ if(error)
+ {
+ DBG_WARN("Cound not load icon :%s",error->message);
+ g_error_free(error);
+ p_dialer_data->g_iconDialed=NULL;
+ error=NULL;
+ }
+
+
+ p_dialer_data->g_iconMissed=create_pixbuf("missed.png",&error);
+ if(error)
+ {
+ DBG_WARN("Cound not load icon :%s",error->message);
+ g_error_free(error);
+ p_dialer_data->g_iconMissed=NULL;
+ error=NULL;
+ }
+
+
+ while(entry)
+ {
+ //DBG_MESSAGE(entry->number);
+ gtk_list_store_append(list_store,&iter);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPE,entry->type,COLUMN_SEPRATE,"--",
+ COLUMN_TIME,entry->time,COLUMN_DURATION,entry->durationsec,COLUMN_ENTRYPOINTER,entry,COLUMN_HASNAME,0,-1);
+ if(entry->name==0)
+ {
+ //DBG_MESSAGE(entry->number);
+ gtk_list_store_set(list_store,&iter,COLUMN_NAME_NUMBER,entry->number,-1);
+ gtk_list_store_set(list_store,&iter,COLUMN_HASNAME,0,-1);
+ }
+ else
+ {
+ gtk_list_store_set(list_store,&iter,COLUMN_NAME_NUMBER,entry->name,-1);
+ gtk_list_store_set(list_store,&iter,COLUMN_HASNAME,1,-1);
+ }
+ switch(entry->type)
+ {
+ case INCOMING:
+ {
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,p_dialer_data->g_iconReceived,-1);
+ // icon=gdk_pixbuf_new_from_file("./received.png",&error);
+ break;
+ }
+ case OUTGOING:
+ {// icon=gdk_pixbuf_new_from_file("./dialed.png",&error);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,p_dialer_data->g_iconDialed,-1);
+ break;
+ }
+ case MISSED:
+ { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,p_dialer_data->g_iconMissed,-1);
+ break;
+ }
+
+ default:
+
+ { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,p_dialer_data->g_iconMissed,-1);
+ break;
+ }
+ }
+
+
+
+ entry=entry->next;
+ }
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW(contactview),GTK_TREE_MODEL(p_dialer_data->g_list_store_filter));
+
+ g_object_unref (list_store);
+
+ return 1;
+}
+
+
+/**
+ * @brief update the counter display widget - labelCounter
+ *
+ * @param widget GtkWidget*, any widget in the same window with treeviewHistory and labelCounter
+ *
+ * @return 1
+ */
+gint history_update_counter(MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+DBG_ENTER();
+GtkTreeIter iter;
+GtkTreeModel* model;
+GtkTreeSelection * selection;
+GtkTreePath *path;
+GtkTreeView * treeview;
+int count=0;
+int nth=0;
+char * pathstring;
+char display[10];
+
+treeview=GTK_TREE_VIEW(p_dialer_data->treeview_history);
+if(!p_dialer_data->treeview_history)
+{
+DBG_WARN("COUNTER NOT READY ");
+return 0;
+}
+
+
+model=gtk_tree_view_get_model(treeview);
+
+count=gtk_tree_model_iter_n_children(model,NULL);
+
+selection = gtk_tree_view_get_selection(treeview);
+
+if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+{
+ nth=0;
+}
+else
+{
+path=gtk_tree_model_get_path(model,&iter);
+pathstring=gtk_tree_path_to_string(path);
+nth=atoi(pathstring)+1;
+gtk_tree_path_free(path);
+
+}
+
+GtkWidget *labelcounter;
+labelcounter=p_dialer_data->label_counter_history;
+sprintf(display,"%d/%d",nth,count);
+gtk_label_set_text(GTK_LABEL(labelcounter),display);
+return 1;
+
+}
+
+GtkWidget* history_create_menu_history (MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+if(!p_dialer_data->menu_history)
+{
+ GtkWidget *menu_history;
+ GtkWidget *all_calls;
+ GtkWidget *imageAll;
+ GtkWidget *separator1;
+ GtkWidget *missed_calls;
+ GtkWidget *imageMissed;
+ GtkWidget *separator3;
+ GtkWidget *dialed_calls;
+ GtkWidget *imageDialed;
+ GtkWidget *separator2;
+ GtkWidget *received_calls;
+ GtkWidget *imageReceived;
+
+ menu_history = gtk_menu_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (menu_history), 2);
+
+ all_calls = gtk_image_menu_item_new_with_mnemonic (("Calls All"));
+ gtk_widget_show (all_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), all_calls);
+ gtk_widget_set_size_request (all_calls, 250, 60);
+
+
+ imageAll =file_new_image_from_relative_path("all.png");
+ gtk_widget_show (imageAll);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (all_calls), imageAll);
+
+ separator1 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator1);
+ gtk_container_add (GTK_CONTAINER (menu_history), separator1);
+ gtk_widget_set_size_request (separator1, 120, -1);
+ gtk_widget_set_sensitive (separator1, FALSE);
+
+ missed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Missed "));
+ gtk_widget_show (missed_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), missed_calls);
+ gtk_widget_set_size_request (missed_calls, 120, 60);
+
+ //imageMissed = gtk_image_new_from_stock ("gtk-goto-bottom", GTK_ICON_SIZE_MENU);
+ imageMissed =file_new_image_from_relative_path("missed.png");
+
+ gtk_widget_show (imageMissed);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (missed_calls), imageMissed);
+
+ separator3 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator3);
+ gtk_container_add (GTK_CONTAINER (menu_history), separator3);
+ gtk_widget_set_size_request (separator3, 120, -1);
+ gtk_widget_set_sensitive (separator3, FALSE);
+
+ dialed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Dialed"));
+ gtk_widget_show (dialed_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), dialed_calls);
+ gtk_widget_set_size_request (dialed_calls, 120, 60);
+
+ // imageDialed = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
+ imageDialed =file_new_image_from_relative_path("dialed.png");
+ gtk_widget_show (imageDialed);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (dialed_calls), imageDialed);
+
+ separator2 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator2);
+ gtk_container_add (GTK_CONTAINER (menu_history), separator2);
+ gtk_widget_set_size_request (separator2, 120, -1);
+ gtk_widget_set_sensitive (separator2, FALSE);
+
+ received_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Received "));
+ gtk_widget_show (received_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), received_calls);
+ gtk_widget_set_size_request (received_calls, 120, 60);
+
+// imageReceived = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);
+ imageReceived=file_new_image_from_relative_path("received.png");
+ gtk_widget_show (imageReceived);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (received_calls), imageReceived);
+
+ g_signal_connect ((gpointer) all_calls, "activate",
+ G_CALLBACK (on_all_calls_activate),
+ p_dialer_data);
+ g_signal_connect ((gpointer) missed_calls, "activate",
+ G_CALLBACK (on_missed_calls_activate),
+ p_dialer_data);
+ g_signal_connect ((gpointer) dialed_calls, "activate",
+ G_CALLBACK (on_dialed_calls_activate),
+ p_dialer_data);
+ g_signal_connect ((gpointer) received_calls, "activate",
+ G_CALLBACK (on_received_calls_activate),
+ p_dialer_data);
+
+p_dialer_data->menu_history=menu_history;
+ return menu_history;
+}
+else
+ return p_dialer_data->menu_history;
+}
+
+
+
+/**
+ * @brief add an entry to the history treeview
+ *
+ *
+ *
+ * @param entry HISTORY_ENTRY *, the history entry to be added to the treeview.
+ * @return
+ * @retval 0 error occured
+ * @retval 1 everything is OK
+ */
+gint history_list_view_add(MOKO_DIALER_APP_DATA* appdata,HISTORY_ENTRY * entry)
+{
+DBG_ENTER();
+if(entry==0)
+ {
+ DBG_ERROR("THE ENTRY IS ZERO");
+ return 0;
+ }
+
+if(appdata->treeview_history==0)
+{
+ DBG_WARN("not ready");
+ return 0;
+
+}
+ //
+GtkTreeIter iter; //iter of the filter store
+GtkTreeModel* model;
+GtkListStore* list_store;
+GtkTreeView* treeview;
+
+treeview=GTK_TREE_VIEW(appdata->treeview_history);
+
+model=gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(appdata->g_list_store_filter));
+
+list_store=GTK_LIST_STORE(model);
+ //
+
+
+ //DBG_MESSAGE(entry->number);
+ gtk_list_store_insert(list_store,&iter,0);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPE,entry->type,COLUMN_SEPRATE,"--",
+ COLUMN_TIME,entry->time,COLUMN_DURATION,entry->durationsec,COLUMN_ENTRYPOINTER,entry,COLUMN_HASNAME,0,-1);
+ if(entry->name==0)
+ {
+ //DBG_MESSAGE(entry->number);
+ gtk_list_store_set(list_store,&iter,COLUMN_NAME_NUMBER,entry->number,-1);
+ gtk_list_store_set(list_store,&iter,COLUMN_HASNAME,0,-1);
+ }
+ else
+ {
+ gtk_list_store_set(list_store,&iter,COLUMN_NAME_NUMBER,entry->name,-1);
+ gtk_list_store_set(list_store,&iter,COLUMN_HASNAME,1,-1);
+ }
+ switch(entry->type)
+ {
+ case INCOMING:
+ {
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,appdata->g_iconReceived,-1);
+ // icon=gdk_pixbuf_new_from_file("./received.png",&error);
+ break;
+ }
+ case OUTGOING:
+ {// icon=gdk_pixbuf_new_from_file("./dialed.png",&error);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,appdata->g_iconDialed,-1);
+ break;
+ }
+ case MISSED:
+ { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,appdata->g_iconMissed,-1);
+ break;
+ }
+
+ default:
+
+ { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
+ gtk_list_store_set(list_store,&iter,COLUMN_TYPEICON,appdata->g_iconMissed,-1);
+ break;
+ }
+ }
+ history_update_counter(appdata);
+ return 1;
+}
+
+
+gint add_histroy_entry(MOKO_DIALER_APP_DATA* appdata,HISTORY_TYPE type,const char *name,const char *number,const char *id, char *time,char *date,int durationsec)
+{
+//DBG_ENTER();
+
+ //DBG_MESSAGE("History add:%s,%s,%s,%s,%s,%d",name,number,picpath,time,date,durationsec);
+ HISTORY_ENTRY * pentry=history_add_entry(&(appdata->g_historylist),type,name,number,id,time,date,durationsec);
+ return history_list_view_add(appdata,pentry);
+}
+
+
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -1,320 +1,310 @@
-/* openmoko-dialer-window-incoming.c
- *
- * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
- *
- * Copyright (C) 2006 FIC Shanghai Lab
- *
- * 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.
- *
- * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
- */
-
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
-
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-#include "contacts.h"
-#include "openmoko-dialer-main.h"
-#include "moko-dialer-status.h"
-#include "openmoko-dialer-window-incoming.h"
-
-void
-cb_answer_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
- appdata->g_state.callstate = STATE_TALKING;
- gsm_answer ();
-
- gtk_widget_hide (appdata->window_incoming);
-
-
-//transfer the contact info
- window_talking_prepare (appdata);
-
-
- gtk_widget_show (appdata->window_talking);
-
- DBG_LEAVE ();
-}
-
-void
-cb_ignore_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- DBG_MESSAGE ("We will mute the phone for this call.");
- appdata->g_state.callstate = STATE_IGNORED;
- DBG_LEAVE ();
-}
-
-void
-cb_reject_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- gsm_hangup ();
- appdata->g_state.callstate = STATE_REJECTED;
- gtk_widget_hide (appdata->window_incoming);
- DBG_LEAVE ();
-}
-
-void
-window_incoming_prepare (MOKO_DIALER_APP_DATA * appdata)
-{
- if (!appdata)
- {
- DBG_WARN ("appdata=NULL!");
- return;
- }
-
- if (appdata->window_incoming == 0)
- {
- window_incoming_init (appdata);
- }
-
- moko_dialer_status_set_person_number (appdata->status_incoming,
- appdata->g_peer_info.number);
- if (appdata->g_peer_info.hasname)
- {
-
- moko_dialer_status_set_person_image (appdata->status_incoming,
- appdata->g_peer_info.ID);
- moko_dialer_status_set_person_name (appdata->status_incoming,
- appdata->g_peer_info.name);
- }
- else
- {
- moko_dialer_status_set_person_image (appdata->status_incoming, "");
- moko_dialer_status_set_person_name (appdata->status_incoming, "");
-
- }
-
-
-
-}
-
-gint
-window_incoming_fails (MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- DBG_LEAVE ();
-}
-
-gint
-timer_incoming_time_out (MOKO_DIALER_APP_DATA * appdata)
-{
-//DBG_ENTER();
- TIMER_DATA *timer_data = &(appdata->g_timer_data);
-
-/*
-timer_data->ticks++;
-timer_data->hour=timer_data->ticks/3600;
-timer_data->min=(timer_data->ticks-timer_data->hour*3600)/60;
-timer_data->sec=timer_data->ticks%60;
-
-
-sprintf(timer_data->timestring,"%02d:%02d:%02d",timer_data->hour,timer_data->min,timer_data->sec);
-//ok,we update the label now.
-moko_dialer_status_set_status_label(appdata->status_incoming,timer_data->timestring);
-moko_dialer_status_update_icon(appdata->status_incoming);
-*/
- if (event_get_keep_calling ())
- {
- event_reset_keep_calling ();
- timer_data->ticks = 0;
- }
- else
- { //we count 4 before we confirm that there are no calling at all.
- if (timer_data->ticks >= 3)
- {
- DBG_MESSAGE ("THE CALLER aborted, we quit.");
- gsm_hangup ();
- appdata->g_state.callstate = STATE_MISSED;
- appdata->g_state.historytype = MISSED;
- gdk_threads_enter ();
- gtk_widget_hide (appdata->window_incoming);
- gdk_threads_leave ();
- return 0; //don't lookout the timeout.
- }
- else
- {
- DBG_MESSAGE ("ticks=%d", timer_data->ticks);
- timer_data->ticks++;
- }
- }
-
- return 1;
-
-
-}
-
-
-
-void
-on_window_incoming_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
-
- DBG_ENTER ();
-
- if (appdata->g_timer_data.ptimer != 0)
- {
- gtk_timeout_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
-
- event_reset_clip_signaled ();
- event_reset_incoming_signaled ();
- event_reset_keep_calling ();
-
- if (appdata->g_state.callstate != STATE_TALKING)
- { // add_histroy_entry(g_state.historytype,g_state.contactinfo.name,g_state.contactinfo.number,g_state.contactinfo.picpath,g_state.starttime,0);
-
- add_histroy_entry (appdata, appdata->g_state.historytype,
- appdata->g_peer_info.name,
- appdata->g_peer_info.number,
- appdata->g_peer_info.ID,
- appdata->g_state.starttime,
- appdata->g_state.startdate, 0);
-
- }
-
- DBG_LEAVE ();
-}
-
-gint
-window_incoming_setup_timer (MOKO_DIALER_APP_DATA * appdata)
-{
- time_t timep;
- struct tm *p;
- time (&timep);
- p = localtime (&timep);
-
- sprintf (appdata->g_state.starttime, "%02d:%02d:%02d", p->tm_hour,
- p->tm_min, p->tm_sec);
- sprintf (appdata->g_state.startdate, "%04d/%02d/%02d", p->tm_year,
- p->tm_mon, p->tm_mday);
-
- if (appdata->g_timer_data.ptimer != 0)
- {
- gtk_timeout_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
-
- memset (&(appdata->g_timer_data), 0, sizeof (appdata->g_timer_data));
-
- appdata->g_timer_data.stopsec = 0;
-
- appdata->g_timer_data.ptimer =
- gtk_timeout_add (1000, timer_incoming_time_out, appdata);
-
-
-}
-
-void
-on_window_incoming_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
-
- DBG_ENTER ();
- appdata->g_state.callstate = STATE_INCOMING;
- window_incoming_setup_timer (appdata);
- DBG_LEAVE ();
-
-}
-
-
-gint
-window_incoming_init (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
-
- DBG_ENTER ();
- MokoFingerWindow *window;
- GtkWidget *vbox;
- MokoDialerStatus *status;
-
- if (p_dialer_data->window_incoming == 0)
- {
-
- vbox = gtk_vbox_new (FALSE, 0);
- status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (status, "status0.png");
- moko_dialer_status_add_status_icon (status, "status1.png");
- moko_dialer_status_add_status_icon (status, "status2.png");
- moko_dialer_status_set_icon_by_index (status, 0);
-
- gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
-
-
- GtkHBox *hbox2 = gtk_hbox_new (FALSE, 0);
- GtkButton *button = gtk_button_new_with_label ("Answer");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_answer_button_clicked), p_dialer_data);
-
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 10);
-
- button = gtk_button_new_with_label ("Ignore");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_ignore_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 10);
-
-
-
- button = gtk_button_new_with_label ("Reject");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_reject_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 10);
-
-
-
-
- gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
-
-
-//currently MokoDialogWindow is not finished, wating...
-// MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
-// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
-
- window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-
-
- gtk_widget_show_all (GTK_WIDGET (window));
-
-
- gtk_widget_hide (GTK_WIDGET (window));
-
-
- moko_dialer_status_set_title_label (status, "Incoming call");
- moko_dialer_status_set_status_label (status, "");
-
- p_dialer_data->window_incoming = window;
- p_dialer_data->status_incoming = status;
-
-// DBG_MESSAGE("p_dialer_data->status_incoming=0X%x",p_dialer_data->status_incoming);
-
-
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_incoming_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_incoming_hide), p_dialer_data);
-
- }
-
-
- DBG_LEAVE ();
- return 1;
-}
+/* openmoko-dialer-window-incoming.c
+ *
+ * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 FIC Shanghai Lab
+ *
+ * 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.
+ *
+ * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
+ */
+
+#include <libmokoui/moko-finger-tool-box.h>
+#include <libmokoui/moko-finger-window.h>
+#include <libmokoui/moko-finger-wheel.h>
+#include <libmokoui/moko-pixmap-button.h>
+
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkvbox.h>
+#include "contacts.h"
+#include "openmoko-dialer-main.h"
+#include "moko-dialer-status.h"
+#include "openmoko-dialer-window-incoming.h"
+
+void cb_answer_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+
+appdata->g_state.callstate=STATE_TALKING;
+gsm_answer();
+
+gtk_widget_hide(appdata->window_incoming);
+
+
+//transfer the contact info
+window_talking_prepare(appdata);
+
+
+gtk_widget_show(appdata->window_talking);
+
+DBG_LEAVE();
+}
+
+void cb_ignore_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+DBG_MESSAGE("We will mute the phone for this call.");
+appdata->g_state.callstate=STATE_IGNORED;
+DBG_LEAVE();
+}
+
+void cb_reject_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+gsm_hangup();
+appdata->g_state.callstate=STATE_REJECTED;
+gtk_widget_hide(appdata->window_incoming);
+DBG_LEAVE();
+}
+
+void window_incoming_prepare(MOKO_DIALER_APP_DATA * appdata)
+{
+if(!appdata)
+{
+DBG_WARN("appdata=NULL!");
+return;
+}
+
+if(appdata->window_incoming==0)
+{
+window_incoming_init(appdata);
+}
+
+ moko_dialer_status_set_person_number(appdata->status_incoming, appdata->g_peer_info.number);
+if(appdata->g_peer_info.hasname)
+{
+
+ moko_dialer_status_set_person_image(appdata->status_incoming, appdata->g_peer_info.ID);
+ moko_dialer_status_set_person_name(appdata->status_incoming, appdata->g_peer_info.name);
+}
+else
+{
+ moko_dialer_status_set_person_image(appdata->status_incoming, "");
+ moko_dialer_status_set_person_name(appdata->status_incoming, "");
+
+}
+
+
+
+}
+
+gint window_incoming_fails(MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+DBG_LEAVE();
+}
+
+gint timer_incoming_time_out(MOKO_DIALER_APP_DATA * appdata)
+{
+//DBG_ENTER();
+TIMER_DATA* timer_data=&(appdata->g_timer_data);
+
+/*
+timer_data->ticks++;
+timer_data->hour=timer_data->ticks/3600;
+timer_data->min=(timer_data->ticks-timer_data->hour*3600)/60;
+timer_data->sec=timer_data->ticks%60;
+
+
+sprintf(timer_data->timestring,"%02d:%02d:%02d",timer_data->hour,timer_data->min,timer_data->sec);
+//ok,we update the label now.
+moko_dialer_status_set_status_label(appdata->status_incoming,timer_data->timestring);
+moko_dialer_status_update_icon(appdata->status_incoming);
+*/
+if(event_get_keep_calling())
+{
+ event_reset_keep_calling();
+ timer_data->ticks=0;
+}
+else
+{ //we count 4 before we confirm that there are no calling at all.
+ if(timer_data->ticks>=3)
+ {
+ DBG_MESSAGE("THE CALLER aborted, we quit.");
+ gsm_hangup();
+ appdata->g_state.callstate=STATE_MISSED;
+ appdata->g_state.historytype=MISSED;
+ gdk_threads_enter();
+ gtk_widget_hide(appdata->window_incoming);
+ gdk_threads_leave();
+ return 0; //don't lookout the timeout.
+ }
+ else
+ {
+ DBG_MESSAGE("ticks=%d",timer_data->ticks);
+ timer_data->ticks++;
+ }
+}
+
+return 1;
+
+
+}
+
+
+
+void
+on_window_incoming_hide (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+
+DBG_ENTER();
+appdata->window_present=0;
+
+if(appdata->g_timer_data.ptimer!=0)
+{
+gtk_timeout_remove(appdata->g_timer_data.ptimer);
+appdata->g_timer_data.ptimer=0;
+}
+
+event_reset_clip_signaled();
+event_reset_incoming_signaled();
+event_reset_keep_calling();
+
+if(appdata->g_state.callstate!=STATE_TALKING)
+{// add_histroy_entry(g_state.historytype,g_state.contactinfo.name,g_state.contactinfo.number,g_state.contactinfo.picpath,g_state.starttime,0);
+
+add_histroy_entry(appdata,appdata->g_state.historytype,
+ appdata->g_peer_info.name,
+ appdata->g_peer_info.number,
+ appdata->g_peer_info.ID,
+ appdata->g_state.starttime,
+ appdata->g_state.startdate,
+ 0);
+
+}
+
+DBG_LEAVE();
+}
+
+gint window_incoming_setup_timer(MOKO_DIALER_APP_DATA * appdata)
+{
+time_t timep;
+struct tm *p;
+time(&timep);
+p=localtime(&timep);
+
+sprintf(appdata->g_state.starttime,"%02d:%02d:%02d",p->tm_hour,p->tm_min,p->tm_sec);
+sprintf(appdata->g_state.startdate,"%04d/%02d/%02d",p->tm_year,p->tm_mon,p->tm_mday);
+
+if(appdata->g_timer_data.ptimer!=0)
+{
+gtk_timeout_remove(appdata->g_timer_data.ptimer);
+appdata->g_timer_data.ptimer=0;
+}
+
+memset(&(appdata->g_timer_data),0,sizeof(appdata->g_timer_data));
+
+appdata->g_timer_data.stopsec=0;
+
+appdata->g_timer_data.ptimer=gtk_timeout_add(1000,timer_incoming_time_out,appdata);
+
+
+}
+
+void
+on_window_incoming_show (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+appdata->window_present=widget;
+appdata->g_state.callstate=STATE_INCOMING;
+window_incoming_setup_timer(appdata);
+DBG_LEAVE();
+
+}
+
+
+gint window_incoming_init( MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+
+DBG_ENTER();
+MokoFingerWindow* window;
+GtkWidget* vbox;
+MokoDialerStatus * status;
+
+if(p_dialer_data->window_incoming==0)
+{
+
+ vbox = gtk_vbox_new( FALSE, 0 );
+ status=moko_dialer_status_new();
+ moko_dialer_status_add_status_icon(status,"status0.png");
+ moko_dialer_status_add_status_icon(status,"status1.png");
+ moko_dialer_status_add_status_icon(status,"status2.png");
+ moko_dialer_status_set_icon_by_index(status,0);
+
+ gtk_box_pack_start( GTK_BOX(vbox),status, FALSE, FALSE, 0 );
+
+
+ GtkHBox * hbox2 = gtk_hbox_new( FALSE, 0 );
+ GtkButton* button = gtk_button_new_with_label("Answer");
+ g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_answer_button_clicked), p_dialer_data );
+
+ gtk_box_pack_start( GTK_BOX(hbox2), GTK_WIDGET(button),TRUE, TRUE, 10);
+
+ button = gtk_button_new_with_label("Ignore");
+ g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_ignore_button_clicked), p_dialer_data );
+ gtk_box_pack_start( GTK_BOX(hbox2), GTK_WIDGET(button), TRUE, TRUE, 10 );
+
+
+
+button = gtk_button_new_with_label("Reject");
+ g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_reject_button_clicked), p_dialer_data );
+ gtk_box_pack_start( GTK_BOX(hbox2), GTK_WIDGET(button),TRUE, TRUE, 10);
+
+
+
+
+ gtk_box_pack_start( GTK_BOX(vbox),hbox2, FALSE, FALSE, 50 );
+
+
+//currently MokoDialogWindow is not finished, wating...
+// MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
+// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
+
+ window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+ moko_finger_window_set_contents(window, GTK_WIDGET(vbox) );
+
+
+ gtk_widget_show_all( GTK_WIDGET(window) );
+
+
+ gtk_widget_hide( GTK_WIDGET(window) );
+
+
+ moko_dialer_status_set_title_label(status, "Incoming call");
+ moko_dialer_status_set_status_label(status, "");
+
+ p_dialer_data->window_incoming=window;
+ p_dialer_data->status_incoming=status;
+
+// DBG_MESSAGE("p_dialer_data->status_incoming=0X%x",p_dialer_data->status_incoming);
+
+
+ g_signal_connect ((gpointer) window, "show",
+ G_CALLBACK (on_window_incoming_show),
+ p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_incoming_hide),
+ p_dialer_data);
+
+}
+
+
+DBG_LEAVE();
+ return 1;
+}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -1,329 +1,313 @@
-/* openmoko-dialer-window-outgoing.c
- *
- * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
- *
- * Copyright (C) 2006 FIC Shanghai Lab
- *
- * 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.
- *
- * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
- */
-
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
-
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-#include "contacts.h"
-#include "openmoko-dialer-main.h"
-#include "moko-dialer-status.h"
-#include "openmoko-dialer-window-outgoing.h"
-
-void
-cb_speaker_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-//moko_dialer_status_update_icon(appdata->status_outgoing);
-
-
- appdata->g_state.callstate = STATE_TALKING;
-
- gtk_widget_hide (appdata->window_outgoing);
-
-
-//transfer the contact info
- window_talking_prepare (appdata);
-
-//start dialling.
-
- DBG_TRACE ();
- gtk_widget_show (appdata->window_talking);
-
-
- DBG_LEAVE ();
-}
-
-void
-cb_redial_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- gtk_widget_hide (appdata->buttonRedial);
- gtk_widget_show (appdata->buttonSpeaker);
- moko_dialer_status_set_title_label (appdata->status_outgoing,
- "Outgoing call");
- moko_dialer_status_set_status_label (appdata->status_outgoing,
- "Calling ... (00:00:00)");
- window_outgoing_setup_timer (appdata);
-
- appdata->g_state.callstate = STATE_CALLING;
- appdata->g_state.historytype = OUTGOING;
- gsm_dial (appdata->g_peer_info.number);
-
- DBG_LEAVE ();
-}
-
-void
-cb_cancel_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- gsm_hangup ();
- appdata->g_state.callstate = STATE_FAILED;
- gtk_widget_hide (appdata->window_outgoing);
- DBG_LEAVE ();
-}
-
-void
-window_outgoing_prepare (MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- if (appdata->window_outgoing == 0)
- window_outgoing_init (appdata);
-
-
- moko_dialer_status_set_person_number (appdata->status_outgoing,
- appdata->g_peer_info.number);
- if (appdata->g_peer_info.hasname)
- {
- moko_dialer_status_set_person_image (appdata->status_outgoing,
- appdata->g_peer_info.ID);
- moko_dialer_status_set_person_name (appdata->status_outgoing,
- appdata->g_peer_info.name);
- }
- else
- {
- moko_dialer_status_set_person_image (appdata->status_outgoing, "");
- moko_dialer_status_set_person_name (appdata->status_outgoing, "");
-
- }
- strcpy (appdata->g_state.lastnumber, appdata->g_peer_info.number);
- DBG_LEAVE ();
-
-}
-
-gint
-window_outgoing_fails (MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- moko_dialer_status_set_error (appdata->status_outgoing);
- moko_dialer_status_set_title_label (appdata->status_outgoing,
- "Call Failure");
- gtk_widget_hide (appdata->buttonSpeaker);
- gtk_widget_show (appdata->buttonRedial);
- DBG_LEAVE ();
-}
-
-gint
-timer_outgoing_time_out (MOKO_DIALER_APP_DATA * appdata)
-{
-//DBG_ENTER();
- TIMER_DATA *timer_data = &(appdata->g_timer_data);
-
-
- timer_data->ticks++;
- timer_data->hour = timer_data->ticks / 3600;
- timer_data->min = (timer_data->ticks - timer_data->hour * 3600) / 60;
- timer_data->sec = timer_data->ticks % 60;
-
-
- sprintf (timer_data->timestring, "Calling ... (%02d:%02d:%02d)",
- timer_data->hour, timer_data->min, timer_data->sec);
-
-//ok,we update the label now.
-
-
- moko_dialer_status_set_status_label (appdata->status_outgoing,
- timer_data->timestring);
- moko_dialer_status_update_icon (appdata->status_outgoing);
-
- if (timer_data->stopsec != 0 && timer_data->ticks >= timer_data->stopsec)
- {
-
- timer_data->timeout = 1;
- gtk_timeout_remove (timer_data->ptimer);
- timer_data->ptimer = 0;
-//maybe it failes
- window_outgoing_fails (appdata);
- return 0; //0 stops the timer.
- }
- else
- return 1;
-}
-
-
-
-void
-on_window_outgoing_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
- if (appdata->g_timer_data.ptimer != 0)
- {
- gtk_timeout_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
- if (appdata->g_state.callstate != STATE_TALKING)
- { // add_histroy_entry(g_state.historytype,g_state.contactinfo.name,g_state.contactinfo.number,g_state.contactinfo.picpath,g_state.starttime,0);
-
- add_histroy_entry (appdata, appdata->g_state.historytype,
- appdata->g_peer_info.name,
- appdata->g_peer_info.number,
- appdata->g_peer_info.picpath,
- appdata->g_state.starttime,
- appdata->g_state.startdate, 0);
-
- }
-
-
-
-}
-
-gint
-window_outgoing_setup_timer (MOKO_DIALER_APP_DATA * appdata)
-{
- time_t timep;
- struct tm *p;
- time (&timep);
- p = localtime (&timep);
-
- sprintf (appdata->g_state.starttime, "%02d:%02d:%02d", p->tm_hour,
- p->tm_min, p->tm_sec);
- sprintf (appdata->g_state.startdate, "%04d/%02d/%02d", p->tm_year,
- p->tm_mon, p->tm_mday);
-
- if (appdata->g_timer_data.ptimer != 0)
- {
- gtk_timeout_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
-
- memset (&(appdata->g_timer_data), 0, sizeof (appdata->g_timer_data));
-// 1:30 timeout
- appdata->g_timer_data.stopsec = 90;
-
- appdata->g_timer_data.ptimer =
- gtk_timeout_add (1000, timer_outgoing_time_out, appdata);
-
-
-}
-
-void
-on_window_outgoing_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
-
- DBG_ENTER ();
- window_outgoing_setup_timer (appdata);
- DBG_TRACE ();
- appdata->g_state.callstate = STATE_CALLING;
- DBG_TRACE ();
- appdata->g_state.historytype = OUTGOING;
- DBG_TRACE ();
- gsm_dial (appdata->g_peer_info.number);
- DBG_LEAVE ();
-
-}
-
-
-gint
-window_outgoing_init (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
-
- DBG_ENTER ();
- MokoFingerWindow *window;
- GtkWidget *vbox;
- MokoDialerStatus *status;
-
- if (p_dialer_data->window_outgoing == 0)
- {
-
- vbox = gtk_vbox_new (FALSE, 0);
- status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (status, "status0.png");
- moko_dialer_status_add_status_icon (status, "status1.png");
- moko_dialer_status_add_status_icon (status, "status2.png");
- moko_dialer_status_set_icon_by_index (status, 0);
-
- gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
-
-
- GtkHBox *hbox2 = gtk_hbox_new (FALSE, 0);
- GtkButton *button = gtk_button_new_with_label ("Speaker");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
- p_dialer_data->buttonSpeaker = button;
-//gtk_widget_set_size_request(button,100,32);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
-
- button = gtk_button_new_with_label ("Redial");
- p_dialer_data->buttonRedial = button;
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
-//gtk_widget_set_size_request(button,100,32);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
-//gtk_widget_set_size_request(button,60,24);
-
-
- button = gtk_button_new_with_label ("Cancel");
- p_dialer_data->buttonCancel = button;
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_cancel_button_clicked), p_dialer_data);
-//gtk_widget_set_size_request(button,100,32);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
-
-
-
-
- gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
-
-
-//currently MokoDialogWindow is not finished, wating...
-// MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
-// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
-
- window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-
-
- gtk_widget_show_all (GTK_WIDGET (window));
-
- gtk_widget_hide (p_dialer_data->buttonRedial);
-
-
- gtk_widget_hide (GTK_WIDGET (window));
-
-
- moko_dialer_status_set_title_label (status, "Outgoing call");
- moko_dialer_status_set_status_label (status, "Calling ... (00:00:00)");
-
- p_dialer_data->window_outgoing = window;
- p_dialer_data->status_outgoing = status;
-
-// DBG_MESSAGE("p_dialer_data->status_outgoing=0X%x",p_dialer_data->status_outgoing);
-
-
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_outgoing_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_outgoing_hide), p_dialer_data);
-
- }
-
-
-
-// gtk_widget_show(p_dialer_data->window_outgoing);
-
- DBG_LEAVE ();
- return 1;
-}
+/* openmoko-dialer-window-outgoing.c
+ *
+ * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 FIC Shanghai Lab
+ *
+ * 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.
+ *
+ * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
+ */
+
+#include <libmokoui/moko-finger-tool-box.h>
+#include <libmokoui/moko-finger-window.h>
+#include <libmokoui/moko-finger-wheel.h>
+#include <libmokoui/moko-pixmap-button.h>
+
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkvbox.h>
+#include "contacts.h"
+#include "openmoko-dialer-main.h"
+#include "moko-dialer-status.h"
+#include "openmoko-dialer-window-outgoing.h"
+
+void cb_speaker_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+//moko_dialer_status_update_icon(appdata->status_outgoing);
+
+
+appdata->g_state.callstate=STATE_TALKING;
+
+gtk_widget_hide(appdata->window_outgoing);
+
+
+//transfer the contact info
+window_talking_prepare(appdata);
+
+//start dialling.
+
+DBG_TRACE();
+gtk_widget_show(appdata->window_talking);
+
+
+DBG_LEAVE();
+}
+
+void cb_redial_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+gtk_widget_hide(appdata->buttonRedial);
+gtk_widget_show( appdata->buttonSpeaker);
+moko_dialer_status_set_title_label(appdata->status_outgoing, "Outgoing call");
+ moko_dialer_status_set_status_label(appdata->status_outgoing, "Calling ... (00:00:00)");
+window_outgoing_setup_timer(appdata);
+
+appdata->g_state.callstate=STATE_CALLING;
+appdata->g_state.historytype=OUTGOING;
+gsm_dial(appdata->g_peer_info.number);
+
+DBG_LEAVE();
+}
+
+void cb_cancel_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+gsm_hangup();
+appdata->g_state.callstate=STATE_FAILED;
+gtk_widget_hide(appdata->window_outgoing);
+DBG_LEAVE();
+}
+
+void window_outgoing_prepare(MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+if(appdata->window_outgoing==0)
+ window_outgoing_init( appdata);
+
+
+ moko_dialer_status_set_person_number(appdata->status_outgoing, appdata->g_peer_info.number);
+if(appdata->g_peer_info.hasname)
+{
+ moko_dialer_status_set_person_image(appdata->status_outgoing, appdata->g_peer_info.ID);
+ moko_dialer_status_set_person_name(appdata->status_outgoing, appdata->g_peer_info.name);
+}
+else
+{
+ moko_dialer_status_set_person_image(appdata->status_outgoing, "");
+ moko_dialer_status_set_person_name(appdata->status_outgoing, "");
+
+}
+strcpy(appdata->g_state.lastnumber,appdata->g_peer_info.number);
+DBG_LEAVE();
+
+}
+
+gint window_outgoing_fails(MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+ moko_dialer_status_set_error(appdata->status_outgoing);
+ moko_dialer_status_set_title_label(appdata->status_outgoing, "Call Failure");
+ gtk_widget_hide( appdata->buttonSpeaker);
+ gtk_widget_show(appdata->buttonRedial);
+DBG_LEAVE();
+}
+
+gint timer_outgoing_time_out(MOKO_DIALER_APP_DATA * appdata)
+{
+//DBG_ENTER();
+TIMER_DATA* timer_data=&(appdata->g_timer_data);
+
+
+timer_data->ticks++;
+timer_data->hour=timer_data->ticks/3600;
+timer_data->min=(timer_data->ticks-timer_data->hour*3600)/60;
+timer_data->sec=timer_data->ticks%60;
+
+
+sprintf(timer_data->timestring,"Calling ... (%02d:%02d:%02d)",timer_data->hour,timer_data->min,timer_data->sec);
+
+//ok,we update the label now.
+
+
+moko_dialer_status_set_status_label(appdata->status_outgoing,timer_data->timestring);
+moko_dialer_status_update_icon(appdata->status_outgoing);
+
+if(timer_data->stopsec!=0&&timer_data->ticks>=timer_data->stopsec)
+{
+
+timer_data->timeout=1;
+gtk_timeout_remove(timer_data->ptimer);
+timer_data->ptimer=0;
+//maybe it failes
+window_outgoing_fails(appdata);
+return 0;//0 stops the timer.
+}
+else
+return 1;
+}
+
+
+
+void
+on_window_outgoing_hide (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+if(appdata->g_timer_data.ptimer!=0)
+{
+gtk_timeout_remove(appdata->g_timer_data.ptimer);
+appdata->g_timer_data.ptimer=0;
+}
+if(appdata->g_state.callstate!=STATE_TALKING)
+{// add_histroy_entry(g_state.historytype,g_state.contactinfo.name,g_state.contactinfo.number,g_state.contactinfo.picpath,g_state.starttime,0);
+
+add_histroy_entry(appdata,appdata->g_state.historytype,
+ appdata->g_peer_info.name,
+ appdata->g_peer_info.number,
+ appdata->g_peer_info.picpath,
+ appdata->g_state.starttime,
+ appdata->g_state.startdate,
+ 0);
+
+}
+appdata->window_present=0;
+
+
+}
+
+gint window_outgoing_setup_timer(MOKO_DIALER_APP_DATA * appdata)
+{
+time_t timep;
+struct tm *p;
+time(&timep);
+p=localtime(&timep);
+
+sprintf(appdata->g_state.starttime,"%02d:%02d:%02d",p->tm_hour,p->tm_min,p->tm_sec);
+sprintf(appdata->g_state.startdate,"%04d/%02d/%02d",p->tm_year,p->tm_mon,p->tm_mday);
+
+if(appdata->g_timer_data.ptimer!=0)
+{
+gtk_timeout_remove(appdata->g_timer_data.ptimer);
+appdata->g_timer_data.ptimer=0;
+}
+
+memset(&(appdata->g_timer_data),0,sizeof(appdata->g_timer_data));
+// 1:30 timeout
+appdata->g_timer_data.stopsec=90;
+
+appdata->g_timer_data.ptimer=gtk_timeout_add(1000,timer_outgoing_time_out,appdata);
+
+
+}
+
+void
+on_window_outgoing_show (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+
+//DBG_ENTER();
+appdata->window_present=widget;
+window_outgoing_setup_timer(appdata);
+//DBG_TRACE();
+appdata->g_state.callstate=STATE_CALLING;
+//DBG_TRACE();
+appdata->g_state.historytype=OUTGOING;
+//DBG_TRACE();
+gsm_dial(appdata->g_peer_info.number);
+//DBG_LEAVE();
+}
+
+
+gint window_outgoing_init( MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+
+DBG_ENTER();
+MokoFingerWindow* window;
+GtkWidget* vbox;
+MokoDialerStatus * status;
+
+if(p_dialer_data->window_outgoing==0)
+{
+
+ vbox = gtk_vbox_new( FALSE, 0 );
+ status=moko_dialer_status_new();
+ moko_dialer_status_add_status_icon(status,"status0.png");
+ moko_dialer_status_add_status_icon(status,"status1.png");
+ moko_dialer_status_add_status_icon(status,"status2.png");
+ moko_dialer_status_set_icon_by_index(status,0);
+
+ gtk_box_pack_start( GTK_BOX(vbox),status, FALSE, FALSE, 0 );
+
+
+ GtkHBox * hbox2 = gtk_hbox_new( FALSE, 0 );
+ GtkButton* button = gtk_button_new_with_label("Speaker");
+ g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_speaker_button_clicked), p_dialer_data );
+p_dialer_data->buttonSpeaker=button;
+//gtk_widget_set_size_request(button,100,32);
+ gtk_box_pack_start( GTK_BOX(hbox2), GTK_WIDGET(button),TRUE, TRUE, 40 );
+
+ button = gtk_button_new_with_label("Redial");
+ p_dialer_data->buttonRedial=button;
+ g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_redial_button_clicked), p_dialer_data );
+//gtk_widget_set_size_request(button,100,32);
+ gtk_box_pack_start( GTK_BOX(hbox2), GTK_WIDGET(button), TRUE, TRUE, 40 );
+//gtk_widget_set_size_request(button,60,24);
+
+
+button = gtk_button_new_with_label("Cancel");
+ p_dialer_data->buttonCancel=button;
+ g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(cb_cancel_button_clicked), p_dialer_data );
+//gtk_widget_set_size_request(button,100,32);
+ gtk_box_pack_start( GTK_BOX(hbox2), GTK_WIDGET(button),TRUE, TRUE, 40);
+
+
+
+
+ gtk_box_pack_start( GTK_BOX(vbox),hbox2, FALSE, FALSE, 50 );
+
+
+//currently MokoDialogWindow is not finished, wating...
+// MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
+// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
+
+ window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+ moko_finger_window_set_contents(window, GTK_WIDGET(vbox) );
+
+
+ gtk_widget_show_all( GTK_WIDGET(window) );
+
+ gtk_widget_hide( p_dialer_data->buttonRedial);
+
+
+ gtk_widget_hide( GTK_WIDGET(window) );
+
+
+ moko_dialer_status_set_title_label(status, "Outgoing call");
+ moko_dialer_status_set_status_label(status, "Calling ... (00:00:00)");
+
+ p_dialer_data->window_outgoing=window;
+ p_dialer_data->status_outgoing=status;
+
+// DBG_MESSAGE("p_dialer_data->status_outgoing=0X%x",p_dialer_data->status_outgoing);
+
+
+ g_signal_connect ((gpointer) window, "show",
+ G_CALLBACK (on_window_outgoing_show),
+ p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_outgoing_hide),
+ p_dialer_data);
+
+}
+
+
+
+// gtk_widget_show(p_dialer_data->window_outgoing);
+
+DBG_LEAVE();
+ return 1;
+}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-02-08 02:10:02 UTC (rev 906)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-02-08 08:31:09 UTC (rev 907)
@@ -1,420 +1,397 @@
-/* openmoko-dialer-window-talking.c
- *
- * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
- *
- * Copyright (C) 2006 FIC Shanghai Lab
- *
- * 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.
- *
- * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
- */
-#include "alsa.h"
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
-
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-#include "contacts.h"
-#include "openmoko-dialer-main.h"
-#include "moko-dialer-status.h"
-#include "openmoko-dialer-window-talking.h"
-
-void
-openmoko_wheel_press_left_up_cb (GtkWidget * widget,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- gint l, r;
- alsa_get_volume (&l, &r);
- alsa_set_volume (l + 10, r + 10);
-
- alsa_get_volume (&l, &r);
- g_print ("l = %d, r = %d\n", l, r);
-
-/*
- l = 90;
- r = 90;
-
-*/
-
-}
-
-void
-openmoko_wheel_press_right_down_cb (GtkWidget * widget,
- MOKO_DIALER_APP_DATA * appdata)
-{
- gint l, r;
- alsa_get_volume (&l, &r);
- alsa_set_volume (l - 10, r - 10);
- alsa_get_volume (&l, &r);
- g_print ("l = %d, r = %d\n", l, r);
-
- DBG_ENTER ();
-}
-
-
-void
-cb_tool_button_speaker_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-}
-
-void
-cb_tool_button_dtmf_talk_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
- appdata->dtmf_in_talking_window = !appdata->dtmf_in_talking_window;
- if (appdata->dtmf_in_talking_window)
- {
-
-
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button,
- appdata->
- imageTALK);
- gtk_widget_hide (appdata->content_talk);
- gtk_widget_show (appdata->content_dtmf);
- }
- else
- {
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button,
- appdata->
- imageDTMF);
- gtk_widget_hide (appdata->content_dtmf);
- gtk_widget_show (appdata->content_talk);
-
-
- }
-
-
-}
-
-void
-cb_tool_button_hangup_clicked (GtkButton * button,
- MOKO_DIALER_APP_DATA * appdata)
-{
- gsm_hangup ();
- gtk_widget_hide (appdata->window_talking);
-
-}
-
-
-void
-on_dtmf_panel_user_input (GtkWidget * widget, gchar parac, gpointer user_data)
-{
- char input[2];
- input[0] = parac;
- input[1] = 0;
- char codesinput[MOKO_DIALER_MAX_NUMBER_LEN + 1];
-
-
- MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
- MokoDialerTextview *moko_dtmf_text_view = appdata->moko_dtmf_text_view;
-
- moko_dialer_textview_insert (moko_dtmf_text_view, input);
-
-
- gsm_dtmf_send (input[0]);
-//lgsm_voice_dtmf(lgsmh, buf[1]);
-
-}
-
-
-
-void
-window_talking_prepare (MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
-// moko_dialer_status_set_person_number(appdata->status_talking, appdata->g_peer_info.number);
-
- if (!appdata->window_talking)
- window_talking_init (appdata);
-
- if (!appdata->window_talking)
- {
- DBG_WARN ("NO TALKING WINDOW INITIATED");
- return;
- }
-
-
- if (appdata->g_peer_info.hasname)
- {
- DBG_TRACE ();
- moko_dialer_status_set_person_image (appdata->status_talking,
- appdata->g_peer_info.ID);
- DBG_TRACE ();
- moko_dialer_status_set_person_name (appdata->status_talking,
- appdata->g_peer_info.name);
- DBG_TRACE ();
- }
- else
- {
- moko_dialer_status_set_person_image (appdata->status_talking, "");
- moko_dialer_status_set_person_name (appdata->status_talking, "");
-
- }
-
- DBG_LEAVE ();
-
-}
-
-gint
-timer_talking_time_out (MOKO_DIALER_APP_DATA * appdata)
-{
-//DBG_ENTER();
- TIMER_DATA *timer_data = &(appdata->g_timer_data);
-
-
- timer_data->ticks++;
- timer_data->hour = timer_data->ticks / 3600;
- timer_data->min = (timer_data->ticks - timer_data->hour * 3600) / 60;
- timer_data->sec = timer_data->ticks % 60;
-
-
- sprintf (timer_data->timestring, "Talking (%02d:%02d:%02d)",
- timer_data->hour, timer_data->min, timer_data->sec);
-
-//ok,we update the label now.
-
-
- moko_dialer_status_set_status_label (appdata->status_talking,
- timer_data->timestring);
- moko_dialer_status_update_icon (appdata->status_talking);
-
- if (timer_data->stopsec != 0 && timer_data->ticks >= timer_data->stopsec)
- {
-
- timer_data->timeout = 1;
- gtk_timeout_remove (timer_data->ptimer);
- timer_data->ptimer = 0;
- return 0; //0 stops the timer.
- }
- else
- return 1;
-}
-
-void
-on_window_talking_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
-
-
- if (appdata->g_timer_data.ptimer != 0)
- {
- gtk_timeout_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
-
- gtk_widget_hide (appdata->wheel_talking);
- gtk_widget_hide (appdata->toolbox_talking);
-
-//DBG_MESSAGE("%s, %s",appdata->g_state.starttime,appdata->g_state.startdate);
- add_histroy_entry (appdata, appdata->g_state.historytype,
- appdata->g_peer_info.name,
- appdata->g_peer_info.number,
- appdata->g_peer_info.picpath,
- appdata->g_state.starttime,
- appdata->g_state.startdate, appdata->g_timer_data.ticks);
-
-
-}
-
-void
-on_window_talking_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
- appdata->dtmf_in_talking_window = TRUE;
- //hide the talking button in talking mode.
-
- time_t timep;
- struct tm *p;
- time (&timep);
- p = localtime (&timep);
-
- sprintf (appdata->g_state.starttime, "%02d:%02d:%02d", p->tm_hour,
- p->tm_min, p->tm_sec);
- sprintf (appdata->g_state.startdate, "%04d/%02d/%02d", p->tm_year + 1900,
- p->tm_mon, p->tm_mday);
-
- memset (&(appdata->g_timer_data), 0, sizeof (appdata->g_timer_data));
-
- appdata->g_timer_data.stopsec = 0;
-
- appdata->g_timer_data.ptimer =
- gtk_timeout_add (1000, timer_talking_time_out, appdata);
-
- if (appdata->wheel_talking)
- gtk_widget_show (appdata->wheel_talking);
-
- if (appdata->toolbox_talking)
- gtk_widget_show (appdata->toolbox_talking);
-
-
-
- DBG_LEAVE ();
-}
-
-
-
-
-gint
-window_talking_init (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
-
- DBG_ENTER ();
-
-
- if (p_dialer_data->window_talking == 0)
- {
-
- MokoFingerWindow *window = NULL;
- GtkWidget *vbox = gtk_vbox_new (FALSE, 0);;
- MokoDialerStatus *status = NULL;
- GtkWidget *content_talk = NULL;
- GtkWidget *content_dtmf = NULL;
- MokoFingerToolBox *tools = NULL;
- MokoDialerPanel *mokodialerpanel = NULL;
- GtkWidget *button;
- GtkWidget *image;
-
-
-//first, the talking content.
-
- content_talk = gtk_vbox_new (FALSE, 0);
- status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (status, "status0.png");
- moko_dialer_status_add_status_icon (status, "status1.png");
- moko_dialer_status_add_status_icon (status, "status2.png");
- moko_dialer_status_set_icon_by_index (status, 0);
-
-
- moko_dialer_status_set_title_label (status, "In Call");
- moko_dialer_status_set_status_label (status, "Talking ...(00:00:00)");
-
- gtk_box_pack_start (GTK_BOX (content_talk), status, FALSE, FALSE, 0);
-
-
- p_dialer_data->status_talking = status;
- p_dialer_data->content_talk = content_talk;
-
- gtk_box_pack_start (GTK_BOX (vbox), content_talk, FALSE, FALSE, 0);
-
-
-//now the dtmf content
- content_dtmf = gtk_vbox_new (FALSE, 0);
- GtkEventBox *eventbox1 = gtk_event_box_new ();
- gtk_widget_show (eventbox1);
-
gtk_widget_set_name (GTK_WIDGET (eventbox1), "gtkeventbox-black");
-
- MokoDialerTextview *mokotextview = moko_dialer_textview_new ();
-
- gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
-
- p_dialer_data->moko_dtmf_text_view = mokotextview;
-
- gtk_box_pack_start (GTK_BOX (content_dtmf), GTK_WIDGET (eventbox1), FALSE,
- FALSE, 2);
-
-
-
- mokodialerpanel = moko_dialer_panel_new ();
-
- gtk_widget_set_size_request (mokodialerpanel, 380, 384);
- g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
- G_CALLBACK (on_dtmf_panel_user_input), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (content_dtmf), GTK_WIDGET (mokodialerpanel),
- TRUE, TRUE, 5);
-
- gtk_box_pack_start (GTK_BOX (vbox), content_dtmf, FALSE, FALSE, 0);
- p_dialer_data->content_dtmf = content_dtmf;
-
-
-//now the container--window
- window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- p_dialer_data->window_talking = window;
- moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_talking_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_talking_hide), p_dialer_data);
-
-
-
-
-
- gtk_widget_show_all (GTK_WIDGET (window));
-//the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
-
- gtk_widget_hide (content_dtmf);
-
-
- //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
-// gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
-
- g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
- "press_left_up",
- G_CALLBACK (openmoko_wheel_press_left_up_cb),
- p_dialer_data);
- g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
- "press_right_down",
- G_CALLBACK (openmoko_wheel_press_right_down_cb),
- p_dialer_data);
-
-
-
- tools = moko_finger_window_get_toolbox (window);
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("speaker.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_speaker_clicked),
- p_dialer_data);
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("dtmf.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_dtmf_talk_clicked),
- p_dialer_data);
- p_dialer_data->imageDTMF = image;
- p_dialer_data->imageTALK =
- file_new_image_from_relative_path ("talking.png");
-
-
- button = moko_finger_tool_box_add_button_without_label (tools);
- image = file_new_image_from_relative_path ("tony.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_tool_button_hangup_clicked),
- p_dialer_data);
- gtk_widget_show (GTK_WIDGET (tools));
-
- p_dialer_data->dtmf_in_talking_window = 0;
- p_dialer_data->wheel_talking = moko_finger_window_get_wheel (window);
- p_dialer_data->toolbox_talking = tools;
-
-
- DBG_LEAVE ();
- }
-
- return 1;
-}
+/* openmoko-dialer-window-talking.c
+ *
+ * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 FIC Shanghai Lab
+ *
+ * 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.
+ *
+ * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
+ */
+#include "alsa.h"
+#include <libmokoui/moko-finger-tool-box.h>
+#include <libmokoui/moko-finger-window.h>
+#include <libmokoui/moko-finger-wheel.h>
+#include <libmokoui/moko-pixmap-button.h>
+
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkvbox.h>
+#include "contacts.h"
+#include "openmoko-dialer-main.h"
+#include "moko-dialer-status.h"
+#include "openmoko-dialer-window-talking.h"
+
+void
+openmoko_wheel_press_left_up_cb(GtkWidget *widget, MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+ gint l , r;
+ alsa_get_volume(&l, &r);
+alsa_set_volume(l+10, r+10);
+
+ alsa_get_volume(&l, &r);
+ g_print("l = %d, r = %d\n", l, r);
+
+/*
+ l = 90;
+ r = 90;
+
+*/
+
+}
+
+void
+openmoko_wheel_press_right_down_cb(GtkWidget *widget, MOKO_DIALER_APP_DATA * appdata)
+{
+ gint l , r;
+ alsa_get_volume(&l, &r);
+alsa_set_volume(l-10, r-10);
+ alsa_get_volume(&l, &r);
+ g_print("l = %d, r = %d\n", l, r);
+
+DBG_ENTER();
+}
+
+
+void cb_tool_button_speaker_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+ DBG_ENTER();
+}
+
+void cb_tool_button_dtmf_talk_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+ DBG_ENTER();
+
+ appdata->dtmf_in_talking_window=!appdata->dtmf_in_talking_window;
+ if(appdata->dtmf_in_talking_window)
+ {
+
+
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, appdata->imageTALK);
+ gtk_widget_hide(appdata->content_talk);
+ gtk_widget_show(appdata->content_dtmf);
+ }
+ else
+ {
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, appdata->imageDTMF);
+ gtk_widget_hide(appdata->content_dtmf);
+ gtk_widget_show(appdata->content_talk);
+
+
+ }
+
+
+}
+
+void cb_tool_button_hangup_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
+{
+ gsm_hangup();
+ gtk_widget_hide(appdata->window_talking);
+
+}
+
+
+void
+on_dtmf_panel_user_input(GtkWidget * widget,gchar parac,
+ gpointer user_data)
+{
+char input[2];
+input[0]=parac;
+input[1]=0;
+char codesinput[MOKO_DIALER_MAX_NUMBER_LEN+1];
+
+
+MOKO_DIALER_APP_DATA * appdata=(MOKO_DIALER_APP_DATA*)user_data;
+MokoDialerTextview *moko_dtmf_text_view=appdata->moko_dtmf_text_view;
+
+moko_dialer_textview_insert(moko_dtmf_text_view, input);
+
+
+gsm_dtmf_send(input[0]);
+//lgsm_voice_dtmf(lgsmh, buf[1]);
+
+}
+
+
+
+void window_talking_prepare(MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+
+// moko_dialer_status_set_person_number(appdata->status_talking, appdata->g_peer_info.number);
+
+if(!appdata->window_talking)
+ window_talking_init(appdata);
+
+if(!appdata->window_talking)
+{
+ DBG_WARN("NO TALKING WINDOW INITIATED");
+ return;
+}
+
+
+if(appdata->g_peer_info.hasname)
+{
+DBG_TRACE();
+ moko_dialer_status_set_person_image(appdata->status_talking, appdata->g_peer_info.ID);
+DBG_TRACE();
+ moko_dialer_status_set_person_name(appdata->status_talking, appdata->g_peer_info.name);
+ DBG_TRACE();
+}
+else
+{
+ moko_dialer_status_set_person_image(appdata->status_talking, "");
+ moko_dialer_status_set_person_name(appdata->status_talking, "");
+
+}
+
+DBG_LEAVE();
+
+}
+
+gint timer_talking_time_out(MOKO_DIALER_APP_DATA * appdata)
+{
+//DBG_ENTER();
+TIMER_DATA* timer_data=&(appdata->g_timer_data);
+
+
+timer_data->ticks++;
+timer_data->hour=timer_data->ticks/3600;
+timer_data->min=(timer_data->ticks-timer_data->hour*3600)/60;
+timer_data->sec=timer_data->ticks%60;
+
+
+sprintf(timer_data->timestring,"Talking (%02d:%02d:%02d)",timer_data->hour,timer_data->min,timer_data->sec);
+
+//ok,we update the label now.
+
+
+moko_dialer_status_set_status_label(appdata->status_talking,timer_data->timestring);
+moko_dialer_status_update_icon(appdata->status_talking);
+
+if(timer_data->stopsec!=0&&timer_data->ticks>=timer_data->stopsec)
+{
+
+timer_data->timeout=1;
+gtk_timeout_remove(timer_data->ptimer);
+timer_data->ptimer=0;
+return 0;//0 stops the timer.
+}
+else
+return 1;
+}
+
+void
+on_window_talking_hide (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+
+
+if(appdata->g_timer_data.ptimer!=0)
+{
+gtk_timeout_remove(appdata->g_timer_data.ptimer);
+appdata->g_timer_data.ptimer=0;
+}
+
+gtk_widget_hide(appdata->wheel_talking);
+gtk_widget_hide(appdata->toolbox_talking);
+
+//DBG_MESSAGE("%s, %s",appdata->g_state.starttime,appdata->g_state.startdate);
+add_histroy_entry(appdata,appdata->g_state.historytype,
+ appdata->g_peer_info.name,
+ appdata->g_peer_info.number,
+ appdata->g_peer_info.picpath,
+ appdata->g_state.starttime,
+ appdata->g_state.startdate,
+ appdata->g_timer_data.ticks);
+ appdata->window_present=0;
+}
+
+void
+on_window_talking_show (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+appdata->window_present=widget;
+appdata->dtmf_in_talking_window=TRUE;
+ //hide the talking button in talking mode.
+
+time_t timep;
+struct tm *p;
+time(&timep);
+p=localtime(&timep);
+
+sprintf(appdata->g_state.starttime,"%02d:%02d:%02d",p->tm_hour,p->tm_min,p->tm_sec);
+sprintf(appdata->g_state.startdate,"%04d/%02d/%02d",p->tm_year+1900,p->tm_mon,p->tm_mday);
+
+memset(&(appdata->g_timer_data),0,sizeof(appdata->g_timer_data));
+
+appdata->g_timer_data.stopsec=0;
+
+appdata->g_timer_data.ptimer=gtk_timeout_add(1000,timer_talking_time_out,appdata);
+
+if(appdata->wheel_talking)
+gtk_widget_show(appdata->wheel_talking);
+
+if(appdata->toolbox_talking)
+gtk_widget_show(appdata->toolbox_talking);
+
+
+
+DBG_LEAVE();
+}
+
+
+
+
+gint window_talking_init( MOKO_DIALER_APP_DATA* p_dialer_data)
+{
+
+DBG_ENTER();
+
+
+if(p_dialer_data->window_talking==0)
+{
+
+ MokoFingerWindow* window=NULL;
+ GtkWidget* vbox=gtk_vbox_new( FALSE, 0 );;
+ MokoDialerStatus * status=NULL;
+ GtkWidget* content_talk= NULL;
+ GtkWidget* content_dtmf= NULL;
+ MokoFingerToolBox *tools = NULL;
+ MokoDialerPanel* mokodialerpanel=NULL;
+ GtkWidget *button;
+ GtkWidget* image;
+
+
+//first, the talking content.
+
+ content_talk = gtk_vbox_new( FALSE, 0 );
+ status=moko_dialer_status_new();
+ moko_dialer_status_add_status_icon(status,"status0.png");
+ moko_dialer_status_add_status_icon(status,"status1.png");
+ moko_dialer_status_add_status_icon(status,"status2.png");
+ moko_dialer_status_set_icon_by_index(status,0);
+
+
+ moko_dialer_status_set_title_label(status, "In Call");
+ moko_dialer_status_set_status_label(status, "Talking ...(00:00:00)");
+
+ gtk_box_pack_start( GTK_BOX(content_talk),status, FALSE, FALSE, 0 );
+
+
+ p_dialer_data->status_talking=status;
+ p_dialer_data->content_talk= content_talk;
+
+ gtk_box_pack_start( GTK_BOX(vbox),content_talk, FALSE, FALSE, 0 );
+
+
+//now the dtmf content
+ content_dtmf= gtk_vbox_new( FALSE, 0 );
+ GtkEventBox* eventbox1 = gtk_event_box_new ();
+ gtk_widget_show (eventbox1);
+ gtk_widget_set_name(GTK_WIDGET(eventbox1),"gtkeventbox-black");
+
+ MokoDialerTextview * mokotextview=moko_dialer_textview_new();
+
+ gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
+
+ p_dialer_data->moko_dtmf_text_view=mokotextview;
+
+ gtk_box_pack_start( GTK_BOX(content_dtmf), GTK_WIDGET(eventbox1), FALSE,FALSE, 2 );
+
+
+
+ mokodialerpanel=moko_dialer_panel_new();
+
+ gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+ g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input", G_CALLBACK (on_dtmf_panel_user_input),p_dialer_data);
+ gtk_box_pack_start( GTK_BOX(content_dtmf), GTK_WIDGET(mokodialerpanel), TRUE, TRUE, 5 );
+
+ gtk_box_pack_start( GTK_BOX(vbox),content_dtmf, FALSE, FALSE, 0 );
+ p_dialer_data->content_dtmf=content_dtmf;
+
+
+//now the container--window
+ window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+ p_dialer_data->window_talking=window;
+ moko_finger_window_set_contents(window, GTK_WIDGET(vbox) );
+ g_signal_connect ((gpointer) window, "show",
+ G_CALLBACK (on_window_talking_show),
+ p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_talking_hide),
+ p_dialer_data);
+
+
+
+
+
+ gtk_widget_show_all( GTK_WIDGET(window) );
+//the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
+
+ gtk_widget_hide(content_dtmf);
+
+
+ //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
+// gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
+
+ g_signal_connect(G_OBJECT(moko_finger_window_get_wheel(window)),
+ "press_left_up",
+ G_CALLBACK(openmoko_wheel_press_left_up_cb),
+ p_dialer_data);
+ g_signal_connect(G_OBJECT(moko_finger_window_get_wheel(window)),
+ "press_right_down",
+ G_CALLBACK(openmoko_wheel_press_right_down_cb),
+ p_dialer_data);
+
+
+
+ tools = moko_finger_window_get_toolbox(window);
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("speaker.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_speaker_clicked), p_dialer_data);
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("dtmf.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_dtmf_talk_clicked), p_dialer_data);
+ p_dialer_data->imageDTMF=image;
+ p_dialer_data->imageTALK=file_new_image_from_relative_path("talking.png");
+
+
+ button = moko_finger_tool_box_add_button_without_label(tools);
+ image = file_new_image_from_relative_path("tony.png");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image(button, image);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(cb_tool_button_hangup_clicked), p_dialer_data);
+ gtk_widget_show(GTK_WIDGET(tools));
+
+ p_dialer_data->dtmf_in_talking_window=0;
+ p_dialer_data->wheel_talking=moko_finger_window_get_wheel(window);
+ p_dialer_data->toolbox_talking=tools;
+
+
+ DBG_LEAVE();
+}
+
+ return 1;
+}
+
More information about the commitlog
mailing list
