diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index 8e2200c68..6158c8392 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -209,10 +209,11 @@ NSTimer *callQualityRefresher; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return interfaceOrientation == UIInterfaceOrientationPortrait + BOOL result = interfaceOrientation == UIInterfaceOrientationPortrait || interfaceOrientation == UIInterfaceOrientationLandscapeRight || interfaceOrientation == UIInterfaceOrientationLandscapeLeft; + + return result; } - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { diff --git a/PhoneMainView.xib b/PhoneMainView.xib index 3953ea8da..666964c1f 100644 --- a/PhoneMainView.xib +++ b/PhoneMainView.xib @@ -47,6 +47,7 @@ {320, 480} + 1 MSAxIDEAA @@ -74,6 +75,7 @@ history-orange.png IBCocoaTouchFramework + @@ -95,6 +97,7 @@ dialer-orange.png IBCocoaTouchFramework + PhoneViewController @@ -109,6 +112,7 @@ IBCocoaTouchFramework + 5 @@ -123,6 +127,7 @@ IBCocoaTouchFramework + 0 @@ -140,12 +145,21 @@ 266 {{0, 431}, {320, 49}} + 3 MCAwAA NO IBCocoaTouchFramework + + YES + + + + + + @@ -359,7 +373,407 @@ 48 - + + + YES + + ABPeoplePickerNavigationController + UINavigationController + + IBProjectSource + ./Classes/ABPeoplePickerNavigationController.h + + + + CallHistoryTableViewController + GenericTabViewController + + clear + UIButton + + + clear + + clear + UIButton + + + + IBProjectSource + ./Classes/CallHistoryTableViewController.h + + + + GenericTabViewController + UITableViewController + + header + UIView + + + header + + header + UIView + + + + IBProjectSource + ./Classes/GenericTabViewController.h + + + + MainScreenWithVideoPreview + UIViewController + + YES + + YES + phoneMainView + window + + + YES + PhoneViewController + UIWindow + + + + YES + + YES + phoneMainView + window + + + YES + + phoneMainView + PhoneViewController + + + window + UIWindow + + + + + IBProjectSource + ./Classes/MainScreenWithVideoPreview.h + + + + 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 + + + + 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 + + + + UIEraseButton + UIButton + + IBProjectSource + ./Classes/UIEraseButton.h + + + + linphoneAppDelegate + NSObject + + YES + + YES + myPeoplePickerController + myPhoneViewController + myTabBarController + window + + + YES + ABPeoplePickerNavigationController + PhoneViewController + UITabBarController + UIWindow + + + + YES + + YES + myPeoplePickerController + myPhoneViewController + myTabBarController + window + + + YES + + myPeoplePickerController + ABPeoplePickerNavigationController + + + myPhoneViewController + PhoneViewController + + + myTabBarController + UITabBarController + + + window + UIWindow + + + + + IBProjectSource + ./Classes/linphoneAppDelegate.h + + + + 0 IBCocoaTouchFramework diff --git a/Resources/contact_vide.png b/Resources/contact_vide.png new file mode 100755 index 000000000..dda753a32 Binary files /dev/null and b/Resources/contact_vide.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index cc01131ef..107407db0 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -250,6 +250,9 @@ 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 34957F3F147D3FBF00DD7A09 /* secured.png in Resources */ = {isa = PBXBuildFile; fileRef = 34957F3E147D3FBF00DD7A09 /* secured.png */; }; + 34C7646914CD51CD008E9607 /* contact_vide.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646814CD51CD008E9607 /* contact_vide.png */; }; + 34C7646C14CD5585008E9607 /* dialer-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646A14CD5585008E9607 /* dialer-orange.png */; }; + 34C7646D14CD5585008E9607 /* history-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646B14CD5585008E9607 /* history-orange.png */; }; 34CA852F148F646700503C01 /* MainScreenWithVideoPreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA852E148F646700503C01 /* MainScreenWithVideoPreview.xib */; }; 34CA8530148F646700503C01 /* MainScreenWithVideoPreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA852E148F646700503C01 /* MainScreenWithVideoPreview.xib */; }; 34CA8535148F669900503C01 /* VideoViewController-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA8534148F669900503C01 /* VideoViewController-ipad.xib */; }; @@ -626,6 +629,9 @@ 344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; }; 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; }; 34957F3E147D3FBF00DD7A09 /* secured.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = secured.png; path = Resources/secured.png; sourceTree = ""; }; + 34C7646814CD51CD008E9607 /* contact_vide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_vide.png; path = Resources/contact_vide.png; sourceTree = ""; }; + 34C7646A14CD5585008E9607 /* dialer-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-orange.png"; path = "submodules/linphone/pixmaps/dialer-orange.png"; sourceTree = ""; }; + 34C7646B14CD5585008E9607 /* history-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-orange.png"; path = "submodules/linphone/pixmaps/history-orange.png"; sourceTree = ""; }; 34CA852E148F646700503C01 /* MainScreenWithVideoPreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainScreenWithVideoPreview.xib; sourceTree = ""; }; 34CA8534148F669900503C01 /* VideoViewController-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "VideoViewController-ipad.xib"; sourceTree = ""; }; 34CA8537148F692A00503C01 /* MainScreenWithVideoPreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainScreenWithVideoPreview.h; sourceTree = ""; }; @@ -1175,6 +1181,9 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 34C7646A14CD5585008E9607 /* dialer-orange.png */, + 34C7646B14CD5585008E9607 /* history-orange.png */, + 34C7646814CD51CD008E9607 /* contact_vide.png */, 3418845B14C7077400EA48C7 /* status_gray.png */, 3418844F14C6F66E00EA48C7 /* status_green.png */, 3418845114C6F66F00EA48C7 /* status_orange.png */, @@ -1364,6 +1373,9 @@ 3418845714C6F66F00EA48C7 /* status_orange.png in Resources */, 3418845914C6F66F00EA48C7 /* status_red.png in Resources */, 3418845C14C7077400EA48C7 /* status_gray.png in Resources */, + 34C7646914CD51CD008E9607 /* contact_vide.png in Resources */, + 34C7646C14CD5585008E9607 /* dialer-orange.png in Resources */, + 34C7646D14CD5585008E9607 /* history-orange.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };