mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 07:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for iPad version

Browse source 
Remove useless setting entries
This commit is contained in:
Yann Diorcet 2012-09-17 15:05:34 +02:00
parent 47183c5ac2
commit 3e90ac95b5
11 changed files with 39 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/BuschJaegerCallView.h
View file

@ -29,7 +29,6 @@
@interface BuschJaegerCallView : UIViewController {
@private
LinphoneChatRoom * chatRoom;
VideoZoomHandler* videoZoomHandler;
}

9
Classes/BuschJaegerCallView.m
View file

@ -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*/
{

5
Classes/BuschJaegerCallView.xib
View file

@ -52,7 +52,7 @@
</object>
<object class="IBUIButton" id="317702958">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{266, 20}, {34, 34}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
@ -90,7 +90,7 @@
</object>
<object class="IBUIView" id="903884486">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">269</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="910162139">
<reference key="NSNextResponder" ref="903884486"/>
@ -172,7 +172,6 @@
<string key="NSFrame">{{207, 0}, {73, 58}}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
<bool key="IBUIOpaque">NO</bool>

23
Classes/BuschJaegerHistoryDetailsView.xib
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
@ -94,7 +94,7 @@
</object>
<object class="IBUILabel" id="251393705">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{168, 5}, {112, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
@ -122,7 +122,7 @@
</object>
<object class="IBUIButton" id="1041038771">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">257</int>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{286, 0}, {34, 34}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
@ -157,7 +157,7 @@
</object>
<object class="IBUIView" id="794939656">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">269</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="380982191">
<reference key="NSNextResponder" ref="794939656"/>
@ -220,11 +220,11 @@
</object>
<object class="IBUIView" id="899524222">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="322407382">
<reference key="NSNextResponder" ref="899524222"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="899524222"/>
<reference key="NSWindow"/>
@ -241,7 +241,7 @@
</object>
<object class="IBUIButton" id="802025467">
<reference key="NSNextResponder" ref="899524222"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{266, 406}, {34, 34}}</string>
<reference key="NSSuperview" ref="899524222"/>
<reference key="NSWindow"/>
@ -663,6 +663,7 @@
<string key="dateLabel">UILabel</string>
<string key="fullscreenView">UIView</string>
<string key="imageView">UIRemoteImageView</string>
<string key="saveButton">UIButton</string>
<string key="stationLabel">UILabel</string>
<string key="tableController">UITableViewController</string>
</dictionary>
@ -683,6 +684,10 @@
<string key="name">imageView</string>
<string key="candidateClassName">UIRemoteImageView</string>
</object>
<object class="IBToOneOutletInfo" key="saveButton">
<string key="name">saveButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="stationLabel">
<string key="name">stationLabel</string>
<string key="candidateClassName">UILabel</string>
@ -709,6 +714,10 @@
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

4
Classes/BuschJaegerHistoryView.xib
View file

@ -41,7 +41,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="275032897">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">269</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="776304479">
<reference key="NSNextResponder" ref="275032897"/>
@ -136,7 +136,7 @@
</object>
<object class="IBUIView" id="664811608">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIActivityIndicatorView" id="294663888">
<reference key="NSNextResponder" ref="664811608"/>

5
Classes/BuschJaegerSettingsView.xib
View file

@ -40,7 +40,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="432106977">
<reference key="NSNextResponder" ref="823940774"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">290</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="681245415">
<reference key="NSNextResponder" ref="432106977"/>
@ -131,7 +131,7 @@
</object>
<object class="IBUIView" id="558519328">
<reference key="NSNextResponder" ref="823940774"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">269</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="870767854">
<reference key="NSNextResponder" ref="558519328"/>
@ -161,7 +161,6 @@
<string key="NSFrameSize">{280, 40}</string>
<reference key="NSSuperview" ref="558519328"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="446909226"/>
<bool key="IBUIOpaque">NO</bool>

17
Classes/BuschJaegerWelcomeView.xib
View file

@ -40,7 +40,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUILabel" id="324231259">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{82, 17}, {156, 50}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
@ -75,7 +75,7 @@
</object>
<object class="IBUIButton" id="606095570">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{246, 10}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
@ -150,7 +150,6 @@
<string key="NSFrame">{{0, 85}, {320, 375}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="866892554"/>
<bool key="IBUIClipsSubviews">YES</bool>
@ -351,14 +350,6 @@
<string key="minorKey">./Classes/BuschJaegerStationTableViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerStationViewController</string>
<string key="superclassName">UITableViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BuschJaegerStationViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerWelcomeView</string>
<string key="superclassName">UIViewController</string>
@ -379,7 +370,7 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="historyButton">UIButton</string>
<string key="settingsButton">UIButton</string>
<string key="tableController">BuschJaegerStationViewController</string>
<string key="tableController">BuschJaegerStationTableViewController</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="historyButton">
@ -392,7 +383,7 @@
</object>
<object class="IBToOneOutletInfo" key="tableController">
<string key="name">tableController</string>
<string key="candidateClassName">BuschJaegerStationViewController</string>
<string key="candidateClassName">BuschJaegerStationTableViewController</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">

7
Classes/LinphoneUI/UIHistoryCell.xib
View file

@ -35,7 +35,7 @@
</object>
<object class="IBUIView" id="1038390791">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="171265463">
<reference key="NSNextResponder" ref="1038390791"/>
@ -81,7 +81,7 @@
</object>
<object class="IBUILabel" id="661666265">
<reference key="NSNextResponder" ref="1038390791"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{173, 10}, {103, 21}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
@ -109,11 +109,10 @@
</object>
<object class="IBUIButton" id="509979453">
<reference key="NSNextResponder" ref="1038390791"/>
<int key="NSvFlags">257</int>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{276, 0}, {44, 44}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>

5
Classes/LinphoneUI/UIHistoryDetailsCell.xib
View file

@ -33,15 +33,14 @@
</object>
<object class="IBUIView" id="1038390791">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="171265463">
<reference key="NSNextResponder" ref="1038390791"/>
<int key="NSvFlags">274</int>
<int key="NSvFlags">298</int>
<string key="NSFrame">{{5, 5}, {310, 100}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>

28
Settings.bundle/Root.plist
View file

@ -82,34 +82,6 @@
<key>Type</key>
<string>PSTextFieldSpecifier</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Adapter IP</string>
<key>Key</key>
<string>adapter_ip_preference</string>
<key>DefaultValue</key>
<string></string>
<key>IsSecure</key>
<false/>
<key>KeyboardType</key>
<string>NumbersAndPunctuation</string>
</dict>
<dict>
<key>Key</key>
<string>stun_preference</string>
<key>Title</key>
<string>Stun server</string>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>AutocapitalizationType</key>
<string>None</string>
<key>AutocorrectionType</key>
<string>No</string>
<key>DefaultValue</key>
<string></string>
</dict>
<dict>
<key>Title</key>
<string>Sounds</string>

12
linphone.xcodeproj/project.pbxproj
View file

@ -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;
};