diff --git a/Makefile.am b/Makefile.am index 37abf47a9..458ddbe80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ ORTP_DIR = oRTP endif SUBDIRS = m4 pixmaps po $(ORTP_DIR) mediastreamer2\ - coreapi console gtk-glade share scripts + coreapi console gtk share scripts @@ -125,7 +125,7 @@ zip: #add gtk dlls and files make gtk-cherrypick make other-cherrypick - cp -f $(top_srcdir)/gtk-glade/gtkrc $(INSTALLDIR_WITH_PREFIX)/. + cp -f $(top_srcdir)/gtk/gtkrc $(INSTALLDIR_WITH_PREFIX)/. cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/. cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/. cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(ZIPFILE) * @@ -162,7 +162,7 @@ setup.exe: filelist rm -f $(INSTALLDIR_WITH_PREFIX)/$(ISS_SCRIPT) newdate: - cd gtk-glade && $(MAKE) newdate + cd gtk && $(MAKE) newdate Portfile: $(top_srcdir)/scripts/Portfile.tmpl dist diff --git a/configure.in b/configure.in index cda24af91..c67f47ec8 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.3.99.1],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.3.99.2],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM dnl Source packaging numbers @@ -135,11 +135,8 @@ AC_ARG_ENABLE(gtk_ui, if test "$gtk_ui" = "true" ; then PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.4.0 gthread-2.0) - PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0) AC_SUBST(LIBGTK_CFLAGS) AC_SUBST(LIBGTK_LIBS) - AC_SUBST(LIBGLADE_CFLAGS) - AC_SUBST(LIBGLADE_LIBS) else echo "GTK interface compilation is disabled." fi @@ -329,8 +326,8 @@ dnl build console if required AM_CONDITIONAL(BUILD_CONSOLE, test x$console_ui = xtrue) dnl special things for arm-linux cross compilation toolchain AM_CONDITIONAL(ARMBUILD, test x$use_arm_toolchain = xyes) -dnl compilation of gtk-glade user interface -AM_CONDITIONAL(BUILD_GLADE_UI, [test x$gtk_ui = xtrue ] ) +dnl compilation of gtk user interface +AM_CONDITIONAL(BUILD_GTK_UI, [test x$gtk_ui = xtrue ] ) AM_CONDITIONAL(BUILD_WIN32, test x$mingw_found = xyes ) dnl check getenv @@ -438,7 +435,7 @@ coreapi/Makefile coreapi/help/Makefile coreapi/help/Doxyfile coreapi/help/doxygen.dox -gtk-glade/Makefile +gtk/Makefile console/Makefile share/Makefile share/C/Makefile diff --git a/gtk-glade/.gitignore b/gtk/.gitignore similarity index 100% rename from gtk-glade/.gitignore rename to gtk/.gitignore diff --git a/gtk-glade/Makefile.am b/gtk/Makefile.am similarity index 67% rename from gtk-glade/Makefile.am rename to gtk/Makefile.am index f2086d823..7bcba956f 100644 --- a/gtk-glade/Makefile.am +++ b/gtk/Makefile.am @@ -1,15 +1,15 @@ -GLADE_FILES= about.glade \ - main.glade \ - password.glade \ - contact.glade \ - incoming_call.glade \ - parameters.glade \ - sip_account.glade \ - chatroom.glade \ - call_logs.glade \ - log.glade \ - buddylookup.glade \ - waiting.glade +UI_FILES= about.ui \ + main.ui \ + password.ui \ + contact.ui \ + incoming_call.ui \ + parameters.ui \ + sip_account.ui \ + chatroom.ui \ + call_logs.ui \ + log.ui \ + buddylookup.ui \ + waiting.ui PIXMAPS= \ stock_people.png @@ -18,13 +18,13 @@ LINPHONE_ICO_RC_FILE=linphone.rc LINPHONE_ICO_FILE=linphone.ico EXTRA_DIST= $(PIXMAPS) \ - $(GLADE_FILES) \ + $(UI_FILES) \ linphone.iss \ $(LINPHONE_ICO_RC_FILE) \ $(LINPHONE_ICO_FILE) -if BUILD_GLADE_UI +if BUILD_GTK_UI BUILT_SOURCES=version_date.h @@ -49,8 +49,7 @@ linphone_3_SOURCES= \ linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \ $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ $(top_builddir)/coreapi/liblinphone.la \ - $(LIBGTK_LIBS) $(INTLLIBS) \ - $(LIBGLADE_LIBS) + $(LIBGTK_LIBS) $(INTLLIBS) if BUILD_WIN32 @@ -64,13 +63,8 @@ else linphone_3_LDFLAGS=-export-dynamic endif -gladedir=$(datadir)/linphone -glade_DATA=$(GLADE_FILES) $(PIXMAPS) $(top_srcdir)/COPYING - -#all-local: gtk-linphone.ui - -#gtk-linphone.ui: gtk-linphone.glade -# gtk-builder-convert gtk-linphone.glade $@ +uidir=$(datadir)/linphone +ui_DATA=$(UI_FILES) $(PIXMAPS) $(top_srcdir)/COPYING endif @@ -78,7 +72,7 @@ endif AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \ -I$(top_srcdir)/mediastreamer2/include/ \ $(ORTP_CFLAGS) \ - $(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ + $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ $(OSIP_CFLAGS) diff --git a/gtk-glade/about.glade b/gtk/about.ui similarity index 90% rename from gtk-glade/about.glade rename to gtk/about.ui index e4ee4d2bb..3fc7d3538 100644 --- a/gtk-glade/about.glade +++ b/gtk/about.ui @@ -1,14 +1,13 @@ - + - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 About linphone False center-on-parent - linphone2.png dialog False Linphone @@ -35,7 +34,7 @@ hu: anonymous Icons by kerosine.fr - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical @@ -44,18 +43,18 @@ hu: anonymous - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - + False end 0 - + - - + + diff --git a/gtk-glade/buddylookup.c b/gtk/buddylookup.c similarity index 100% rename from gtk-glade/buddylookup.c rename to gtk/buddylookup.c diff --git a/gtk-glade/buddylookup.glade b/gtk/buddylookup.ui similarity index 75% rename from gtk-glade/buddylookup.glade rename to gtk/buddylookup.ui index 2e6eb96bd..34b45edfc 100644 --- a/gtk-glade/buddylookup.glade +++ b/gtk/buddylookup.ui @@ -1,94 +1,94 @@ - + - + 5 Search contacts in directory center-on-parent linphone2.png dialog False - + - + True 2 - + True 5 0 - + True 12 - + True - + True True True - - + + False 0 - + True True automatic automatic etched-in - + 512 140 True True - - + + - + 6 1 - + True True True - + False 2 - + True - + True False True True - + - + True - + True gtk-add - + False False @@ -96,17 +96,17 @@ - + True Add to my list - + 1 - + - + False False @@ -114,34 +114,31 @@ 0 - + False False 3 - + - + - - + + True <b>Search somebody</b> True - - - label_item - + - + 1 - + True end @@ -150,14 +147,14 @@ - + False end 0 - + - - + + diff --git a/gtk-glade/call_logs.glade b/gtk/call_logs.ui similarity index 77% rename from gtk-glade/call_logs.glade rename to gtk/call_logs.ui index d2ac682d3..566f525f2 100644 --- a/gtk-glade/call_logs.glade +++ b/gtk/call_logs.ui @@ -1,8 +1,7 @@ - - + - - + + 500 370 5 @@ -12,55 +11,57 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True True GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC - + True True False GTK_WRAP_WORD - + - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-close True - 0 - + 1 - + False GTK_PACK_END - + - - + + button1 + + + diff --git a/gtk-glade/calllogs.c b/gtk/calllogs.c similarity index 100% rename from gtk-glade/calllogs.c rename to gtk/calllogs.c diff --git a/gtk-glade/chat.c b/gtk/chat.c similarity index 100% rename from gtk-glade/chat.c rename to gtk/chat.c diff --git a/gtk-glade/chatroom.glade b/gtk/chatroom.ui similarity index 68% rename from gtk-glade/chatroom.glade rename to gtk/chatroom.ui index 870ae537e..6322d09cc 100644 --- a/gtk-glade/chatroom.glade +++ b/gtk/chatroom.ui @@ -1,69 +1,67 @@ - - + - - - + + + - + True - + 200 200 True True False GTK_WRAP_WORD - + - + True - + True True True - - + + - + True True True - 0 - + - + True - + True gtk-ok - + - + True Send - + 7 1 - + - + False False 1 - + False False @@ -71,30 +69,29 @@ - + True GTK_BUTTONBOX_END - + True True True gtk-close True - 0 - - + + GTK_PACK_END - + False 2 - + - - + + diff --git a/gtk-glade/contact.glade b/gtk/contact.ui similarity index 84% rename from gtk-glade/contact.glade rename to gtk/contact.ui index d16543b53..516f427cb 100644 --- a/gtk-glade/contact.glade +++ b/gtk/contact.ui @@ -1,8 +1,8 @@ - + - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 center-on-parent @@ -10,46 +10,46 @@ dialog False - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Name - + GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK SIP Address - + 1 2 @@ -57,11 +57,11 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -69,11 +69,11 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -82,14 +82,14 @@ GTK_FILL - + False 0 - + Show this contact presence status True True @@ -97,13 +97,13 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True True - + 1 - + Allow this contact to see my presence status True True @@ -111,46 +111,43 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True True - + 2 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Contact information</b> True - - - label_item - + - + 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - + gtk-cancel True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False @@ -158,29 +155,29 @@ - + gtk-ok True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False 1 - + False end 0 - + - - + + diff --git a/gtk-glade/fonis.c b/gtk/fonis.c similarity index 100% rename from gtk-glade/fonis.c rename to gtk/fonis.c diff --git a/gtk-glade/friendlist.c b/gtk/friendlist.c similarity index 100% rename from gtk-glade/friendlist.c rename to gtk/friendlist.c diff --git a/gtk-glade/gtkrc b/gtk/gtkrc similarity index 100% rename from gtk-glade/gtkrc rename to gtk/gtkrc diff --git a/gtk-glade/incall_view.c b/gtk/incall_view.c similarity index 100% rename from gtk-glade/incall_view.c rename to gtk/incall_view.c diff --git a/gtk-glade/incoming_call.glade b/gtk/incoming_call.ui similarity index 81% rename from gtk-glade/incoming_call.glade rename to gtk/incoming_call.ui index 14c89480a..00a6e0efc 100644 --- a/gtk-glade/incoming_call.glade +++ b/gtk/incoming_call.ui @@ -1,8 +1,8 @@ - + - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 popup @@ -13,84 +13,81 @@ True False - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Incoming call from - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Incoming call True - - - label_item - + - + 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK spread - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-yes - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Accept - + 1 - + - + False False @@ -98,53 +95,53 @@ - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-no - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Decline - + 1 - + - + False False 1 - + False end 0 - + - - + + diff --git a/gtk-glade/linphone.h b/gtk/linphone.h similarity index 100% rename from gtk-glade/linphone.h rename to gtk/linphone.h diff --git a/gtk-glade/linphone.ico b/gtk/linphone.ico similarity index 100% rename from gtk-glade/linphone.ico rename to gtk/linphone.ico diff --git a/gtk-glade/linphone.iss b/gtk/linphone.iss similarity index 100% rename from gtk-glade/linphone.iss rename to gtk/linphone.iss diff --git a/gtk-glade/linphone.rc b/gtk/linphone.rc similarity index 100% rename from gtk-glade/linphone.rc rename to gtk/linphone.rc diff --git a/gtk-glade/log.glade b/gtk/log.ui similarity index 77% rename from gtk-glade/log.glade rename to gtk/log.ui index fc7206433..4f5603ef1 100644 --- a/gtk-glade/log.glade +++ b/gtk/log.ui @@ -1,24 +1,24 @@ - - + + - + 540 290 5 Linphone debug window center-on-parent - linphone2.png dialog False False - + True + vertical 2 - + True True never @@ -27,48 +27,51 @@ True in - + True True False word - + - + 1 - + True end - - gtk-close + + gtk-close True True True True - + False False 1 - + False end 0 - + - - + + button1 + + + diff --git a/gtk-glade/logging.c b/gtk/logging.c similarity index 100% rename from gtk-glade/logging.c rename to gtk/logging.c diff --git a/gtk-glade/loginframe.c b/gtk/loginframe.c similarity index 100% rename from gtk-glade/loginframe.c rename to gtk/loginframe.c diff --git a/gtk-glade/main.c b/gtk/main.c similarity index 96% rename from gtk-glade/main.c rename to gtk/main.c index ddae9ff90..ea176e666 100644 --- a/gtk-glade/main.c +++ b/gtk/main.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define USE_LIBGLADE 1 +//#define USE_LIBGLADE 1 #define VIDEOSELFVIEW_DEFAULT 1 @@ -280,11 +280,42 @@ GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name){ #else GtkWidget *linphone_gtk_create_window(const char *window_name){ - + GError* error = NULL; + GtkBuilder* builder = gtk_builder_new (); + char path[2048]; + GtkWidget *w; + snprintf(path,sizeof(path),"%s/%s.ui",BUILD_TREE_XML_DIR,window_name); + if (access(path,F_OK)!=0){ + snprintf(path,sizeof(path),"%s/%s.ui",INSTALLED_XML_DIR,window_name); + if (access(path,F_OK)!=0){ + g_error("Could not locate neither %s/%s.ui and %s/%s.ui .",BUILD_TREE_XML_DIR,window_name, + INSTALLED_XML_DIR,window_name); + return NULL; + } + } + if (!gtk_builder_add_from_file (builder, path, &error)){ + g_error("Couldn't load builder file: %s", error->message); + g_error_free (error); + } + w=GTK_WIDGET(gtk_builder_get_object (builder,window_name)); + if (w==NULL){ + g_error("Could not retrieve '%s' window from xml file",window_name); + return NULL; + } + g_object_set_data(G_OBJECT(w),"builder",builder); + gtk_builder_connect_signals(builder,w); + linphone_gtk_configure_window(w,window_name); + return w; } GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name){ - GObject *w=gtk_builder_get_object(the_ui,name); + GtkBuilder *builder=(GtkBuilder*)g_object_get_data(G_OBJECT(window),"builder"); + GObject *w; + if (builder==NULL){ + g_error("Fail to retrieve builder from window !"); + return NULL; + } + w=gtk_builder_get_object(builder,name); if (w==NULL){ g_error("No widget named %s found in xml interface.",name); } @@ -1104,10 +1135,10 @@ static void linphone_gtk_configure_main_window(){ g_object_unref(G_OBJECT(pbuf)); } } - if (!linphone_gtk_can_manage_accounts()) - gtk_widget_hide(linphone_gtk_get_widget(w,"run_assistant")); + 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")); + gtk_widget_show(linphone_gtk_get_widget(w,"versioncheck_item")); } } @@ -1280,6 +1311,7 @@ int main(int argc, char *argv[]){ } settings=gtk_settings_get_default(); + g_type_class_unref (g_type_class_ref (GTK_TYPE_IMAGE_MENU_ITEM)); g_object_set(settings, "gtk-menu-images", TRUE, NULL); g_object_set(settings, "gtk-button-images", TRUE, NULL); #ifdef WIN32 @@ -1304,9 +1336,7 @@ int main(int argc, char *argv[]){ add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/linphone"); - g_set_application_name("Linphone"); - pbuf=create_pixbuf(linphone_gtk_get_ui_config("icon",LINPHONE_ICON)); - if (pbuf!=NULL) gtk_window_set_default_icon(pbuf); + the_ui=linphone_gtk_create_window("main"); @@ -1314,6 +1344,11 @@ int main(int argc, char *argv[]){ linphone_core_enable_logs_with_cb(linphone_gtk_log_handler); linphone_gtk_init_liblinphone(config_file, factory_config_file); + + g_set_application_name(linphone_gtk_get_ui_config("title","Linphone")); + pbuf=create_pixbuf(linphone_gtk_get_ui_config("icon",LINPHONE_ICON)); + if (pbuf!=NULL) gtk_window_set_default_icon(pbuf); + /* do not lower timeouts under 30 ms because it exhibits a bug on gtk+/win32, with cpu running 20% all the time...*/ gtk_timeout_add(30,(GtkFunction)linphone_gtk_iterate,(gpointer)linphone_gtk_get_core()); gtk_timeout_add(30,(GtkFunction)linphone_gtk_check_logs,(gpointer)NULL); diff --git a/gtk-glade/main.glade b/gtk/main.ui similarity index 77% rename from gtk-glade/main.glade rename to gtk/main.ui index 67701fb23..52e6d7833 100644 --- a/gtk-glade/main.glade +++ b/gtk/main.ui @@ -1,264 +1,277 @@ - - + + - + + + + + + + + All users + + + Online users + + + + + + + + + + + ADSL + + + Fiber Channel + + + + + + + + + + + Default + + + + + + + + + + + ADSL + + + Fiber Channel + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - linphone2.png - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Linphone True - - + + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - Assistant - True + + _Assistant + True + image3 False - - - - True - gtk-preferences - 1 - - - + - + gtk-preferences True True True - + - - Call history + + _Call history True + True + image2 False - - - True - gtk-justify-fill - 1 - - - + - + gtk-disconnect True True - + - + True - + - + gtk-quit True True True - + - + - + - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Modes + _Options True - - + + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Audio only True True - video_item - - + + - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Audio & Video + Audio & video True True True audio_only_item - - + + - + True - + - + True Enable self-view True True - + - + - + - - gtk-help + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Aid_e True - True - - + + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - Show debug messages - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - True - gtk-info - 1 - - - - - - + gtk-about True True True - + - - Homepage + + Show debug window True + image1 + False + + + + + + _Homepage + True + True + image4 False - - - True - gtk-home - 1 - - - + - - Check for updates + + Check _Updates + True + image5 False - - - - True - gtk-info - 1 - - - + + - + - + - + False 0 - + True - + True vertical - + True - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - Start call + Start call none - + True - + True gtk-apply - + 0 - + Start call - + 1 - + - + False False @@ -267,90 +280,87 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True True - Enter username, phone number, or full sip address + Enter username, phone number, or full sip address ● - + 0 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK SIP address or phone number: True - - - label_item - + - + 1 - + True False True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - Terminate call + Terminate call none - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-close - + 0 - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Terminate call - + 1 - + - + False False @@ -358,7 +368,7 @@ 2 - + False 8 @@ -366,104 +376,109 @@ - + True True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Lookup: - + 12 0 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ● - + 4 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK in - + 8 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + model1 0 - All users -Online users - + + + + 0 + + + 4 3 - + False 0 - + True True automatic automatic - + 120 True True @@ -472,23 +487,23 @@ Online users - + - + 1 - + True 0 none - + True - + True True ● @@ -496,60 +511,57 @@ Online users - + 0 - + True True True none - + True - + True gtk-find - + 0 - + True Search - + 1 - + - + False 1 - + - - + + True <b>Add contacts from directory</b> True - - - label_item - + - + False False @@ -557,44 +569,41 @@ Online users 2 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Contact list</b> True - - - label_item - + - + 8 0 - + True - + Mute False True True - + False 0 - + False False @@ -602,160 +611,167 @@ Online users - + - + True Internet connection: - + 0 - + True + model2 0 - ADSL -Fiber Channel - + + + + 0 + + + 1 - + False 2 - + 8 0 - + 0 - + True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + model3 0 - Default - + + + + 0 + + + - + 0 - + True True True - + False 1 - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK My current identity: True - - - label_item - + - + 0 - + False 1 - + - - + + True - + True gtk-missing-image - + 0 - + True Contacts - + 1 - + False - tab - + True vertical - + True 0.5 none - + True 0 0 - + True 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 4 @@ -763,7 +779,7 @@ Fiber Channel 4 True - + D 50 50 @@ -771,7 +787,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 3 4 @@ -782,7 +798,7 @@ Fiber Channel - + # 50 50 @@ -790,7 +806,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 2 3 @@ -801,7 +817,7 @@ Fiber Channel - + 0 50 50 @@ -809,7 +825,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -820,7 +836,7 @@ Fiber Channel - + * 50 50 @@ -828,7 +844,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 3 4 @@ -837,7 +853,7 @@ Fiber Channel - + C 50 50 @@ -845,7 +861,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 3 4 @@ -856,7 +872,7 @@ Fiber Channel - + 9 50 50 @@ -864,7 +880,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 2 3 @@ -875,7 +891,7 @@ Fiber Channel - + 8 50 50 @@ -883,7 +899,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -894,7 +910,7 @@ Fiber Channel - + 7 50 50 @@ -902,7 +918,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 2 3 @@ -911,7 +927,7 @@ Fiber Channel - + B 50 50 @@ -919,7 +935,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 3 4 @@ -930,7 +946,7 @@ Fiber Channel - + 6 50 50 @@ -938,7 +954,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 2 3 @@ -949,7 +965,7 @@ Fiber Channel - + 5 50 50 @@ -957,7 +973,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -968,7 +984,7 @@ Fiber Channel - + 4 50 50 @@ -976,7 +992,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -985,7 +1001,7 @@ Fiber Channel - + A 50 50 @@ -993,7 +1009,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 3 4 @@ -1002,7 +1018,7 @@ Fiber Channel - + 3 50 50 @@ -1010,7 +1026,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 2 3 @@ -1019,7 +1035,7 @@ Fiber Channel - + 2 50 50 @@ -1027,7 +1043,7 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -1036,7 +1052,7 @@ Fiber Channel - + 1 50 50 @@ -1044,25 +1060,22 @@ Fiber Channel True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + GTK_FILL - + - + - + - + - - label_item - - + 0 @@ -1070,136 +1083,129 @@ Fiber Channel - + 1 - - + + True - + True gtk-missing-image - + 0 - + True Keypad - + 1 - + 1 False - tab - + 0.5 none - + True 12 12 - + True vertical - + True gtk-info 5 - + 0 - + True 0 - + True label center - + - - + + True True - - - label_item - + - + 1 - + True 0 - + True vertical - + True Duration center - + 0 - + - - + + True Duration: True - - - label_item - + - + False 2 - + True spread - + Mute True False True True - + False False @@ -1207,137 +1213,133 @@ Fiber Channel - + HoldOn True False True True - + False False 1 - + False False 3 - + - + - - + + True In call True center - - - label_item - + - + 2 - - + + True Call Details - + 2 False - tab - + 1 - + 0 - + 0 - + True 12 - + True vertical - + True 0 - + True 12 12 - + True 4 2 - + True Username - + - + True Password - + 1 2 - + True Internet connection: - + 2 3 - + True True ● - + 1 2 - + True True False ● - + 1 2 @@ -1346,13 +1348,18 @@ Fiber Channel - + True + model4 0 - ADSL -Fiber Channel - + + + + 0 + + + 1 2 @@ -1361,13 +1368,13 @@ Fiber Channel - + Automatically log me in True True False True - + 1 2 @@ -1378,85 +1385,99 @@ Fiber Channel - + - + - - + + True Login information True - - - label_item - + - + 0 - + True - + gtk-connect True True True True - + False False 0 - + 1 - + - + - - + + True <b>Welcome !</b> True - - - label_item - + - + 1 - + 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 - + False False 2 - + - - + + + True + gtk-info + + + True + gtk-refresh + + + True + gtk-properties + + + True + gtk-home + + + True + gtk-execute + + diff --git a/gtk-glade/p2pwizard.glade b/gtk/p2pwizard.ui similarity index 68% rename from gtk-glade/p2pwizard.glade rename to gtk/p2pwizard.ui index 79007a6e9..e8e6703ee 100644 --- a/gtk-glade/p2pwizard.glade +++ b/gtk/p2pwizard.ui @@ -1,13 +1,12 @@ - - + - - + + Creating a FONICS account - - + + - + True Welcome ! This wizard will help you to setup a SIP account. @@ -16,119 +15,115 @@ This wizard will help you to setup a SIP account. GTK_JUSTIFY_CENTER True True - + GTK_ASSISTANT_PAGE_INTRO Introduction - + True - + True Please choose a username: - + - + True 0 - + True 12 - + True - + True - + True True - + - + True True True - 0 - + - + True - + True gtk-apply - + - + True Check availability - + 1 - + - + False 1 - + False - + True - + 1 - + - + - - + + True True - - - label_item - + - + 1 - + Create your account ! - + True Done ! Your account is now created and ready to use. - + GTK_ASSISTANT_PAGE_CONFIRM Finished ! - - + + diff --git a/gtk-glade/parameters.glade b/gtk/parameters.ui similarity index 75% rename from gtk-glade/parameters.glade rename to gtk/parameters.ui index 3f3671330..9d7f79e38 100644 --- a/gtk-glade/parameters.glade +++ b/gtk/parameters.ui @@ -1,144 +1,262 @@ - + + + 3001 + 500 + 10 + 1 + 10 + 500 + + + 65535 + 1 + 10 + 1 + 10 + 1 + + + 65535 + 1 + 10 + 1 + 10 + 1 + + + 65535 + 1 + 10 + 1 + 10 + 1 + + + 100000 + -1 + 10 + 1 + 10 + 0 + + + 100000 + -1 + 10 + 1 + 10 + 0 + + + + + + + + default soundcard + + + + + + + + + + default soundcard + + + + + + + + + + a sound card + + + + + + + + + + default camera + + + + + + + + + + CIF + + + + + + + + + + Audio codecs + + + Video codecs + + + + + + + + + + C + + + - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Settings linphone2.png - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True vertical - + True - + Set Maximum Transmission Unit: True True False True - - + + 0 - + True True - 500 500 3001 1 10 10 - - + adjustment1 + + 1 - + 0 - + Send DTMFs as SIP info True True False True - - + + 1 - + Use IPv6 instead of IPv4 True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + 2 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Transport</b> True - - - label_item - + - + False 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 3 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 1 65535 1 10 10 - - + adjustment2 + + 1 2 @@ -147,13 +265,13 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 1 65535 1 10 10 - - + adjustment3 + + 1 2 @@ -162,90 +280,87 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 1 65535 1 10 10 - - + adjustment4 + + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Video RTP/UDP: right - + 2 3 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Audio RTP/UDP: right - + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK SIP (UDP): right - + - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Ports</b> True - - - label_item - + - + False 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True vertical - + Direct connection to the Internet True True False True True - - + + False False @@ -253,11 +368,11 @@ - + True vertical - + Behind NAT / Firewall (specify gateway IP below) True True @@ -265,44 +380,44 @@ True True no_nat - - + + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Public IP address: right - + 0 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + + 1 - + 1 - + False False @@ -310,11 +425,11 @@ - + True vertical - + Behind NAT / Firewall (use STUN to resolve) True True @@ -322,151 +437,147 @@ True True no_nat - - + + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Stun server: right - + 0 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + + 1 - + 1 - + False False 2 - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>NAT and Firewall</b> True - - - label_item - + - + False 2 - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-network - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Network settings - + 1 - + False - tab - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + + 0 - + gtk-media-play True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + 1 - + 1 2 @@ -476,12 +587,12 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Ring sound: right - + 4 5 @@ -489,11 +600,11 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + + 1 2 @@ -503,13 +614,18 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - default soundcard - - - + + model1 + + + + 0 + + + 1 2 @@ -519,12 +635,18 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - default soundcard - - + + model2 + + + + 0 + + + 1 2 @@ -534,11 +656,11 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ALSA special device (optional): right - + 3 4 @@ -546,12 +668,12 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Capture device: right - + 2 3 @@ -559,12 +681,12 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Ring device: right - + 1 2 @@ -572,25 +694,30 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Playback device: right - + GTK_FILL GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - a sound card - - - + + model3 + + + + 0 + + + 1 2 @@ -599,14 +726,14 @@ - + Enable echo cancellation True True False True - - + + 1 2 @@ -617,55 +744,58 @@ - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Audio</b> True - - - label_item - + - + 0 - + True 0 - + True 12 - + True 2 2 - + True Video input device: right - + GTK_EXPAND - + True - default camera - - + + model4 + + + + 0 + + + 1 2 @@ -673,22 +803,28 @@ - + True Prefered video resolution: - + 1 2 - + True 0 - CIF - - + + model5 + + + + 0 + + + 1 2 @@ -696,132 +832,125 @@ 2 - + - + - - + + True <b>Video</b> True - - - label_item - + - + False 1 - - - 1 - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-media-play - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Multimedia settings - + 1 - + 1 False - tab - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - This section defines your SIP address when not using a SIP account + This section defines your SIP address when not using a SIP account 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 3 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Your display name (eg: John Doe): - + - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Your username: - + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Your resulting SIP address: - + 2 3 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - + + 1 2 @@ -830,12 +959,12 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False - + 1 2 @@ -843,98 +972,95 @@ 3 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Default identity</b> True - - - label_item - + - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK automatic automatic - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-add - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Add - + 1 - + - + False False @@ -942,39 +1068,39 @@ - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-edit - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Edit - + 1 - + - + False False @@ -982,39 +1108,39 @@ - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Remove - + 1 - + - + False False @@ -1022,218 +1148,213 @@ - + True True - + - + True - + True gtk-network - + 0 - + True Register to FONICS virtual network ! - + 1 - + - + False False 3 - + False False 1 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Proxy accounts</b> True - - - label_item - + - + 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Erase all passwords - + 1 - + - + False False 0 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Privacy</b> True - - - label_item - + - + 2 - - - 2 - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK stock_people.png - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Manage SIP Accounts - + 1 - + 2 False - tab - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Audio codecs -Video codecs - - + + model6 + + + + 0 + + + False 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1241,33 +1362,33 @@ Video codecs automatic out - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - + - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + gtk-go-up True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False @@ -1275,15 +1396,15 @@ Video codecs - + gtk-go-down True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False @@ -1291,39 +1412,39 @@ Video codecs - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-yes - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Enable - + 1 - + - + False False @@ -1331,101 +1452,98 @@ Video codecs - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-no - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Disable - + 1 - + - + False False 3 - + False 1 - + 1 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Codecs</b> True - - - label_item - + - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 stands for "unlimited" - 0 -1 100000 1 10 10 - - + 0 stands for "unlimited" + adjustment5 + + 1 2 @@ -1434,243 +1552,232 @@ Video codecs - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 stands for "unlimited" - 0 -1 100000 1 10 10 - - + 0 stands for "unlimited" + adjustment6 + + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Upload speed limit in Kbit/sec: right - + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Download speed limit in Kbit/sec: right - + - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Bandwidth control</b> True - - - label_item - + - + 1 - - - 3 - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-execute - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Codecs - + 1 - + 3 False - tab - + True vertical - + True 0 - + True 12 - + True - C - - + + model7 + + + + 0 + + + - + - - + + True <b>Language</b> True - - - label_item - + - + False 0 - + True 0 - + True 12 - + Show advanced settings True True False True - - + + - + - - + + True <b>Level</b> True - - - label_item - + - + False 1 - - - 4 - + - - + + True - + True gtk-properties 3 - + 0 - + True User interface - + 1 - + 4 False - tab - + 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + True - + True gtk-apply - + 0 - + True Done - + 1 - + - + False False @@ -1678,13 +1785,13 @@ Video codecs 0 - + 5 1 - + - - + + diff --git a/gtk-glade/password.glade b/gtk/password.ui similarity index 83% rename from gtk-glade/password.glade rename to gtk/password.ui index 6617f4831..59ac15212 100644 --- a/gtk-glade/password.glade +++ b/gtk/password.ui @@ -1,8 +1,8 @@ - + - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Linphone - Authentication required @@ -12,68 +12,68 @@ dialog False - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Please enter the domain password center True - + 0 - + True 2 2 - + True UserID - + - + True True ● - + 1 2 - + True Password: right - + 1 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False ● - - + + 1 2 @@ -81,31 +81,31 @@ 2 - + 1 - + 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - + gtk-ok True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False @@ -113,29 +113,29 @@ - + gtk-cancel True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False 1 - + False end 0 - + - - + + diff --git a/gtk-glade/propertybox.c b/gtk/propertybox.c similarity index 99% rename from gtk-glade/propertybox.c rename to gtk/propertybox.c index be4073fb9..179a134b7 100644 --- a/gtk-glade/propertybox.c +++ b/gtk/propertybox.c @@ -813,11 +813,13 @@ void linphone_gtk_show_parameters(void){ linphone_gtk_show_sip_accounts(pb); /* CODECS CONFIG */ linphone_gtk_init_codec_list(GTK_TREE_VIEW(codec_list)); + linphone_gtk_draw_codec_list(GTK_TREE_VIEW(codec_list),0); gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(pb,"codec_view")),0); gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"download_bw")), linphone_core_get_download_bandwidth(lc)); gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"upload_bw")), linphone_core_get_upload_bandwidth(lc)); + /* UI CONFIG */ linphone_gtk_fill_langs(pb); diff --git a/gtk-glade/setupwizard.c b/gtk/setupwizard.c similarity index 100% rename from gtk-glade/setupwizard.c rename to gtk/setupwizard.c diff --git a/gtk-glade/sip_account.glade b/gtk/sip_account.ui similarity index 81% rename from gtk-glade/sip_account.glade rename to gtk/sip_account.ui index bb8862619..0c49aafdb 100644 --- a/gtk-glade/sip_account.glade +++ b/gtk/sip_account.ui @@ -1,8 +1,16 @@ - + + + 100000 + 0 + 10 + 1 + 10 + 3600 + - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Linphone - Configure a SIP account @@ -11,74 +19,74 @@ dialog False - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK vertical - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 4 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Your SIP identity: right - + - + 275 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Looks like sip:<username>@<domain> + Looks like sip:<username>@<domain> sip: - + 1 2 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK SIP Proxy address: right - + 1 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Looks like sip:<proxy hostname> + Looks like sip:<proxy hostname> sip: - + 1 2 @@ -87,23 +95,23 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Route (optional): right - + 2 3 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + 1 2 @@ -112,24 +120,24 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Registration duration (sec): right - + 3 4 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3600 0 100000 1 10 10 - + adjustment1 + 1 2 @@ -137,73 +145,70 @@ 4 - + 0 - + Register at startup True True False True True - + 1 - + Publish presence information True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - + False 2 - + - + - - + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Configure a SIP account True - - - label_item - + - + 1 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - + gtk-ok True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False @@ -211,29 +216,29 @@ - + gtk-cancel True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - - + + False False 1 - + False end 0 - + - - + + diff --git a/gtk-glade/stock_people.png b/gtk/stock_people.png similarity index 100% rename from gtk-glade/stock_people.png rename to gtk/stock_people.png diff --git a/gtk-glade/support.c b/gtk/support.c similarity index 98% rename from gtk-glade/support.c rename to gtk/support.c index 3e3320c4f..2124d2ee8 100644 --- a/gtk-glade/support.c +++ b/gtk/support.c @@ -177,7 +177,7 @@ const gchar *linphone_gtk_get_ui_config(const char *key, const char *def){ LpConfig *cfg=linphone_core_get_config(linphone_gtk_get_core()); return lp_config_get_string(cfg,"GtkUi",key,def); }else{ - ms_warning ("Cannot read config, no core created yet."); + g_error ("Cannot read config, no core created yet."); return NULL; } } diff --git a/gtk-glade/update.c b/gtk/update.c similarity index 100% rename from gtk-glade/update.c rename to gtk/update.c diff --git a/gtk-glade/utils.c b/gtk/utils.c similarity index 100% rename from gtk-glade/utils.c rename to gtk/utils.c diff --git a/gtk-glade/waiting.glade b/gtk/waiting.ui similarity index 69% rename from gtk-glade/waiting.glade rename to gtk/waiting.ui index 294f44eff..4413dfab0 100644 --- a/gtk-glade/waiting.glade +++ b/gtk/waiting.ui @@ -1,8 +1,7 @@ - - + - - + + Linphone False True @@ -10,52 +9,49 @@ linphone2.png False - + True 0 - + True 12 - + True 5 - + True gtk-dialog-info - + False False - + True - + 5 1 - + - + - - + + True Please wait True GTK_JUSTIFY_CENTER - - - label_item - + - + - - + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 3fcfbdd20..1e699aa8a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,29 +1,29 @@ # List of source files containing translatable strings. -gtk-glade/calllogs.c -gtk-glade/logging.c -gtk-glade/support.c -gtk-glade/chat.c -gtk-glade/main.c -gtk-glade/friendlist.c -gtk-glade/propertybox.c -gtk-glade/update.c -gtk-glade/buddylookup.c -gtk-glade/setupwizard.c -gtk-glade/incall_view.c -gtk-glade/loginframe.c -gtk-glade/main.glade -gtk-glade/about.glade -gtk-glade/contact.glade -gtk-glade/log.glade -gtk-glade/password.glade -gtk-glade/call_logs.glade -gtk-glade/main.glade -gtk-glade/sip_account.glade -gtk-glade/chatroom.glade -gtk-glade/incoming_call.glade -gtk-glade/parameters.glade -gtk-glade/buddylookup.glade -gtk-glade/waiting.glade +gtk/calllogs.c +gtk/logging.c +gtk/support.c +gtk/chat.c +gtk/main.c +gtk/friendlist.c +gtk/propertybox.c +gtk/update.c +gtk/buddylookup.c +gtk/setupwizard.c +gtk/incall_view.c +gtk/loginframe.c +gtk/main.ui +gtk/about.ui +gtk/contact.ui +gtk/log.ui +gtk/password.ui +gtk/call_logs.ui +gtk/main.ui +gtk/sip_account.ui +gtk/chatroom.ui +gtk/incoming_call.ui +gtk/parameters.ui +gtk/buddylookup.ui +gtk/waiting.ui coreapi/linphonecore.c coreapi/misc.c coreapi/presence.c