From 28c59401a3f15c99cf6d939628c173f8bf7c4004 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 26 Jun 2012 10:36:38 +0200 Subject: [PATCH 01/30] Fix video display and pausing during transfert --- Classes/LinphoneUI/LinphoneManager.m | 38 ++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 1f2b3dded..b7f1d9a2a 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -179,6 +179,8 @@ extern void libmsbcg729_init(); forUser:lUserName withDisplayName:lDisplayName]; break; + case LinphoneCallPaused: + case LinphoneCallPausing: case LinphoneCallPausedByRemote: case LinphoneCallConnected: [callDelegate displayInCall: call @@ -248,10 +250,20 @@ extern void libmsbcg729_init(); forUser:@"" withDisplayName:@""]; } else { - [callDelegate displayInCall:call - FromUI:mCurrentViewController - forUser:lUserName - withDisplayName:lDisplayName]; + call = linphone_core_get_current_call([LinphoneManager getLc]); + if(call) { + const LinphoneCallParams* current = linphone_call_get_current_params(call); + if (linphone_call_params_video_enabled(current)) { + [callDelegate displayVideoCall:call FromUI:mCurrentViewController + forUser:lUserName + withDisplayName:lDisplayName]; + } else { + [callDelegate displayInCall:call + FromUI:mCurrentViewController + forUser:lUserName + withDisplayName:lDisplayName]; + } + } } break; } @@ -261,10 +273,20 @@ extern void libmsbcg729_init(); forUser:@"" withDisplayName:@""]; } else { - [callDelegate displayInCall:call - FromUI:mCurrentViewController - forUser:lUserName - withDisplayName:lDisplayName]; + call = linphone_core_get_current_call([LinphoneManager getLc]); + if(call) { + const LinphoneCallParams* current = linphone_call_get_current_params(call); + if (linphone_call_params_video_enabled(current)) { + [callDelegate displayVideoCall:call FromUI:mCurrentViewController + forUser:lUserName + withDisplayName:lDisplayName]; + } else { + [callDelegate displayInCall:call + FromUI:mCurrentViewController + forUser:lUserName + withDisplayName:lDisplayName]; + } + } } break; case LinphoneCallStreamsRunning: From 544f4dc140d079c63dc604110a8a6d89e768d494 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 26 Jun 2012 15:49:44 +0200 Subject: [PATCH 02/30] update exosip submodule (to disable tcp server socket) --- submodules/externals/exosip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/exosip b/submodules/externals/exosip index 8c42924ae..df2219241 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit 8c42924ae9009f6003e98d29638e078ca1bd7c71 +Subproject commit df221924193acbfac3c7205cfdab32e690fa5f83 From 77690b7018c4656dfa18a3c8de4109fc4e7d4a27 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 2 Jul 2012 19:14:08 +0200 Subject: [PATCH 03/30] update linphone submodule with a memory leak fixe --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 630e26944..179727a5f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 630e26944dd6e5cca53787452b162ec6baf7ba48 +Subproject commit 179727a5f65c4f9043b8534e59be8ecf508073ad From d487b99f8b8932302975465a9e00e8e38de1bb83 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 31 Jul 2012 16:26:51 +0200 Subject: [PATCH 04/30] fix IOS camera localized name issue --- Classes/LinphoneUI/LinphoneManager.m | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index b7f1d9a2a..8345c50d4 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -40,8 +40,8 @@ extern void libmsamr_init(); #ifdef HAVE_X264 extern void libmsx264_init(); #endif -#define FRONT_CAM_NAME "AV Capture: Front Camera" -#define BACK_CAM_NAME "AV Capture: Back Camera" +#define FRONT_CAM_NAME "AV Capture: com.apple.avfoundation.avcapturedevice.built-in_video:1" /*"AV Capture: Front Camera"*/ +#define BACK_CAM_NAME "AV Capture: com.apple.avfoundation.avcapturedevice.built-in_video:0" /*"AV Capture: Back Camera"*/ #define DEFAULT_EXPIRES 600 #if defined (HAVE_SILK) extern void libmssilk_init(); diff --git a/submodules/linphone b/submodules/linphone index 179727a5f..9a0097a97 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 179727a5f65c4f9043b8534e59be8ecf508073ad +Subproject commit 9a0097a9748862b91448bb71c10c619e122e739a From d077851f7e2a1104a6ae05a1680d0e498a2beb08 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 31 Jul 2012 16:28:01 +0200 Subject: [PATCH 05/30] update exosip2 to fix tcp cnx connection issue --- submodules/externals/exosip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/exosip b/submodules/externals/exosip index df2219241..dfe434328 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit df221924193acbfac3c7205cfdab32e690fa5f83 +Subproject commit dfe434328c0b0cbbaee669d40b27e09fea5f49ab From 0cfc20b8da05d141600b34d39dd3499dbff56981 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 18 Sep 2012 10:32:00 +0200 Subject: [PATCH 06/30] xcode 4.6/ios6 support --- README | 2 + submodules/build/Makefile | 10 +-- submodules/build/Makefile.ios6-beta | 81 ++++++++++++++++++++++++ submodules/build/builder-iphone-os.mk | 16 +++-- submodules/build/builders.d/libvpx.mk | 2 + submodules/build/builders.d/libvpx.patch | 37 +++++++++-- submodules/build/iphone-config.site | 13 ++-- submodules/linphone | 2 +- 8 files changed, 141 insertions(+), 22 deletions(-) create mode 100644 submodules/build/Makefile.ios6-beta diff --git a/README b/README index 096cfdadb..774b58245 100644 --- a/README +++ b/README @@ -50,6 +50,8 @@ BUILDING THE SDK $ cd submodules/build $ make all enable_gpl_third_parties=no +xcode 4.5i/ios6 beta do: + $ make -f Makefile.ios6-beta * ZRTP support You can enable ZRTP support in GPL mode only, by adding "enable_zrtp=yes" to the make command, for example: diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 72b7b1d5e..276688bb4 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk ipa \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk clean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ && make -f builder-iphone-os.mk host=armv7-apple-darwin clean clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk clean-makefile \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean diff --git a/submodules/build/Makefile.ios6-beta b/submodules/build/Makefile.ios6-beta new file mode 100644 index 000000000..bb1fd7a6c --- /dev/null +++ b/submodules/build/Makefile.ios6-beta @@ -0,0 +1,81 @@ +############################################################################ +# Makefile +# Copyright (C) 2009 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +enable_gpl_third_parties=yes +enable_zrtp=no + +.NOTPARALLEL all: check_options build warning +ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) +check_options: + @echo "ZRTP is not available in non-gpl build." + @exit -1 +else +check_options: + +endif + +ifeq ($(enable_gpl_third_parties),yes) +warning: + @echo + @echo "*****************************************************************" + @echo "*****************************************************************" + @echo "*****CAUTION, this liblinphone SDK is built using GPL code ******" + @echo "*****To disable gpl code, use make enable_gpl_third_parties=no***" + @echo "*****************************************************************" + @echo "*****************************************************************" +else +warning: + @echo + @echo "*****************************************************************" + @echo "*****************************************************************" + @echo "*****linphone SDK without GPL code ******" + @echo "*****************************************************************" + @echo "*****************************************************************" +endif + +LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) + +build: + make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk delivery-sdk + +ipa: build + make -f builder-iphone-simulator.mk ipa \ + && make -f builder-iphone-os.mk ipa \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ + +clean: + make -f builder-iphone-simulator.mk clean \ + && make -f builder-iphone-os.mk clean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ + +clean-makefile: + make -f builder-iphone-simulator.mk clean-makefile \ + && make -f builder-iphone-os.mk clean-makefile \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ + +veryclean: + make -f builder-iphone-simulator.mk veryclean \ + && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ + diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 93c5571d1..48b54121a 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -20,7 +20,7 @@ # ############################################################################ -host?=armv6-apple-darwin +host?=armv7-apple-darwin config_site:=iphone-config.site library_mode:= --disable-shared --enable-static linphone_configure_controls= \ @@ -301,13 +301,17 @@ multi-arch: cp -rf $(prefix)/include $(prefix)/../apple-darwin/. ; \ cp -rf $(prefix)/share $(prefix)/../apple-darwin/. ; \ for archive in $$arm_archives ; do \ - i386_path=`echo $$archive | sed -e "s/armv6/i386/"` ;\ - armv7_path=`echo $$archive | sed -e "s/armv6/armv7/"` ;\ - destpath=`echo $$archive | sed -e "s/armv6-//"` ;\ + i386_path=`echo $$archive | sed -e "s/armv7/i386/"` ;\ + armv6_path=`echo $$archive | sed -e "s/armv7/armv6/"` ;\ + if test ! -f "$$armv6_path"; then \ + armv6_path= ; \ + fi; \ + armv7s_path=`echo $$archive | sed -e "s/armv7/armv7s/"` ;\ + destpath=`echo $$archive | sed -e "s/armv7-//"` ;\ if test -f "$$i386_path"; then \ - echo "Mixing $$archive and $$i386_path into $$destpath"; \ + echo "Mixing $$archive into $$destpath"; \ mkdir -p `dirname $$destpath` ; \ - lipo -create $$archive $$armv7_path $$i386_path -output $$destpath; \ + lipo -create $$archive $$armv7s_path $$armv6_path $$i386_path -output $$destpath; \ else \ echo "WARNING: archive `basename $$archive` exists in arm tree but does not exists in i386 tree."; \ fi \ diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 13e0aa62b..8b65258a9 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -6,6 +6,8 @@ libvpx_configure_options=\ ifneq (,$(findstring armv6,$(host))) libvpx_configure_options+= --target=armv6-darwin-gcc --cpu=arm1176jzf-s +else ifneq (,$(findstring armv7s,$(host))) + libvpx_configure_options+= --target=armv7s-darwin-gcc --cpu=cortex-a8 else ifneq (,$(findstring armv7,$(host))) libvpx_configure_options+= --target=armv7-darwin-gcc --cpu=cortex-a8 else diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch index 390ec4ecf..6d77453c3 100644 --- a/submodules/build/builders.d/libvpx.patch +++ b/submodules/build/builders.d/libvpx.patch @@ -1,5 +1,5 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index 0426f92..24fa04e 100755 +index 0426f92..d1f4760 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -624,6 +624,9 @@ process_common_toolchain() { @@ -12,7 +12,7 @@ index 0426f92..24fa04e 100755 case ${toolchain} in *-darwin8-*) -@@ -743,6 +746,14 @@ process_common_toolchain() { +@@ -743,9 +746,17 @@ process_common_toolchain() { darwin*) SDK_PATH=/Developer/Platforms/iPhoneOS.platform/Developer TOOLCHAIN_PATH=${SDK_PATH}/usr/bin @@ -26,10 +26,17 @@ index 0426f92..24fa04e 100755 + fi CC=${TOOLCHAIN_PATH}/gcc AR=${TOOLCHAIN_PATH}/ar - LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 -@@ -759,10 +770,10 @@ process_common_toolchain() { +- LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 ++ LD=${TOOLCHAIN_PATH}/ld + AS=${TOOLCHAIN_PATH}/as + STRIP=${TOOLCHAIN_PATH}/strip + NM=${TOOLCHAIN_PATH}/nm +@@ -757,12 +768,12 @@ process_common_toolchain() { + ASFLAGS="-version -arch ${tgt_isa} -g" + add_cflags -arch ${tgt_isa} - add_ldflags -arch_only ${tgt_isa} +- add_ldflags -arch_only ${tgt_isa} ++ add_ldflags -arch ${tgt_isa} - add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS5.0.sdk" + add_cflags "-isysroot $SDK_FULL_PATH" @@ -40,3 +47,23 @@ index 0426f92..24fa04e 100755 # Add the paths for the alternate libc for d in usr/include; do +diff --git a/configure b/configure +index 6f20c6b..4638ea2 100755 +--- a/configure ++++ b/configure +@@ -94,6 +94,7 @@ all_platforms="${all_platforms} iwmmxt-linux-gcc" + all_platforms="${all_platforms} iwmmxt2-linux-rvct" + all_platforms="${all_platforms} iwmmxt2-linux-gcc" + all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 ++all_platforms="${all_platforms} armv7s-darwin-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 +@@ -198,6 +199,7 @@ ARCH_EXT_LIST=" + armv5te + armv6 + armv7 ++ armv7s + iwmmxt + iwmmxt2 + diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 4256d17ed..ea15aad82 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -18,16 +18,20 @@ elif test "${host_alias}" = "armv7-apple-darwin" ; then PLATFORM=OS CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" MCPU="-mcpu=cortex-a8" +elif test "${host_alias}" = "armv7s-apple-darwin" ; then + ARCH=armv7s + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" else echo "bad host ${host_alias} must be either i386-apple-darwin or armv6-apple-darwin" exit fi echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}" - +XCODE_ROOT=/Applications/Xcode.app #new path with Xcode 4.3: -if test -d /Applications/Xcode.app/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then - SDK_PATH_LIST=`ls -drt /Applications/Xcode.app/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` - SDK_BIN_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +if test -d ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then + SDK_PATH_LIST=`ls -drt ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin else SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin @@ -44,5 +48,4 @@ AR=${SDK_BIN_PATH}/ar RANLIB=${SDK_BIN_PATH}/ranlib CPPFLAGS="-Dasm=__asm" -LDFLAGS="-Wl,-syslibroot,${SYSROOT_PATH} -framework CFNetwork" OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/linphone b/submodules/linphone index 9a0097a97..1cbe09869 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9a0097a9748862b91448bb71c10c619e122e739a +Subproject commit 1cbe098692da4ad2a511bd677994c50d3716f314 From b226d0de322ab9194f53f3a69ec15323cc16bf5e Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 18 Sep 2012 15:04:47 +0200 Subject: [PATCH 07/30] fix build for xcode4.4 --- submodules/build/builder-iphone-os.mk | 3 +++ submodules/build/builders.d/libvpx.patch | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 48b54121a..35e345620 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -307,6 +307,9 @@ multi-arch: armv6_path= ; \ fi; \ armv7s_path=`echo $$archive | sed -e "s/armv7/armv7s/"` ;\ + if test ! -f "$$armv7s_path"; then \ + armv7s_path= ; \ + fi; \ destpath=`echo $$archive | sed -e "s/armv7-//"` ;\ if test -f "$$i386_path"; then \ echo "Mixing $$archive into $$destpath"; \ diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch index 6d77453c3..d651ccfc8 100644 --- a/submodules/build/builders.d/libvpx.patch +++ b/submodules/build/builders.d/libvpx.patch @@ -1,5 +1,5 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index 0426f92..d1f4760 100755 +index 0426f92..38fdcb2 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -624,6 +624,9 @@ process_common_toolchain() { @@ -27,7 +27,7 @@ index 0426f92..d1f4760 100755 CC=${TOOLCHAIN_PATH}/gcc AR=${TOOLCHAIN_PATH}/ar - LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 -+ LD=${TOOLCHAIN_PATH}/ld ++ LD=${TOOLCHAIN_PATH}/gcc AS=${TOOLCHAIN_PATH}/as STRIP=${TOOLCHAIN_PATH}/strip NM=${TOOLCHAIN_PATH}/nm From c126a5172dcb315731861ead851f71b4bfca7917 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 20 Sep 2012 18:12:52 +0200 Subject: [PATCH 08/30] remove armv6 build Conflicts: README --- Classes/ConsoleViewController.xib | 207 +- Classes/InCallViewController-ipad.xib | 2600 +++++++-------- Classes/IncallViewController.xib | 2799 +++++++---------- Classes/MoreViewController.xib | 514 +-- Classes/PhoneViewController-ipad.xib | 1561 ++++----- Classes/PhoneViewController.xib | 1919 +++++------ Classes/VideoViewController-ipad.xib | 48 +- README | 8 +- submodules/build/Makefile | 22 +- .../{Makefile.ios6-beta => Makefile.xcode4.4} | 22 +- submodules/build/builder-iphone-os.mk | 2 +- submodules/build/builders.d/libvpx.mk | 3 + 12 files changed, 3898 insertions(+), 5807 deletions(-) rename submodules/build/{Makefile.ios6-beta => Makefile.xcode4.4} (76%) diff --git a/Classes/ConsoleViewController.xib b/Classes/ConsoleViewController.xib index 16846dae6..9413d2106 100644 --- a/Classes/ConsoleViewController.xib +++ b/Classes/ConsoleViewController.xib @@ -1,76 +1,90 @@ - + 784 - 9L31a - 680 - 949.54 - 353.00 - + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + YES - + IBProxyObject + IBUITextView + IBUIView YES com.apple.InterfaceBuilder.IBCocoaTouchPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES IBFilesOwner + IBCocoaTouchFramework IBFirstResponder + IBCocoaTouchFramework - - - - 292 - - YES - - - 274 - {320, 450} - - - 1 - MSAxIDEAA - - YES - YES - NO - NO - NO - NO - NO - - - 2 - + + + 292 + + YES + + + 274 + {320, 450} + + + + 1 + MSAxIDEAA + + YES + YES + IBCocoaTouchFramework + NO + NO + NO + NO + NO + + + 2 + IBCocoaTouchFramework + + + 1 + 17 + + + Helvetica + 17 + 16 - {320, 460} - - - 3 - MQA - - 2 - - - NO - + {320, 460} + + + + 3 + MQA + + 2 + + + NO + IBCocoaTouchFramework @@ -78,11 +92,11 @@ YES - logs + view - + - 9 + 14 @@ -94,11 +108,11 @@ - view + logs - + - 14 + 9 @@ -116,22 +130,13 @@ -1 - RmlsZSdzIE93bmVyA + File's Owner -2 - - 10 - - - YES - - - - 4 @@ -139,7 +144,7 @@ YES - + logView @@ -151,22 +156,20 @@ YES - + YES -1.CustomClassName + -1.IBPluginDependency -2.CustomClassName - 10.CustomClassName - 10.IBEditorWindowLastContentRect - 10.IBPluginDependency + -2.IBPluginDependency 4.IBPluginDependency 7.IBPluginDependency - + YES ConsoleViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder - ConsoleViewController - {{807, 300}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -174,22 +177,14 @@ YES - - YES - - - YES - + + YES - - YES - - - YES - + + 14 @@ -202,27 +197,55 @@ UIViewController YES - + YES logs logsView - + YES UITextView UIView + + YES + + YES + logs + logsView + + + YES + + logs + UITextView + + + logsView + UIView + + + IBProjectSource - Classes/ConsoleViewController.h + ./Classes/ConsoleViewController.h 0 - ../linphone.xcodeproj + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES 3 - 3.1 + 1926 diff --git a/Classes/InCallViewController-ipad.xib b/Classes/InCallViewController-ipad.xib index 51b1dfa66..f59eb43ab 100644 --- a/Classes/InCallViewController-ipad.xib +++ b/Classes/InCallViewController-ipad.xib @@ -1,21 +1,20 @@ - 1280 - 11C74 - 1938 - 1138.23 - 567.00 + 1536 + 11E53 + 2840 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 - IBUIButton - IBUIImageView - IBUIViewController IBProxyObject IBUIActivityIndicatorView + IBUIButton + IBUIImageView IBUITableView IBUIView @@ -35,846 +34,776 @@ IBFirstResponder IBIPadFramework - - - - 274 - - - - 274 - - - - 292 - {768, 1024} - - - - _NS:569 - NO - IBIPadFramework - - - - 292 - {{20, 956}, {28, 28}} - - - - _NS:567 - NO - IBIPadFramework - - - - 292 - {{366, 493}, {37, 37}} - - - - _NS:1062 - NO - IBIPadFramework - NO - 0 - - - - 292 - {{598, 799}, {170, 225}} - - - - - 3 - MQA - - 2 - - - IBIPadFramework - - - {768, 1024} - - - - _NS:212 - - 3 - MC42NjY2NjY2NjY3AA + + + 274 + + + + 274 + + + + 292 + {768, 1024} + + + _NS:569 + NO + IBIPadFramework - IBIPadFramework + + + 292 + {{20, 956}, {28, 28}} + + + _NS:567 + NO + IBIPadFramework + + + + 292 + {{366, 493}, {37, 37}} + + + _NS:1062 + NO + IBIPadFramework + NO + 0 + + + + 292 + {{598, 799}, {170, 225}} + + + + 3 + MQA + + 2 + + + IBIPadFramework + + + {768, 1024} + + + _NS:212 + + 3 + MC42NjY2NjY2NjY3AA - - - 292 - {{224, 740}, {320, 66}} - - - - NO - IBIPadFramework - 0 - 0 - 1 - Change camera - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - clavier-01-108px.png - - - Helvetica-Bold - Helvetica - 2 - 15 - - - Helvetica-Bold - 15 - 16 - + IBIPadFramework + + + + 292 + {{224, 740}, {320, 66}} + + + NO + IBIPadFramework + 0 + 0 + 1 + Change camera + + 3 + MQA - - - 274 - {768, 805} - - - - _NS:408 - - 3 - MSAwAA - + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + clavier-01-108px.png + + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 274 + {768, 805} + + + _NS:408 + + 3 + MSAwAA + + + YES + IBIPadFramework + YES + 0 + YES + 80 + 22 + 22 + + + + 292 + + + + 292 + {{0, 1}, {320, 66}} + + + 1 + MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + stopcall-red.png + + + NSImage + clavier-01-106px.png + + + - YES - IBIPadFramework - YES - 0 - YES - 80 - 22 - 22 + + {{224, 937}, {320, 77}} + + + _NS:196 + + 3 + MCAwAA - - - 292 - - - - 292 - {{0, 1}, {320, 66}} - - - - - 1 - MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - stopcall-red.png - - - NSImage - clavier-01-106px.png - - - + IBIPadFramework + + + + 292 + + + + 292 + {{80, 70}, {80, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + grouper.png + + + 2 + 17 + + + Helvetica-Bold + 17 + 16 - - {{224, 937}, {320, 77}} - - - - _NS:196 - - 3 - MCAwAA - IBIPadFramework - - - - 292 - - - - 292 - {{80, 70}, {80, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - grouper.png - - - 2 - 17 - - - Helvetica-Bold - 17 - 16 - + + + 292 + {{0, 4}, {107, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - 292 - {{0, 4}, {107, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - mic_active.png - - - NSImage - micro_inverse.png - - - NSImage - micro.png - - - 2 - 2 - - - Helvetica-Bold - 18 - 16 - + + + NSImage + mic_active.png - - - 292 - {{0, 70}, {80, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - ajouter.png - - - + + NSImage + micro_inverse.png - - - 292 - {{240, 70}, {80, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - 1 - MCAwIDAAA - - - NSImage - contact.png - - - + + NSImage + micro.png - - - -2147483356 - {{240, 70}, {80, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 1 - video - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - clavier-01-160px.png - - - + + 2 + 2 - - - 292 - {{160, 70}, {80, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - transfer - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - + + Helvetica-Bold + 18 + 16 - - - 292 - {{262, 84}, {37, 37}} - - - - _NS:1062 - NO - IBIPadFramework - NO - 0 - - - - 292 - {{107, 4}, {106, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - clavier.png - - - - - - - 292 - {{213, 4}, {107, 66}} - - - - - NO - NO - IBIPadFramework - NO - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - HP_inverse.png - - - NSImage - HP.png - - - - - - - 292 - {{80, 70}, {80, 66}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - NSImage - pause_inactif.png - - - NSImage - pause.png - - - - - - {{224, 801.5}, {320, 135}} - - - - - NO - NO - IBIPadFramework - - - - -2147483356 - - - - 292 - {{119, 251}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - close - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 193}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 19}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 19}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 2 - - - - - - - - - 292 - {{207, 19}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 3 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 77}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 4 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 77}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 5 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{207, 77}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 6 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 135}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 7 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 135}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 8 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{207, 135}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - 9 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 193}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - * - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{207, 193}, {82, 52}} - - - - - NO - NO - IBIPadFramework - 0 - 0 - # - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - {{178, 146}, {320, 310}} - - - - - 3 - MC4yNAA - NO - NO - IBIPadFramework + + + 292 + {{0, 70}, {80, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + ajouter.png + + + + + + + 292 + {{240, 70}, {80, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + 1 + MCAwIDAAA + darkTextColor + + + NSImage + contact.png + + + + + + + -2147483356 + {{240, 70}, {80, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 1 + video + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + clavier-01-160px.png + + + + + + + 292 + {{160, 70}, {80, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + transfer + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + + + + + + 292 + {{262, 84}, {37, 37}} + + + _NS:1062 + NO + IBIPadFramework + NO + 0 + + + + 292 + {{107, 4}, {106, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + clavier.png + + + + + + + 292 + {{213, 4}, {107, 66}} + + + + NO + NO + IBIPadFramework + NO + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + HP_inverse.png + + + NSImage + HP.png + + + + + + + 292 + {{80, 70}, {80, 66}} + + + + NO + NO + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + + NSImage + pause_inactif.png + + + NSImage + pause.png + + + + + + {{224, 801.5}, {320, 135}} + + + + NO + NO + IBIPadFramework + + + + -2147483356 + + + + 292 + {{119, 251}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + close + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 193}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 19}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 1 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 19}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 2 + + + + + + + + + 292 + {{207, 19}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 3 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 77}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 4 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 77}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 5 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{207, 77}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 6 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 135}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 7 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 135}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 8 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{207, 135}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + 9 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 193}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + * + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{207, 193}, {82, 52}} + + + + NO + NO + IBIPadFramework + 0 + 0 + # + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + {{178, 146}, {320, 310}} + + + + 3 + MC4yNAA - - {{0, 20}, {768, 1004}} - - - - _NS:212 - - IBIPadFramework - - - 2 - - - 1 - 1 - + NO + NO + IBIPadFramework + + + {768, 1004} + + + _NS:212 + IBIPadFramework - NO - - - callTableView - - - - 114 - - - - endCtrl - - - - 119 - - - - hangUpView - - - - 122 - speaker @@ -883,62 +812,6 @@ 132 - - - mute - - - - 125 - - - - addVideo - - - - 113 - - - - mergeCalls - - - - 124 - - - - addCall - - - - 112 - - - - contacts - - - - 116 - - - - dialer - - - - 141 - - - - pause - - - - 129 - controlSubView @@ -949,75 +822,35 @@ - five + star - + - 120 + 133 - nine + hangUpView - + - 126 + 122 - seven + contacts - + - 130 + 116 - six + mergeCalls - + - 131 - - - - four - - - - 121 - - - - three - - - - 134 - - - - zero - - - - 137 - - - - two - - - - 135 - - - - close - - - - 115 + 124 @@ -1029,27 +862,11 @@ - eight + addCall - + - 118 - - - - one - - - - 127 - - - - star - - - - 133 + 112 @@ -1061,11 +878,27 @@ - view + seven - + - 136 + 130 + + + + eight + + + + 118 + + + + pause + + + + 129 @@ -1085,43 +918,11 @@ - videoPreview + callTableView - + - 162 - - - - videoCallQuality - - - - 163 - - - - videoCameraSwitch - - - - 164 - - - - videoUpdateIndicator - - - - 167 - - - - videoWaitingForFirstImage - - - - 168 + 114 @@ -1133,11 +934,155 @@ - dataSource - - + videoCallQuality + + - 139 + 163 + + + + close + + + + 115 + + + + mute + + + + 125 + + + + videoWaitingForFirstImage + + + + 168 + + + + videoUpdateIndicator + + + + 167 + + + + dialer + + + + 141 + + + + endCtrl + + + + 119 + + + + zero + + + + 137 + + + + three + + + + 134 + + + + one + + + + 127 + + + + videoPreview + + + + 162 + + + + five + + + + 120 + + + + view + + + + 136 + + + + videoCameraSwitch + + + + 164 + + + + six + + + + 131 + + + + four + + + + 121 + + + + addVideo + + + + 113 + + + + nine + + + + 126 + + + + two + + + + 135 @@ -1147,6 +1092,14 @@ 140 + + + dataSource + + + + 139 + doAction: @@ -1195,31 +1148,40 @@ - 59 - + 60 + - + + + + + + - 60 - - - - - - - - - - + 154 + + 61 + + 152 + + + + + + + + + video + 88 @@ -1228,95 +1190,41 @@ - - 98 - - - end - 89 - - - - - - - - - + + + + + + + + + controls - - 96 - - - speaker - - - 92 - - - mute - - - 90 - - - video - - - 91 - - - merge - - - 93 - - - addcall - - - 94 - - - contacts - - - 95 - - - dialer - - - 97 - - - pauseresume - 87 - - - - - - - - - - - - + + + + + + + + + + + + pad @@ -1400,40 +1308,10 @@ star - 152 - - - - - - - - - video - - - 158 - - - - video_preview - - - 157 - - - video_view - - - 153 - - - call_quality_video - - - 154 - - + 169 + + + transfer 165 @@ -1441,16 +1319,82 @@ toggleVideoIndicator + + 90 + + + video + + + 96 + + + speaker + + + 92 + + + mute + + + 91 + + + merge + + + 93 + + + addcall + + + 94 + + + contacts + + + 95 + + + dialer + + + 97 + + + pauseresume + + + 98 + + + end + 166 - 169 - - - transfer + 153 + + + call_quality_video + + + 157 + + + video_view + + + 158 + + + video_preview @@ -1492,7 +1436,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1525,408 +1468,7 @@ 170 - - - - IncallViewController - UIViewController - - doAction: - id - - - doAction: - - doAction: - id - - - - UIButton - UIToggleVideoButton - UITableView - UIButton - UIViewController - UIButton - UIView - UIButton - UIButton - UIButton - UIButton - UIButton - UIView - UIButton - UIButton - UIButton - UIButton - UIButton - UIView - UIButton - UIButton - UIButton - UIButton - UIButton - UIButton - UIButton - UIButton - UIImageView - UICamSwitch - UIView - UIView - UIActivityIndicatorView - UIView - VideoViewController - UIActivityIndicatorView - UIButton - - - - addCall - UIButton - - - addVideo - UIToggleVideoButton - - - callTableView - UITableView - - - close - UIButton - - - conferenceDetail - UIViewController - - - contacts - UIButton - - - controlSubView - UIView - - - dialer - UIButton - - - eight - UIButton - - - endCtrl - UIButton - - - five - UIButton - - - four - UIButton - - - hangUpView - UIView - - - hash - UIButton - - - mergeCalls - UIButton - - - mute - UIButton - - - nine - UIButton - - - one - UIButton - - - padSubView - UIView - - - pause - UIButton - - - seven - UIButton - - - six - UIButton - - - speaker - UIButton - - - star - UIButton - - - three - UIButton - - - transfer - UIButton - - - two - UIButton - - - videoCallQuality - UIImageView - - - videoCameraSwitch - UICamSwitch - - - videoGroup - UIView - - - videoPreview - UIView - - - videoUpdateIndicator - UIActivityIndicatorView - - - videoView - UIView - - - videoViewController - VideoViewController - - - videoWaitingForFirstImage - UIActivityIndicatorView - - - zero - UIButton - - - - IBProjectSource - ./Classes/IncallViewController.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - UIDigitButton - UIButton - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UIMuteButton - UIToggleButton - - IBProjectSource - ./Classes/UIMuteButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UIToggleVideoButton - UIButton - - videoUpdateIndicator - UIActivityIndicatorView - - - videoUpdateIndicator - - videoUpdateIndicator - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIToggleVideoButton.h - - - - VideoViewController - UIViewController - - UIImageView - UIImageView - UIImageView - UICamSwitch - UICamSwitch - UICamSwitch - UIView - UIView - UIView - UIHangUpButton - UIHangUpButton - UIHangUpButton - UIView - UIView - UIMuteButton - UIMuteButton - UIMuteButton - UIView - UIView - UIView - UIView - - - - mCallQuality - UIImageView - - - mCallQualityLandLeft - UIImageView - - - mCallQualityLandRight - UIImageView - - - mCamSwitch - UICamSwitch - - - mCamSwitchLandLeft - UICamSwitch - - - mCamSwitchLandRight - UICamSwitch - - - mDisplay - UIView - - - mDisplayLandLeft - UIView - - - mDisplayLandRight - UIView - - - mHangUp - UIHangUpButton - - - mHangUpLandLeft - UIHangUpButton - - - mHangUpLandRight - UIHangUpButton - - - mLandscapeLeft - UIView - - - mLandscapeRight - UIView - - - mMute - UIMuteButton - - - mMuteLandLeft - UIMuteButton - - - mMuteLandRight - UIMuteButton - - - mPortrait - UIView - - - mPreview - UIView - - - mPreviewLandLeft - UIView - - - mPreviewLandRight - UIView - - - - IBProjectSource - ./Classes/VideoViewController.h - - - - + 0 IBIPadFramework YES @@ -1948,6 +1490,6 @@ {106, 67} {62, 54} - 933 + 1926 diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib index 81185bcd5..a24b7e71d 100644 --- a/Classes/IncallViewController.xib +++ b/Classes/IncallViewController.xib @@ -2,21 +2,20 @@ 784 - 11C74 - 1938 - 1138.23 - 567.00 + 11E53 + 2840 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 YES - IBUIButton - IBUIImageView - IBUIViewController IBProxyObject IBUIActivityIndicatorView + IBUIButton + IBUIImageView IBUITableView IBUIView @@ -38,824 +37,781 @@ IBFirstResponder IBCocoaTouchFramework - - - - 274 - - YES - - - 292 - - YES - - - 292 - {320, 480} - - - - _NS:196 - - 3 - MCAwAA - - IBCocoaTouchFramework - - - - 292 - {{240, 354}, {80, 106}} - - - - - IBCocoaTouchFramework - - - - 292 - {{4, 428}, {28, 28}} - - - - _NS:567 - NO - IBCocoaTouchFramework - - - - 292 - {{141, 212}, {37, 37}} - - - - _NS:1030 - NO - IBCocoaTouchFramework - NO - YES - 0 + + + 274 + + YES + + + 292 + + YES + + + 292 + {320, 480} + + + _NS:196 + + 3 + MCAwAA + IBCocoaTouchFramework - {320, 460} - - - - _NS:196 - - 2 - MC4wNTQ5MDE5NjA3OCAwLjA4MjM1Mjk0MTE4IDAuMTI5NDExNzY0NwA + + + 292 + {{240, 354}, {80, 106}} + + + + IBCocoaTouchFramework - NO - IBCocoaTouchFramework - - - - 292 - {320, 66} - - - - - 1 - MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA + + + 292 + {{4, 428}, {28, 28}} + + + _NS:567 + NO + IBCocoaTouchFramework - NO - NO - 0.0 - IBCocoaTouchFramework - 0 - 0 - Change camera - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - NSImage - clavier-01-106px.png - - - Helvetica-Bold - Helvetica - 2 - 15 - - - Helvetica-Bold - 15 - 16 + + + 292 + {{141, 212}, {37, 37}} + + + _NS:1030 + NO + IBCocoaTouchFramework + NO + YES + 0 - - - 274 - {320, 251} - - - - _NS:418 - - YES - IBCocoaTouchFramework - YES - NO - 0 - YES - 44 - 22 - 22 + {320, 460} + + + _NS:196 + + 2 + MC4wNTQ5MDE5NjA3OCAwLjA4MjM1Mjk0MTE4IDAuMTI5NDExNzY0NwA - - - 292 - - YES - - - 292 - {{0, 1}, {320, 66}} - - - - - 1 - MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - stopcall-red.png - - - - - - - {{0, 393.5}, {320, 77}} - - - - _NS:196 - - IBCocoaTouchFramework + NO + IBCocoaTouchFramework + + + + 292 + {320, 66} + + + + 1 + MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA - - - 292 - - YES - - - 292 - {{80, 70}, {80, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - grouper.png - - - 2 - 17 - - - Helvetica-Bold - 17 - 16 - - - - - 292 - {{0, 4}, {107, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - mic_active.png - - - NSImage - micro_inverse.png - - - NSImage - micro.png - - - 2 - 2 - - - Helvetica-Bold - 18 - 16 - - - - - 292 - {{0, 70}, {80, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - ajouter.png - - - - - - - 292 - {{160, 70}, {80, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - Transfer - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - 2 - 15 - - - - - - 292 - {{240, 70}, {80, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - 1 - MCAwIDAAA - - - NSImage - contact.png - - - - - - - -2147483356 - {{240, 70}, {80, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - video - - - 3 - MC42NjY2NjY2NjY3AA - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - NSImage - clavier-01-160px.png - - - - - - - -2147483356 - {{261.5, 84.5}, {37, 37}} - - - - _NS:1030 - NO - IBCocoaTouchFramework - NO - 0 - - - - 292 - {{107, 4}, {106, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - clavier.png - - - - - - - 292 - {{213, 4}, {107, 66}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - HP_inverse.png - - - NSImage - HP.png - - - - - - - 292 - {{80, 70}, {80, 66}} - - - - - NO - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - NSImage - pause_inactif.png - - - NSImage - pause.png - - - - - - {{0, 258.5}, {320, 135}} - - - - - NO - NO - IBCocoaTouchFramework + NO + NO + 0.0 + IBCocoaTouchFramework + 0 + 0 + Change camera + + 3 + MQA - - - -2147483356 - - YES - - - 292 - {{119, 251}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - close - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 193}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 19}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 19}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 2 - - - - - - - - - 292 - {{207, 19}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 3 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 77}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 4 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 77}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 5 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{207, 77}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 6 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 135}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 7 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{119, 135}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 8 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{207, 135}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 9 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{31, 193}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - * - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{207, 193}, {82, 52}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - # - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - {{0, 71}, {320, 310}} - - - - - 3 - MC4yNAA - - NO - NO - IBCocoaTouchFramework + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + 3 + MC41AA + + + NSImage + clavier-01-106px.png + + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 - {{0, 20}, {320, 460}} - - - - - NO - IBCocoaTouchFramework - - - - 1 - 1 + + + 274 + {320, 251} + + + _NS:418 + + YES + IBCocoaTouchFramework + YES + NO + 0 + YES + 44 + 22 + 22 + + + + 292 + + YES + + + 292 + {{0, 1}, {320, 66}} + + + + 1 + MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + stopcall-red.png + + + + + + + {{0, 393.5}, {320, 77}} + + + _NS:196 + + IBCocoaTouchFramework + + + + 292 + + YES + + + 292 + {{80, 70}, {80, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + grouper.png + + + 2 + 17 + + + Helvetica-Bold + 17 + 16 + + + + + 292 + {{0, 4}, {107, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + mic_active.png + + + NSImage + micro_inverse.png + + + NSImage + micro.png + + + 2 + 2 + + + Helvetica-Bold + 18 + 16 + + + + + 292 + {{0, 70}, {80, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + ajouter.png + + + + + + + 292 + {{160, 70}, {80, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + Transfer + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + + 2 + 15 + + + + + + 292 + {{240, 70}, {80, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + 1 + MCAwIDAAA + darkTextColor + + + NSImage + contact.png + + + + + + + -2147483356 + {{240, 70}, {80, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 1 + video + + + 3 + MC42NjY2NjY2NjY3AA + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + + NSImage + clavier-01-160px.png + + + + + + + -2147483356 + {{261.5, 84.5}, {37, 37}} + + + _NS:1030 + NO + IBCocoaTouchFramework + NO + 0 + + + + 292 + {{107, 4}, {106, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + clavier.png + + + + + + + 292 + {{213, 4}, {107, 66}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + HP_inverse.png + + + NSImage + HP.png + + + + + + + 292 + {{80, 70}, {80, 66}} + + + + NO + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + + NSImage + pause_inactif.png + + + NSImage + pause.png + + + + + + {{0, 258.5}, {320, 135}} + + + + NO + NO + IBCocoaTouchFramework + + + + -2147483356 + + YES + + + 292 + {{119, 251}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + close + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 193}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 19}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 1 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 19}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 2 + + + + + + + + + 292 + {{207, 19}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 3 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 77}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 4 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 77}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 5 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{207, 77}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 6 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 135}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 7 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{119, 135}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 8 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{207, 135}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 9 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{31, 193}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + * + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{207, 193}, {82, 52}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + # + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + {{0, 71}, {320, 310}} + + + + 3 + MC4yNAA + + NO + NO + IBCocoaTouchFramework + + {320, 460} + + + + NO IBCocoaTouchFramework - NO @@ -863,11 +819,67 @@ YES - videoCallQuality + padSubView - + - 138 + 45 + + + + five + + + + 69 + + + + controlSubView + + + + 44 + + + + pause + + + + 115 + + + + seven + + + + 73 + + + + mergeCalls + + + + 114 + + + + zero + + + + 55 + + + + eight + + + + 75 @@ -879,35 +891,19 @@ - videoView + star - + - 133 + 56 - videoGroup + endCtrl - + - 129 - - - - addVideo - - - - 125 - - - - mergeCalls - - - - 114 + 99 @@ -927,11 +923,139 @@ - contacts + transfer - + - 84 + 150 + + + + three + + + + 60 + + + + nine + + + + 58 + + + + hangUpView + + + + 122 + + + + addVideo + + + + 125 + + + + two + + + + 59 + + + + videoGroup + + + + 129 + + + + close + + + + 51 + + + + videoView + + + + 133 + + + + hash + + + + 57 + + + + videoCallQuality + + + + 138 + + + + callTableView + + + + 109 + + + + videoUpdateIndicator + + + + 143 + + + + videoCameraSwitch + + + + 141 + + + + view + + + + 23 + + + + four + + + + 67 + + + + videoWaitingForFirstImage + + + + 145 @@ -949,54 +1073,6 @@ 82 - - - pause - - - - 115 - - - - controlSubView - - - - 44 - - - - callTableView - - - - 109 - - - - five - - - - 69 - - - - nine - - - - 58 - - - - seven - - - - 73 - six @@ -1005,62 +1081,6 @@ 71 - - - four - - - - 67 - - - - three - - - - 60 - - - - zero - - - - 55 - - - - two - - - - 59 - - - - close - - - - 51 - - - - hash - - - - 57 - - - - eight - - - - 75 - one @@ -1071,75 +1091,11 @@ - star + contacts - + - 56 - - - - padSubView - - - - 45 - - - - endCtrl - - - - 99 - - - - hangUpView - - - - 122 - - - - view - - - - 23 - - - - videoCameraSwitch - - - - 141 - - - - videoUpdateIndicator - - - - 143 - - - - videoWaitingForFirstImage - - - - 145 - - - - transfer - - - - 150 + 84 @@ -1168,14 +1124,6 @@ 101 - - - dataSource - - - - 107 - delegate @@ -1184,6 +1132,14 @@ 108 + + + dataSource + + + + 107 + @@ -1207,127 +1163,58 @@ - - 2 - - - YES - - - - 9 YES - - - - - + + + + + - + + + + 140 + + + camswitch 126 YES - - - + + + video - - 137 - - - videocallquality - - - 127 - - - preview - - - 132 - - - display - 26 YES - - - - - - - - - + + + + + + + + + controls - - 123 - - - video - - - 104 - - - merge - - - 16 - - - mute - - - 111 - - - addcall - - - 15 - - - contacts - - - 17 - - - dialer - - - 13 - - - speaker - - - 113 - - - pauseresume - 106 @@ -1338,23 +1225,39 @@ YES - - - - - - - - - - - - + + + + + + + + + + + + pad + + 120 + + + YES + + + + hangupview + + + 18 + + + end + 36 @@ -1434,26 +1337,10 @@ star - 120 - - - YES - - - - hangupview - - - 18 - - - end - - - 140 - - - camswitch + 147 + + + transfer 142 @@ -1461,16 +1348,76 @@ video_update_indicator + + 123 + + + video + + + 104 + + + merge + + + 16 + + + mute + + + 111 + + + addcall + + + 15 + + + contacts + + + 17 + + + dialer + + + 13 + + + speaker + + + 113 + + + pauseresume + 144 - 147 - - - transfer + 137 + + + videocallquality + + + 127 + + + preview + + + 132 + + + display @@ -1513,7 +1460,6 @@ 17.IBPluginDependency 18.CustomClassName 18.IBPluginDependency - 2.IBPluginDependency 26.IBPluginDependency 27.IBPluginDependency 29.IBPluginDependency @@ -1544,7 +1490,7 @@ 41.IBPluginDependency 9.IBPluginDependency - + YES IncallViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1584,7 +1530,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton @@ -1627,551 +1572,7 @@ 150 - - - YES - - IncallViewController - UIViewController - - doAction: - id - - - doAction: - - doAction: - id - - - - YES - - YES - addCall - addVideo - callTableView - close - conferenceDetail - contacts - controlSubView - dialer - eight - endCtrl - five - four - hangUpView - hash - mergeCalls - mute - nine - one - padSubView - pause - seven - six - speaker - star - three - transfer - two - videoCallQuality - videoCameraSwitch - videoGroup - videoPreview - videoUpdateIndicator - videoView - videoViewController - videoWaitingForFirstImage - zero - - - YES - UIButton - UIToggleVideoButton - UITableView - UIButton - UIViewController - UIButton - UIView - UIButton - UIButton - UIButton - UIButton - UIButton - UIView - UIButton - UIButton - UIButton - UIButton - UIButton - UIView - UIButton - UIButton - UIButton - UIButton - UIButton - UIButton - UIButton - UIButton - UIImageView - UICamSwitch - UIView - UIView - UIActivityIndicatorView - UIView - VideoViewController - UIActivityIndicatorView - UIButton - - - - YES - - YES - addCall - addVideo - callTableView - close - conferenceDetail - contacts - controlSubView - dialer - eight - endCtrl - five - four - hangUpView - hash - mergeCalls - mute - nine - one - padSubView - pause - seven - six - speaker - star - three - transfer - two - videoCallQuality - videoCameraSwitch - videoGroup - videoPreview - videoUpdateIndicator - videoView - videoViewController - videoWaitingForFirstImage - zero - - - YES - - addCall - UIButton - - - addVideo - UIToggleVideoButton - - - callTableView - UITableView - - - close - UIButton - - - conferenceDetail - UIViewController - - - contacts - UIButton - - - controlSubView - UIView - - - dialer - UIButton - - - eight - UIButton - - - endCtrl - UIButton - - - five - UIButton - - - four - UIButton - - - hangUpView - UIView - - - hash - UIButton - - - mergeCalls - UIButton - - - mute - UIButton - - - nine - UIButton - - - one - UIButton - - - padSubView - UIView - - - pause - UIButton - - - seven - UIButton - - - six - UIButton - - - speaker - UIButton - - - star - UIButton - - - three - UIButton - - - transfer - UIButton - - - two - UIButton - - - videoCallQuality - UIImageView - - - videoCameraSwitch - UICamSwitch - - - videoGroup - UIView - - - videoPreview - UIView - - - videoUpdateIndicator - UIActivityIndicatorView - - - videoView - UIView - - - videoViewController - VideoViewController - - - videoWaitingForFirstImage - UIActivityIndicatorView - - - zero - UIButton - - - - - IBProjectSource - ./Classes/IncallViewController.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - UIDigitButton - UIButton - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UIMuteButton - UIToggleButton - - IBProjectSource - ./Classes/UIMuteButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UIToggleVideoButton - UIButton - - videoUpdateIndicator - UIActivityIndicatorView - - - videoUpdateIndicator - - videoUpdateIndicator - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIToggleVideoButton.h - - - - VideoViewController - UIViewController - - YES - - YES - mCallQuality - mCallQualityLandLeft - mCallQualityLandRight - mCamSwitch - mCamSwitchLandLeft - mCamSwitchLandRight - mDisplay - mDisplayLandLeft - mDisplayLandRight - mHangUp - mHangUpLandLeft - mHangUpLandRight - mLandscapeLeft - mLandscapeRight - mMute - mMuteLandLeft - mMuteLandRight - mPortrait - mPreview - mPreviewLandLeft - mPreviewLandRight - - - YES - UIImageView - UIImageView - UIImageView - UICamSwitch - UICamSwitch - UICamSwitch - UIView - UIView - UIView - UIHangUpButton - UIHangUpButton - UIHangUpButton - UIView - UIView - UIMuteButton - UIMuteButton - UIMuteButton - UIView - UIView - UIView - UIView - - - - YES - - YES - mCallQuality - mCallQualityLandLeft - mCallQualityLandRight - mCamSwitch - mCamSwitchLandLeft - mCamSwitchLandRight - mDisplay - mDisplayLandLeft - mDisplayLandRight - mHangUp - mHangUpLandLeft - mHangUpLandRight - mLandscapeLeft - mLandscapeRight - mMute - mMuteLandLeft - mMuteLandRight - mPortrait - mPreview - mPreviewLandLeft - mPreviewLandRight - - - YES - - mCallQuality - UIImageView - - - mCallQualityLandLeft - UIImageView - - - mCallQualityLandRight - UIImageView - - - mCamSwitch - UICamSwitch - - - mCamSwitchLandLeft - UICamSwitch - - - mCamSwitchLandRight - UICamSwitch - - - mDisplay - UIView - - - mDisplayLandLeft - UIView - - - mDisplayLandRight - UIView - - - mHangUp - UIHangUpButton - - - mHangUpLandLeft - UIHangUpButton - - - mHangUpLandRight - UIHangUpButton - - - mLandscapeLeft - UIView - - - mLandscapeRight - UIView - - - mMute - UIMuteButton - - - mMuteLandLeft - UIMuteButton - - - mMuteLandRight - UIMuteButton - - - mPortrait - UIView - - - mPreview - UIView - - - mPreviewLandLeft - UIView - - - mPreviewLandRight - UIView - - - - - IBProjectSource - ./Classes/VideoViewController.h - - - - + 0 IBCocoaTouchFramework @@ -2203,7 +1604,7 @@ pause_inactif.png stopcall-red.png - + YES {107, 67} {107, 67} @@ -2221,6 +1622,6 @@ {62, 54} - 933 + 1926 diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib index da9802a57..0b50bac4f 100644 --- a/Classes/MoreViewController.xib +++ b/Classes/MoreViewController.xib @@ -2,33 +2,30 @@ 784 - 10J567 - 823 - 1038.35 - 462.00 + 11E53 + 2840 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 132 + 1926 - + YES - - - - + IBProxyObject + IBUIImageView + IBUILabel + IBUITableView + IBUITableViewCell + IBUITextView YES com.apple.InterfaceBuilder.IBCocoaTouchPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -40,66 +37,32 @@ IBFirstResponder IBCocoaTouchFramework - - - - 274 - {{0, 106}, {320, 247}} - - - 10 - - 549453824 - {84, 1} - - YES - - YES - - - - TU0AKgAAAVjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P8ADQEAAAMAAAABAFQAAAEB -AAMAAAABAAEAAAECAAMAAAAEAAAB+gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAAEAAAEXAAQAAAABAAABUAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - - - - - 3 - MCAwAA - - - groupTableViewBackgroundColor - - NO - YES - NO - IBCocoaTouchFramework - NO - 1 - 1 - 0 - YES - 44 - 10 - 10 - - - - 1 + + + 274 + {320, 247} + + + + 1 + MCAwIDAgMAA + groupTableViewBackgroundColor + NO + YES + NO IBCocoaTouchFramework - NO + NO + 1 + 1 + 0 + YES + 44 + 10 + 10 - + 292 YES @@ -125,11 +88,23 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 1 10 + + 1 + 17 + + + Helvetica + 17 + 16 + {300, 44} - + + 3 + MCAwAA + NO YES 4 @@ -138,19 +113,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA {320, 44} - 1 MSAxIDEAA NO IBCocoaTouchFramework - 1 1 - + 292 YES @@ -172,10 +145,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 1 MCAwIDAAA + darkTextColor 1 10 + + {300, 44} @@ -189,11 +165,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA {320, 44} - NO IBCocoaTouchFramework - 1 1 @@ -212,6 +186,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 292 {{28, -14}, {263, 154}} + NO NO 1 @@ -227,6 +202,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 292 {{9, 109}, {301, 89}} + NO YES YES @@ -241,12 +217,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 2 IBCocoaTouchFramework + + 292 {{28, 198}, {263, 21}} + NO YES 7 @@ -258,10 +237,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 1 10 1 + + - {322, 230} + {322, 229} + NO YES @@ -272,11 +254,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA {322, 230} + NO NO IBCocoaTouchFramework - 1 @@ -307,14 +289,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 46 - - - view - - - - 47 - creditText @@ -331,13 +305,23 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 50 + + + view + + + + 52 + YES 0 - + + YES + @@ -352,15 +336,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - 4 - - - YES - - - - 25 @@ -413,16 +388,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - 18 - - - 49 + + 51 + + + @@ -430,38 +405,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA YES -1.CustomClassName + -1.IBPluginDependency -2.CustomClassName - 18.IBEditorWindowLastContentRect - 18.IBPluginDependency - 25.IBEditorWindowLastContentRect + -2.IBPluginDependency 25.IBPluginDependency 34.IBPluginDependency - 38.IBEditorWindowLastContentRect 38.IBPluginDependency 39.IBPluginDependency - 4.IBEditorWindowLastContentRect - 4.IBPluginDependency - 42.IBEditorWindowLastContentRect 42.IBPluginDependency 43.IBPluginDependency 45.IBPluginDependency 49.IBPluginDependency + 51.IBPluginDependency - + YES MoreViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder - {{138, 864}, {320, 247}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{251, 502}, {320, 44}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{252, 1012}, {320, 44}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{79, 106}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{100, 713}, {322, 230}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -471,316 +438,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA YES - - YES - + YES - - YES - + - 50 - - - - YES - - MoreViewController - UITableViewController - - YES - - YES - console - credit - creditText - web - weburi - - - YES - UITableViewCell - UITableViewCell - UITextView - UITableViewCell - UILabel - - - - YES - - YES - console - credit - creditText - web - weburi - - - YES - - console - UITableViewCell - - - credit - UITableViewCell - - - creditText - UITextView - - - web - UITableViewCell - - - weburi - UILabel - - - - - IBProjectSource - Classes/MoreViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UIScrollView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIScrollView.h - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UITableView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITableView.h - - - - UITableViewCell - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITableViewCell.h - - - - UITableViewController - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITableViewController.h - - - - UITextView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITextView.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - + 52 + 0 IBCocoaTouchFramework @@ -789,19 +458,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 YES - ../linphone.xcodeproj 3 linphone-banner.png {300, 100} - 132 + 1926 diff --git a/Classes/PhoneViewController-ipad.xib b/Classes/PhoneViewController-ipad.xib index 0b5db5b31..14079f002 100644 --- a/Classes/PhoneViewController-ipad.xib +++ b/Classes/PhoneViewController-ipad.xib @@ -1,21 +1,20 @@ - 1296 + 1536 11E53 - 2182 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1181 + 1926 - IBUIViewController - IBUIButton - IBUIView - IBUITextField IBProxyObject + IBUIButton + IBUITextField + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -33,588 +32,509 @@ IBFirstResponder IBIPadFramework - - - - 274 - - - - 292 - - - - 292 - {{34, 20}, {699, 78}} - - - - - 3 - MQA - - NO - NO - IBIPadFramework - 0 - - sip: - - 3 - MAA - - 2 - - - YES - 15 - - 1 - 3 - IBCocoaTouchFramework - - 1 - - Helvetica - Helvetica - 0 - 36 - - - Helvetica - 36 - 16 + + + 274 + + + + 292 + + + + 292 + {{34, 20}, {699, 78}} + + + + 3 + MQA + + NO + NO + IBIPadFramework + 0 + + sip: + + 3 + MAA + + 2 - - - 292 - {{660, 25}, {66, 68}} - - - - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - effacer.png - - - Helvetica-Bold - Helvetica - 2 - 15 - - - Helvetica-Bold - 15 - 16 - + YES + 15 + + 1 + 3 + IBCocoaTouchFramework - - - 292 - {{413, 277}, {322, 66}} - - - - _NS:241 - NO - IBIPadFramework - 0 - 0 - Switch camera - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - clavier-01-108px.png - - - 2 - 15 - - + 1 + + Helvetica + Helvetica + 0 + 36 - - - -2147483356 - {{573, 112.5}, {160, 231}} - - - - NO - NO - IBIPadFramework - 0 - 0 - Back - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - clavier-01-160px.png - - - 2 - 2 - - - Helvetica-Bold - 18 - 16 - + + Helvetica + 36 + 16 - - - -2147483356 - {{415, 112}, {160, 231}} - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - startcall-green.png - - - - - - - - 292 - {{413, 111}, {320, 167}} - - - - NO - NO - IBIPadFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - startcall-gray.png - - - - - - - - - 292 - {{32, 112}, {107, 66}} - - - - - 1 - MC40MDAwMDAwMSAxIDEgMAA - - NO - NO - IBIPadFramework - 0 - 0 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - clavier-01-106px.png - - - - - - - 292 - {{139, 112}, {106, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 2 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{245, 112}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 3 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{245, 178}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 6 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{139, 178}, {106, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 5 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{32, 178}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 4 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{32, 244}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 7 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{139, 244}, {106, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 8 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{245, 244}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 9 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{139, 309}, {106, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - 0+ - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{32, 309}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - * - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{245, 309}, {107, 66}} - - - - NO - NO - IBIPadFramework - 0 - 0 - # - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{415, 351}, {320, 20}} - - - _NS:212 - - 3 - MCAwAA - - IBIPadFramework - - - {{0, 569}, {768, 386}} - - - - _NS:212 - - 3 - MC4zMzMzMzMzMzMzIDAuNQA - IBIPadFramework + + + 292 + {{660, 25}, {66, 68}} + + + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + effacer.png + + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 292 + {{413, 277}, {322, 66}} + + + _NS:241 + NO + IBIPadFramework + 0 + 0 + Switch camera + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + clavier-01-108px.png + + + 2 + 15 + + + + + + -2147483356 + {{573, 112.5}, {160, 231}} + + + NO + NO + IBIPadFramework + 0 + 0 + Back + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + clavier-01-160px.png + + + 2 + 2 + + + Helvetica-Bold + 18 + 16 + + + + + -2147483356 + {{415, 112}, {160, 231}} + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + startcall-green.png + + + + + + + + 292 + {{413, 111}, {320, 167}} + + + NO + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + startcall-gray.png + + + + + + + + + 292 + {{32, 112}, {107, 66}} + + + + 1 + MC40MDAwMDAwMSAxIDEgMAA + + NO + NO + IBIPadFramework + 0 + 0 + 1 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + clavier-01-106px.png + + + + + + + 292 + {{139, 112}, {106, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 2 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{245, 112}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 3 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{245, 178}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 6 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{139, 178}, {106, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 5 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{32, 178}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 4 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{32, 244}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 7 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{139, 244}, {106, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 8 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{245, 244}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 9 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{139, 309}, {106, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + 0+ + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{32, 309}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + * + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{245, 309}, {107, 66}} + + + NO + NO + IBIPadFramework + 0 + 0 + # + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{415, 351}, {320, 20}} + + + _NS:212 + + 3 + MCAwAA + + IBIPadFramework + + + {{0, 569}, {768, 386}} + + + _NS:212 + + 3 + MC4zMzMzMzMzMzMzIDAuNQA - - {{0, 20}, {768, 1004}} - - - - _NS:212 - - IBIPadFramework - - - 2 - - - 1 - 1 - + IBIPadFramework + + + {768, 1004} + + + _NS:212 + IBIPadFramework - NO - - - eight - - - - 45 - - - - five - - - - 47 - - - - hash - - - - 49 - - - - nine - - - - 50 - - - - one - - - - 51 - - - - seven - - - - 52 - star @@ -625,11 +545,11 @@ - three + eight - + - 57 + 45 @@ -641,11 +561,11 @@ - view + one - + - 59 + 51 @@ -655,22 +575,6 @@ 60 - - - address - - - - 39 - - - - erase - - - - 46 - backToCallView @@ -679,14 +583,6 @@ 40 - - - switchCamera - - - - 56 - callShort @@ -697,11 +593,11 @@ - callLarge + three - + - 41 + 57 @@ -713,11 +609,19 @@ - four + view - + - 63 + 59 + + + + nine + + + + 50 @@ -727,6 +631,70 @@ 64 + + + seven + + + + 52 + + + + erase + + + + 46 + + + + four + + + + 63 + + + + switchCamera + + + + 56 + + + + five + + + + 47 + + + + address + + + + 39 + + + + hash + + + + 49 + + + + callLarge + + + + 41 + @@ -747,113 +715,51 @@ - - 3 - - - - - - 4 - + 24 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - 33 - + 61 + + status_holder - 28 - + 18 + - - - 34 - - - - - 27 - - - - - 26 - - - - - 35 - - - - - 29 - - - - - 36 - - - - - 32 - - - - - 31 - - - - - 25 - - - - - 30 - - - - - 23 - - - Address + back 22 @@ -862,10 +768,10 @@ Erase - 18 - + 20 + - back + Call-large 38 @@ -879,16 +785,70 @@ Call-short - 20 - + 23 + - Call-large + Address - 61 - + 25 + + + + + 30 + + + + + 32 + + + + + 31 + + + + + 36 + + + + + 29 + + + + + 35 + + + + + 26 + + + + + 33 + + + + + 27 + + + + + 34 + + + + + 28 + - status_holder @@ -917,7 +877,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton @@ -942,188 +901,12 @@ 64 - - - - MainScreenWithVideoPreview - UIViewController - - PhoneViewController - UIWindow - - - - phoneMainView - PhoneViewController - - - window - UIWindow - - - - IBProjectSource - ./Classes/MainScreenWithVideoPreview.h - - - - PhoneViewController - UIViewController - - UITextField - UIButton - UIButton - UIButton - UIView - UIButton - UIEraseButton - UIButton - UIButton - UIButton - MainScreenWithVideoPreview - UITabBarController - UIButton - UIButton - UIButton - UIButton - UIButton - UILabel - UIView - UIButton - UIButton - UIButton - UIButton - - - - address - UITextField - - - backToCallView - UIButton - - - callLarge - UIButton - - - callShort - UIButton - - - dialerView - UIView - - - eight - UIButton - - - erase - UIEraseButton - - - five - UIButton - - - four - UIButton - - - hash - UIButton - - - mMainScreenWithVideoPreview - MainScreenWithVideoPreview - - - myTabBarController - UITabBarController - - - nine - UIButton - - - one - UIButton - - - seven - UIButton - - - six - UIButton - - - star - UIButton - - - status - UILabel - - - statusViewHolder - UIView - - - switchCamera - UIButton - - - three - UIButton - - - two - UIButton - - - zero - UIButton - - - - IBProjectSource - ./Classes/PhoneViewController.h - - - - UICallButton - UIButton - - IBProjectSource - ./Classes/UICallButton.h - - - - UIDigitButton - UIButton - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIEraseButton - UIButton - - IBProjectSource - ./Classes/UIEraseButton.h - - - - + 0 IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -1135,6 +918,6 @@ {60, 52} {60, 52} - 1181 + 1926 diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib index 60f3013c1..f66528a52 100644 --- a/Classes/PhoneViewController.xib +++ b/Classes/PhoneViewController.xib @@ -2,21 +2,20 @@ 784 - 11C74 - 1938 - 1138.23 - 567.00 + 11E53 + 2840 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 YES - IBUIViewController - IBUIButton - IBUIView - IBUITextField IBProxyObject + IBUIButton + IBUITextField + IBUIView YES @@ -36,680 +35,644 @@ IBFirstResponder IBCocoaTouchFramework - - - - 292 - - YES - - - 292 - - YES - - - 292 - {{254, 0}, {66, 81}} - - - - NO - IBCocoaTouchFramework - 0 - 0 - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - effacer.png - - - Helvetica-Bold - Helvetica - 2 - 15 - - - Helvetica-Bold - 15 - 16 - + + + 292 + + YES + + + 292 + + YES + + + 292 + {{254, 0}, {66, 81}} + + + NO + IBCocoaTouchFramework + 0 + 0 + + 3 + MQA - - - 292 - {{0, 1}, {255, 80}} - - - - - NO - NO - IBCocoaTouchFramework - 0 - - sip: - - 3 - MAA - - YES - 15 - - 1 - 3 - IBCocoaTouchFramework - - 1 - - Helvetica - Helvetica - 0 - 36 - - - Helvetica - 36 - 16 - + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + effacer.png + + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 - {320, 81} - - - - - IBCocoaTouchFramework - - - - 292 - {255, 20} - - - - _NS:196 - - 3 - MCAwAA - - IBCocoaTouchFramework - - - - 292 - {{0, 81}, {107, 66}} - - - - - 1 - MC40MDAwMDAwMSAxIDEgMAA - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - clavier-01-106px.png - - - - - - - 292 - {{107, 81}, {106, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 2 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - clavier-01-108px.png - - - - - - - 292 - {{213, 81}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 3 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{0, 147}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 4 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{107, 147}, {106, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 5 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{213, 147}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 6 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{0, 213}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 7 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{107, 213}, {106, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 8 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{213, 213}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 9 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{0, 279}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - * - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{107, 279}, {106, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 0+ - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{213, 279}, {107, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - # - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{160, 345}, {160, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Back - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - NSImage - clavier-01-160px.png - - - 2 - 2 - - - Helvetica-Bold - 18 - 16 + + + 292 + {254, 81} + + + + NO + NO + IBCocoaTouchFramework + 0 + + sip: + + 3 + MAA + + YES + 15 + + 1 + 3 + IBCocoaTouchFramework + + + NSImage + clavier-01-106px.png + + 1 + + Helvetica + Helvetica + 0 + 36 + + + Helvetica + 36 + 16 + - - - 292 - {{0, 345}, {160, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - startcall-gray.png - - - NSImage - startcall-green.png - - - - - + {320, 81} + + + + IBCocoaTouchFramework + + + + 292 + {255, 20} + + + _NS:196 + + 3 + MCAwAA - - - 292 - {{0, 345}, {320, 66}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - + IBCocoaTouchFramework + + + + 292 + {{0, 81}, {107, 66}} + + + + 1 + MC40MDAwMDAwMSAxIDEgMAA + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 1 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{107, 81}, {106, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 2 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + clavier-01-108px.png + + + + + + + 292 + {{213, 81}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 3 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{0, 147}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 4 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{107, 147}, {106, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 5 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{213, 147}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 6 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{0, 213}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 7 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{107, 213}, {106, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 8 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{213, 213}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 9 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{0, 279}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + * + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{107, 279}, {106, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 0+ + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{213, 279}, {107, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + # + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + 292 + {{160, 345}, {160, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 1 + Back + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + NSImage + clavier-01-160px.png + + + 2 + 2 + + + Helvetica-Bold + 18 + 16 - {{0, 20}, {320, 460}} - - - - - 5 - IBCocoaTouchFramework - - - - 1 - 1 + + + 292 + {{0, 345}, {160, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + startcall-gray.png + + + NSImage + startcall-green.png + + + + + + + + + 292 + {{0, 345}, {320, 66}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + + + {320, 460} + + + + 5 IBCocoaTouchFramework - NO YES - - - address - - - - 12 - view - + - 25 + 193 - eight + address - + - 43 - - - - five - - - - 44 - - - - four - - - - 45 - - - - hash - - - - 46 - - - - nine - - - - 47 - - - - one - - - - 48 - - - - seven - - - - 49 - - - - six - - - - 50 - - - - star - - - - 51 - - - - three - - - - 52 - - - - two - - - - 53 - - - - zero - - - - 54 - - - - dialerView - - - - 158 - - - - backToCallView - - - - 161 - - - - callShort - - - - 163 - - - - callLarge - - - - 164 - - - - statusViewHolder - - - - 169 + 194 erase - + - 151 + 195 + + + + statusViewHolder + + + + 196 + + + + one + + + + 197 + + + + two + + + + 198 + + + + three + + + + 199 + + + + four + + + + 200 + + + + five + + + + 201 + + + + six + + + + 202 + + + + seven + + + + 203 + + + + eight + + + + 204 + + + + nine + + + + 205 + + + + star + + + + 206 + + + + zero + + + + 207 + + + + hash + + + + 208 + + + + backToCallView + + + + 209 + + + + callShort + + + + 210 + + + + callLarge + + + + 211 delegate - + - 19 + 192 @@ -735,144 +698,135 @@ - 80 - + 172 + YES - + + + + + + + + + + + + + + + + + - 1 - - - YES - - - - - - - - - - - - - - - - - - - - - - 38 - - - - - 37 - - - - - 29 - - - - - 39 - - - - - 5 - - - Call-short - - - 35 - - - - - 41 - - - - - 40 - - - - - 36 - - - - - 34 - - - - - 33 - - - - - 31 - - - - - 30 - - - - - 157 - - - YES - - - - - Dialer - - - 4 - - - Address - - - 160 - - - back - - - 162 - - - Call-large - - - 165 - - + 173 + + status_view - 150 - - + 174 + + + + + 175 + + + + + 176 + + + + + 177 + + + + + 178 + + + + + 179 + + + + + 180 + + + + + 181 + + + + + 182 + + + Call-large + + + 183 + + + Call-short + + + 184 + + + back + + + 185 + + + YES + + + + + Dialer + + + 186 + + + + + 187 + + + + + 188 + + + + + 189 + + + + + 190 + + + Address + + + 191 + + Erase @@ -885,47 +839,46 @@ -1.IBPluginDependency -2.CustomClassName -2.IBPluginDependency - 1.IBPluginDependency - 1.IBUserGuides - 150.CustomClassName - 150.IBPluginDependency - 157.IBPluginDependency - 160.IBPluginDependency - 162.CustomClassName - 162.IBPluginDependency - 162.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 165.IBPluginDependency - 29.CustomClassName - 29.IBPluginDependency - 30.CustomClassName - 30.IBPluginDependency - 31.CustomClassName - 31.IBPluginDependency - 33.CustomClassName - 33.IBPluginDependency - 34.CustomClassName - 34.IBPluginDependency - 35.CustomClassName - 35.IBPluginDependency - 36.CustomClassName - 36.IBPluginDependency - 37.CustomClassName - 37.IBPluginDependency - 38.CustomClassName - 38.IBPluginDependency - 39.CustomClassName - 39.IBPluginDependency - 4.IBPluginDependency - 40.CustomClassName - 40.IBPluginDependency - 41.CustomClassName - 41.IBPluginDependency - 5.CustomClassName - 5.IBPluginDependency - 5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 80.IBPluginDependency + 172.IBPluginDependency + 172.IBUserGuides + 173.IBPluginDependency + 174.CustomClassName + 174.IBPluginDependency + 175.CustomClassName + 175.IBPluginDependency + 176.CustomClassName + 176.IBPluginDependency + 177.CustomClassName + 177.IBPluginDependency + 178.CustomClassName + 178.IBPluginDependency + 179.CustomClassName + 179.IBPluginDependency + 180.CustomClassName + 180.IBPluginDependency + 181.CustomClassName + 181.IBPluginDependency + 182.CustomClassName + 182.IBPluginDependency + 182.IBUIButtonInspectorSelectedStateConfigurationMetadataKey + 183.CustomClassName + 183.IBPluginDependency + 183.IBUIButtonInspectorSelectedStateConfigurationMetadataKey + 184.IBPluginDependency + 185.IBPluginDependency + 186.CustomClassName + 186.IBPluginDependency + 187.CustomClassName + 187.IBPluginDependency + 188.CustomClassName + 188.IBPluginDependency + 189.CustomClassName + 189.IBPluginDependency + 190.IBPluginDependency + 191.CustomClassName + 191.IBPluginDependency - + YES PhoneViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -935,53 +888,52 @@ YES - + 412 1 - + 65 1 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UICallButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UICallButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIEraseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UICallButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UICallButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -996,264 +948,9 @@ - 169 - - - - YES - - MainScreenWithVideoPreview - UIViewController - - YES - - YES - phoneMainView - window - - - YES - PhoneViewController - UIWindow - - - - YES - - YES - phoneMainView - window - - - YES - - phoneMainView - PhoneViewController - - - window - UIWindow - - - - - IBProjectSource - ./Classes/MainScreenWithVideoPreview.h - - - - PhoneViewController - UIViewController - - YES - - YES - address - backToCallView - callLarge - callShort - dialerView - eight - erase - five - four - hash - mMainScreenWithVideoPreview - myTabBarController - nine - one - seven - six - star - status - statusViewHolder - switchCamera - three - two - zero - - - YES - UITextField - UIButton - UIButton - UIButton - UIView - UIButton - UIEraseButton - UIButton - UIButton - UIButton - MainScreenWithVideoPreview - UITabBarController - UIButton - UIButton - UIButton - UIButton - UIButton - UILabel - UIView - UIButton - UIButton - UIButton - UIButton - - - - YES - - YES - address - backToCallView - callLarge - callShort - dialerView - eight - erase - five - four - hash - mMainScreenWithVideoPreview - myTabBarController - nine - one - seven - six - star - status - statusViewHolder - switchCamera - three - two - zero - - - YES - - address - UITextField - - - backToCallView - UIButton - - - callLarge - UIButton - - - callShort - UIButton - - - dialerView - UIView - - - eight - UIButton - - - erase - UIEraseButton - - - five - UIButton - - - four - UIButton - - - hash - UIButton - - - mMainScreenWithVideoPreview - MainScreenWithVideoPreview - - - myTabBarController - UITabBarController - - - nine - UIButton - - - one - UIButton - - - seven - UIButton - - - six - UIButton - - - star - UIButton - - - status - UILabel - - - statusViewHolder - UIView - - - switchCamera - UIButton - - - three - UIButton - - - two - UIButton - - - zero - UIButton - - - - - IBProjectSource - ./Classes/PhoneViewController.h - - - - UICallButton - UIButton - - IBProjectSource - ./Classes/UICallButton.h - - - - UIDigitButton - UIButton - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIEraseButton - UIButton - - IBProjectSource - ./Classes/UIEraseButton.h - - - + 211 + 0 IBCocoaTouchFramework @@ -1277,7 +974,7 @@ startcall-gray.png startcall-green.png - + YES {106, 60} {108, 60} @@ -1287,6 +984,6 @@ {60, 52} - 933 + 1926 diff --git a/Classes/VideoViewController-ipad.xib b/Classes/VideoViewController-ipad.xib index 01b0daa4c..af69e442d 100644 --- a/Classes/VideoViewController-ipad.xib +++ b/Classes/VideoViewController-ipad.xib @@ -1,20 +1,20 @@ - 1280 - 11C74 - 1938 - 1138.23 - 567.00 + 1536 + 11E53 + 2840 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 + IBProxyObject IBUIButton IBUIImageView IBUIView - IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -38,7 +38,6 @@ {768, 1024} - 4 MAA @@ -46,7 +45,7 @@ IBIPadFramework - + 274 @@ -54,7 +53,6 @@ 292 {768, 1024} - _NS:569 NO @@ -65,7 +63,6 @@ 292 {{329, 962}, {108, 62}} - NO IBIPadFramework @@ -108,7 +105,6 @@ 292 {{223, 962}, {108, 62}} - NO IBIPadFramework @@ -129,8 +125,6 @@ 292 {{598, 799}, {170, 225}} - - 3 MQA @@ -145,7 +139,6 @@ 292 {{436, 962}, {108, 62}} - NO IBIPadFramework @@ -168,7 +161,6 @@ 292 {{20, 976}, {28, 28}} - _NS:567 NO @@ -176,8 +168,6 @@ {768, 1024} - - _NS:212 @@ -187,7 +177,7 @@ IBIPadFramework - + 274 @@ -195,7 +185,6 @@ 292 {1024, 768} - _NS:569 NO @@ -206,7 +195,6 @@ 292 {{799, 598}, {225, 170}} - 3 MQA @@ -219,7 +207,6 @@ 292 {{351, 706}, {108, 62}} - NO IBIPadFramework @@ -240,7 +227,6 @@ 292 {{458, 706}, {108, 62}} - NO IBIPadFramework @@ -262,7 +248,6 @@ 292 {{565, 706}, {108, 62}} - NO IBIPadFramework @@ -285,15 +270,12 @@ 292 {{20, 720}, {28, 28}} - _NS:567 NO IBIPadFramework {1024, 768} - - _NS:212 @@ -307,7 +289,7 @@ IBIPadFramework - + 274 @@ -315,7 +297,6 @@ 292 {1024, 768} - _NS:569 NO @@ -326,7 +307,6 @@ 292 {{799, 598}, {225, 170}} - 3 MQA @@ -339,7 +319,6 @@ 292 {{351, 706}, {108, 62}} - NO IBIPadFramework @@ -360,7 +339,6 @@ 292 {{458, 706}, {108, 62}} - NO IBIPadFramework @@ -382,7 +360,6 @@ 292 {{565, 706}, {108, 62}} - NO IBIPadFramework @@ -405,15 +382,12 @@ 292 {{20, 720}, {28, 28}} - _NS:567 NO IBIPadFramework {1024, 768} - - _NS:212 @@ -988,6 +962,6 @@ {108, 60} {62, 54} - 933 + 1926 diff --git a/README b/README index 774b58245..08bca016a 100644 --- a/README +++ b/README @@ -8,9 +8,9 @@ BUILD PREQUISITES Linphone for iPhone depends on liblinphone sdk. This SDK is generated from makefiles and shell scripts. You must first install both xcode with iPhone OS SDK and MacPorts (www.macports.org) for these scripts to work. -Once xccode and macports are installed, open a terminal and install the required build-time tools with: +Once xcode and macports are installed, open a terminal and install the required build-time tools with: - $ sudo port install nawk coreutils automake autoconf libtool intltool wget pkgconfig cmake yasm doxygen + $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : @@ -50,8 +50,8 @@ BUILDING THE SDK $ cd submodules/build $ make all enable_gpl_third_parties=no -xcode 4.5i/ios6 beta do: - $ make -f Makefile.ios6-beta +xcode prior to 4.5: + $ make -f Makefile.xcode4.4 * ZRTP support You can enable ZRTP support in GPL mode only, by adding "enable_zrtp=yes" to the make command, for example: diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 276688bb4..bb1fd7a6c 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa + && make -f builder-iphone-os.mk ipa \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin clean + && make -f builder-iphone-os.mk clean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile + && make -f builder-iphone-os.mk clean-makefile \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean + && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ diff --git a/submodules/build/Makefile.ios6-beta b/submodules/build/Makefile.xcode4.4 similarity index 76% rename from submodules/build/Makefile.ios6-beta rename to submodules/build/Makefile.xcode4.4 index bb1fd7a6c..276688bb4 100644 --- a/submodules/build/Makefile.ios6-beta +++ b/submodules/build/Makefile.xcode4.4 @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk ipa \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk clean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk clean-makefile \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk veryclean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 35e345620..d481f90a5 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -115,7 +115,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 8b65258a9..8cf0564ec 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -34,6 +34,9 @@ clean-libvpx: veryclean-libvpx: -cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean + cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \ + && git checkout build/make/configure.sh configure\ + && rm -f patched.stamp rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir) clean-makefile-libvpx: From 6626abed2a0436892a7482c18802958d1ef0dce9 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 8 Oct 2012 11:51:22 +0200 Subject: [PATCH 09/30] Fix GSM handle issue with iOS6 --- Classes/LinphoneAppDelegate.h | 4 --- Classes/LinphoneAppDelegate.m | 51 +--------------------------- Classes/LinphoneUI/LinphoneManager.h | 2 ++ Classes/LinphoneUI/LinphoneManager.m | 49 +++++++++++++++++++++++++- 4 files changed, 51 insertions(+), 55 deletions(-) diff --git a/Classes/LinphoneAppDelegate.h b/Classes/LinphoneAppDelegate.h index f5e9508a1..b2e027c43 100644 --- a/Classes/LinphoneAppDelegate.h +++ b/Classes/LinphoneAppDelegate.h @@ -20,7 +20,6 @@ #import #import -#import "CoreTelephony/CTCallCenter.h" #define DIALER_TAB_INDEX 1 #define CONTACTS_TAB_INDEX 2 @@ -40,13 +39,10 @@ IBOutlet PhoneViewController* myPhoneViewController; CallHistoryTableViewController* myCallHistoryTableViewController; ContactPickerDelegate* myContactPickerDelegate; - - CTCallCenter* callCenter; } - (void) loadDefaultSettings:(NSDictionary *) appDefaults; -(void) setupUI; --(void) setupGSMInteraction; -(void) startApplication; diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 8162f851d..f430b7873 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -46,25 +46,6 @@ int __aeabi_idiv(int a, int b) { @synthesize myPeoplePickerController; @synthesize myPhoneViewController; --(void) handleGSMCallInteration: (id) cCenter { - CTCallCenter* ct = (CTCallCenter*) cCenter; - - int callCount = [ct.currentCalls count]; - if (!callCount) { - NSLog(@"No GSM call -> enabling SIP calls"); - linphone_core_set_max_calls([LinphoneManager getLc], 3); - } else { - NSLog(@"%d GSM call(s) -> disabling SIP calls", callCount); - /* pause current call, if any */ - LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); - if (call) { - NSLog(@"Pausing SIP call"); - linphone_core_pause_call([LinphoneManager getLc], call); - } - linphone_core_set_max_calls([LinphoneManager getLc], 0); - } -} - -(void)applicationWillResignActive:(UIApplication *)application { LinphoneCore* lc = [LinphoneManager getLc]; LinphoneCall* call = linphone_core_get_current_call(lc); @@ -84,13 +65,7 @@ int __aeabi_idiv(int a, int b) { } - (void)applicationDidEnterBackground:(UIApplication *)application { if (![[LinphoneManager instance] enterBackgroundMode]) { - // destroying eventHandler if app cannot go in background. - // Otherwise if a GSM call happen and Linphone is resumed, - // the handler will be called before LinphoneCore is built. - // Then handler will be restored in appDidBecomeActive cb - callCenter.callEventHandler = nil; - [callCenter release]; - callCenter = nil; + } } - (void)applicationDidBecomeActive:(UIApplication *)application { @@ -105,18 +80,6 @@ int __aeabi_idiv(int a, int b) { [[LinphoneManager instance] becomeActive]; - if (callCenter == nil) { - callCenter = [[CTCallCenter alloc] init]; - callCenter.callEventHandler = ^(CTCall* call) { - // post on main thread - [self performSelectorOnMainThread:@selector(handleGSMCallInteration:) - withObject:callCenter - waitUntilDone:YES]; - }; - } - // check call state at startup - [self handleGSMCallInteration:callCenter]; - LinphoneCore* lc = [LinphoneManager getLc]; LinphoneCall* call = linphone_core_get_current_call(lc); if (call == NULL) @@ -213,16 +176,6 @@ int __aeabi_idiv(int a, int b) { [UIDevice currentDevice].batteryMonitoringEnabled = YES; } --(void) setupGSMInteraction { - callCenter = [[CTCallCenter alloc] init]; - callCenter.callEventHandler = ^(CTCall* call) { - // post on main thread - [self performSelectorOnMainThread:@selector(handleGSMCallInteration:) - withObject:callCenter - waitUntilDone:YES]; - }; -} - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: @"NO", @"enable_first_login_view_preference", // @@ -258,8 +211,6 @@ int __aeabi_idiv(int a, int b) { [[LinphoneManager instance] startLibLinphone]; [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound]; - - [self setupGSMInteraction]; } diff --git a/Classes/LinphoneUI/LinphoneManager.h b/Classes/LinphoneUI/LinphoneManager.h index 691ebd14f..8e5932e73 100644 --- a/Classes/LinphoneUI/LinphoneManager.h +++ b/Classes/LinphoneUI/LinphoneManager.h @@ -23,6 +23,7 @@ #include "linphonecore.h" #import "LogView.h" #import "LinphoneUIDelegates.h" +#import "CoreTelephony/CTCallCenter.h" typedef enum _Connectivity { wifi, @@ -66,6 +67,7 @@ typedef struct _LinphoneCallAppData { const char* backCamId; NSDictionary* currentSettings; + CTCallCenter* callCenter; @public CallContext currentCallContextBeforeGoingBackground; diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 8345c50d4..26be8f942 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -820,7 +820,16 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach } } -(void) destroyLibLinphone { - [mIterateTimer invalidate]; + [mIterateTimer invalidate]; + + // destroying eventHandler if app cannot go in background. + // Otherwise if a GSM call happen and Linphone is resumed, + // the handler will be called before LinphoneCore is built. + // Then handler will be restored in appDidBecomeActive cb + callCenter.callEventHandler = nil; + [callCenter release]; + callCenter = nil; + AVAudioSession *audioSession = [AVAudioSession sharedInstance]; [audioSession setDelegate:nil]; if (theLinphoneCore != nil) { //just in case application terminate before linphone core initialization @@ -961,6 +970,8 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach #if HAVE_G729 libmsbcg729_init(); // load g729 plugin #endif + + [self setupGSMInteraction]; /* Initialize linphone core*/ NSLog(@"Create linphonecore"); @@ -1070,6 +1081,13 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach } /*IOS specific*/ linphone_core_start_dtmf_stream(theLinphoneCore); + + //call center is unrelialable on the long run, so we change it each time the application is resumed. To avoid zombie GSM call + [self setupGSMInteraction]; + + //to make sure presence status is correct + if ([callCenter currentCalls]==nil) + linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService); } -(void) registerLogView:(id) view { @@ -1088,6 +1106,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach ms_message("Sound interruption ended!"); //let the user resume the call manually. } + +(BOOL) runningOnIpad { #ifdef UI_USER_INTERFACE_IDIOM return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad); @@ -1106,5 +1125,33 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach ms_message("UI - '%s' pressed", name); } +#pragma GSM management +-(void) setupGSMInteraction { + if (callCenter != nil) + [callCenter release]; + + callCenter = [[CTCallCenter alloc] init]; + callCenter.callEventHandler = ^(CTCall* call) { + // post on main thread + [self performSelectorOnMainThread:@selector(handleGSMCallInteration:) + withObject:callCenter + waitUntilDone:YES]; + }; +} + +-(void) handleGSMCallInteration: (id) cCenter { + CTCallCenter* ct = (CTCallCenter*) cCenter; + /* pause current call, if any */ + LinphoneCall* call = linphone_core_get_current_call(theLinphoneCore); + if ([ct currentCalls]!=nil) { + if (call) { + NSLog(@"Pausing SIP call"); + linphone_core_pause_call(theLinphoneCore, call); + } + //set current status to busy + linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusBusy); + } else + linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService); +} @end From 2e4f912d6293cac270e447f2d7a5025cd0db37de Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 8 Oct 2012 12:52:04 +0200 Subject: [PATCH 10/30] Fix incall view issue after gsm call --- Classes/LinphoneAppDelegate.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index f430b7873..edd7e5b43 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -94,6 +94,7 @@ int __aeabi_idiv(int a, int b) { instance->currentCallContextBeforeGoingBackground.cameraIsEnabled); } instance->currentCallContextBeforeGoingBackground.call = 0; + [myPhoneViewController displayCall:call InProgressFromUI:nil forUser:nil withDisplayName:nil]; } } From 5bc0e9e7d2a5da093b74a0ce5c82105953cd9f68 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 19 Oct 2012 14:09:42 +0200 Subject: [PATCH 11/30] answer busy if incomming call while GSM call in progress Conflicts: Classes/LinphoneManager.m submodules/linphone --- Classes/LinphoneUI/LinphoneManager.m | 21 +++++++++++++++++++-- submodules/linphone | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 26be8f942..f4f6a0bfb 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -166,7 +166,16 @@ extern void libmsbcg729_init(); } switch (new_state) { - case LinphoneCallIncomingReceived: + case LinphoneCallIncomingReceived: + /*first step is to re-enable ctcall center*/ + [self setupGSMInteraction]; + + /*should we reject this call ?*/ + if ([callCenter currentCalls]!=nil) { + ms_message("Mobile call ongoing... rejecting call from [%s]",linphone_address_get_username(linphone_call_get_call_log(call)->from)); + linphone_core_decline_call([LinphoneManager getLc], call, LinphoneReasonBusy); + return; + } [callDelegate displayIncomingCall:call NotificationFromUI:mCurrentViewController forUser:lUserName @@ -872,6 +881,12 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach } //kick up network cnx, just in case [self kickOffNetworkConnection]; + + [self setupGSMInteraction]; + //to make sure presence status is correct + if ([callCenter currentCalls]==nil) + linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService); + [self refreshRegisters]; linphone_core_iterate(theLinphoneCore); } @@ -1128,8 +1143,10 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach #pragma GSM management -(void) setupGSMInteraction { - if (callCenter != nil) + if (callCenter != nil) { + callCenter.callEventHandler=NULL; [callCenter release]; + } callCenter = [[CTCallCenter alloc] init]; callCenter.callEventHandler = ^(CTCall* call) { diff --git a/submodules/linphone b/submodules/linphone index 1cbe09869..e829fa6e2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1cbe098692da4ad2a511bd677994c50d3716f314 +Subproject commit e829fa6e222f37de9c26e4e82f0227078f4b6629 From fed41709b5d5324b353f3e3ae169acb6025426f8 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 31 Oct 2012 21:38:33 +0100 Subject: [PATCH 12/30] Fix SILK compilation issue --- submodules/mssilk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mssilk b/submodules/mssilk index 391b6d6b0..68b3e2762 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40 +Subproject commit 68b3e276277e5ec46a381498b4d5714ad69fac1b From c96be98316ab42dda4602e0e4e42646b79a78cd6 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 6 Nov 2012 06:11:13 +0100 Subject: [PATCH 13/30] fix compilation issue bringed from linphone submodule --- Classes/IncallViewController.m | 2 +- Classes/LinphoneUI/LinphoneManager.m | 4 ++-- Classes/LinphoneUI/UICallButton.m | 2 +- Classes/PhoneViewController.m | 2 +- linphone.xcodeproj/project.pbxproj | 12 ++++++++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index 0768fa60d..221abbd0b 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -357,7 +357,7 @@ void addAnimationFadeTransition(UIView* view, float duration) { if (fullUpdate) { videoUpdateIndicator.hidden = YES; LinphoneCallState state = linphone_call_get_state(currentCall); - if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) { + if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdating || state == LinphoneCallUpdatedByRemote) { if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) { [addVideo setTitle:NSLocalizedString(@"-video", nil) forState:UIControlStateNormal]; [IncallViewController updateIndicator: videoCallQuality withCallQuality:linphone_call_get_average_quality(currentCall)]; diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index f4f6a0bfb..f12b7eb74 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -211,7 +211,7 @@ extern void libmsbcg729_init(); } break; } - case LinphoneCallUpdated: + case LinphoneCallUpdating: { const LinphoneCallParams* current = linphone_call_get_current_params(call); if (linphone_call_params_video_enabled(current)) { @@ -467,7 +467,7 @@ static LinphoneCoreVTable linphonec_vtable = { -(void) configurePayloadType:(const char*) type fromPrefKey: (NSString*)key withRate:(int)rate { if ([[NSUserDefaults standardUserDefaults] boolForKey:key]) { PayloadType* pt; - if((pt = linphone_core_find_payload_type(theLinphoneCore,type,rate))) { + if((pt = linphone_core_find_payload_type(theLinphoneCore,type,rate,1))) { linphone_core_enable_payload_type(theLinphoneCore,pt, TRUE); } } diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m index 6957344e5..0df070afa 100644 --- a/Classes/LinphoneUI/UICallButton.m +++ b/Classes/LinphoneUI/UICallButton.m @@ -35,7 +35,7 @@ static BOOL transferMode = NO; } -(void) touchUp:(id) sender { - if (!linphone_core_is_network_reachabled([LinphoneManager getLc])) { + if (!linphone_core_is_network_reachable([LinphoneManager getLc])) { UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Network Error",nil) message:NSLocalizedString(@"There is no network connection available, enable WIFI or WWAN prior to place a call",nil) delegate:nil diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 66ca69f2a..0b84d420c 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -77,7 +77,7 @@ if (config == NULL) { s = LinphoneRegistrationNone; - m = linphone_core_is_network_reachabled([LinphoneManager getLc]) ? NSLocalizedString(@"No SIP account configured", nil) : NSLocalizedString(@"Network down", nil); + m = linphone_core_is_network_reachable([LinphoneManager getLc]) ? NSLocalizedString(@"No SIP account configured", nil) : NSLocalizedString(@"Network down", nil); } else { s = linphone_proxy_config_get_state(config); diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 151ea09df..7fd193b5c 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -103,6 +103,10 @@ 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; 227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; + 228390511648CAD7008A0F2C /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */; }; + 228390521648CAD7008A0F2C /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 228390501648CAD7008A0F2C /* libmediastreamer_voip.a */; }; + 228390531648D31B008A0F2C /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */; }; + 228390541648D31F008A0F2C /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 228390501648CAD7008A0F2C /* libmediastreamer_voip.a */; }; 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 228B19AF130290C500F154D3 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; }; 22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; @@ -505,6 +509,8 @@ 227BCDBF10D4004600FBFD76 /* CallHistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallHistoryTableViewController.h; sourceTree = ""; }; 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallHistoryTableViewController.m; sourceTree = ""; }; 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CallHistoryTableViewController.xib; sourceTree = ""; }; + 2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; + 228390501648CAD7008A0F2C /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = ""; }; 228697C311AC29B800E9E0CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 228B19AE130290C500F154D3 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = text; name = iTunesArtwork; path = Resources/iTunesArtwork; sourceTree = ""; }; 22968A5D12F875C600588287 /* UISpeakerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISpeakerButton.h; sourceTree = ""; }; @@ -713,6 +719,8 @@ 226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */, 226183AE1472527D0037138E /* libsrtp.a in Frameworks */, 226183B0147259670037138E /* libmssilk.a in Frameworks */, + 228390531648D31B008A0F2C /* libmediastreamer_base.a in Frameworks */, + 228390541648D31F008A0F2C /* libmediastreamer_voip.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -720,6 +728,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 228390511648CAD7008A0F2C /* libmediastreamer_base.a in Frameworks */, + 228390521648CAD7008A0F2C /* libmediastreamer_voip.a in Frameworks */, 34075199150645A300B89C47 /* CoreTelephony.framework in Frameworks */, 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, 22D8F15C147548E2008C97DB /* QuartzCore.framework in Frameworks */, @@ -1135,6 +1145,8 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */, + 228390501648CAD7008A0F2C /* libmediastreamer_voip.a */, 340751961506459A00B89C47 /* CoreTelephony.framework */, 226CDADD14E2D0B800513B67 /* libbcg729.a */, 226CDADE14E2D0B800513B67 /* libmsbcg729.a */, From 25a5a99bb0e03fe05c440c5b61dbff264eb5a41f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 6 Nov 2012 14:21:23 +0100 Subject: [PATCH 14/30] clean build file --- linphone.xcodeproj/project.pbxproj | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 7fd193b5c..4b927271b 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -279,7 +279,6 @@ 70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; }; F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; }; - F476004C147AAF4600FFF19B /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB8F147555C800DEE054 /* libmediastreamer.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -430,7 +429,6 @@ 220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; 220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneMainView.xib; sourceTree = ""; }; - 2211DB8F147555C800DEE054 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; 2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; 2211DB94147564B400DEE054 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = "nogpl-thirdparties/Settings.bundle"; sourceTree = ""; }; 2211DBBB14769C8200DEE054 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = ""; }; @@ -679,7 +677,6 @@ 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */, 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */, 344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */, - F476004C147AAF4600FFF19B /* libmediastreamer.a in Frameworks */, F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */, 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */, @@ -728,34 +725,34 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 228390511648CAD7008A0F2C /* libmediastreamer_base.a in Frameworks */, - 228390521648CAD7008A0F2C /* libmediastreamer_voip.a in Frameworks */, 34075199150645A300B89C47 /* CoreTelephony.framework in Frameworks */, - 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, 22D8F15C147548E2008C97DB /* QuartzCore.framework in Frameworks */, 22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */, 22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */, 22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */, - 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, - 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */, 22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */, 22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */, 22D8F167147548E2008C97DB /* CoreGraphics.framework in Frameworks */, 22D8F168147548E2008C97DB /* CoreAudio.framework in Frameworks */, 22D8F169147548E2008C97DB /* AudioToolbox.framework in Frameworks */, + 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, + 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, + 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, + 22D8F173147548E2008C97DB /* SystemConfiguration.framework in Frameworks */, + 22D8F176147548E2008C97DB /* CFNetwork.framework in Frameworks */, + 228390511648CAD7008A0F2C /* libmediastreamer_base.a in Frameworks */, + 228390521648CAD7008A0F2C /* libmediastreamer_voip.a in Frameworks */, + 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, + 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, + 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */, 22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */, 22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */, 22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */, 22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */, 22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */, 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */, - 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, - 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, - 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, - 22D8F173147548E2008C97DB /* SystemConfiguration.framework in Frameworks */, 22D8F174147548E2008C97DB /* libilbc.a in Frameworks */, 22D8F175147548E2008C97DB /* libmsilbc.a in Frameworks */, - 22D8F176147548E2008C97DB /* CFNetwork.framework in Frameworks */, 22D8F177147548E2008C97DB /* libortp.a in Frameworks */, 22D8F178147548E2008C97DB /* libresolv.dylib in Frameworks */, 22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */, @@ -1155,7 +1152,6 @@ 344ABDE71484E723007420B6 /* libzrtpcpp.a */, 2211DB9614764F6B00DEE054 /* nogpl-thirdparties */, 2211DB911475562600DEE054 /* liblinphone.a */, - 2211DB8F147555C800DEE054 /* libmediastreamer.a */, 226183AF147259670037138E /* libmssilk.a */, 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */, 226183AB1472527D0037138E /* libsrtp.a */, From ee3735c2d194dbbba1c993afd01af4d18ee9f3e6 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 3 Dec 2012 17:18:41 +0100 Subject: [PATCH 15/30] Fix profile and versions Conflicts: linphone-Info.plist --- linphone-Info.plist | 4 ++-- linphone.xcodeproj/project.pbxproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linphone-Info.plist b/linphone-Info.plist index 0cd918ae3..40643746c 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -42,7 +42,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.3 + 3.5.99 CFBundleURLTypes @@ -59,7 +59,7 @@ CFBundleVersion - 2.0 + 2.0.1 NSMainNibFile LinphoneApp NSMainNibFile~ipad diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 824e77e6c..f617ab8ee 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5619,7 +5619,7 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = "075921BC-C7D8-42E1-B864-F05FD9BF841C"; + PROVISIONING_PROFILE = "C7F794BC-6D48-41F2-B37D-E1B1B1A40901"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; From f9f2a81fe3fead599727c376e6140592b79c56d7 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 4 Dec 2012 11:52:49 +0100 Subject: [PATCH 16/30] Update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 243016a97..3c4bd90ba 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 243016a976f22ba31059aced9b5c748edb133e55 +Subproject commit 3c4bd90ba3ebbfd600a3180d45a4514e8f641e5d From b44eaec8e42c3bb6b9ea59a64b0217bd57146164 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 4 Dec 2012 12:14:14 +0100 Subject: [PATCH 17/30] Fix project for sensitive case fs --- linphone.xcodeproj/project.pbxproj | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index f617ab8ee..92b05a8a4 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5243,8 +5243,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5316,8 +5316,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5366,8 +5366,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5414,8 +5414,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5463,8 +5463,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5512,8 +5512,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5583,8 +5583,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5656,8 +5656,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( From 752fd59339322a0f597d90a6ba5760aa6c207aad Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 4 Dec 2012 13:14:12 +0100 Subject: [PATCH 18/30] Fix XMLRPC and NinePath link --- linphone.xcodeproj/project.pbxproj | 72 ++++-------------------------- 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 92b05a8a4..9595141e5 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -625,6 +625,10 @@ D350F22615A43D3400149E54 /* setup_start_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21815A43D3400149E54 /* setup_start_default.png */; }; D350F22815A43D3400149E54 /* setup_start_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21915A43D3400149E54 /* setup_start_over.png */; }; D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; + D35204F6166E1F3800887A94 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; + D35204F7166E1F3800887A94 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; + D35204F8166E1F4700887A94 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; + D35204F9166E1F4700887A94 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F515A47E9E007E7E81 /* button_background_default.png */; }; D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F615A47E9E007E7E81 /* button_background_over.png */; }; D354944C160B615A0027E44E /* linphone_splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone_splashscreen.png */; }; @@ -2307,6 +2311,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D35204F8166E1F4700887A94 /* libNinePatch.a in Frameworks */, + D35204F9166E1F4700887A94 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */, 22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */, @@ -2365,6 +2371,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D35204F6166E1F3800887A94 /* libNinePatch.a in Frameworks */, + D35204F7166E1F3800887A94 /* libXMLRPC.a in Frameworks */, 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, @@ -5253,14 +5261,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5326,14 +5326,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5376,14 +5368,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5424,14 +5408,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5473,14 +5449,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5522,14 +5490,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5593,14 +5553,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5666,14 +5618,6 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; - ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; From f98a63c59a8321258677a0db8e70b009e84de6ff Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 6 Dec 2012 18:17:54 +0100 Subject: [PATCH 19/30] Revert "Fix XMLRPC and NinePath link" This reverts commit 752fd59339322a0f597d90a6ba5760aa6c207aad. --- linphone.xcodeproj/project.pbxproj | 72 ++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 9595141e5..92b05a8a4 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -625,10 +625,6 @@ D350F22615A43D3400149E54 /* setup_start_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21815A43D3400149E54 /* setup_start_default.png */; }; D350F22815A43D3400149E54 /* setup_start_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21915A43D3400149E54 /* setup_start_over.png */; }; D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; - D35204F6166E1F3800887A94 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; - D35204F7166E1F3800887A94 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; - D35204F8166E1F4700887A94 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; - D35204F9166E1F4700887A94 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F515A47E9E007E7E81 /* button_background_default.png */; }; D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F615A47E9E007E7E81 /* button_background_over.png */; }; D354944C160B615A0027E44E /* linphone_splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone_splashscreen.png */; }; @@ -2311,8 +2307,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D35204F8166E1F4700887A94 /* libNinePatch.a in Frameworks */, - D35204F9166E1F4700887A94 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */, 22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */, @@ -2371,8 +2365,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D35204F6166E1F3800887A94 /* libNinePatch.a in Frameworks */, - D35204F7166E1F3800887A94 /* libXMLRPC.a in Frameworks */, 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, @@ -5261,6 +5253,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5326,6 +5326,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5368,6 +5376,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5408,6 +5424,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5449,6 +5473,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5490,6 +5522,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5553,6 +5593,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5618,6 +5666,14 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", + "-force_load", + "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", + "-Objc", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; From cc0983860cdc267337ec8539cc88eb8bde0728cb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 6 Dec 2012 17:44:03 +0100 Subject: [PATCH 20/30] improve customazation process --- Classes/AboutViewController.h | 3 + Classes/AboutViewController.m | 14 +- Classes/AboutViewController.xib | 25 ++- Classes/ContactDetailsTableViewController.m | 2 +- Classes/ContactsViewController.m | 5 +- Classes/LinphoneAppDelegate.m | 5 + Classes/PhoneMainView.m | 2 +- Classes/SettingsViewController.m | 5 +- .../ContactDetailsLabelViewController.xib | 6 +- .../en.lproj/ContactDetailsViewController.xib | 194 +---------------- Classes/en.lproj/ContactsViewController.xib | 94 +++++++- Resources/en.lproj/Localizable.strings | Bin 17904 -> 18562 bytes Resources/fr.lproj/Localizable.strings | Bin 18524 -> 19158 bytes linphone.ldb/Contents.plist | 202 +++++++++++++++--- .../Localizable/1/Localizable.strings | Bin 17904 -> 18562 bytes 15 files changed, 315 insertions(+), 242 deletions(-) diff --git a/Classes/AboutViewController.h b/Classes/AboutViewController.h index a486efbd1..041031e06 100644 --- a/Classes/AboutViewController.h +++ b/Classes/AboutViewController.h @@ -24,10 +24,13 @@ @interface AboutViewController : UIViewController { } +@property (nonatomic, retain) IBOutlet UILabel *linphoneLabel; @property (nonatomic, retain) IBOutlet UILabel *linphoneIphoneVersionLabel; @property (nonatomic, retain) IBOutlet UILabel *linphoneCoreVersionLabel; @property (nonatomic, retain) IBOutlet UIView *contentView; @property (nonatomic, retain) IBOutlet UILabel *linkLabel; +@property (nonatomic, retain) IBOutlet UILabel *copyrightLabel; +@property (nonatomic, retain) IBOutlet UILabel *licenseLabel; @property (nonatomic, retain) IBOutlet UIWebView *licensesView; @property (nonatomic, retain) IBOutlet UITapGestureRecognizer *linkTapGestureRecognizer; diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m index 1e2b5dddc..d85a80874 100644 --- a/Classes/AboutViewController.m +++ b/Classes/AboutViewController.m @@ -25,11 +25,14 @@ @implementation AboutViewController @synthesize linphoneCoreVersionLabel; +@synthesize linphoneLabel; @synthesize linphoneIphoneVersionLabel; @synthesize contentView; @synthesize linkTapGestureRecognizer; @synthesize linkLabel; @synthesize licensesView; +@synthesize licenseLabel; +@synthesize copyrightLabel; #pragma mark - Lifecycle Functions @@ -59,15 +62,22 @@ - (void)viewDidLoad { [super viewDidLoad]; + [linkLabel setText:NSLocalizedString(@"http://www.linphone.org", nil)]; + [licenseLabel setText:NSLocalizedString(@"GNU General Public License V2 ", nil)]; + [copyrightLabel setText:NSLocalizedString(@"© 2010-2012 Belledonne Communications ", nil)]; + [linkLabel addGestureRecognizer:linkTapGestureRecognizer]; UIScrollView *scrollView = (UIScrollView *)self.view; [scrollView addSubview:contentView]; [scrollView setContentSize:[contentView bounds].size]; - [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"Linphone iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; + [linphoneLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]]; + + [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + ,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; - [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"Linphone Core %s", linphone_core_get_version()]]; + [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"%@ Core %s", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], linphone_core_get_version()]]; if([LinphoneManager runningOnIpad]) { [LinphoneUtils adjustFontSize:self.view mult:2.22f]; diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index 7c0a4570c..f24b5c75a 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 YES @@ -43,7 +43,6 @@ {320, 460} - _NS:9 YES YES @@ -246,7 +245,6 @@ {{10, 380}, {300, 210}} - _NS:9 IBCocoaTouchFramework 2 @@ -315,6 +313,14 @@ 70 + + + linphoneLabel + + + + 71 + @@ -461,7 +467,7 @@ - 70 + 71 @@ -490,6 +496,7 @@ linkTapGestureRecognizer linphoneCoreVersionLabel linphoneIphoneVersionLabel + linphoneLabel YES @@ -499,6 +506,7 @@ UITapGestureRecognizer UILabel UILabel + UILabel @@ -511,6 +519,7 @@ linkTapGestureRecognizer linphoneCoreVersionLabel linphoneIphoneVersionLabel + linphoneLabel YES @@ -538,6 +547,10 @@ linphoneIphoneVersionLabel UILabel + + linphoneLabel + UILabel + @@ -563,6 +576,6 @@ linphone_logo.png {512, 512} - 1926 + 1930 diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 74a47a6fe..1fbd28ba8 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -74,7 +74,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C - (void)initContactDetailsTableViewController { dataCache = [[NSMutableArray alloc] init]; labelArray = [[NSMutableArray alloc] initWithObjects: - @"Linphone", + [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], [NSString stringWithString:(NSString*)kABPersonPhoneMobileLabel], [NSString stringWithString:(NSString*)kABPersonPhoneIPhoneLabel], [NSString stringWithString:(NSString*)kABPersonPhoneMainLabel], nil]; diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 94d36acf0..ae80673f2 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -168,7 +168,10 @@ static UICompositeViewDescription *compositeDescription = nil; [linphoneButton setBackgroundImage:[UIImage imageNamed:@"contacts_linphone_selected.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [LinphoneUtils buttonFixStates:linphoneButton]; + [linphoneButton setTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + forState:UIControlStateNormal]; + + [LinphoneUtils buttonFixStates:linphoneButton]; // Set selected+over background: IB lack ! [allButton setBackgroundImage:[UIImage imageNamed:@"contacts_all_selected.png"] diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 13f849f29..d2846823d 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -122,6 +122,11 @@ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: @"YES", @"start_at_boot_preference", @"YES", @"backgroundmode_preference", +#ifdef DEBUG + @"YES",@"debugenable_preference", +#else + @"NO",@"debugenable_preference", +#endif nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 5aa1c3fae..7f629700d 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -342,7 +342,7 @@ static PhoneMainView* phoneMainViewInstance=nil; } else { // Change to default view const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]); - if(list != NULL) { + if(list != NULL || ([[LinphoneManager instance] lpConfigBoolForKey:@"hide_wizard_preference"] == true)) { [self changeCurrentView: [DialerViewController compositeViewDescription]]; } else { WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController); diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 02c27d79b..0fcd374f2 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -634,7 +634,10 @@ static UICompositeViewDescription *compositeDescription = nil; if(![LinphoneManager runningOnIpad]) { [hiddenKeys addObject:@"preview_preference"]; } - + if([[LinphoneManager instance] lpConfigBoolForKey:@"hide_run_assistant_preference"]) { + [hiddenKeys addObject:@"wizard_button"]; + } + return hiddenKeys; } diff --git a/Classes/en.lproj/ContactDetailsLabelViewController.xib b/Classes/en.lproj/ContactDetailsLabelViewController.xib index 5a1cdfbe1..18e50e4a0 100644 --- a/Classes/en.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/en.lproj/ContactDetailsLabelViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -318,6 +318,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/en.lproj/ContactDetailsViewController.xib b/Classes/en.lproj/ContactDetailsViewController.xib index b17eb8066..b1421d105 100644 --- a/Classes/en.lproj/ContactDetailsViewController.xib +++ b/Classes/en.lproj/ContactDetailsViewController.xib @@ -2,13 +2,13 @@ 1536 - 11G56 - 2840 - 1138.51 + 11E53 + 2844 + 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -110,7 +108,6 @@ -2147483356 {160, 44} - _NS:9 NO @@ -148,7 +145,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -191,7 +187,6 @@ {320, 44} - _NS:9 @@ -208,7 +203,6 @@ 306 {{0, 44}, {320, 416}} - _NS:9 1 @@ -238,7 +232,6 @@ {320, 460} - 3 @@ -533,182 +526,7 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES @@ -723,6 +541,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/en.lproj/ContactsViewController.xib b/Classes/en.lproj/ContactsViewController.xib index fef3173c9..5b7aeaebc 100644 --- a/Classes/en.lproj/ContactsViewController.xib +++ b/Classes/en.lproj/ContactsViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -47,6 +47,7 @@ 290 {320, 44} + _NS:9 NO @@ -65,6 +66,7 @@ 292 {107, 44} + _NS:9 NO @@ -117,6 +119,7 @@ 289 {{107, 0}, {107, 44}} + _NS:9 NO @@ -151,6 +154,7 @@ {{106, 0}, {214, 44}} + _NS:9 @@ -167,6 +171,7 @@ 292 {107, 44} + _NS:9 NO @@ -214,6 +219,7 @@ -2147483356 {107, 44} + _NS:9 NO @@ -246,6 +252,7 @@ {320, 44} + _NS:9 @@ -260,6 +267,7 @@ 274 {{0, 44}, {320, 416}} + _NS:10 3 @@ -291,6 +299,7 @@ {320, 460} + _NS:9 @@ -555,7 +564,84 @@ 94 - + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + 0 IBCocoaTouchFramework YES @@ -571,6 +657,6 @@ {213, 88} {5, 88} - 1926 + 1930 diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index a85e45a154b8dc2544795341e82c4a1d027d501d..784e448609bd1dba7d86e2cba65e3b86cadd2149 100644 GIT binary patch delta 382 zcmey+&Db=NalHsc21$zJh diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 55e7ada2569d53f3d4dad40351245d192b3bad32..31236f4fd87969fcd29e922afdd3247201c80ba1 100644 GIT binary patch delta 1118 zcmbVL-Ahwp7=PZaA*P>0)lB?iXJd*0`~&+qyEy-Txd@tJ!2!xzj_ zfn3Vc1m&nq6>{~ePuHnFuI?V!X2Sz@G6k(gC48spwkJ72T9k&}GHzYSc@LAOB258V z!JkbQt9VF%Yc$m1tz0+&i(@f&*|Dzal5t3d#pjye49*hbN^V{heq&bI+7;oHIjXYy zh55REuatnq0lf>*H2x%Ehcet0ZQ-6in`_|{`g_}w+Os9>phGh-5l0qfr~@tvxGB;d zNKzr(^5;m1d!iq7Eo%Gj4^xURK{4z>1>~R(i$(yw4k?EQS#;4m#aY?QYK#)NjbWei z&j0q}BWtdDIXj7jD`-(K9mBfiE!&G;!0jXokZ#yGU5t1m?zZeW7#r8N^)k>@LXpyq z6rH6}#OJT=rXFkm;ty@&5iLWnpB`NaU_jDU8PE(E#UQOKNPYENuNdx04Y>bQRjS0TeHNa;Yc7Qm4dH4;dy2>2uw)X$S7n02K)PX3Q zM@&B564CSBj|0kK}2O&AQFQi+Oi~fbanx9viOg8%4u1aTwqYj2&1O+On zP&$=f@0d`0?bXOgGSCV_WVw}>Bm{9_DQ~RoX{2j8LGWCEs7|yi-f9Af0LvdBPUdryTgG>4Ot#RfgL NZQrqLW!tPZuuWn%DYXZS zXAd?!yodc zRHG`EL#xyzzx|{r?*$fn0~X!jACV=Q2tO90!0q|-DVr>+Qw#eyKpRN0kklX_>k3)? zVIVG#A~BIJP=;(k>wvfbZQ$D=52q2D#%^K&dIts<_( zm2VZ#z|6me@6bFg{8xB~UnLEBY+7A%Km9t`uT)h1?LUQ;#Z10C`d26A+spZ$ejDml zxTzrHA=Dj?=JH&+6yo7QOEz+|f?tlG4eHMG%&5cJvEkkVh*1Nc$;5@~)Lyv5yvgbK zGQSv&02$+jt3CX2Xb>C;;qdn%laG=iX^bBP*~*rjvkh%KXbr$o;9qK%bfg z)npe7eUjVLqC2dbaUX#eZSvEbsZ3|SY(170ywq2wU`@@6t1YhZchange date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLBundleObject errors @@ -31,20 +33,29 @@ name Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib + 6 + + class + BLWrapperHandle + name + Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib + change date - 2012-10-12T07:54:44Z + 2012-12-06T16:14:16Z changed values - + + <reference> + class BLNibFileObject errors flags - 0 + 1 hash - f826110f6bb9c9f39b9191f041a2e184 + 5a206fff1944a6ff2a10814f0ff35a15 name ContactDetailsViewController.xib @@ -54,7 +65,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -79,7 +92,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -104,7 +119,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -129,7 +146,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -154,7 +173,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -179,7 +200,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -204,7 +227,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -233,7 +258,7 @@ versions en - 5 + 6 fr 5 @@ -250,20 +275,29 @@ name Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib + 5 + + class + BLWrapperHandle + name + Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib + change date - 2012-09-25T09:16:19Z + 2012-12-06T16:14:16Z changed values - + + <reference> + class BLNibFileObject errors flags - 0 + 1 hash - 5c405771bb00fa3b9d58151b4f959205 + 1628c1686cfb982660e726c2f8118ebb name ContactDetailsLabelViewController.xib @@ -273,7 +307,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -298,7 +334,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -327,7 +365,7 @@ versions en - 4 + 5 fr 4 @@ -1055,20 +1093,29 @@ name Classes/ContactsViewController/13/ContactsViewController.xib + 14 + + class + BLWrapperHandle + name + Classes/ContactsViewController/14/ContactsViewController.xib + change date - 2012-09-25T09:16:19Z + 2012-12-06T16:04:33Z changed values - + + <reference> + class BLNibFileObject errors flags - 0 + 1 hash - 8e543e6857c6d386b26dfcbb630432f3 + 55cfac63b99a2e8b631ee79f15a579c5 name ContactsViewController.xib @@ -1078,7 +1125,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1103,7 +1152,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1128,7 +1179,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1153,7 +1206,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1178,7 +1233,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1203,7 +1260,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1228,7 +1287,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1253,7 +1314,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1358,7 +1421,7 @@ versions en - 13 + 14 fr 13 @@ -12175,7 +12238,7 @@ change date - 2012-10-16T09:25:05Z + 2012-12-06T16:35:25Z changed values class @@ -12185,7 +12248,7 @@ flags 0 hash - c50a71e6174b7a7b723ffa38dd90788b + 5d8dda6d0a22dfa9f07da63202a55cbb name Localizable.strings @@ -13219,6 +13282,52 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + GNU General Public License V2 + localizations + + en + GNU General Public License V2 + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + http://www.linphone.org + localizations + + en + http://www.linphone.org + + snapshots + + change date 2001-01-01T00:00:00Z @@ -14511,6 +14620,29 @@ Activer l'application dans Réglages > Confidentialité > Contactssnapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + © 2010-2012 Belledonne Communications + localizations + + en + © 2010-2012 Belledonne Communications + + snapshots + + old objects diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index a85e45a154b8dc2544795341e82c4a1d027d501d..784e448609bd1dba7d86e2cba65e3b86cadd2149 100644 GIT binary patch delta 382 zcmey+&Db=NalHsc21$zJh From 3911d21519f8cefa72e53dbd6bd7c287ad06ceeb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 7 Dec 2012 09:20:33 +0100 Subject: [PATCH 21/30] add missing ldbs --- .../5/ContactDetailsLabelViewController.xib | 323 +++++++++ .../6/ContactDetailsViewController.xib | 546 +++++++++++++++ .../14/ContactsViewController.xib | 662 ++++++++++++++++++ 3 files changed, 1531 insertions(+) create mode 100644 linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib create mode 100644 linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib create mode 100644 linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib diff --git a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib new file mode 100644 index 000000000..18e50e4a0 --- /dev/null +++ b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib @@ -0,0 +1,323 @@ + + + + 1536 + 11E53 + 2844 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1930 + + + IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 274 + {320, 460} + + + _NS:9 + NO + + + + IBCocoaTouchFramework + + NSImage + background.png + + + + + 290 + + + + 290 + {320, 44} + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + toolsbar_background.png + + + + + 292 + {160, 44} + + + _NS:9 + NO + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + contact_back_over.png + + + NSImage + contact_back_default.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + {320, 44} + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 306 + {{0, 59}, {320, 401}} + + _NS:9 + + 1 + MCAwIDAgMAA + groupTableViewBackgroundColor + + YES + IBCocoaTouchFramework + 0.0 + 10 + 0.0 + 0.0 + YES + NO + 0.0 + 10 + 0.0 + 0.0 + 1 + 2 + 0 + YES + 44 + 10 + 10 + + + {320, 460} + + + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + + + + view + + + + 12 + + + + tableView + + + + 15 + + + + dataSource + + + + 13 + + + + delegate + + + + 14 + + + + onBackClick: + + + 7 + + 11 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + + + + + + + + 5 + + + tableView + + + 6 + + + + + + + toolsBar + + + 8 + + + backButton + + + 10 + + + barBackground + + + 16 + + + background + + + + + ContactDetailsLabelViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + + + 16 + + + 0 + IBCocoaTouchFramework + YES + 3 + + {640, 523} + {320, 88} + {320, 88} + {5, 88} + + 1930 + + diff --git a/linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib new file mode 100644 index 000000000..b1421d105 --- /dev/null +++ b/linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib @@ -0,0 +1,546 @@ + + + + 1536 + 11E53 + 2844 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1930 + + + IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUITableViewController + IBUIView + IBUIViewController + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 290 + + + + 290 + {320, 44} + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + toolsbar_background.png + + + + + 292 + {160, 44} + + + _NS:9 + NO + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + contact_back_over.png + + + NSImage + contact_back_default.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + -2147483356 + {160, 44} + + + _NS:9 + NO + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MCAwIDAAA + + + + + NSImage + contact_cancel_over.png + + + NSImage + contact_cancel_default.png + + + + + + + 289 + {{160, 0}, {160, 44}} + + + _NS:9 + NO + + Edit + + IBCocoaTouchFramework + 0 + 0 + NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + 2 + MC44MDc4NDMxNDg3IDAuODE1Njg2Mjg1NSAwLjgyMzUyOTQyMjMAA + + + + + + NSImage + contact_edit_over.png + + + NSImage + contact_ok_default.png + + + NSImage + contact_edit_default.png + + + + + + {320, 44} + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 306 + {{0, 44}, {320, 416}} + + _NS:9 + + 1 + MCAwIDAgMAA + groupTableViewBackgroundColor + + YES + IBCocoaTouchFramework + 0.0 + 10 + 0.0 + 0.0 + YES + 0.0 + 10 + 0.0 + 0.0 + 1 + 2 + 0 + YES + YES + 44 + 10 + 10 + + + {320, 460} + + + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + UIContactDetailsFooter + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + UIContactDetailsHeader + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + + + + view + + + + 3 + + + + tableController + + + + 27 + + + + editButton + + + + 31 + + + + backButton + + + + 50 + + + + cancelButton + + + + 51 + + + + onEditClick: + + + 7 + + 30 + + + + onBackClick: + + + 7 + + 10 + + + + dataSource + + + + 28 + + + + delegate + + + + 29 + + + + view + + + + 26 + + + + contactDetailsDelegate + + + + 53 + + + + footerController + + + + 59 + + + + headerController + + + + 60 + + + + onCancelClick: + + + 7 + + 49 + + + + contactDetailsDelegate + + + + 61 + + + + contactDetailsDelegate + + + + 62 + + + + + + 0 + + + + + + 1 + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + + + + + + + toolBar + + + 8 + + + editButton + + + 9 + + + backButton + + + 19 + + + tableView + + + 20 + + + + tableController + + + 47 + + + cancelButton + + + 52 + + + barBackground + + + 57 + + + footerController + + + 58 + + + headerController + + + + + ContactDetailsViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + ContactDetailsTableViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIContactDetailsFooter + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIContactDetailsHeader + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + + + 62 + + + 0 + IBCocoaTouchFramework + YES + 3 + + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {5, 88} + + 1930 + + diff --git a/linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib b/linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib new file mode 100644 index 000000000..5b7aeaebc --- /dev/null +++ b/linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib @@ -0,0 +1,662 @@ + + + + 1536 + 11E53 + 2844 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1930 + + + IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUITableViewController + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 290 + + + + 290 + {320, 44} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + toolsbar_background.png + + + + + 293 + + + + 292 + {107, 44} + + + + _NS:9 + NO + + All contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + All + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + contacts_all_selected.png + + + + NSImage + contacts_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{107, 0}, {107, 44}} + + + + _NS:9 + NO + + Linphone contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Linphone + + + + + + NSImage + contacts_linphone_selected.png + + + + NSImage + contacts_linphone_default.png + + + + + + {{106, 0}, {214, 44}} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 292 + {107, 44} + + + + _NS:9 + NO + + Add contact + + IBCocoaTouchFramework + 0 + 0 + NO + 18 + 0.0 + 0.0 + 0.0 + Add contact + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + + NSImage + contacts_add_over.png + + + NSImage + contacts_add_default.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + -2147483356 + {107, 44} + + + + _NS:9 + NO + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + 18 + 0.0 + 0.0 + 0.0 + Back + + + + + NSImage + contacts_back_over.png + + + NSImage + contacts_back_default.png + + + + + + {320, 44} + + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + + + + 274 + {{0, 44}, {320, 416}} + + + _NS:10 + + 3 + MQA + + YES + IBCocoaTouchFramework + 0.0 + 10 + 0.0 + 0.0 + YES + NO + 0.0 + 10 + 0.0 + 0.0 + 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + 0 + YES + 44 + 22 + 22 + + + {320, 460} + + + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + NO + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + + + + view + + + + 16 + + + + tableController + + + + 83 + + + + tableView + + + + 84 + + + + backButton + + + + 90 + + + + addButton + + + + 91 + + + + allButton + + + + 27 + + + + linphoneButton + + + + 31 + + + + onAllClick: + + + 7 + + 29 + + + + onLinphoneClick: + + + 7 + + 47 + + + + onAddContactClick: + + + 7 + + 86 + + + + dataSource + + + + 81 + + + + delegate + + + + 82 + + + + view + + + + 80 + + + + onBackClick: + + + 7 + + 89 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + 3 + + + + + + + + + toolBar + + + 6 + + + addButton + + + 69 + + + tableView + + + 76 + + + + tableController + + + 87 + + + backButton + + + 92 + + + background + + + 93 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + linphoneButton + + + + + ContactsViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + ContactsTableViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 94 + + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + + 0 + IBCocoaTouchFramework + YES + 3 + + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {5, 88} + + 1930 + + From 2b72e4598cb3ea30832a17a661b594abc510d6e0 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 7 Dec 2012 09:21:21 +0100 Subject: [PATCH 22/30] Fix other flags of projects --- linphone.xcodeproj/project.pbxproj | 72 +++++++----------------------- 1 file changed, 16 insertions(+), 56 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 92b05a8a4..309c0d627 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -154,6 +154,10 @@ D3012CC51610467D007CD926 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D3012CC31610467D007CD926 /* linphone_logo.png */; }; D3012CC616105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; D3012CC716105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; + D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; + D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; + D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; + D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D30BBD1815D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; }; @@ -2307,6 +2311,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, + D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */, 22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */, @@ -2365,6 +2371,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */, + D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */, 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, @@ -5254,13 +5262,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5327,13 +5329,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5377,13 +5373,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5425,13 +5415,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5474,13 +5458,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5523,13 +5501,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5594,13 +5566,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5667,13 +5633,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; From 799a4112a0ac31fcc018e96936dde1dbbdd0ff0d Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 7 Dec 2012 10:43:28 +0100 Subject: [PATCH 23/30] fix missing binding for copyright label --- Classes/AboutViewController.xib | 24 +- .../ContactDetailsLabelViewController.xib | 79 +- .../fr.lproj/ContactDetailsViewController.xib | 187 +---- Classes/fr.lproj/ContactsViewController.xib | 97 ++- linphone.ldb/Contents.plist | 117 +-- .../4/ContactDetailsLabelViewController.xib | 323 -------- .../5/ContactDetailsViewController.xib | 728 ------------------ .../13/ContactsViewController.xib | 576 -------------- 8 files changed, 157 insertions(+), 1974 deletions(-) delete mode 100644 linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib delete mode 100644 linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib delete mode 100644 linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index f24b5c75a..6f995fd83 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -321,6 +321,14 @@ 71 + + + copyrightLabel + + + + 72 + @@ -467,7 +475,7 @@ - 71 + 72 @@ -491,6 +499,8 @@ YES contentView + copyrightLabel + licenseLabel licensesView linkLabel linkTapGestureRecognizer @@ -501,6 +511,8 @@ YES UIView + UILabel + UILabel UIWebView UILabel UITapGestureRecognizer @@ -514,6 +526,8 @@ YES contentView + copyrightLabel + licenseLabel licensesView linkLabel linkTapGestureRecognizer @@ -527,6 +541,14 @@ contentView UIView + + copyrightLabel + UILabel + + + licenseLabel + UILabel + licensesView UIWebView diff --git a/Classes/fr.lproj/ContactDetailsLabelViewController.xib b/Classes/fr.lproj/ContactDetailsLabelViewController.xib index bd2befa68..63a6214c5 100644 --- a/Classes/fr.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/fr.lproj/ContactDetailsLabelViewController.xib @@ -1,21 +1,21 @@ - 1280 + 1536 11E53 - 1938 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1930 - IBUITableView - IBUIButton - IBUIView - IBUIImageView IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -143,62 +143,8 @@ _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -224,7 +170,10 @@ AAgACAAIAAEAAQABAAE {320, 460} - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -368,6 +317,6 @@ AAgACAAIAAEAAQABAAE {320, 88} {5, 88} - 933 + 1930 diff --git a/Classes/fr.lproj/ContactDetailsViewController.xib b/Classes/fr.lproj/ContactDetailsViewController.xib index dc9831ee7..d5b9c0d7e 100644 --- a/Classes/fr.lproj/ContactDetailsViewController.xib +++ b/Classes/fr.lproj/ContactDetailsViewController.xib @@ -2,13 +2,13 @@ 1536 - 11G56 - 2840 - 1138.51 + 11E53 + 2844 + 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -525,182 +525,7 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES @@ -715,6 +540,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/fr.lproj/ContactsViewController.xib b/Classes/fr.lproj/ContactsViewController.xib index 4629e79bd..dc083bc75 100644 --- a/Classes/fr.lproj/ContactsViewController.xib +++ b/Classes/fr.lproj/ContactsViewController.xib @@ -1,22 +1,22 @@ - 1280 + 1536 11E53 - 1938 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1930 - IBUIImageView - IBUIButton - IBUITableView - IBUIView - IBUITableViewController IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUITableViewController + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -554,7 +554,84 @@ 94 - + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + 0 IBCocoaTouchFramework YES @@ -570,6 +647,6 @@ {213, 88} {5, 88} - 933 + 1930 diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 3c4537046..7f3103e25 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -12,9 +12,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLBundleObject errors @@ -26,13 +24,6 @@ backup - 5 - - class - BLWrapperHandle - name - Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib - 6 class @@ -45,15 +36,13 @@ change date 2012-12-06T16:14:16Z changed values - - <reference> - + class BLNibFileObject errors flags - 1 + 0 hash 5a206fff1944a6ff2a10814f0ff35a15 @@ -65,9 +54,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -92,9 +79,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -119,9 +104,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -146,9 +129,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -173,9 +154,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -200,9 +179,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -227,9 +204,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -260,7 +235,7 @@ en 6 fr - 5 + 6 @@ -268,13 +243,6 @@ backup - 4 - - class - BLWrapperHandle - name - Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib - 5 class @@ -287,15 +255,13 @@ change date 2012-12-06T16:14:16Z changed values - - <reference> - + class BLNibFileObject errors flags - 1 + 0 hash 1628c1686cfb982660e726c2f8118ebb @@ -307,9 +273,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -334,9 +298,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -367,7 +329,7 @@ en 5 fr - 4 + 5 @@ -1086,13 +1048,6 @@ backup - 13 - - class - BLWrapperHandle - name - Classes/ContactsViewController/13/ContactsViewController.xib - 14 class @@ -1105,15 +1060,13 @@ change date 2012-12-06T16:04:33Z changed values - - <reference> - + class BLNibFileObject errors flags - 1 + 0 hash 55cfac63b99a2e8b631ee79f15a579c5 @@ -1125,9 +1078,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1152,9 +1103,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1179,9 +1128,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1206,9 +1153,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1233,9 +1178,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1260,9 +1203,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1287,9 +1228,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1314,9 +1253,7 @@ change date 2001-01-01T00:00:00Z changed values - - <reference> - + class BLStringKeyObject comment @@ -1423,7 +1360,7 @@ en 14 fr - 13 + 14 diff --git a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib deleted file mode 100644 index 5a1cdfbe1..000000000 --- a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib +++ /dev/null @@ -1,323 +0,0 @@ - - - - 1536 - 11E53 - 2840 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 - - - IBProxyObject - IBUIButton - IBUIImageView - IBUITableView - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 274 - {320, 460} - - - _NS:9 - NO - - - - IBCocoaTouchFramework - - NSImage - background.png - - - - - 290 - - - - 290 - {320, 44} - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - toolsbar_background.png - - - - - 292 - {160, 44} - - - _NS:9 - NO - - Back - - IBCocoaTouchFramework - 0 - 0 - NO - 18 - 0.0 - 0.0 - 0.0 - Back - - 2 - MCAwIDAAA - - - 2 - MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA - - - 3 - MC41AA - - - NSImage - contact_back_over.png - - - NSImage - contact_back_default.png - - - 1 - 14 - - - Helvetica - 14 - 16 - - - - {320, 44} - - - _NS:9 - - 3 - MQA - - 2 - - - IBCocoaTouchFramework - - - - 306 - {{0, 59}, {320, 401}} - - _NS:9 - - 1 - MCAwIDAgMAA - groupTableViewBackgroundColor - - YES - IBCocoaTouchFramework - 0.0 - 10 - 0.0 - 0.0 - YES - NO - 0.0 - 10 - 0.0 - 0.0 - 1 - 2 - 0 - YES - 44 - 10 - 10 - - - {320, 460} - - - - 3 - MCAwAA - - IBCocoaTouchFramework - - - - - - - view - - - - 12 - - - - tableView - - - - 15 - - - - dataSource - - - - 13 - - - - delegate - - - - 14 - - - - onBackClick: - - - 7 - - 11 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - - - - 5 - - - tableView - - - 6 - - - - - - - toolsBar - - - 8 - - - backButton - - - 10 - - - barBackground - - - 16 - - - background - - - - - ContactDetailsLabelViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - - 16 - - - 0 - IBCocoaTouchFramework - YES - 3 - - {640, 523} - {320, 88} - {320, 88} - {5, 88} - - 1926 - - diff --git a/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib deleted file mode 100644 index b17eb8066..000000000 --- a/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib +++ /dev/null @@ -1,728 +0,0 @@ - - - - 1536 - 11G56 - 2840 - 1138.51 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 - - - IBProxyObject - IBUIButton - IBUIImageView - IBUITableView - IBUITableViewController - IBUIView - IBUIViewController - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 290 - - - - 290 - {320, 44} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - toolsbar_background.png - - - - - 292 - {160, 44} - - - - _NS:9 - NO - - Back - - IBCocoaTouchFramework - 0 - 0 - NO - 18 - 0.0 - 0.0 - 0.0 - Back - - 2 - MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA - - - 3 - MC41AA - - - NSImage - contact_back_over.png - - - NSImage - contact_back_default.png - - - 1 - 14 - - - Helvetica - 14 - 16 - - - - - -2147483356 - {160, 44} - - - - _NS:9 - NO - - Cancel - - IBCocoaTouchFramework - 0 - 0 - NO - 18 - 0.0 - 0.0 - 0.0 - Cancel - - 2 - MCAwIDAAA - - - - - NSImage - contact_cancel_over.png - - - NSImage - contact_cancel_default.png - - - - - - - 289 - {{160, 0}, {160, 44}} - - - - _NS:9 - NO - - Edit - - IBCocoaTouchFramework - 0 - 0 - NO - 18 - 0.0 - 0.0 - 0.0 - Ok - Edit - - - 2 - MC44MDc4NDMxNDg3IDAuODE1Njg2Mjg1NSAwLjgyMzUyOTQyMjMAA - - - - - - NSImage - contact_edit_over.png - - - NSImage - contact_ok_default.png - - - NSImage - contact_edit_default.png - - - - - - {320, 44} - - - - _NS:9 - - 3 - MQA - - 2 - - - IBCocoaTouchFramework - - - - 306 - {{0, 44}, {320, 416}} - - - _NS:9 - - 1 - MCAwIDAgMAA - groupTableViewBackgroundColor - - YES - IBCocoaTouchFramework - 0.0 - 10 - 0.0 - 0.0 - YES - 0.0 - 10 - 0.0 - 0.0 - 1 - 2 - 0 - YES - YES - 44 - 10 - 10 - - - {320, 460} - - - - - 3 - MCAwAA - - IBCocoaTouchFramework - - - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - UIContactDetailsFooter - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - UIContactDetailsHeader - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - - - - view - - - - 3 - - - - tableController - - - - 27 - - - - editButton - - - - 31 - - - - backButton - - - - 50 - - - - cancelButton - - - - 51 - - - - onEditClick: - - - 7 - - 30 - - - - onBackClick: - - - 7 - - 10 - - - - dataSource - - - - 28 - - - - delegate - - - - 29 - - - - view - - - - 26 - - - - contactDetailsDelegate - - - - 53 - - - - footerController - - - - 59 - - - - headerController - - - - 60 - - - - onCancelClick: - - - 7 - - 49 - - - - contactDetailsDelegate - - - - 61 - - - - contactDetailsDelegate - - - - 62 - - - - - - 0 - - - - - - 1 - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - - - toolBar - - - 8 - - - editButton - - - 9 - - - backButton - - - 19 - - - tableView - - - 20 - - - - tableController - - - 47 - - - cancelButton - - - 52 - - - barBackground - - - 57 - - - footerController - - - 58 - - - headerController - - - - - ContactDetailsViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - ContactDetailsTableViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIContactDetailsFooter - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIContactDetailsHeader - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIToggleButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - - 62 - - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - - {320, 88} - {320, 88} - {320, 88} - {320, 88} - {320, 88} - {320, 88} - {320, 88} - {5, 88} - - 1926 - - diff --git a/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib b/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib deleted file mode 100644 index fef3173c9..000000000 --- a/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib +++ /dev/null @@ -1,576 +0,0 @@ - - - - 1536 - 11E53 - 2840 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 - - - IBProxyObject - IBUIButton - IBUIImageView - IBUITableView - IBUITableViewController - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 292 - - - - 290 - - - - 290 - {320, 44} - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - toolsbar_background.png - - - - - 293 - - - - 292 - {107, 44} - - - _NS:9 - NO - - All contacts filter - - IBCocoaTouchFramework - 0 - 0 - NO - 16 - 0.0 - 0.0 - 0.0 - All - - 2 - MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA - - - - 2 - MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA - - - 3 - MC41AA - - - NSImage - contacts_all_selected.png - - - - NSImage - contacts_all_default.png - - - 1 - 12 - - - Helvetica - 12 - 16 - - - - - 289 - {{107, 0}, {107, 44}} - - - _NS:9 - NO - - Linphone contacts filter - - IBCocoaTouchFramework - 0 - 0 - NO - 16 - 0.0 - 0.0 - 0.0 - Linphone - - - - - - NSImage - contacts_linphone_selected.png - - - - NSImage - contacts_linphone_default.png - - - - - - {{106, 0}, {214, 44}} - - - _NS:9 - - 3 - MQA - - 2 - - - IBCocoaTouchFramework - - - - 292 - {107, 44} - - - _NS:9 - NO - - Add contact - - IBCocoaTouchFramework - 0 - 0 - NO - 18 - 0.0 - 0.0 - 0.0 - Add contact - - 2 - MCAwIDAAA - - - 2 - MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA - - - - NSImage - contacts_add_over.png - - - NSImage - contacts_add_default.png - - - 1 - 14 - - - Helvetica - 14 - 16 - - - - - -2147483356 - {107, 44} - - - _NS:9 - NO - - Back - - IBCocoaTouchFramework - 0 - 0 - NO - 18 - 0.0 - 0.0 - 0.0 - Back - - - - - NSImage - contacts_back_over.png - - - NSImage - contacts_back_default.png - - - - - - {320, 44} - - - _NS:9 - - 3 - MQA - - - IBCocoaTouchFramework - - - - 274 - {{0, 44}, {320, 416}} - - _NS:10 - - 3 - MQA - - YES - IBCocoaTouchFramework - 0.0 - 10 - 0.0 - 0.0 - YES - NO - 0.0 - 10 - 0.0 - 0.0 - 1 - - 2 - MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA - - 0 - YES - 44 - 22 - 22 - - - {320, 460} - - - _NS:9 - - 3 - MCAwAA - - IBCocoaTouchFramework - - - NO - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - - - - view - - - - 16 - - - - tableController - - - - 83 - - - - tableView - - - - 84 - - - - backButton - - - - 90 - - - - addButton - - - - 91 - - - - allButton - - - - 27 - - - - linphoneButton - - - - 31 - - - - onAllClick: - - - 7 - - 29 - - - - onLinphoneClick: - - - 7 - - 47 - - - - onAddContactClick: - - - 7 - - 86 - - - - dataSource - - - - 81 - - - - delegate - - - - 82 - - - - view - - - - 80 - - - - onBackClick: - - - 7 - - 89 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 2 - - - - - - - - - 3 - - - - - - - - - toolBar - - - 6 - - - addButton - - - 69 - - - tableView - - - 76 - - - - tableController - - - 87 - - - backButton - - - 92 - - - background - - - 93 - - - - - - - switchView - - - 4 - - - allButton - - - 5 - - - linphoneButton - - - - - ContactsViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - ContactsTableViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 94 - - - 0 - IBCocoaTouchFramework - YES - 3 - - {214, 88} - {214, 88} - {213, 88} - {213, 88} - {214, 88} - {214, 88} - {213, 88} - {213, 88} - {5, 88} - - 1926 - - From 6900913b59b8420d3d162b6e3618440d61202205 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 7 Dec 2012 11:01:34 +0100 Subject: [PATCH 24/30] Improve battery warning Improve logs --- Classes/LinphoneCoreSettingsStore.m | 8 ++- Classes/LinphoneManager.m | 16 +++--- .../LinphoneUI/UICompositeViewController.m | 2 +- Classes/PhoneMainView.h | 1 + Classes/PhoneMainView.m | 49 +++++++++++-------- Classes/PhoneMainView.xib | 4 +- Classes/Utils/Utils.m | 14 +++--- Classes/WizardViewController.m | 8 +-- 8 files changed, 57 insertions(+), 45 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 36fcc1dea..65918750f 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -590,8 +590,12 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); BOOL debugmode = [self boolForKey:@"debugenable_preference"]; lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference", debugmode); - if (debugmode) linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); - else linphone_core_disable_logs(); + if (debugmode) { + linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); + ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); + } else { + linphone_core_disable_logs(); + } [[NSUserDefaults standardUserDefaults] setBool:debugmode forKey:@"debugenable_preference"]; //to be used at linphone core startup BOOL animations = [self boolForKey:@"animations_preference"]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index c8270b4b6..96f7d73c5 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -82,7 +82,7 @@ extern void libmsbcg729_init(); if ((self = [super init])) { self->batteryWarningShown = FALSE; self->notification = nil; - self->videoRequested=FALSE; + self->videoRequested = FALSE; self->userInfos = [[NSMutableDictionary alloc] init]; } return self; @@ -379,14 +379,11 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char - (void)onCall:(LinphoneCall*)call StateChanged:(LinphoneCallState)state withMessage:(const char *)message { // Handling wrapper - LinphoneCallAppData* data=nil; - if (!linphone_call_get_user_pointer(call)) { + LinphoneCallAppData* data=(LinphoneCallAppData*)linphone_call_get_user_pointer(call); + if (!data) { data = [[LinphoneCallAppData alloc] init]; linphone_call_set_user_pointer(call, data); - } else { - data = (LinphoneCallAppData*) linphone_call_get_user_pointer(call); - } - + } if (state == LinphoneCallIncomingReceived) { @@ -795,6 +792,7 @@ static LinphoneCoreVTable linphonec_vtable = { /*to make sure we don't loose debug trace*/ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"debugenable_preference"]) { linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); + ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); } [LinphoneLogger logc:LinphoneLoggerLog format:"Create linphonecore"]; linphone_core_set_user_agent([@"LinphoneIPhone" UTF8String], @@ -1142,7 +1140,7 @@ static void audioRouteChangeListenerCallback ( if([self lpConfigBoolForKey:@"edge_opt_preference"]) { bool low_bandwidth = self.network == network_2g; if(low_bandwidth) { - [LinphoneLogger log:LinphoneLoggerDebug format:@"Low bandwidth mode"]; + [LinphoneLogger log:LinphoneLoggerLog format:@"Low bandwidth mode"]; } linphone_call_params_enable_low_bandwidth(lcallParams, low_bandwidth); } @@ -1183,7 +1181,7 @@ static void audioRouteChangeListenerCallback ( if([self lpConfigBoolForKey:@"edge_opt_preference"]) { bool low_bandwidth = self.network == network_2g; if(low_bandwidth) { - [LinphoneLogger log:LinphoneLoggerDebug format:@"Low bandwidth mode"]; + [LinphoneLogger log:LinphoneLoggerLog format:@"Low bandwidth mode"]; } linphone_call_params_enable_low_bandwidth(lcallParams, low_bandwidth); } diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 593f85a82..aa7237646 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -350,7 +350,7 @@ } } if(remove) { - [LinphoneLogger log:LinphoneLoggerDebug format:@"Free cached view: %@", key]; + [LinphoneLogger log:LinphoneLoggerLog format:@"Free cached view: %@", key]; UIViewController *vc = [viewControllerCache objectForKey:key]; if ([[UIDevice currentDevice].systemVersion doubleValue] >= 5.0) { [vc viewWillUnload]; diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index bd8aaeec7..0f62eb42d 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -47,6 +47,7 @@ int loadCount; NSMutableArray *viewStack; NSMutableArray *inhibitedEvents; + NSTimer *batteryTimer; } @property (nonatomic, retain) IBOutlet UICompositeViewController *mainViewController; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 7f629700d..8392df26b 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -116,6 +116,8 @@ static PhoneMainView* phoneMainViewInstance=nil; name:UIDeviceBatteryLevelDidChangeNotification object:nil]; [[UIDevice currentDevice] setBatteryMonitoringEnabled:YES]; + + batteryTimer = [NSTimer scheduledTimerWithTimeInterval:10.0f target:self selector:@selector(batteryLevelChanged:) userInfo:nil repeats:TRUE]; } - (void)viewWillDisappear:(BOOL)animated { @@ -139,6 +141,8 @@ static PhoneMainView* phoneMainViewInstance=nil; name:UIDeviceBatteryLevelDidChangeNotification object:nil]; [[UIDevice currentDevice] setBatteryMonitoringEnabled:NO]; + + [batteryTimer invalidate]; } - (void)viewDidAppear:(BOOL)animated { @@ -577,30 +581,35 @@ static PhoneMainView* phoneMainViewInstance=nil; } - (void)batteryLevelChanged:(NSNotification*)notif { + float level = [UIDevice currentDevice].batteryLevel; + UIDeviceBatteryState state = [UIDevice currentDevice].batteryState; + [LinphoneLogger log:LinphoneLoggerLog format:@"Battery state:%d level:%.2f", state, level]; + if (![LinphoneManager isLcReady]) return; LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); - if (!call || !linphone_call_params_video_enabled(linphone_call_get_current_params(call))) - return; - LinphoneCallAppData* appData = (LinphoneCallAppData*) linphone_call_get_user_pointer(call); - float level = [UIDevice currentDevice].batteryLevel; - if ([UIDevice currentDevice].batteryState == UIDeviceBatteryStateUnplugged) { - [LinphoneLogger logc:LinphoneLoggerLog format:"Video call is running. Battery level: %.2f", level]; - if (level < 0.1 && !appData->batteryWarningShown) { - DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Battery is running low. Stop video ?",nil)] autorelease]; - [sheet addCancelButtonWithTitle:NSLocalizedString(@"Continue video", nil)]; - [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { - LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); - // stop video - linphone_call_params_enable_video(paramsCopy, FALSE); - linphone_core_update_call([LinphoneManager getLc], call, paramsCopy); - }]; - [sheet showInView:self.view]; - appData->batteryWarningShown = TRUE; + if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) { + LinphoneCallAppData* callData = (LinphoneCallAppData*) linphone_call_get_user_pointer(call); + if(callData != nil) { + if (state == UIDeviceBatteryStateUnplugged) { + if (level <= 0.2f && !callData->batteryWarningShown) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Battery warning"]; + DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Battery is running low. Stop video ?",nil)] autorelease]; + [sheet addCancelButtonWithTitle:NSLocalizedString(@"Continue video", nil)]; + [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { + LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); + // stop video + linphone_call_params_enable_video(paramsCopy, FALSE); + linphone_core_update_call([LinphoneManager getLc], call, paramsCopy); + }]; + [sheet showInView:self.view]; + callData->batteryWarningShown = TRUE; + } + } + if (level > 0.2f) { + callData->batteryWarningShown = FALSE; + } } } - if (level >= 0.1) { - appData->batteryWarningShown = FALSE; - } } diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index e81cbe2de..4a6d46b1a 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 8e7b39d1d..fe19abf08 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -27,10 +27,10 @@ va_list args; va_start (args, format); NSString *str = [[NSString alloc] initWithFormat: format arguments:args]; - if(severity <= LinphoneLoggerLog) { - ms_message("%s", [str UTF8String]); - } else if(severity <= LinphoneLoggerDebug) { + if(severity <= LinphoneLoggerDebug) { ms_debug("%s", [str UTF8String]); + } else if(severity <= LinphoneLoggerLog) { + ms_message("%s", [str UTF8String]); } else if(severity <= LinphoneLoggerWarning) { ms_warning("%s", [str UTF8String]); } else if(severity <= LinphoneLoggerError) { @@ -45,13 +45,13 @@ + (void)logc:(LinphoneLoggerSeverity) severity format:(const char *)format,... { va_list args; va_start (args, format); - if(severity <= LinphoneLoggerLog) { - ortp_logv(ORTP_MESSAGE, format, args); - } else if(severity <= LinphoneLoggerDebug) { + if(severity <= LinphoneLoggerDebug) { ortp_logv(ORTP_DEBUG, format, args); + } else if(severity <= LinphoneLoggerLog) { + ortp_logv(ORTP_MESSAGE, format, args); } else if(severity <= LinphoneLoggerWarning) { ortp_logv(ORTP_WARNING, format, args); - } else if(severity <= LinphoneLoggerError) { + } else if(severity <= LinphoneLoggerError) { ortp_logv(ORTP_ERROR, format, args); } else if(severity <= LinphoneLoggerFatal) { ortp_logv(ORTP_FATAL, format, args); diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 2d9b17c23..f11d51a34 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -374,7 +374,7 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)checkUserExist:(NSString*)username { - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC check_account %@", username]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC check_account %@", username]; NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]]; XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL]; @@ -389,7 +389,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)createAccount:(NSString*)identity password:(NSString*)password email:(NSString*)email { NSString *useragent = [LinphoneManager getUserAgent]; - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC create_account_with_useragent %@ %@ %@ %@", identity, password, email, useragent]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC create_account_with_useragent %@ %@ %@ %@", identity, password, email, useragent]; NSURL *URL = [NSURL URLWithString: [[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]]; XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL]; @@ -403,7 +403,7 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)checkAccountValidation:(NSString*)identity { - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC check_account_validated %@", identity]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC check_account_validated %@", identity]; NSURL *URL = [NSURL URLWithString: [[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]]; XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL]; @@ -659,7 +659,7 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - XMLRPCConnectionDelegate Functions - (void)request:(XMLRPCRequest *)request didReceiveResponse:(XMLRPCResponse *)response { - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC %@: %@", [request method], [response body]]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC %@: %@", [request method], [response body]]; [waitView setHidden:true]; if ([response isFault]) { NSString *errorString = [NSString stringWithFormat:NSLocalizedString(@"Communication issue (%@)", nil), [response faultString]]; From 3606d826e31c52a0f6ba0b8160b1eb054717f89d Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 14 Dec 2012 08:17:23 +0100 Subject: [PATCH 25/30] iTunesArtwork must be at the root directory level --- Resources/iTunesArtwork => iTunesArtwork | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/iTunesArtwork => iTunesArtwork (100%) diff --git a/Resources/iTunesArtwork b/iTunesArtwork similarity index 100% rename from Resources/iTunesArtwork rename to iTunesArtwork From ecfe93d790b6e4b886a039067c7fc2de09f6b29e Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 14 Dec 2012 09:55:12 +0100 Subject: [PATCH 26/30] check certificate CN name --- Classes/LinphoneManager.m | 5 +++-- submodules/externals/exosip | 2 +- submodules/linphone | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 96f7d73c5..860fa91b3 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -795,13 +795,14 @@ static LinphoneCoreVTable linphonec_vtable = { ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); } [LinphoneLogger logc:LinphoneLoggerLog format:"Create linphonecore"]; - linphone_core_set_user_agent([@"LinphoneIPhone" UTF8String], - [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); + theLinphoneCore = linphone_core_new (&linphonec_vtable , [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]] , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]] ,self); + linphone_core_set_user_agent(theLinphoneCore,"LinphoneIPhone", + [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); fastAddressBook = [[FastAddressBook alloc] init]; linphone_core_set_root_ca(theLinphoneCore, lRootCa); diff --git a/submodules/externals/exosip b/submodules/externals/exosip index cbb76acfe..cb5a82765 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit cbb76acfe36aaa0e79911569e218d77c622fa9d4 +Subproject commit cb5a8276531d2436f35bdddaca99665b88ee6e95 diff --git a/submodules/linphone b/submodules/linphone index 3c4bd90ba..30e8bf54b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3c4bd90ba3ebbfd600a3180d45a4514e8f641e5d +Subproject commit 30e8bf54b81adb7e99cd5bf012c4ab63fdb8a884 From c09975a9c10ee68ae48d291be6fc0822bda8b21c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 17 Dec 2012 16:34:05 +0100 Subject: [PATCH 27/30] Update linphone submodule for ICE fix. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 30e8bf54b..ebf0b1897 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 30e8bf54b81adb7e99cd5bf012c4ab63fdb8a884 +Subproject commit ebf0b1897ac114c998a59a3d344417603c25069b From 7a75f2bb8bb6e207457ad4341a9f7c5e40be1c7a Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 20 Dec 2012 14:12:23 +0100 Subject: [PATCH 28/30] Show organization name if there is no first name and last name --- Classes/ContactsTableViewController.m | 10 +- Classes/LinphoneUI/UIContactCell.m | 12 +- Classes/LinphoneUI/UIContactDetailsHeader.m | 5 +- .../en.lproj/UIContactDetailsHeader.xib | 77 +++++++++- .../fr.lproj/UIContactDetailsHeader.xib | 141 +++++++++--------- linphone.ldb/Contents.plist | 12 +- .../{4 => 5}/UIContactDetailsHeader.xib | 77 +++++++++- 7 files changed, 243 insertions(+), 91 deletions(-) rename linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/{4 => 5}/UIContactDetailsHeader.xib (84%) diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index 2fcd57e3f..c46f31fd4 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -102,6 +102,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf CFStringRef lLocalizedFirstName = (lFirstName != nil)? ABAddressBookCopyLocalizedLabel(lFirstName): nil; CFStringRef lLastName = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonLastNameProperty); CFStringRef lLocalizedLastName = (lLastName != nil)? ABAddressBookCopyLocalizedLabel(lLastName): nil; + CFStringRef lOrganization = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonOrganizationProperty); + CFStringRef lLocalizedlOrganization = (lOrganization != nil)? ABAddressBookCopyLocalizedLabel(lOrganization): nil; NSString *name = nil; if(lLocalizedFirstName != nil && lLocalizedLastName != nil) { name=[NSString stringWithFormat:@"%@%@", [(NSString *)lLocalizedFirstName retain], [(NSString *)lLocalizedLastName retain]]; @@ -109,8 +111,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf name=[NSString stringWithFormat:@"%@",[(NSString *)lLocalizedLastName retain]]; } else if(lLocalizedFirstName != nil) { name=[NSString stringWithFormat:@"%@",[(NSString *)lLocalizedFirstName retain]]; - } else { - + } else if(lLocalizedlOrganization != nil) { + name=[NSString stringWithFormat:@"%@",[(NSString *)lLocalizedlOrganization retain]]; } if(name != nil && [name length] > 0) { // Put in correct subDic @@ -125,6 +127,10 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf } [subDic insertObject:lPerson forKey:name selector:@selector(caseInsensitiveCompare:)]; } + if(lLocalizedlOrganization != nil) + CFRelease(lLocalizedlOrganization); + if(lOrganization != nil) + CFRelease(lOrganization); if(lLocalizedLastName != nil) CFRelease(lLocalizedLastName); if(lLastName != nil) diff --git a/Classes/LinphoneUI/UIContactCell.m b/Classes/LinphoneUI/UIContactCell.m index bee9f1448..59a8c7ebb 100644 --- a/Classes/LinphoneUI/UIContactCell.m +++ b/Classes/LinphoneUI/UIContactCell.m @@ -80,7 +80,9 @@ CFStringRef lLocalizedFirstName = (lFirstName != nil)?ABAddressBookCopyLocalizedLabel(lFirstName):nil; CFStringRef lLastName = ABRecordCopyValue(contact, kABPersonLastNameProperty); CFStringRef lLocalizedLastName = (lLastName != nil)?ABAddressBookCopyLocalizedLabel(lLastName):nil; - + CFStringRef lOrganization = ABRecordCopyValue(contact, kABPersonOrganizationProperty); + CFStringRef lLocalizedOrganization = (lOrganization != nil)?ABAddressBookCopyLocalizedLabel(lOrganization):nil; + if(lLocalizedFirstName != nil) [firstNameLabel setText: (NSString *)lLocalizedFirstName]; else @@ -91,6 +93,14 @@ else [lastNameLabel setText: @""]; + if(lLocalizedFirstName == nil && lLocalizedLastName == nil) { + [firstNameLabel setText: (NSString *)lLocalizedOrganization]; + } + + if(lLocalizedOrganization != nil) + CFRelease(lLocalizedOrganization); + if(lOrganization != nil) + CFRelease(lOrganization); if(lLocalizedLastName != nil) CFRelease(lLocalizedLastName); if(lLastName != nil) diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m index 3359d35b3..f9db45aa5 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.m +++ b/Classes/LinphoneUI/UIContactDetailsHeader.m @@ -42,7 +42,8 @@ - (void)initUIContactDetailsHeader { propertyList = [[NSArray alloc] initWithObjects: [NSNumber numberWithInt:kABPersonFirstNameProperty], - [NSNumber numberWithInt:kABPersonLastNameProperty], nil]; + [NSNumber numberWithInt:kABPersonLastNameProperty], + [NSNumber numberWithInt:kABPersonOrganizationProperty], nil]; editing = FALSE; } @@ -139,7 +140,7 @@ + (CGFloat)height:(BOOL)editing { if(editing) { - return 130.0f; + return 160.0f; } else { return 80.0f; } diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib index 3448c3439..729262f8a 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -43,6 +43,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -57,6 +58,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -71,6 +73,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -112,6 +115,7 @@ 290 {{0, 37}, {199, 43}} + _NS:9 NO @@ -143,6 +147,7 @@ {{101, 0}, {219, 80}} + _NS:9 @@ -158,8 +163,10 @@ 274 - {219, 130} + {219, 160} + + _NS:9 1 @@ -178,16 +185,18 @@ 10 - {{101, 0}, {219, 130}} + {{101, 0}, {219, 160}} + _NS:9 IBCocoaTouchFramework - {320, 130} + {320, 160} + _NS:9 @@ -370,7 +379,63 @@ 23 - + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + 0 IBCocoaTouchFramework YES diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib index b1b2452be..f08ae22f4 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib @@ -1,22 +1,22 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G63 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 - IBUIButton - IBUITableView - IBUIImageView - IBUIView - IBUILabel IBProxyObject + IBUIButton + IBUIImageView + IBUILabel + IBUITableView + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -158,63 +158,12 @@ 274 - {219, 130} + {219, 160} _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -229,7 +178,7 @@ AAgACAAIAAEAAQABAAE 10 - {{101, 0}, {219, 130}} + {{101, 0}, {219, 160}} _NS:9 @@ -237,7 +186,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework - {320, 130} + {320, 160} _NS:9 @@ -420,7 +369,63 @@ AAgACAAIAAEAAQABAAE 23 - + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + 0 IBCocoaTouchFramework YES @@ -429,6 +434,6 @@ AAgACAAIAAEAAQABAAE {262, 214} {131, 131} - 933 + 1926 diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 7f3103e25..6f5bdfb7a 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -11072,17 +11072,17 @@ backup - 4 + 5 class BLWrapperHandle name - LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib + LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib change date - 2012-09-25T09:16:21Z + 2012-12-20T13:07:09Z changed values class @@ -11092,7 +11092,7 @@ flags 0 hash - a3054fa100ec1a034084f20d8b1369d9 + b230aead5bd66e84a58b749ed6a37680 name UIContactDetailsHeader.xib @@ -11179,9 +11179,9 @@ versions en - 4 + 5 fr - 4 + 5 diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib similarity index 84% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib index 3448c3439..729262f8a 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -43,6 +43,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -57,6 +58,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -71,6 +73,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -112,6 +115,7 @@ 290 {{0, 37}, {199, 43}} + _NS:9 NO @@ -143,6 +147,7 @@ {{101, 0}, {219, 80}} + _NS:9 @@ -158,8 +163,10 @@ 274 - {219, 130} + {219, 160} + + _NS:9 1 @@ -178,16 +185,18 @@ 10 - {{101, 0}, {219, 130}} + {{101, 0}, {219, 160}} + _NS:9 IBCocoaTouchFramework - {320, 130} + {320, 160} + _NS:9 @@ -370,7 +379,63 @@ 23 - + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + 0 IBCocoaTouchFramework YES From e55012e8842c5290f39d8ac8b05c2255cc26e21c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 21 Dec 2012 10:22:51 +0100 Subject: [PATCH 29/30] update msx264 (required to fix VFU request) --- submodules/msx264 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/msx264 b/submodules/msx264 index 6ba1b8699..f1fd3d6be 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 6ba1b86990d60f1a29d11a4e0cdd71d7b6b1b5bf +Subproject commit f1fd3d6be817dd5c1b8a46f68de04421f75cf056 From 1b9f022fb4b80d6a1928794bf8f036248dbc9587 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 11 Jan 2013 10:53:41 +0100 Subject: [PATCH 30/30] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ebf0b1897..643ea9925 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ebf0b1897ac114c998a59a3d344417603c25069b +Subproject commit 643ea99258887997010d0d05df4e21da00b700a8