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

tony_guan at sita.openmoko.org tony_guan at sita.openmoko.org
Tue Mar 13 06:58:48 CET 2007


Author: tony_guan
Date: 2007-03-13 06:58:15 +0100 (Tue, 13 Mar 2007)
New Revision: 1334

Added:
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/exit.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_0.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_1.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_2.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_3.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_0.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_1.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_2.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_3.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_0.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_1.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_2.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_3.png
Removed:
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/10086.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/chaowei.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/ken.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/sally.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/status0.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/status1.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/status2.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/steven.png
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/tony.png
Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
   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:
dynamic status displaying support.


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

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-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am	2007-03-13 05:58:15 UTC (rev 1334)
@@ -1,13 +1,4 @@
-EXTRA_DIST = tony.png\
-                steven.png\
-                ken.png\
-                sally.png\
-                10086.png\
-                chaowei.png\
-                unkown.png\
-                status0.png\
-                status1.png\
-                status2.png\
+EXTRA_DIST =unkown.png\
                 dialed.png\
                 missed.png\
                 received.png\
@@ -16,35 +7,35 @@
                 phone.png\
                 delete.png\
                 dtmf.png\
-                talking.png\
                 sms.png\
                 all.png\
                 history.png\
                 delete_01.png\
-                incall.png\
-                connecting.png\
                 answer.png\
                 cancel.png\
                 hangup.png\
                 redial.png\
-                failure.png
-
+                failure.png\
+                incoming_0.png\
+                incoming_1.png\
+                incoming_2.png\
+                incoming_3.png\
+                outgoing_0.png\
+                outgoing_1.png\
+                outgoing_2.png\
+                outgoing_3.png\
+                talking_0.png\
+                talking_1.png\
+                talking_2.png\
+                talking_3.png\
+                exit.png
+                
 resourcedir = $(pkgdatadir)
 
-resource_DATA = tony.png\
-                steven.png\
-                ken.png\
-                sally.png\
-                10086.png\
-                chaowei.png\
-                unkown.png\
-                status0.png\
-                status1.png\
-                status2.png\
+resource_DATA =unkown.png\
                 dialed.png\
                 missed.png\
                 received.png\
-                received.png\
                 speaker.png\
                 email.png\
                 phone.png\
@@ -55,10 +46,21 @@
                 all.png\
                 history.png\
                 delete_01.png\
-                incall.png\
-                connecting.png\
                 answer.png\
                 cancel.png\
                 hangup.png\
                 redial.png\
-                failure.png
+                failure.png\
+                incoming_0.png\
+                incoming_1.png\
+                incoming_2.png\
+                incoming_3.png\
+                outgoing_0.png\
+                outgoing_1.png\
+                outgoing_2.png\
+                outgoing_3.png\
+                talking_0.png\
+                talking_1.png\
+                talking_2.png\
+                talking_3.png\
+                exit.png

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

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


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

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


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

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


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

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


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

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


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

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

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


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

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


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

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


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

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


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

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

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

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

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

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

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


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

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


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

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


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

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


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

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

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h	2007-03-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h	2007-03-13 05:58:15 UTC (rev 1334)
@@ -25,7 +25,7 @@
 //MAXDISPNAMENUM MUST >=1 & <=9!
 
 #define MOKO_DIALER_MIN_SENSATIVE_LEN (1)       ///<only when user inputs at least MINSENSATIVELEN, should we start to search.
-#define MOKO_DIALER_MAX_STATUS_ICONS (3)        ///<THE NUMBERS OF THE ICONS WHEN OUTGOING CALL IS ON
+#define MOKO_DIALER_MAX_STATUS_ICONS (6)        ///<THE NUMBERS OF THE ICONS WHEN OUTGOING CALL IS ON
 #define MOKO_DIALER_DEFAULT_PERSON_IMAGE_PATH ("unkown.png")    ///<THE DEFAULT PERSON IMAGE
 #define MOKO_DIALER_MAX_TIPS (3)
 

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-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c	2007-03-13 05:58:15 UTC (rev 1334)
@@ -414,7 +414,7 @@
                       p_dialer_data);
     button =
       GTK_WIDGET (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 ("exit.png");
     moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
                                                             (button), image);
     g_signal_connect (G_OBJECT (button), "clicked",

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-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c	2007-03-13 05:58:15 UTC (rev 1334)
@@ -247,9 +247,10 @@
 
     vbox = gtk_vbox_new (FALSE, 0);
     status = moko_dialer_status_new ();
-    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_add_status_icon (MOKO_DIALER_STATUS (status), " incoming_0.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), " incoming_1.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), " incoming_2.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), " incoming_3.png");
     moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
 
     gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);

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-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-03-13 05:58:15 UTC (rev 1334)
@@ -258,9 +258,10 @@
 
     vbox = gtk_vbox_new (FALSE, 0);
     status = moko_dialer_status_new ();
-    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_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_0.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_1.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_2.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_3.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);
 

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-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c	2007-03-13 05:58:15 UTC (rev 1334)
@@ -305,8 +305,10 @@
 
     content_talk = gtk_vbox_new (FALSE, 0);
     status = moko_dialer_status_new ();
-    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_add_status_icon (MOKO_DIALER_STATUS (status), "talking_0.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_1.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_2.png");
+    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_3.png");
     moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
 
 





More information about the commitlog mailing list