Changeset 458

Timestamp:

12/22/06 10:30:35 (6 years ago)

Author:

tony_guan

Message:

WindowDialer? finished, start the outgoing dialogue, class MokoDialerStatus? defined, but not finished.

Location:

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

Files:

• Makefile.am (modified) (1 diff)
• common.c (modified) (1 diff)
• moko-dialer-autolist.c (modified) (1 diff)
• moko-dialer-declares.h (modified) (1 diff)
• moko-dialer-status.c (added)
• moko-dialer-status.h (added)
• moko-dialer-textview.c (modified) (2 diffs)
• moko-dialer-tip.c (modified) (1 diff)
• openmoko-dialer-main.c (modified) (2 diffs)
• openmoko-dialer-main.h (modified) (1 diff)
• openmoko-dialer-window-dialer.c (modified) (6 diffs)
• openmoko-dialer-window-dialer.h (modified) (1 diff)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am

@@ -11 +11 @@
 contacts.c\
 common.c\
-openmoko-dialer-window-dialer.c
+openmoko-dialer-window-dialer.c\
+openmoko-dialer-window-outgoing.c\
+moko-dialer-status.c
 
 openmoko_dialer_LDADD = @OPENMOKO_LIBS@

trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.c

@@ -134 +134 @@
 
 
+/**
+ * @brief load the person's image file by the filename from the PKGDATADIR, and strech it.
+ * @param rela_path The filename of the pixbuf file
+ * @param widget, the gtkImage to load the file.
+ * @return TURE, FALSE
+ */
+gboolean file_load_person_image_scalable_from_relative_path(GtkWidget *widget,char * rela_path)
+{
+
+  gchar     *pathname;
+  GtkImage *image=GTK_IMAGE(widget);      
+
+  pathname = g_strdup_printf ("%s%s%s", PKGDATADIR, G_DIR_SEPARATOR_S, 
+                              rela_path);
+
+
+  if (g_file_test (pathname, G_FILE_TEST_EXISTS))
+    {
+        //    gtk_image_set_from_file(image,pathname);          
+            GError* err = NULL;
+            GdkPixbuf *src_pixbuf, *dest_pixbuf;
+            src_pixbuf = gdk_pixbuf_new_from_file ( pathname, &err );
+            DBG_MESSAGE("file_load_person_image_scalable_from_relative_path,width=%d,height=%d",widget->allocation.width, widget->allocation.height);
+            
+            dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, widget->allocation.width, widget->allocation.height, GDK_INTERP_NEAREST);
+             gtk_image_set_from_pixbuf (image,dest_pixbuf);
+            g_free (pathname);
+            return TRUE;
+    }
+  else
+    {
+              g_debug ("Can not find the file %s", pathname);
+               gtk_image_set_from_stock(image,"gtk-yes",GTK_ICON_SIZE_LARGE_TOOLBAR);
+              g_free (pathname);
+              return FALSE;
+    }
+
+
+}
+

trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c

@@ -371 +371 @@
 
         //refresh the imagePerson widget
-        file_load_person_image_from_relative_path(moko_dialer_autolist->imagePerson,moko_dialer_autolist->readycontacts[selected].p_contact->picpath);
-        gtk_widget_show(moko_dialer_autolist->imagePerson);     
+//      file_load_person_image_from_relative_path(moko_dialer_autolist->imagePerson,moko_dialer_autolist->readycontacts[selected].p_contact->picpath);
+        file_load_person_image_scalable_from_relative_path(moko_dialer_autolist->imagePerson,moko_dialer_autolist->readycontacts[selected].p_contact->picpath);
+                gtk_widget_show(moko_dialer_autolist->imagePerson);     
         //just change the selected attribute of the tips
                 for(gint i=0;i<moko_dialer_autolist->g_alternatecount;i++)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h

@@ -24 +24 @@
 //MAXDISPNAMENUM MUST >=1 & <=9!
 //only when user inputs at least MINSENSATIVELEN, should we start to search.
-#define MOKO_DIALER_MIN_SENSATIVE_LEN (3)
+#define MOKO_DIALER_MIN_SENSATIVE_LEN (1)
+#define MOKO_DIALER_MAX_STATUS_ICONS (1)
 #define MOKO_DIALER_DEFAULT_PERSON_IMAGE_PATH ("./default.png")
 #define MOKO_DIALER_MAX_TIPS (3)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c

@@ -53 +53 @@
                         GtkTextView *textview=0;
                         GtkTextBuffer *buffer;
+                        GdkColor color;
 
                         textview=&moko_dialer_textview->textview;
@@ -60 +61 @@
                         moko_dialer_textview->tag_for_cursor=NULL;
                         moko_dialer_textview->tag_for_autofilled=NULL;
+
+                        gdk_color_parse("black",&color);
+//                      gtk_widget_modify_bg(textview,GTK_STATE_NORMAL,&color);
+                        gtk_widget_modify_base(textview,GTK_STATE_NORMAL,&color);
+                        
 
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-tip.c

@@ -95 +95 @@
         priv->label=label;
 
-        gdk_color_parse("black",&color);
-
-        
-        gtk_widget_modify_fg(GTK_WIDGET(dialertip),GTK_STATE_NORMAL,&color);    
+//      gdk_color_parse("black",&color);
+
+        gtk_widget_set_name(GTK_WIDGET(dialertip),"gtkeventbox-black");
+//      gtk_widget_modify_fg(GTK_WIDGET(dialertip),GTK_STATE_NORMAL,&color);    
+//      gtk_widget_modify_bg(GTK_WIDGET(dialertip),GTK_STATE_NORMAL,&color);    
 
 //      gtk_widget_hide(GTK_WIDGET(dialertip));

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c

@@ -32 +32 @@
 #include "openmoko-dialer-main.h"
 #include "openmoko-dialer-window-dialer.h"
+#include "openmoko-dialer-window-outgoing.h"
 int main( int argc, char** argv )
 {
@@ -49 +50 @@
 
 //init the dialer window
-   window_dialer_init(p_dialer_data);
+
+   window_outgoing_init(p_dialer_data);
+   window_dialer_init(p_dialer_data); 
 
     gtk_main();

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h

@@ -38 +38 @@
 
 GtkWidget * window_dialer;
+GtkWidget* window_outgoing;
 
 // GtkListStore  *g_list_store_filter;///<the list store used by the gtktreeview, for displaying the history list dynamically.

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c

@@ -45 +45 @@
 //fill the textview with ""
 moko_dialer_textview_fill_it(appdata->moko_dialer_text_view,"");
+//moko_dialer_textview_set_color(moko_dialer_textview);
 }
 else
@@ -52 +53 @@
 char codesinput[MOKO_DIALER_MAX_NUMBER_LEN];
 moko_dialer_textview_get_input(appdata->moko_dialer_text_view,codesinput, 0);
+
 if(strlen(codesinput)>=MOKO_DIALER_MIN_SENSATIVE_LEN)
-                moko_dialer_autolist_refresh_by_string(appdata->moko_dialer_autolist,codesinput,FALSE);
+{
+moko_dialer_autolist_refresh_by_string(appdata->moko_dialer_autolist,codesinput,FALSE);
+moko_dialer_textview_set_color(appdata->moko_dialer_text_view);
+}
 else
         moko_dialer_autolist_hide_all_tips(appdata->moko_dialer_autolist);
@@ -70 +75 @@
 {
     g_debug( "dialer button clicked" );
+if(!appdata->window_outgoing)
+        window_outgoing_init(appdata);
+
+gtk_widget_show(appdata->window_outgoing);
 }
 
@@ -158 +167 @@
 {
 
+        GdkColor  color;
+        gdk_color_parse("black",&color);
+
     GtkVBox* vbox = NULL;
 
@@ -179 +191 @@
     /* contents */
     vbox = gtk_vbox_new( FALSE, 0 );
-
-
     GtkHBox* hbox = gtk_hbox_new( FALSE, 10 );
 
+
+
+  
+        
+         GtkEventBox *eventbox1 = gtk_event_box_new ();
+         gtk_widget_show (eventbox1);
+        //  gtk_widget_set_size_request (eventbox1, 480, 132);
+  gtk_widget_set_name(GTK_WIDGET(eventbox1),"gtkeventbox-black");
 
     MokoDialerAutolist* autolist=moko_dialer_autolist_new();
     moko_dialer_autolist_set_data       (autolist,&(p_dialer_data->g_contactlist));
     p_dialer_data->moko_dialer_autolist=autolist;
-    gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(autolist), FALSE, FALSE, 5 );
-
+
+   gtk_container_add (GTK_CONTAINER (eventbox1), autolist);
+//    gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(autolist), FALSE, FALSE, 5 );
+    gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(eventbox1), FALSE, FALSE, 0 );
+ 
+    gtk_widget_modify_bg(eventbox1,GTK_STATE_NORMAL,&color);
 
     g_signal_connect (GTK_OBJECT (autolist), "user_selected",
@@ -201 +223 @@
 
 
+
+
+
+        eventbox1 = gtk_event_box_new ();
+        gtk_widget_show (eventbox1);
+
+        gtk_widget_set_name(GTK_WIDGET(eventbox1),"gtkeventbox-black");
+      gtk_widget_modify_bg(eventbox1,GTK_STATE_NORMAL,&color);
+//        gtk_widget_set_size_request (eventbox1, 480, 132);
+
     MokoDialerTextview * mokotextview=moko_dialer_textview_new();
     p_dialer_data->moko_dialer_text_view=mokotextview;
 
-    gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(mokotextview), FALSE,FALSE, 5 );
+   gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
+       gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(eventbox1), FALSE,FALSE, 0 );
+//    gtk_box_pack_start( GTK_BOX(vbox), GTK_WIDGET(mokotextview), FALSE,FALSE, 5 );
 
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h

@@ -17 +17 @@
  */
  #include "moko-dialer-includes.h"
+
+ #ifndef _OPENMOKO_DIALER_WINDOW_DIALER_H
+#define _OPENMOKO_DIALER_WINDOW_DIALER_H
+
+#ifdef __cplusplus
+
+
+
+extern "C"
+
+{
+#endif
+
  
 gint window_dialer_init( MOKO_DIALER_APP_DATA* p_dialer_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif