From 6361bfcba5eeab47adc13e6635f549c9cc418578 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 15 Dec 2011 09:38:13 +0100 Subject: [PATCH] Bump ios version to 1.1.0.50 --- Classes/VideoViewController-ipad.xib | 373 ++++++++++++++++++++++----- linphone-Info.plist | 2 +- linphone.xcodeproj/project.pbxproj | 2 +- 3 files changed, 310 insertions(+), 67 deletions(-) diff --git a/Classes/VideoViewController-ipad.xib b/Classes/VideoViewController-ipad.xib index a4270d57d..ab6124536 100644 --- a/Classes/VideoViewController-ipad.xib +++ b/Classes/VideoViewController-ipad.xib @@ -38,6 +38,7 @@ {768, 1004} + 4 MAA @@ -54,6 +55,7 @@ {{-9, 0}, {777, 1004}} + _NS:569 NO IBIPadFramework @@ -128,6 +130,7 @@ {{598, 779}, {170, 225}} + 3 MQA @@ -164,7 +167,7 @@ {768, 1004} - + _NS:212 3 @@ -182,6 +185,7 @@ {1004, 768} + _NS:569 NO IBIPadFramework @@ -192,7 +196,7 @@ {{779, 598}, {225, 170}} - + 3 MQA @@ -249,6 +253,7 @@ {{555, 706}, {108, 62}} + NO IBIPadFramework 0 @@ -269,7 +274,118 @@ {1004, 768} - + + _NS:212 + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + 3 + 3 + + IBIPadFramework + + + + 274 + + + + 292 + {1004, 768} + + + + _NS:569 + NO + IBIPadFramework + + + + 292 + {{779, 598}, {225, 170}} + + + + + 3 + MQA + + + IBIPadFramework + + + + 292 + {{341, 706}, {108, 62}} + + + + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + + 292 + {{448, 706}, {108, 62}} + + + + NO + IBIPadFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + + + 292 + {{555, 706}, {108, 62}} + + + + NO + IBIPadFramework + 0 + 0 + 1 + switch + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + {1004, 768} + + + _NS:212 1 @@ -292,14 +408,6 @@ 13 - - - mCamSwitchLand - - - - 14 - mHangUp @@ -308,22 +416,6 @@ 16 - - - mHangUpLand - - - - 17 - - - - mLandscape - - - - 18 - mPortrait @@ -340,14 +432,6 @@ 20 - - - mPreviewLand - - - - 21 - view @@ -364,14 +448,6 @@ 23 - - - mMuteLand - - - - 24 - mDisplay @@ -382,11 +458,99 @@ - mDisplayLand + mCamSwitchLandLeft + + + + 35 + + + + mCamSwitchLandRight + + + + 36 + + + + mDisplayLandLeft + + + + 37 + + + + mDisplayLandRight - 28 + 38 + + + + mHangUpLandLeft + + + + 39 + + + + mHangUpLandRight + + + + 40 + + + + mLandscapeLeft + + + + 41 + + + + mLandscapeRight + + + + 42 + + + + mMuteLandLeft + + + + 43 + + + + mMuteLandRight + + + + 44 + + + + mPreviewLandLeft + + + + 45 + + + + mPreviewLandRight + + + + 46 @@ -439,7 +603,7 @@ - landscape + landscape-right 5 @@ -496,6 +660,46 @@ + + 29 + + + + + + + + + + landscape-left + + + 30 + + + + + 31 + + + Hang Up Button + + + 32 + + + + + 33 + + + preview + + + 34 + + + @@ -511,7 +715,16 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIMuteButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIHangUpButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UICamSwitch + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -527,7 +740,7 @@ - 28 + 46 @@ -579,53 +792,79 @@ UIViewController UICamSwitch - UICamSwitch + UICamSwitch + UICamSwitch UIView - UIView + UIView + UIView UIHangUpButton - UIHangUpButton - UIView + UIHangUpButton + UIHangUpButton + UIView + UIView UIMuteButton - UIMuteButton + UIMuteButton + UIMuteButton UIView UIView - UIView + UIView + UIView mCamSwitch UICamSwitch - - mCamSwitchLand + + mCamSwitchLandLeft + UICamSwitch + + + mCamSwitchLandRight UICamSwitch mDisplay UIView - - mDisplayLand + + mDisplayLandLeft + UIView + + + mDisplayLandRight UIView mHangUp UIHangUpButton - - mHangUpLand + + mHangUpLandLeft UIHangUpButton - - mLandscape + + mHangUpLandRight + UIHangUpButton + + + mLandscapeLeft + UIView + + + mLandscapeRight UIView mMute UIMuteButton - - mMuteLand + + mMuteLandLeft + UIMuteButton + + + mMuteLandRight UIMuteButton @@ -636,8 +875,12 @@ mPreview UIView - - mPreviewLand + + mPreviewLandLeft + UIView + + + mPreviewLandRight UIView diff --git a/linphone-Info.plist b/linphone-Info.plist index 1c7755433..d830ec52e 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 1.1.0.1 + 1.1.0.50 NSMainNibFile PhoneMainView NSMainNibFile~ipad diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 26cbb301a..ce0f4b8b5 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1558,7 +1558,7 @@ armv6, ); CODE_SIGN_ENTITLEMENTS = untitled.plist; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ""; GCC_DYNAMIC_NO_PIC = NO;