witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Add settings for wizard

Browse source 
Fix xibs
This commit is contained in:
Yann Diorcet 2012-09-18 17:27:34 +02:00
parent 4accca8b3a
commit e7d3c6a0d9
19 changed files with 234 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/ChatRoomViewController.m
View file

@ -156,8 +156,8 @@ static UICompositeViewDescription *compositeDescription = nil;
[transferBackgroundImage setImage:[TUNinePatchCache imageOfSize:[transferBackgroundImage bounds].size
forNinePatchNamed:@"chat_background"]];
BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] != NULL
&& [[[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] length]>0;
BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] != NULL
&& [[[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] length]>0;
CGRect pictureFrame = pictureButton.frame;
CGRect messageframe = messageView.frame;
@ -457,7 +457,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
- (BOOL)chatRoomStartImageUpload:(UIImage*)image url:(NSURL*)url{
if(imageSharing == nil) {
NSString *urlString = [[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"];
NSString *urlString = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"];
imageSharing = [ImageSharing imageSharingUpload:[NSURL URLWithString:urlString] image:image delegate:self userInfo:url];
[footerView setHidden:TRUE];
[transferView setHidden:FALSE];
@ -615,6 +615,8 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
// Always stay at bottom
CGPoint contentPt = [tableController.tableView contentOffset];
contentPt.y -= diff;
if(contentPt.y + tableFrame.size.height > tableController.tableView.contentSize.height)
contentPt.y += diff;
[tableController.tableView setContentOffset:contentPt animated:FALSE];
}

8
Classes/LinphoneCoreSettingsStore.m
View file

@ -194,7 +194,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference", 0) forKey:@"debugenable_preference"];
[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "animations_preference", 1) forKey:@"animations_preference"];
[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "wifi_only_preference", 0) forKey:@"wifi_only_preference"];
[self setString: lp_config_get_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "file_upload_url_preference", NULL) forKey:@"file_upload_url_preference"];
[self setString: lp_config_get_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "sharing_server_preference", NULL) forKey:@"sharing_server_preference"];
/*keep this one also in the standardUserDefaults so that it can be read before starting liblinphone*/
BOOL start_at_boot = TRUE;
@ -448,7 +448,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
NSString* stun_server = [self stringForKey:@"stun_preference"];
if ([stun_server length] > 0){
linphone_core_set_stun_server(lc,[stun_server cStringUsingEncoding:[NSString defaultCStringEncoding]]);
linphone_core_set_stun_server(lc, [stun_server UTF8String]);
BOOL ice_preference = [self boolForKey:@"ice_preference"];
if(ice_preference) {
linphone_core_set_firewall_policy(lc, LinphonePolicyUseIce);
@ -512,8 +512,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
BOOL animations = [self boolForKey:@"animations_preference"];
lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "animations_preference", animations);
NSString* file_upload_url= [self stringForKey:@"file_upload_url_preference"];
[[LinphoneManager instance] lpConfigSetString:file_upload_url forKey:@"file_upload_url_preference"];
NSString* sharing_server = [self stringForKey:@"sharing_server_preference"];
[[LinphoneManager instance] lpConfigSetString:sharing_server forKey:@"sharing_server_preference"];

4
Classes/LinphoneUI/UIChatRoomCell.m
View file

@ -47,8 +47,8 @@ static const CGFloat CELL_MAX_WIDTH = 320.0f;
static const CGFloat CELL_MESSAGE_X_MARGIN = 26.0f;
static const CGFloat CELL_MESSAGE_Y_MARGIN = 36.0f;
static const CGFloat CELL_FONT_SIZE = 17.0f;
static const CGFloat CELL_IMAGE_HEIGHT = 50.0f;
static const CGFloat CELL_IMAGE_WIDTH = 50.0f;
static const CGFloat CELL_IMAGE_HEIGHT = 100.0f;
static const CGFloat CELL_IMAGE_WIDTH = 100.0f;
static UIFont *CELL_FONT = nil;
#pragma mark - Lifecycle Functions

2
Classes/SettingsViewController.m
View file

@ -394,7 +394,6 @@ static UICompositeViewDescription *compositeDescription = nil;
settingsController.showDoneButton = FALSE;
settingsController.delegate = self;
settingsController.showCreditsFooter = FALSE;
settingsController.hiddenKeys = [self findHiddenKeys];
settingsController.settingsStore = settingsStore;
[navigationController.view setBackgroundColor:[UIColor clearColor]];
@ -417,6 +416,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[super viewWillAppear:animated];
[settingsStore transformLinphoneCoreToKeys]; // Sync settings with linphone core settings
settingsController.hiddenKeys = [self findHiddenKeys];
[settingsController.tableView reloadData];
// Set observer

21
Classes/WizardViewController.m
View file

@ -283,6 +283,27 @@ static UICompositeViewDescription *compositeDescription = nil;
[LinphoneLogger logc:LinphoneLoggerError format:"cannot set transport"];
}
}
NSString* sharing_server = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server" forSection:@"wizard"];
[[LinphoneManager instance] lpConfigSetString:sharing_server forKey:@"sharing_server_preference"];
BOOL ice = [[LinphoneManager instance] lpConfigBoolForKey:@"ice" forSection:@"wizard"];
[[LinphoneManager instance] lpConfigSetBool:ice forKey:@"ice_preference"];
NSString* stun = [[LinphoneManager instance] lpConfigStringForKey:@"stun" forSection:@"wizard"];
[[LinphoneManager instance] lpConfigSetString:stun forKey:@"stun_preference"];
if ([stun length] > 0){
linphone_core_set_stun_server(lc, [stun UTF8String]);
if(ice) {
linphone_core_set_firewall_policy(lc, LinphonePolicyUseIce);
} else {
linphone_core_set_firewall_policy(lc, LinphonePolicyUseStun);
}
} else {
linphone_core_set_stun_server(lc, NULL);
linphone_core_set_firewall_policy(lc, LinphonePolicyNoFirewall);
}
}
- (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server {

20
Classes/en.lproj/ImageViewController.xib
View file

@ -42,12 +42,13 @@
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUIContentMode">4</int>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
@ -73,7 +74,7 @@
<object class="IBUIButton" id="771824371">
<reference key="NSNextResponder" ref="350805517"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{80, 44}</string>
<string key="NSFrameSize">{160, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="170933358"/>
@ -85,6 +86,8 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -97,13 +100,13 @@
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_back_default.png</string>
<string key="NSResourceName">image_back_over.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_back_over.png</string>
<string key="NSResourceName">image_back_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
@ -218,11 +221,13 @@
<int key="objectID">7</int>
<reference key="object" ref="771824371"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="714444944"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">background</string>
</object>
</array>
</object>
@ -236,6 +241,7 @@
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@ -289,8 +295,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="chat_back_default.png">{320, 88}</string>
<string key="chat_back_over.png">{320, 88}</string>
<string key="image_back_default.png">{320, 88}</string>
<string key="image_back_over.png">{320, 88}</string>
<string key="toolsbar_background.png">{5, 117}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1498</string>

19
Classes/fr.lproj/ImageViewController.xib
View file

@ -46,7 +46,7 @@
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUIContentMode">4</int>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
@ -71,7 +71,7 @@
<object class="IBUIButton" id="771824371">
<reference key="NSNextResponder" ref="350805517"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{80, 44}</string>
<string key="NSFrameSize">{160, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSNextKeyView" ref="170933358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@ -82,6 +82,8 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -94,13 +96,13 @@
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_back_default.png</string>
<string key="NSResourceName">image_back_over.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_back_over.png</string>
<string key="NSResourceName">image_back_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
@ -212,11 +214,13 @@
<int key="objectID">7</int>
<reference key="object" ref="771824371"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="714444944"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">background</string>
</object>
</array>
</object>
@ -230,6 +234,7 @@
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@ -283,8 +288,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="chat_back_default.png">{320, 88}</string>
<string key="chat_back_over.png">{320, 88}</string>
<string key="image_back_default.png">{320, 88}</string>
<string key="image_back_over.png">{320, 88}</string>
<string key="toolsbar_background.png">{5, 117}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">933</string>

BIN
Resources/image_back_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Resources/image_back_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

3
Resources/linphonerc-factory
View file

@ -40,4 +40,7 @@ username_length=4
expires=600
push_notification=1
transport=tls
sharing_server=https://www.linphone.org:444/upload.php
ice=1
stun=stun.linphone.org

3
Resources/linphonerc-factory~ipad
View file

@ -40,3 +40,6 @@ username_length=4
expires=600
push_notification=1
transport=tls
sharing_server=https://www.linphone.org:444/upload.php
ice=1
stun=stun.linphone.org

2
Settings/InAppSettings.bundle/Advanced.plist
View file

@ -174,7 +174,7 @@
<key>Title</key>
<string>Sharing server</string>
<key>Key</key>
<string>file_upload_url_preference</string>
<string>sharing_server_preference</string>
<key>IASKTextAlignment</key>
<string>IASKUITextAlignmentRight</string>
</dict>

8
Settings/InAppSettings.bundle/Network.plist
View file

@ -18,7 +18,7 @@
<key>Key</key>
<string>stun_preference</string>
<key>Title</key>
<string>Stun server</string>
<string>Stun Server</string>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>AutocapitalizationType</key>
@ -113,9 +113,9 @@
<string>Transport</string>
<key>Titles</key>
<array>
<string>udp</string>
<string>tcp</string>
<string>tls</string>
<string>UDP</string>
<string>TCP</string>
<string>TLS</string>
</array>
<key>Type</key>
<string>PSMultiValueSpecifier</string>

16
Settings/InAppSettings.bundle/en.lproj/Network.strings
View file

@ -1,8 +1,8 @@
/* Wifi only */
"Wifi only" = "Wifi only";
/* Stun server */
"Stun server" = "Stun server";
/* Stun Server */
"Stun Server" = "Stun Server";
/* ICE */
"ICE" = "ICE";
@ -31,14 +31,14 @@
/* Transport */
"Transport" = "Transport";
/* udp */
"udp" = "udp";
/* UDP */
"UDP" = "UDP";
/* tcp */
"tcp" = "tcp";
/* TCP */
"TCP" = "TCP";
/* tls */
"tls" = "tls";
/* TLS */
"TLS" = "TLS";
/* None */
"None" = "None";

16
Settings/InAppSettings.bundle/fr.lproj/Network.strings
View file

@ -1,8 +1,8 @@
/* Wifi only */
"Wifi only" = "Uniquement Wifi";
/* Stun server */
"Stun server" = "Serveur Stun";
/* Stun Server */
"Stun Server" = "Serveur Stun";
/* ICE */
"ICE" = "ICE";
@ -31,14 +31,14 @@
/* Transport */
"Transport" = "Transport";
/* udp */
"udp" = "udp";
/* UDP */
"UDP" = "UDP";
/* tcp */
"tcp" = "tcp";
/* TCP */
"TCP" = "TCP";
/* tls */
"tls" = "tls";
/* TLS */
"TLS" = "TLS";
/* None */
"None" = "Aucun";

137
linphone.ldb/Contents.plist
View file

@ -4281,17 +4281,17 @@
<dict>
<key>backup</key>
<dict>
<key>4</key>
<key>6</key>
<dict>
<key>class</key>
<string>BLWrapperHandle</string>
<key>name</key>
<string>Classes/ImageViewController/4/ImageViewController.xib</string>
<string>Classes/ImageViewController/6/ImageViewController.xib</string>
</dict>
</dict>
</dict>
<key>change date</key>
<date>2012-09-18T12:55:28Z</date>
<date>2012-09-18T15:26:33Z</date>
<key>changed values</key>
<array/>
<key>class</key>
@ -4301,7 +4301,7 @@
<key>flags</key>
<integer>0</integer>
<key>hash</key>
<string>cf8736251f03474edd9a8c46b942ae63
<string>b3e155c6a9c76213208e70d8dc9bd3df
</string>
<key>name</key>
<string>ImageViewController.xib</string>
@ -4340,9 +4340,9 @@
<key>versions</key>
<dict>
<key>en</key>
<string>4</string>
<string>6</string>
<key>fr</key>
<string>4</string>
<string>6</string>
</dict>
</dict>
</array>
@ -11500,7 +11500,7 @@ Raison: %2$s</string>
</dict>
</dict>
<key>change date</key>
<date>2012-09-18T09:18:41Z</date>
<date>2012-09-18T15:13:17Z</date>
<key>changed values</key>
<array/>
<key>class</key>
@ -11510,7 +11510,7 @@ Raison: %2$s</string>
<key>flags</key>
<integer>0</integer>
<key>hash</key>
<string>3c3bd8331f174699330a8cffb2875fa5
<string>f5919fdebddf11e613578ee7ff05f05e
</string>
<key>name</key>
<string>Network.strings</string>
@ -11549,17 +11549,17 @@ Raison: %2$s</string>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>Stun server</string>
<string>Stun Server</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>0</integer>
<key>key</key>
<string>Stun server</string>
<string>Stun Server</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>Stun server</string>
<string>Stun Server</string>
<key>fr</key>
<string>Serveur Stun</string>
</dict>
@ -11774,17 +11774,17 @@ Raison: %2$s</string>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>udp</string>
<string>UDP</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>2</integer>
<key>key</key>
<string>udp</string>
<string>UDP</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>udp</string>
<string>UDP</string>
</dict>
<key>snapshots</key>
<dict/>
@ -11797,17 +11797,17 @@ Raison: %2$s</string>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>tcp</string>
<string>TCP</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>2</integer>
<key>key</key>
<string>tcp</string>
<string>TCP</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>tcp</string>
<string>TCP</string>
</dict>
<key>snapshots</key>
<dict/>
@ -11820,17 +11820,17 @@ Raison: %2$s</string>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>tls</string>
<string>TLS</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>2</integer>
<key>key</key>
<string>tls</string>
<string>TLS</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>tls</string>
<string>TLS</string>
</dict>
<key>snapshots</key>
<dict/>
@ -11908,7 +11908,102 @@ Raison: %2$s</string>
</dict>
</array>
<key>old objects</key>
<array/>
<array>
<dict>
<key>change date</key>
<date>2001-01-01T00:00:00Z</date>
<key>changed values</key>
<array/>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>udp</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>2</integer>
<key>key</key>
<string>udp</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>udp</string>
</dict>
<key>snapshots</key>
<dict/>
</dict>
<dict>
<key>change date</key>
<date>2001-01-01T00:00:00Z</date>
<key>changed values</key>
<array/>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>tcp</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>2</integer>
<key>key</key>
<string>tcp</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>tcp</string>
</dict>
<key>snapshots</key>
<dict/>
</dict>
<dict>
<key>change date</key>
<date>2001-01-01T00:00:00Z</date>
<key>changed values</key>
<array/>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>tls</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>2</integer>
<key>key</key>
<string>tls</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>tls</string>
</dict>
<key>snapshots</key>
<dict/>
</dict>
<dict>
<key>change date</key>
<date>2001-01-01T00:00:00Z</date>
<key>changed values</key>
<array/>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>Stun server</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>0</integer>
<key>key</key>
<string>Stun server</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>Stun server</string>
<key>fr</key>
<string>Serveur Stun</string>
</dict>
<key>snapshots</key>
<dict/>
</dict>
</array>
<key>plist file</key>
<false/>
<key>snapshots</key>

20
linphone.ldb/Resources/Classes/ImageViewController/4/ImageViewController.xib → linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib
View file

@ -42,12 +42,13 @@
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUIContentMode">4</int>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
@ -73,7 +74,7 @@
<object class="IBUIButton" id="771824371">
<reference key="NSNextResponder" ref="350805517"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{80, 44}</string>
<string key="NSFrameSize">{160, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="170933358"/>
@ -85,6 +86,8 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -97,13 +100,13 @@
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_back_default.png</string>
<string key="NSResourceName">image_back_over.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_back_over.png</string>
<string key="NSResourceName">image_back_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
@ -218,11 +221,13 @@
<int key="objectID">7</int>
<reference key="object" ref="771824371"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="714444944"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">background</string>
</object>
</array>
</object>
@ -236,6 +241,7 @@
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@ -289,8 +295,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="chat_back_default.png">{320, 88}</string>
<string key="chat_back_over.png">{320, 88}</string>
<string key="image_back_default.png">{320, 88}</string>
<string key="image_back_over.png">{320, 88}</string>
<string key="toolsbar_background.png">{5, 117}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1498</string>

16
linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
View file

@ -1,8 +1,8 @@
/* Wifi only */
"Wifi only" = "Wifi only";
/* Stun server */
"Stun server" = "Stun server";
/* Stun Server */
"Stun Server" = "Stun Server";
/* ICE */
"ICE" = "ICE";
@ -31,14 +31,14 @@
/* Transport */
"Transport" = "Transport";
/* udp */
"udp" = "udp";
/* UDP */
"UDP" = "UDP";
/* tcp */
"tcp" = "tcp";
/* TCP */
"TCP" = "TCP";
/* tls */
"tls" = "tls";
/* TLS */
"TLS" = "TLS";
/* None */
"None" = "None";

12
linphone.xcodeproj/project.pbxproj
View file

@ -783,6 +783,10 @@
D3832801158100E400FA0D23 /* history_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FD158100E400FA0D23 /* history_over.png */; };
D3832802158100E400FA0D23 /* settings_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FE158100E400FA0D23 /* settings_over.png */; };
D3832803158100E400FA0D23 /* chat_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FF158100E400FA0D23 /* chat_over.png */; };
D3866C281608CA1600830F95 /* image_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C261608CA1600830F95 /* image_back_default.png */; };
D3866C291608CA1600830F95 /* image_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C261608CA1600830F95 /* image_back_default.png */; };
D3866C2A1608CA1600830F95 /* image_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C271608CA1600830F95 /* image_back_over.png */; };
D3866C2B1608CA1600830F95 /* image_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3866C271608CA1600830F95 /* image_back_over.png */; };
D389363915A6D53200A3A3AA /* chat_bubble_incoming.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */; };
D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; };
D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; };
@ -1821,6 +1825,8 @@
D38327FD158100E400FA0D23 /* history_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_over.png; path = Resources/history_over.png; sourceTree = "<group>"; };
D38327FE158100E400FA0D23 /* settings_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settings_over.png; path = Resources/settings_over.png; sourceTree = "<group>"; };
D38327FF158100E400FA0D23 /* chat_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_over.png; path = Resources/chat_over.png; sourceTree = "<group>"; };
D3866C261608CA1600830F95 /* image_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = image_back_default.png; path = Resources/image_back_default.png; sourceTree = "<group>"; };
D3866C271608CA1600830F95 /* image_back_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = image_back_over.png; path = Resources/image_back_over.png; sourceTree = "<group>"; };
D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_incoming.9.png; path = Resources/chat_bubble_incoming.9.png; sourceTree = "<group>"; };
D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = "<group>"; };
D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = "<group>"; };
@ -2929,6 +2935,8 @@
D3A74E8615C69392001500B9 /* history_selected_landscape~ipad.png */,
D3A74E8715C69392001500B9 /* history_selected~ipad.png */,
D3C714B2159DB84400705B8E /* hold.wav */,
D3866C261608CA1600830F95 /* image_back_default.png */,
D3866C271608CA1600830F95 /* image_back_over.png */,
D3432A5C158A4446001C6B0B /* led_connected.png */,
D3432A70158A45AF001C6B0B /* led_disconnected.png */,
D3432A5D158A4446001C6B0B /* led_error.png */,
@ -3885,6 +3893,8 @@
D3ED40241602257400BF332B /* chat_background.9.png in Resources */,
D3ED40261602257400BF332B /* chat_background.9@2x.png in Resources */,
D3998D0416031937009DD22C /* background_alt.png in Resources */,
D3866C281608CA1600830F95 /* image_back_default.png in Resources */,
D3866C2A1608CA1600830F95 /* image_back_over.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -4337,6 +4347,8 @@
D3ED40251602257400BF332B /* chat_background.9.png in Resources */,
D3ED40271602257400BF332B /* chat_background.9@2x.png in Resources */,
D3998D0516031937009DD22C /* background_alt.png in Resources */,
D3866C291608CA1600830F95 /* image_back_default.png in Resources */,
D3866C2B1608CA1600830F95 /* image_back_over.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};