diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 981453497..7f54cff59 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -39,6 +39,7 @@ set(UI_FILES sip_account.ui tunnel_config.ui waiting.ui + chat_view.ui ) set(PIXMAPS stock_people.png) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index f1200fce9..1103168aa 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -15,7 +15,8 @@ UI_FILES= about.ui \ ldap.ui \ config-uri.ui \ provisioning-fetch.ui \ - audio_assistant.ui + audio_assistant.ui \ + chat_view.ui PIXMAPS= \ stock_people.png diff --git a/gtk/chat.c b/gtk/chat.c index 5f6ebef6e..4b447e446 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -481,7 +481,7 @@ static gboolean copy_uri_into_clipboard_handler(GtkMenuItem *menuitem, gpointer } GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *with){ - GtkWidget *chat_view=linphone_gtk_create_widget("main","chatroom_frame"); + GtkWidget *chat_view=linphone_gtk_create_widget_2("chat_view","chatroom_frame"); GtkWidget *main_window=linphone_gtk_get_main_window(); GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch"); GtkWidget *text=linphone_gtk_get_widget(chat_view,"textview"); diff --git a/gtk/chat_view.ui b/gtk/chat_view.ui new file mode 100644 index 000000000..b9f1e2213 --- /dev/null +++ b/gtk/chat_view.ui @@ -0,0 +1,118 @@ + + + + + + False + + + True + False + 0 + none + + + True + False + + + True + True + never + + + True + True + 4 + False + word-char + False + + + + + True + True + 0 + + + + + True + False + + + True + True + + True + False + False + True + True + + + True + True + 0 + + + + + True + True + True + + + True + False + + + True + False + gtk-ok + + + True + True + 0 + + + + + True + False + Send + + + True + True + 7 + 1 + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + + + + + + + diff --git a/gtk/main.ui b/gtk/main.ui index 1c28c26f3..50f2a106f 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -96,119 +96,6 @@ - - False - - - True - False - 0 - none - - - True - False - - - True - True - never - - - True - True - 4 - False - word-char - False - - - - - True - True - 0 - - - - - True - False - - - True - True - True - - False - False - True - True - - - True - True - 0 - - - - - True - True - True - - - True - False - - - True - False - gtk-ok - - - True - True - 0 - - - - - True - False - Send - - - True - True - 7 - 1 - - - - - - - False - False - 1 - - - - - False - False - 1 - - - - - - - - - - False @@ -1111,8 +998,8 @@ audio-volume-medium False True - 4 end + 4