r1171 - in trunk/src/target/OM-2007/applications/openmoko-dialer: data src

tony_guan at sita.openmoko.org tony_guan at sita.openmoko.org
Thu Mar 1 10:13:21 CET 2007


Author: tony_guan
Date: 2007-03-01 10:12:51 +0100 (Thu, 01 Mar 2007)
New Revision: 1171

Added:
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/answer.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/cancel.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/connecting.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/delete_01.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/failure.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/hangup.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/history.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/incall.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/redial.png
Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/delete.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/dialed.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/dtmf.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/missed.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/received.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/sms.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/speaker.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
   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-pin.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
solved history window treeview problem,updated some png files,removed some bugs.


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am	2007-03-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am	2007-03-01 09:12:51 UTC (rev 1171)
@@ -18,7 +18,17 @@
                 dtmf.png\
                 talking.png\
                 sms.png\
-                all.png
+                all.png\
+                history.png\
+                delete_01.png\
+                incall.png\
+                connecting.png\
+                answer.png\
+                cancel.png\
+                hangup.png\
+                redial.png\
+                failure.png
+
 resourcedir = $(pkgdatadir)
 
 resource_DATA = tony.png\
@@ -42,4 +52,13 @@
                 dtmf.png\
                 talking.png\
                 sms.png\
-                all.png
+                all.png\
+                history.png\
+                delete_01.png\
+                incall.png\
+                connecting.png\
+                answer.png\
+                cancel.png\
+                hangup.png\
+                redial.png\
+                failure.png

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/answer.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/answer.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/cancel.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/cancel.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/connecting.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/connecting.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/delete.png
===================================================================
(Binary files differ)

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/delete_01.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/delete_01.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/dialed.png
===================================================================
(Binary files differ)

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/dtmf.png
===================================================================
(Binary files differ)

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/failure.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/failure.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/hangup.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/hangup.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/history.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/history.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/incall.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/incall.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/missed.png
===================================================================
(Binary files differ)

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/received.png
===================================================================
(Binary files differ)

Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/redial.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007/applications/openmoko-dialer/data/redial.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/sms.png
===================================================================
(Binary files differ)

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/speaker.png
===================================================================
(Binary files differ)

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking.png
===================================================================
(Binary files differ)

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-03-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -83,7 +83,7 @@
 
 DBG_MESSAGE("START=%d,END=%d",start,end);
 g_stpcpy(temp,number+start);
-temp[end-1]=0;
+temp[end-start]=0;
 DBG_MESSAGE("%s",temp);	
 
 
@@ -290,30 +290,17 @@
   window_pin_init(p_dialer_data); 
   window_outgoing_init(p_dialer_data); 
   window_history_init(p_dialer_data); 
-
-
   DBG_MSG ("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
 
 
 
 //from now on we will not use multithreads.
   gsm_lgsm_start(mainloop);
-  //gtk_widget_show(p_dialer_data->window_pin);
-  //start a timer to monitor incoming calls
-  //gtk_timeout_add(100,incoming_calls,0);
- 
-//instead, we add a g_source
 
+//for debug only>>
+//gsm_incoming_call("13917209523");
+//<<for debug only
 
-  //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);
 
 

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-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -316,8 +316,8 @@
 
 
     GtkWidget *window = moko_finger_window_new ();
+    gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
 
-
     GtkMenu *appmenu = GTK_MENU (gtk_menu_new ());
     GtkWidget *closeitem = gtk_menu_item_new_with_label ("Close");
     g_signal_connect (G_OBJECT (closeitem), "activate",
@@ -415,8 +415,10 @@
     g_signal_connect (G_OBJECT (button1), "clicked",
                       G_CALLBACK (cb_delete_button_clicked), p_dialer_data);
     gtk_widget_set_name (button1, "mokofingerbutton-orange");
-    moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (button1),
-                                         "gtk-delete");
+    moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
+                                                            (button1),
+                                                            file_new_image_from_relative_path
+                                                            ("delete.png"));
     moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
                                                    (button1), "Delete");
     gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
@@ -432,7 +434,7 @@
     moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
                                                             (button3),
                                                             file_new_image_from_relative_path
-                                                            ("all.png"));
+                                                            ("history.png"));
     moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
                                                    (button3), "History");
     gtk_widget_set_size_request (button3, WINDOW_DIALER_BUTTON_SIZE_X,

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-03-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -132,7 +132,7 @@
 }
 
 void
-openmoko_history_wheel_press_left_up_cb (GtkWidget * widget,
+cb_openmoko_history_wheel_press_left_up(GtkWidget * widget,
                                          MOKO_DIALER_APP_DATA * appdata)
 {
   DBG_ENTER ();
@@ -168,7 +168,7 @@
 }
 
 void
-openmoko_history_wheel_press_right_down_cb (GtkWidget * widget,
+cb_openmoko_history_wheel_press_right_down (GtkWidget * widget,
                                             MOKO_DIALER_APP_DATA * appdata)
 {
   DBG_ENTER ();
@@ -309,12 +309,15 @@
 {
   DBG_ENTER ();
 
-  if (appdata->wheel_history)
-    gtk_widget_show (appdata->wheel_history);
 
+
   if (appdata->toolbox_history)
     gtk_widget_show (appdata->toolbox_history);
 
+  if (appdata->wheel_history)
+    gtk_widget_show (appdata->wheel_history);
+
+//FIXME: some day later, the contact changed infor will be sent to the dialer.
   if (appdata->history_need_to_update)
   {
     DBG_MESSAGE ("NEED TO UPDATE HISTORY");
@@ -345,6 +348,7 @@
 
 //now the container--window
     window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+    gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
     p_dialer_data->window_history = GTK_WIDGET (window);
 
 
@@ -357,26 +361,26 @@
     g_signal_connect ((gpointer) window, "hide",
                       G_CALLBACK (on_window_history_hide), p_dialer_data);
 
+   //FIXME: without gtk_widget_show_all first and then hide, the history view will not show properly. -tony
+   gtk_widget_show_all(GTK_WIDGET(window));
 
-
-   // 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???
     // This causes a segfault for me... maybe a problem in libmokoui? - thomas
     //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),
+                      G_CALLBACK (cb_openmoko_history_wheel_press_left_up),
                       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),
+                      G_CALLBACK (cb_openmoko_history_wheel_press_right_down),
                       p_dialer_data);
 
+    g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
+                      "press_bottom",
+                      G_CALLBACK (cb_tool_button_history_back_clicked),
+                      p_dialer_data);
 
 
     tools = moko_finger_window_get_toolbox (window);
@@ -403,7 +407,7 @@
 
     button =
       GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
-    image = file_new_image_from_relative_path ("delete.png");
+    image = file_new_image_from_relative_path ("delete_01.png");
     moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
                                                             (button), image);
     g_signal_connect (G_OBJECT (button), "clicked",
@@ -419,13 +423,12 @@
     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 = GTK_WIDGET (moko_finger_window_get_wheel (window));
     p_dialer_data->toolbox_history = GTK_WIDGET (tools);
-
-    //gtk_widget_hide (GTK_WIDGET (window));
-
+    gtk_widget_hide(GTK_WIDGET(window));
     DBG_LEAVE ();
   }
   else
@@ -471,6 +474,7 @@
 
   GtkWidget *treeviewHistory;
   GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox);
   //FIRST of all, the top title area;
   GtkWidget *eventboxTop = gtk_event_box_new ();
   gtk_widget_show (eventboxTop);
@@ -526,10 +530,11 @@
                                   GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 
   treeviewHistory = gtk_tree_view_new ();
+  gtk_widget_show (treeviewHistory);
   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);
@@ -547,7 +552,7 @@
                     G_CALLBACK (on_treeviewHistory_cursor_changed),
                     p_dialer_data);
 
-
+  gtk_widget_show (vbox);
   return vbox;
 }
 
@@ -609,7 +614,6 @@
   GtkWidget *contactview = NULL;
 
   //DBG_ENTER();
-  //DBG_MESSAGE("History:%d",g_historylist.length);
 
   //DBG_TRACE();
   p_dialer_data->g_history_filter_type = ALL;

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-03-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -136,8 +136,9 @@
 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 ();
@@ -256,9 +257,9 @@
 
     vbox = gtk_vbox_new (FALSE, 0);
     status = moko_dialer_status_new ();
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status0.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status1.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status2.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "incall.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "connecting.png");
+// moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status2.png");
     moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
 
     gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
@@ -266,6 +267,7 @@
 
     GtkWidget *hbox2 = gtk_hbox_new (FALSE, 0);
     GtkWidget *button = gtk_button_new_with_label ("Answer");
+    gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("answer.png"));
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_answer_button_clicked), p_dialer_data);
 
@@ -279,6 +281,7 @@
 
 
     button = gtk_button_new_with_label ("Reject");
+    gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("cancel.png"));
     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);
@@ -294,6 +297,7 @@
 //  moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
 
     window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+    gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
     moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
 
 

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-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -237,7 +237,8 @@
   //DBG_TRACE ();
   appdata->g_state.historytype = OUTGOING;
   //DBG_TRACE ();
-  gsm_dial (appdata->g_peer_info.number);
+  int retv=gsm_dial (appdata->g_peer_info.number);
+  DBG_MESSAGE("GSM_DIAL returns %d",retv);
   //DBG_LEAVE ();
 }
 
@@ -256,9 +257,10 @@
 
     vbox = gtk_vbox_new (FALSE, 0);
     status = moko_dialer_status_new ();
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status0.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "connecting.png");
     moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status1.png");
     moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status2.png");
+    moko_dialer_status_set_error_icon(MOKO_DIALER_STATUS (status),"failure.png");
     moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
 
     gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
@@ -266,6 +268,7 @@
 
     GtkWidget *hbox2 = gtk_hbox_new (FALSE, 0);
     GtkWidget *button = gtk_button_new_with_label ("Speaker");
+    gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("speaker.png"));
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
     p_dialer_data->buttonSpeaker = button;
@@ -273,6 +276,7 @@
     gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
 
     button = gtk_button_new_with_label ("Redial");
+    gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("redial.png"));
     p_dialer_data->buttonRedial = button;
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
@@ -282,6 +286,7 @@
 
 
     button = gtk_button_new_with_label ("Cancel");
+    gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("cancel.png"));
     p_dialer_data->buttonCancel = button;
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_cancel_button_clicked), p_dialer_data);
@@ -299,6 +304,7 @@
 //  moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
 
     window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+    gtk_window_set_decorated(GTK_WINDOW(window ),FALSE); //FIXME: this line seems only necessary on my PC. tony
     moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
 
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c	2007-03-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -128,6 +128,7 @@
 
 
     MokoFingerWindow *window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+    gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
     g_signal_connect ((gpointer) window, "show",
                       G_CALLBACK (on_window_pin_show), p_dialer_data);
     g_signal_connect ((gpointer) window, "hide",
@@ -173,8 +174,12 @@
     g_signal_connect (G_OBJECT (button1), "clicked",
                       G_CALLBACK (pin_delete_button_clicked), p_dialer_data);
     gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
-    moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (button1),
-                                         "gtk-delete");
+    
+    moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
+                                                            (button1),
+                                                            file_new_image_from_relative_path
+                                                            ("delete.png"));
+
     moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
                                                    (button1), "Delete");
 //    gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,

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-01 07:54:40 UTC (rev 1170)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c	2007-03-01 09:12:51 UTC (rev 1171)
@@ -264,11 +264,12 @@
   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->wheel_talking)
     gtk_widget_show (appdata->wheel_talking);
 
-  if (appdata->toolbox_talking)
-    gtk_widget_show (appdata->toolbox_talking);
 
 
 
@@ -294,6 +295,7 @@
     GtkWidget *content_talk = NULL;
     GtkWidget *content_dtmf = NULL;
     MokoFingerToolBox *tools = NULL;
+    MokoFingerWheel* wheel=NULL;
     GtkWidget *mokodialerpanel = NULL;
     MokoPixmapButton *button;
     GtkWidget *image;
@@ -303,9 +305,8 @@
 
     content_talk = gtk_vbox_new (FALSE, 0);
     status = moko_dialer_status_new ();
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status0.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status1.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "status2.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "connecting.png");
     moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
 
 
@@ -352,6 +353,7 @@
 
 //now the container--window
     window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+    gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
     p_dialer_data->window_talking = GTK_WIDGET (window);
     moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
     g_signal_connect ((gpointer) window, "show",
@@ -362,8 +364,8 @@
 
 
 
+    gtk_widget_show_all (GTK_WIDGET (window));
 
-    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);
@@ -371,20 +373,20 @@
 
     //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)),
+    wheel=moko_finger_window_get_wheel (window);
+    g_signal_connect (G_OBJECT (wheel),
                       "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)),
+    g_signal_connect (G_OBJECT (wheel),
                       "press_right_down",
                       G_CALLBACK (openmoko_wheel_press_right_down_cb),
                       p_dialer_data);
+    
 
 
 
     tools = moko_finger_window_get_toolbox (window);
-
     button = MOKO_PIXMAP_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 (MOKO_PIXMAP_BUTTON(button), image);
@@ -404,18 +406,21 @@
 
 
     button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
-    image = file_new_image_from_relative_path ("tony.png");
+    image = file_new_image_from_relative_path ("hangup.png");
     moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(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));
+    gtk_widget_show (GTK_WIDGET (wheel));
 
     p_dialer_data->dtmf_in_talking_window = 0;
-    p_dialer_data->wheel_talking = GTK_WIDGET (moko_finger_window_get_wheel (window));
+    p_dialer_data->wheel_talking = GTK_WIDGET (wheel);
     p_dialer_data->toolbox_talking = GTK_WIDGET (tools);
 
+    //gtk_widget_hide(window);
 
+
     DBG_LEAVE ();
   }
 





More information about the commitlog mailing list