r1401 - trunk/src/target/OM-2007/applications/openmoko-dialer/src

[tony_guan at sita.openmoko.org]

Author: tony_guan
Date: 2007-03-19 04:54:27 +0100 (Mon, 19 Mar 2007)
New Revision: 1401

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-window-dialer.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:
talking window display/dtmf input box/dialer autocomplete.


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-03-19 03:46:34 UTC (rev 1400)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h	2007-03-19 03:54:27 UTC (rev 1401)
@@ -77,6 +77,7 @@
   GtkWidget *imageTALK;
   GtkWidget *imageDTMF;
 
+  GtkWidget *buttonTalk_DTMF;
   GtkWidget *content_talk;
   GtkWidget *content_dtmf;
 

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-03-19 03:46:34 UTC (rev 1400)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c	2007-03-19 03:54:27 UTC (rev 1401)
@@ -171,8 +171,6 @@
   MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
   MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
   DIALER_READY_CONTACT *ready_contact = (DIALER_READY_CONTACT *) para_pointer;
-  DBG_MESSAGE ("GOT THE MESSAGE OF SELECTED:%s",
-               ready_contact->p_entry->content);
   codesinput = moko_dialer_textview_get_input (moko_dialer_text_view, FALSE);
   lenstring = g_utf8_strlen (ready_contact->p_entry->content, -1);
   leninput = g_utf8_strlen (codesinput, -1);
@@ -184,7 +182,8 @@
                                     content[leninput]));
 
   }
-
+  else
+  moko_dialer_textview_fill_it (moko_dialer_text_view,"");
   g_free (codesinput);
 
 }

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-03-19 03:46:34 UTC (rev 1400)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-03-19 03:54:27 UTC (rev 1401)
@@ -59,7 +59,8 @@
   //start dialling.
 
   DBG_TRACE ();
-  gtk_widget_show_all (appdata->window_talking);
+//  gtk_widget_show_all (appdata->window_talking);
+  gtk_widget_show(appdata->window_talking);
 
 
   DBG_LEAVE ();

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-03-19 03:46:34 UTC (rev 1400)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c	2007-03-19 03:54:27 UTC (rev 1401)
@@ -228,8 +228,8 @@
   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,
+   moko_dialer_textview_empty(appdata->moko_dtmf_text_view);
+   add_histroy_entry (appdata, appdata->g_state.historytype,
                      appdata->g_peer_info.name,
                      appdata->g_peer_info.number,
                      appdata->g_peer_info.picpath,
@@ -244,7 +244,7 @@
 {
   DBG_ENTER ();
 
-  appdata->dtmf_in_talking_window = TRUE;
+    appdata->dtmf_in_talking_window = TRUE;
   //hide the talking button in talking mode.
 
   time_t timep;
@@ -264,9 +264,17 @@
   appdata->g_timer_data.ptimer =
     g_timeout_add (1000, (GSourceFunc) timer_talking_time_out, appdata);
 
-  if (appdata->toolbox_talking)
-    gtk_widget_show (appdata->toolbox_talking);
+  if (appdata->toolbox_talking){
+      gtk_widget_show (appdata->toolbox_talking);
+      moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON (appdata->buttonTalk_DTMF),
+                                                            appdata->
+                                                            imageDTMF);
+     gtk_widget_hide (appdata->content_dtmf);
+     gtk_widget_show(appdata->content_talk);
+  	}
 
+
+
   if (appdata->wheel_talking)
     gtk_widget_show (appdata->wheel_talking);
 
@@ -401,6 +409,7 @@
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_tool_button_dtmf_talk_clicked),
                       p_dialer_data);
+    p_dialer_data->buttonTalk_DTMF=button;
     p_dialer_data->imageDTMF = image;
     p_dialer_data->imageTALK =
       file_new_image_from_relative_path ("talking.png");