r458 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
tony_guan at gta01.hmw-consulting.de
tony_guan at gta01.hmw-consulting.de
Fri Dec 22 10:30:47 CET 2006
Author: tony_guan
Date: 2006-12-22 10:30:35 +0100 (Fri, 22 Dec 2006)
New Revision: 458
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-tip.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-dialer.h
Log:
WindowDialer finished, start the outgoing dialogue, class MokoDialerStatus defined, but not finished.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2006-12-22 09:30:35 UTC (rev 458)
@@ -10,7 +10,9 @@
moko-dialer-autolist.c\
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@
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.c 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -133,3 +133,43 @@
}
+/**
+ * @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;
+ }
+
+
+}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -370,8 +370,9 @@
{
//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++)
{
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 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h 2006-12-22 09:30:35 UTC (rev 458)
@@ -23,7 +23,8 @@
#define MOKO_DIALER_MAX_PATH_LEN (128)
//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)
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -0,0 +1,130 @@
+/* moko-dialer-autolist .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.1 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 "moko-dialer-status.h"
+ #include "error.h"
+#include "common.h"
+G_DEFINE_TYPE (MokoDialerStatus, moko_dialer_status, GTK_TYPE_VBOX)
+
+
+static void
+moko_dialer_status_class_init (MokoDialerStatusClass *class)
+{
+/*
+ GtkVBoxClass* vbox_class;
+
+ vbox_class= (GtkVBoxClass*) class;
+*/
+
+ GtkObjectClass *object_class;
+
+ object_class = (GtkObjectClass*) class;
+
+
+}
+
+
+static void
+moko_dialer_status_init (MokoDialerStatus *moko_dialer_status)
+{
+DBG_ENTER();
+moko_dialer_status->imagePerson=0;
+
+//upper section
+; ///<the topmost title bar of the status
+moko_dialer_status->labelStatusTitle= gtk_label_new("");
+for(gint i=0;i<MOKO_DIALER_MAX_STATUS_ICONS;i++)
+ moko_dialer_status->iconStatus[i]=gtk_image_new();
+
+//lower section
+ moko_dialer_status->imagePerson=gtk_image_new(); ///<the image of the person we care
+ moko_dialer_status->labelStatus=gtk_label_new(""); ///<the status label
+ moko_dialer_status->labelPersonName=gtk_label_new(""); ///<the person name
+ moko_dialer_status->labelNumber=gtk_label_new(""); ///<the number of the person
+//private section
+ moko_dialer_status->number_of_the_icons=0;
+
+ gtk_box_pack_start( GTK_BOX(moko_dialer_status), moko_dialer_status->labelStatusTitle , FALSE, FALSE, 0 );
+ gtk_box_pack_start( GTK_BOX(moko_dialer_status), moko_dialer_status->iconStatus[0], FALSE, FALSE, 0 );
+
+//ok now, we arrange them in the vbox.
+
+// we create another vbox to hold the status labels.
+ GtkVBox * vbox2 = gtk_vbox_new( FALSE, 0 );
+ gtk_box_pack_start( GTK_BOX(vbox2), moko_dialer_status->labelStatus, FALSE, FALSE, 0 );
+
+ gtk_box_pack_start( GTK_BOX(vbox2), moko_dialer_status->labelPersonName, FALSE, FALSE, 0 );
+
+
+
+ gtk_box_pack_start( GTK_BOX(vbox2), moko_dialer_status->labelNumber, FALSE, FALSE, 0 );
+// a hbox to hold the image and the vbox2
+ GtkVBox * hbox2 = gtk_hbox_new( FALSE, 0 );
+ gtk_widget_set_size_request (moko_dialer_status->imagePerson, 64,64);
+ gtk_box_pack_start( GTK_BOX(hbox2), moko_dialer_status->imagePerson, FALSE, FALSE, 0 );
+
+ gtk_box_pack_start( GTK_BOX(hbox2),vbox2, FALSE, FALSE, 0 );
+
+gtk_box_pack_start( GTK_BOX(moko_dialer_status),hbox2, FALSE, FALSE, 0 );
+
+gtk_widget_set_size_request (GTK_WIDGET(moko_dialer_status), 480, 40);
+
+DBG_LEAVE();
+
+}
+
+GtkWidget* moko_dialer_status_new()
+{
+DBG_ENTER();
+
+MokoDialerStatus * dp;
+
+dp=(MokoDialerStatus * )g_object_new (MOKO_TYPE_DIALER_STATUS, NULL);
+return GTK_WIDGET(dp);
+
+}
+
+void moko_dialer_status_set_title_label(MokoDialerStatus *moko_dialer_status,const gchar* text)
+{
+
+gtk_label_set_text(GTK_LABEL(moko_dialer_status->labelStatusTitle),text);
+}
+void moko_dialer_status_set_status_label(MokoDialerStatus *moko_dialer_status,const gchar* text)
+{
+gtk_label_set_text(GTK_LABEL(moko_dialer_status->labelStatus),text);
+}
+
+void moko_dialer_status_set_person_name(MokoDialerStatus *moko_dialer_status,const gchar* text)
+{
+gtk_label_set_text(GTK_LABEL(moko_dialer_status->labelPersonName),text);
+}
+void moko_dialer_status_set_person_number(MokoDialerStatus *moko_dialer_status,const gchar* text)
+{
+gtk_label_set_text(GTK_LABEL(moko_dialer_status->labelNumber),text);
+}
+
+void moko_dialer_status_set_person_image(MokoDialerStatus *moko_dialer_status,const gchar* path)
+{
+file_load_person_image_scalable_from_relative_path(moko_dialer_status->imagePerson,path);
+}
+void moko_dialer_status_set_icons(MokoDialerStatus *moko_dialer_status,const gchar* text)
+{
+
+}
+
+
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h 2006-12-22 09:30:35 UTC (rev 458)
@@ -0,0 +1,95 @@
+/* moko-dialer-status.h
+ * to display the person name, picuter,number. etc.
+ * 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.1 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 $]
+ */
+ #ifndef _MOKO_DIALER_STATUS_H_
+#define _MOKO_DIALER_STATUS_H_
+
+
+
+
+#include <gdk/gdk.h>
+#include <gtk/gtkhbox.h>
+#include <glib-object.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtktextview.h>
+#include "moko-dialer-tip.h"
+#include "moko-dialer-declares.h"
+#include "contacts.h"
+
+//#include "moko-dialer-includes.h"
+
+G_BEGIN_DECLS
+
+
+
+#define MOKO_TYPE_DIALER_STATUS (moko_dialer_status_get_type())
+#define MOKO_DIALER_STATUS (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_DIALER_STATUS, MokoDialerStatus))
+#define MOKO_DIALER_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),MOKO_TYPE_DIALER_STATUS,MokoDialerStatusClass))
+#define MOKO_IS_DIALER_STATUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_DIALER_STATUS))
+#define MOKO_IS_DIALER_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_DIALER_STATUS))
+#define MOKO_DIALER_STATUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_DIALER_STATUS, MokoDialerStatusClass))
+
+
+
+typedef struct _MokoDialerStatusClass MokoDialerStatusClass;
+
+typedef struct _MokoDialerStatus MokoDialerStatus;
+struct _MokoDialerStatus
+{
+ GtkVBox vbox;
+//upper section
+ GtkWidget * labelStatusTitle; ///<the topmost title bar of the status
+ GtkWidget * iconStatus[MOKO_DIALER_MAX_STATUS_ICONS];
+
+//lower section
+ GtkWidget * imagePerson; ///<the image of the person we care
+ GtkWidget * labelStatus; ///<the status label
+ GtkWidget * labelPersonName; ///<the person name
+ GtkWidget * labelNumber; ///<the number of the person
+
+//private section
+ gint number_of_the_icons;
+
+
+};
+
+struct _MokoDialerStatusClass
+{
+ GtkVBoxClass parent_class;
+};
+
+
+GType moko_dialer_status_get_type (void) ;
+
+GtkWidget* moko_dialer_status_new();
+
+void moko_dialer_status_set_title_label(MokoDialerStatus *moko_dialer_status,const gchar* text);
+void moko_dialer_status_set_person_name(MokoDialerStatus *moko_dialer_status,const gchar* text);
+void moko_dialer_status_set_person_number(MokoDialerStatus *moko_dialer_status,const gchar* text);
+void moko_dialer_status_set_person_image(MokoDialerStatus *moko_dialer_status,const gchar* path);
+void moko_dialer_status_set_icons(MokoDialerStatus *moko_dialer_status,const gchar* text);
+void moko_dialer_status_set_status_label(MokoDialerStatus *moko_dialer_status,const gchar* text);
+
+G_END_DECLS
+
+#endif //
+
+
+
+
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -52,6 +52,7 @@
GtkTextView *textview=0;
GtkTextBuffer *buffer;
+ GdkColor color;
textview=&moko_dialer_textview->textview;
buffer = gtk_text_view_get_buffer (textview);
@@ -60,8 +61,13 @@
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);
+
+
gtk_widget_set_size_request (GTK_WIDGET(textview), 480, 92);
GTK_WIDGET_UNSET_FLAGS (textview, GTK_CAN_FOCUS);
gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-tip.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-tip.c 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-tip.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -94,10 +94,11 @@
priv->label=label;
- gdk_color_parse("black",&color);
+// gdk_color_parse("black",&color);
-
- gtk_widget_modify_fg(GTK_WIDGET(dialertip),GTK_STATE_NORMAL,&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));
return GTK_WIDGET(dialertip);
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 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -31,6 +31,7 @@
#include "contacts.h"
#include "openmoko-dialer-main.h"
#include "openmoko-dialer-window-dialer.h"
+#include "openmoko-dialer-window-outgoing.h"
int main( int argc, char** argv )
{
@@ -48,8 +49,10 @@
g_set_application_name( "OpenMoko Dialer" );
//init the dialer window
- window_dialer_init(p_dialer_data);
+ window_outgoing_init(p_dialer_data);
+ window_dialer_init(p_dialer_data);
+
gtk_main();
contact_release_contact_list(&(p_dialer_data->g_contactlist));
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 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2006-12-22 09:30:35 UTC (rev 458)
@@ -37,6 +37,7 @@
TIMER_DATA g_timer_data;///< the data used by the timers
GtkWidget * window_dialer;
+GtkWidget* window_outgoing;
// GtkListStore *g_list_store_filter;///<the list store used by the gtktreeview, for displaying the history list dynamically.
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 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2006-12-22 09:30:35 UTC (rev 458)
@@ -44,6 +44,7 @@
//fill the textview with ""
moko_dialer_textview_fill_it(appdata->moko_dialer_text_view,"");
+//moko_dialer_textview_set_color(moko_dialer_textview);
}
else
{
@@ -51,8 +52,12 @@
//refresh the autolist,but do not automaticall fill the textview
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);
@@ -69,6 +74,10 @@
void cb_dialer_button_clicked( GtkButton* button, MOKO_DIALER_APP_DATA * appdata)
{
g_debug( "dialer button clicked" );
+if(!appdata->window_outgoing)
+ window_outgoing_init(appdata);
+
+gtk_widget_show(appdata->window_outgoing);
}
@@ -157,6 +166,9 @@
gint window_dialer_init( MOKO_DIALER_APP_DATA* p_dialer_data)
{
+ GdkColor color;
+ gdk_color_parse("black",&color);
+
GtkVBox* vbox = NULL;
@@ -178,16 +190,26 @@
/* contents */
vbox = gtk_vbox_new( FALSE, 0 );
+ GtkHBox* hbox = gtk_hbox_new( FALSE, 10 );
- 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",
G_CALLBACK (on_dialer_autolist_user_selected),p_dialer_data);
@@ -200,10 +222,21 @@
G_CALLBACK ( on_dialer_autolist_nomatch),p_dialer_data);
+
+
+
+ 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 );
MokoDialerPanel* mokodialerpanel=moko_dialer_panel_new();
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h 2006-12-22 09:19:59 UTC (rev 457)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h 2006-12-22 09:30:35 UTC (rev 458)
@@ -16,5 +16,24 @@
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
#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
More information about the commitlog
mailing list
