diff --git a/gtk/chat.c b/gtk/chat.c index 2b3a969ed..bcaca1a99 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -110,12 +110,14 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,display,-1,"bold",me ? "left" : "left",NULL); gtk_text_buffer_get_end_iter(buffer,&iter); + gtk_text_buffer_insert_with_tags_by_name(buffer,&iter," : ",-1,"bold",me ? "left" : "left",NULL); + gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); g_object_set_data(G_OBJECT(w),"from_message",linphone_address_as_string(from)); } gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_get_iter_at_offset(buffer,&begin,off); - gtk_text_buffer_get_end_iter(buffer,&iter); + gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,message,-1,me ? "left" : "left",NULL); gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); @@ -140,14 +142,12 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, } else { struct tm *tm=localtime(&t); char buf[80]; - strftime(buf,80,"%H:%M",tm); + strftime(buf,80,"Received at %H:%M",tm); gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,buf,-1, - "italic","right","small","font_grey",NULL); + "italic","right","small","font_grey",NULL); } gtk_text_buffer_get_end_iter(buffer,&iter); gtk_text_buffer_insert(buffer,&iter,"\n",-1); - - GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE); gtk_text_view_scroll_mark_onscreen(text,mark); } diff --git a/gtk/main.c b/gtk/main.c index 114a7244f..cfbd8983f 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1503,7 +1503,7 @@ static void linphone_gtk_configure_main_window(){ static const char *search_icon; static gboolean update_check_menu; static gboolean buttons_have_borders; - //static gboolean show_abcd; + static gboolean show_abcd; GtkWidget *w=linphone_gtk_get_main_window(); GHashTable *contacts_history; @@ -1518,7 +1518,7 @@ static void linphone_gtk_configure_main_window(){ search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL); update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0); buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1); - //show_abcd=linphone_gtk_get_ui_config_int("show_abcd",1); + show_abcd=linphone_gtk_get_ui_config_int("show_abcd",1); config_loaded=TRUE; } linphone_gtk_configure_window(w,"main_window"); @@ -1559,32 +1559,20 @@ static void linphone_gtk_configure_main_window(){ } */ } - /*{ - GdkPixbuf *pbuf=create_pixbuf("dialer-orange.png"); + { + GdkPixbuf *pbuf=create_pixbuf("dialer.png"); if (pbuf) { - GtkImage *img=GTK_IMAGE(linphone_gtk_get_widget(w,"keypad_tab_icon")); - int w,h; - GdkPixbuf *scaled; - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU,&w,&h); - scaled=gdk_pixbuf_scale_simple(pbuf,w,h,GDK_INTERP_BILINEAR); - gtk_image_set_from_pixbuf(img,scaled); - g_object_unref(G_OBJECT(scaled)); - g_object_unref(G_OBJECT(pbuf)); + GtkButton *button=GTK_BUTTON(linphone_gtk_get_widget(w,"keypad")); + gtk_button_set_image(button,gtk_image_new_from_pixbuf (pbuf)); } - }*/ + } if (linphone_gtk_can_manage_accounts()) { gtk_widget_show(linphone_gtk_get_widget(w,"assistant_item")); } if (update_check_menu){ gtk_widget_show(linphone_gtk_get_widget(w,"versioncheck_item")); } - /*if (!show_abcd){ - gtk_widget_hide(linphone_gtk_get_widget(w,"dtmf_A")); - gtk_widget_hide(linphone_gtk_get_widget(w,"dtmf_B")); - gtk_widget_hide(linphone_gtk_get_widget(w,"dtmf_C")); - gtk_widget_hide(linphone_gtk_get_widget(w,"dtmf_D")); - gtk_table_resize(GTK_TABLE(linphone_gtk_get_widget(w,"dtmf_table")),4,3); - }*/ + g_object_set_data(G_OBJECT(w),"show_abcd",GINT_TO_POINTER(show_abcd)); } void linphone_gtk_manage_login(void){ @@ -1599,7 +1587,6 @@ void linphone_gtk_manage_login(void){ } } - gboolean linphone_gtk_close(GtkWidget *mw){ /*shutdown calls if any*/ LinphoneCore *lc=linphone_gtk_get_core(); @@ -1660,6 +1647,13 @@ void linphone_gtk_create_keypad(GtkWidget *button){ linphone_gtk_connect_digits(keypad); linphone_gtk_init_dtmf_table(keypad); g_object_set_data(G_OBJECT(mw),"keypad",(gpointer)keypad); + if(!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mw),"show_abcd"))){ + gtk_widget_hide(linphone_gtk_get_widget(keypad,"dtmf_A")); + gtk_widget_hide(linphone_gtk_get_widget(keypad,"dtmf_B")); + gtk_widget_hide(linphone_gtk_get_widget(keypad,"dtmf_C")); + gtk_widget_hide(linphone_gtk_get_widget(keypad,"dtmf_D")); + gtk_table_resize(GTK_TABLE(linphone_gtk_get_widget(keypad,"dtmf_table")),4,3); + } gtk_widget_show(keypad); } diff --git a/gtk/main.ui b/gtk/main.ui index 50883c3f0..6c15688c2 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -282,6 +282,7 @@ True True + 2 0 @@ -329,6 +330,7 @@ True True + 2 2 @@ -416,6 +418,7 @@ False False + 2 2 @@ -958,6 +961,7 @@ False False + end 1 @@ -973,9 +977,24 @@ False True 6 + end 2 + + + True + True + True + False + + + + False + False + 3 + + False @@ -1091,22 +1110,6 @@ 2 - - - True - True - True - False - image18 - - - - False - False - end - 3 - - False diff --git a/mediastreamer2 b/mediastreamer2 index e5d529906..1f0374f48 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e5d52990695be15802741e920801f77d24bd8fba +Subproject commit 1f0374f48290e0e852bcbb15c4d302c0c5b332f4 diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 186254c11..d10d48222 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -18,6 +18,7 @@ startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addc contact_starred.png contact_unstarred.png \ speaker.png \ ok.png \ +dialer.png \ notok.png EXTRA_DIST=$(pixmap_DATA) diff --git a/pixmaps/dialer.png b/pixmaps/dialer.png new file mode 100644 index 000000000..5da3ad70d Binary files /dev/null and b/pixmaps/dialer.png differ