From 3e90ac95b54fa0b16ec3fa5882f2f2f12b22633e Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 17 Sep 2012 15:05:34 +0200 Subject: [PATCH] Fix for iPad version Remove useless setting entries --- Classes/BuschJaegerCallView.h | 1 - Classes/BuschJaegerCallView.m | 9 ------- Classes/BuschJaegerCallView.xib | 5 ++-- Classes/BuschJaegerHistoryDetailsView.xib | 23 +++++++++++------ Classes/BuschJaegerHistoryView.xib | 4 +-- Classes/BuschJaegerSettingsView.xib | 5 ++-- Classes/BuschJaegerWelcomeView.xib | 17 +++---------- Classes/LinphoneUI/UIHistoryCell.xib | 7 +++--- Classes/LinphoneUI/UIHistoryDetailsCell.xib | 5 ++-- Settings.bundle/Root.plist | 28 --------------------- linphone.xcodeproj/project.pbxproj | 12 ++++++--- 11 files changed, 39 insertions(+), 77 deletions(-) diff --git a/Classes/BuschJaegerCallView.h b/Classes/BuschJaegerCallView.h index dced2f831..4fd85957e 100644 --- a/Classes/BuschJaegerCallView.h +++ b/Classes/BuschJaegerCallView.h @@ -29,7 +29,6 @@ @interface BuschJaegerCallView : UIViewController { @private - LinphoneChatRoom * chatRoom; VideoZoomHandler* videoZoomHandler; } diff --git a/Classes/BuschJaegerCallView.m b/Classes/BuschJaegerCallView.m index d6c975e40..b460a8cc6 100644 --- a/Classes/BuschJaegerCallView.m +++ b/Classes/BuschJaegerCallView.m @@ -118,15 +118,6 @@ [endOrRejectCallButton setHidden:YES]; [videoView setHidden:YES]; - if (!chatRoom) { - NSString* s = [NSString stringWithFormat:@"sip:100000001@%@", [[NSUserDefaults standardUserDefaults] stringForKey:@"adapter_ip_preference"]]; - const char* adapter = [s cStringUsingEncoding:[NSString defaultCStringEncoding]]; - chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], adapter); - - //lights->chatRoom = chatRoom; - //openDoor->chatRoom = chatRoom; - } - User *usr = [[[LinphoneManager instance] configuration] getCurrentUser]; /* init gradients for openDoorButton*/ { diff --git a/Classes/BuschJaegerCallView.xib b/Classes/BuschJaegerCallView.xib index 4748ede46..cdc1cb975 100644 --- a/Classes/BuschJaegerCallView.xib +++ b/Classes/BuschJaegerCallView.xib @@ -52,7 +52,7 @@ - 292 + 289 {{266, 20}, {34, 34}} @@ -90,7 +90,7 @@ - 292 + 269 @@ -172,7 +172,6 @@ {{207, 0}, {73, 58}} - _NS:225 NO diff --git a/Classes/BuschJaegerHistoryDetailsView.xib b/Classes/BuschJaegerHistoryDetailsView.xib index 1c13c6f59..ac8f886a6 100644 --- a/Classes/BuschJaegerHistoryDetailsView.xib +++ b/Classes/BuschJaegerHistoryDetailsView.xib @@ -1,7 +1,7 @@ - 1280 + 1296 11E53 2549 1138.47 @@ -94,7 +94,7 @@ - 292 + 289 {{168, 5}, {112, 21}} @@ -122,7 +122,7 @@ - 257 + 289 {{286, 0}, {34, 34}} @@ -157,7 +157,7 @@ - 292 + 269 @@ -220,11 +220,11 @@ - 292 + 274 - 292 + 274 {320, 460} @@ -241,7 +241,7 @@ - 292 + 265 {{266, 406}, {34, 34}} @@ -663,6 +663,7 @@ UILabel UIView UIRemoteImageView + UIButton UILabel UITableViewController @@ -683,6 +684,10 @@ imageView UIRemoteImageView + + saveButton + UIButton + stationLabel UILabel @@ -709,6 +714,10 @@ 0 IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + YES 3 diff --git a/Classes/BuschJaegerHistoryView.xib b/Classes/BuschJaegerHistoryView.xib index 1c149cdab..625f42de2 100644 --- a/Classes/BuschJaegerHistoryView.xib +++ b/Classes/BuschJaegerHistoryView.xib @@ -41,7 +41,7 @@ - 292 + 269 @@ -136,7 +136,7 @@ - 292 + 274 diff --git a/Classes/BuschJaegerSettingsView.xib b/Classes/BuschJaegerSettingsView.xib index 40d6c86a9..f259e7d03 100644 --- a/Classes/BuschJaegerSettingsView.xib +++ b/Classes/BuschJaegerSettingsView.xib @@ -40,7 +40,7 @@ - 292 + 290 @@ -131,7 +131,7 @@ - 292 + 269 @@ -161,7 +161,6 @@ {280, 40} - _NS:9 NO diff --git a/Classes/BuschJaegerWelcomeView.xib b/Classes/BuschJaegerWelcomeView.xib index 9cb6596ef..87bb9d03c 100644 --- a/Classes/BuschJaegerWelcomeView.xib +++ b/Classes/BuschJaegerWelcomeView.xib @@ -40,7 +40,7 @@ - 292 + 293 {{82, 17}, {156, 50}} @@ -75,7 +75,7 @@ - 292 + 289 {{246, 10}, {64, 64}} @@ -150,7 +150,6 @@ {{0, 85}, {320, 375}} - _NS:9 YES @@ -351,14 +350,6 @@ ./Classes/BuschJaegerStationTableViewController.h - - BuschJaegerStationViewController - UITableViewController - - IBProjectSource - ./Classes/BuschJaegerStationViewController.h - - BuschJaegerWelcomeView UIViewController @@ -379,7 +370,7 @@ UIButton UIButton - BuschJaegerStationViewController + BuschJaegerStationTableViewController @@ -392,7 +383,7 @@ tableController - BuschJaegerStationViewController + BuschJaegerStationTableViewController diff --git a/Classes/LinphoneUI/UIHistoryCell.xib b/Classes/LinphoneUI/UIHistoryCell.xib index 8ba0bcd09..2c3ed4464 100644 --- a/Classes/LinphoneUI/UIHistoryCell.xib +++ b/Classes/LinphoneUI/UIHistoryCell.xib @@ -35,7 +35,7 @@ - 292 + 274 @@ -81,7 +81,7 @@ - 292 + 289 {{173, 10}, {103, 21}} @@ -109,11 +109,10 @@ - 257 + 289 {{276, 0}, {44, 44}} - _NS:9 NO IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/UIHistoryDetailsCell.xib b/Classes/LinphoneUI/UIHistoryDetailsCell.xib index 3f2bc9f69..ea5137f0f 100644 --- a/Classes/LinphoneUI/UIHistoryDetailsCell.xib +++ b/Classes/LinphoneUI/UIHistoryDetailsCell.xib @@ -33,15 +33,14 @@ - 292 + 274 - 274 + 298 {{5, 5}, {310, 100}} - _NS:9 1 NO diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist index edd127799..4bf2d403a 100644 --- a/Settings.bundle/Root.plist +++ b/Settings.bundle/Root.plist @@ -82,34 +82,6 @@ Type PSTextFieldSpecifier - - Type - PSTextFieldSpecifier - Title - Adapter IP - Key - adapter_ip_preference - DefaultValue - - IsSecure - - KeyboardType - NumbersAndPunctuation - - - Key - stun_preference - Title - Stun server - Type - PSTextFieldSpecifier - AutocapitalizationType - None - AutocorrectionType - No - DefaultValue - - Title Sounds diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index ccf388e6f..5980d8998 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1825,6 +1825,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "buschjaeger-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -1836,7 +1837,7 @@ OTHER_LDFLAGS = ""; PRODUCT_NAME = buschjaeger; SKIP_INSTALL = NO; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1892,6 +1893,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "buschjaeger-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -1903,7 +1905,7 @@ OTHER_LDFLAGS = ""; PRODUCT_NAME = buschjaeger; SKIP_INSTALL = NO; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = DistributionAdhoc; }; @@ -2129,6 +2131,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "buschjaeger-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -2140,7 +2143,7 @@ OTHER_LDFLAGS = ""; PRODUCT_NAME = buschjaeger; SKIP_INSTALL = NO; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -2196,6 +2199,7 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "buschjaeger-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -2207,7 +2211,7 @@ OTHER_LDFLAGS = ""; PRODUCT_NAME = buschjaeger; SKIP_INSTALL = NO; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Distribution; };