diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m
index 4bcf7b651..f208fc48e 100644
--- a/Classes/ChatRoomTableViewController.m
+++ b/Classes/ChatRoomTableViewController.m
@@ -150,7 +150,7 @@
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
ChatModel *chat = [data objectAtIndex:[indexPath row]];
- return [UIChatRoomCell height:chat];
+ return [UIChatRoomCell height:chat width:[self.view frame].size.width];
}
@end
diff --git a/Classes/ChatRoomViewController.xib b/Classes/ChatRoomViewController.xib
index c8b9c4f6b..738e35a47 100644
--- a/Classes/ChatRoomViewController.xib
+++ b/Classes/ChatRoomViewController.xib
@@ -3,22 +3,22 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
- IBUIView
- IBUIImageView
IBProxyObject
- IBUILabel
- IBUITextField
- IBUITableViewController
- IBUITableView
IBUIButton
+ IBUIImageView
+ IBUILabel
+ IBUITableView
+ IBUITableViewController
+ IBUITextField
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -44,6 +44,20 @@
290
+
292
@@ -84,7 +98,7 @@
- 292
+ 289
{{160, 0}, {160, 58}}
@@ -150,7 +164,7 @@
- 274
+ 292
{{20, 6}, {65, 65}}
@@ -165,7 +179,7 @@
- 292
+ 290
{{101, 37}, {199, 43}}
@@ -267,7 +281,7 @@
- 260
+ 258
{250, 59}
@@ -282,7 +296,7 @@
- 260
+ 258
{{10, 10}, {230, 39}}
@@ -527,6 +541,7 @@
+
toolsView
@@ -614,6 +629,12 @@
addressLabel
+
+ 47
+
+
+ background
+
@@ -635,6 +656,7 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -645,7 +667,7 @@
- 46
+ 47
@@ -763,7 +785,8 @@
{140, 117}
{140, 117}
{140, 117}
+ {5, 117}
- 1181
+ 1498
diff --git a/Classes/ChatViewController.xib b/Classes/ChatViewController.xib
index 24b92a3ae..395f02293 100644
--- a/Classes/ChatViewController.xib
+++ b/Classes/ChatViewController.xib
@@ -3,19 +3,20 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUITableViewController
- IBUITableView
- IBUIView
- IBUIButton
IBProxyObject
+ IBUIButton
+ IBUIImageView
+ IBUITableView
+ IBUITableViewController
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -39,8 +40,23 @@
- 288
+ 290
+
+
+ 290
+ {320, 58}
+
+
+
+ _NS:9
+ NO
+ IBCocoaTouchFramework
+
+ NSImage
+ toolsbar_background.png
+
+
292
@@ -81,7 +97,7 @@
- 292
+ 289
{{160, 0}, {160, 58}}
@@ -115,7 +131,7 @@
{320, 58}
-
+
_NS:9
3
@@ -290,9 +306,10 @@
+
- header
+ toolsBar
9
@@ -306,6 +323,12 @@
addButton
+
+ 23
+
+
+ background
+
@@ -315,6 +338,7 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
ChatTableViewController
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -328,7 +352,7 @@
- 22
+ 23
@@ -400,7 +424,8 @@
{320, 117}
{320, 117}
{320, 117}
+ {5, 117}
- 1181
+ 1498
diff --git a/Classes/ConsoleViewController.xib b/Classes/ConsoleViewController.xib
index 16846dae6..9b81061ea 100644
--- a/Classes/ConsoleViewController.xib
+++ b/Classes/ConsoleViewController.xib
@@ -1,35 +1,39 @@
-
+
784
- 9L31a
- 680
- 949.54
- 353.00
-
+ 11E53
+ 2549
+ 1138.47
+ 569.00
+
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ 1498
+
+
YES
-
+ IBProxyObject
+ IBUITextView
+ IBUIView
+ IBUIViewController
YES
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- YES
-
- YES
-
-
- YES
-
+ PluginDependencyRecalculationVersion
+
YES
IBFilesOwner
+ IBCocoaTouchFramework
IBFirstResponder
+ IBCocoaTouchFramework
@@ -42,12 +46,14 @@
274
{320, 450}
+
1
MSAxIDEAA
YES
YES
+ IBCocoaTouchFramework
NO
NO
NO
@@ -56,11 +62,22 @@
2
+ IBCocoaTouchFramework
+
+
+ 1
+ 17
+
+
+ Helvetica
+ 17
+ 16
{320, 460}
+
3
MQA
@@ -69,8 +86,14 @@
NO
+ IBCocoaTouchFramework
-
+
+ 1
+ 1
+
+ IBCocoaTouchFramework
+ NO
@@ -116,7 +139,7 @@
-1
- RmlsZSdzIE93bmVyA
+ File's Owner
-2
@@ -151,22 +174,24 @@
YES
-
+
YES
-1.CustomClassName
+ -1.IBPluginDependency
-2.CustomClassName
+ -2.IBPluginDependency
10.CustomClassName
- 10.IBEditorWindowLastContentRect
10.IBPluginDependency
4.IBPluginDependency
7.IBPluginDependency
-
+
YES
ConsoleViewController
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
UIResponder
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
ConsoleViewController
- {{807, 300}, {320, 480}}
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -174,22 +199,14 @@
YES
-
- YES
-
-
- YES
-
+
+
YES
-
- YES
-
-
- YES
-
+
+
14
@@ -202,27 +219,59 @@
UIViewController
YES
-
+
YES
logs
logsView
-
+
YES
UITextView
UIView
+
+ YES
+
+ YES
+ logs
+ logsView
+
+
+ YES
+
+ logs
+ UITextView
+
+
+ logsView
+ UIView
+
+
+
IBProjectSource
- Classes/ConsoleViewController.h
+ ./Classes/ConsoleViewController.h
0
- ../linphone.xcodeproj
+ IBCocoaTouchFramework
+
+ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS
+
+
+
+ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS
+
+
+
+ com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3
+
+
+ YES
3
- 3.1
+ 1498
diff --git a/Classes/ContactDetailsLabelViewController.xib b/Classes/ContactDetailsLabelViewController.xib
index 324f0e974..8c0a5eb90 100644
--- a/Classes/ContactDetailsLabelViewController.xib
+++ b/Classes/ContactDetailsLabelViewController.xib
@@ -3,19 +3,19 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUITableView
- IBUIButton
- IBUIView
- IBUIImageView
IBProxyObject
+ IBUIButton
+ IBUIImageView
+ IBUITableView
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -65,13 +65,13 @@
{320, 58}
-
+
_NS:9
NO
IBCocoaTouchFramework
NSImage
- contact_bar_background.png
+ toolsbar_background.png
@@ -80,7 +80,7 @@
{160, 58}
-
+
_NS:9
NO
@@ -116,7 +116,7 @@
{320, 58}
-
+
_NS:9
3
@@ -133,6 +133,7 @@
{{0, 59}, {320, 401}}
+
_NS:9
10
@@ -210,12 +211,11 @@ AAgACAAIAAEAAQABAAE
10
- {{0, 20}, {320, 460}}
+ {320, 460}
-
IBCocoaTouchFramework
@@ -306,7 +306,7 @@ AAgACAAIAAEAAQABAAE
- header
+ toolsBar
8
@@ -401,8 +401,8 @@ AAgACAAIAAEAAQABAAE
{640, 523}
{320, 117}
{320, 117}
- {5, 117}
+ {5, 117}
- 1181
+ 1498
diff --git a/Classes/ContactDetailsViewController.xib b/Classes/ContactDetailsViewController.xib
index 42e2901cc..86c780b1f 100644
--- a/Classes/ContactDetailsViewController.xib
+++ b/Classes/ContactDetailsViewController.xib
@@ -3,20 +3,20 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUIImageView
- IBUIButton
- IBUITableView
- IBUIView
- IBUITableViewController
IBProxyObject
+ IBUIButton
+ IBUIImageView
+ IBUITableView
+ IBUITableViewController
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -48,12 +48,13 @@
{320, 58}
+
_NS:9
NO
IBCocoaTouchFramework
NSImage
- contact_bar_background.png
+ toolsbar_background.png
@@ -158,7 +159,7 @@
{320, 58}
-
+
_NS:9
3
@@ -175,6 +176,7 @@
{{0, 59}, {320, 401}}
+
_NS:9
10
@@ -252,12 +254,11 @@ AAgACAAIAAEAAQABAAE
10
- {{0, 20}, {320, 460}}
+ {320, 460}
-
IBCocoaTouchFramework
@@ -559,13 +560,13 @@ AAgACAAIAAEAAQABAAE
{320, 117}
{320, 117}
- {5, 117}
{320, 117}
{320, 117}
{320, 117}
{320, 117}
{320, 117}
+ {5, 117}
- 1181
+ 1498
diff --git a/Classes/ContactsViewController.xib b/Classes/ContactsViewController.xib
index 91add1d9e..1a98f54c2 100644
--- a/Classes/ContactsViewController.xib
+++ b/Classes/ContactsViewController.xib
@@ -3,19 +3,20 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUIButton
- IBUITableView
- IBUIView
- IBUITableViewController
IBProxyObject
+ IBUIButton
+ IBUIImageView
+ IBUITableView
+ IBUITableViewController
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -39,11 +40,25 @@
- 288
+ 290
+
+
+ 290
+ {320, 58}
+
+
+ _NS:9
+ NO
+ IBCocoaTouchFramework
+
+ NSImage
+ toolsbar_background.png
+
+
- 292
+ 289
{{108, 0}, {106, 58}}
@@ -82,7 +97,7 @@
- 292
+ 289
{{214, 0}, {106, 58}}
@@ -191,9 +206,7 @@
1
MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA
- NO
YES
- NO
IBCocoaTouchFramework
0.0
10
@@ -387,6 +400,7 @@
+
toolBar
@@ -428,6 +442,12 @@
backButton
+
+ 92
+
+
+ background
+
@@ -448,12 +468,13 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 91
+ 92
@@ -550,7 +571,8 @@
{213, 117}
{213, 117}
{213, 117}
+ {5, 117}
- 1181
+ 1498
diff --git a/Classes/FirstLoginViewController.xib b/Classes/FirstLoginViewController.xib
index ac29c839c..73b5dab9f 100644
--- a/Classes/FirstLoginViewController.xib
+++ b/Classes/FirstLoginViewController.xib
@@ -3,20 +3,20 @@
784
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
YES
- IBUIButton
- IBUIActivityIndicatorView
- IBUIView
- IBUITextField
IBProxyObject
+ IBUIActivityIndicatorView
+ IBUIButton
+ IBUITextField
+ IBUIView
YES
@@ -87,6 +87,7 @@
{{60, 420}, {200, 37}}
+
NO
NO
IBCocoaTouchFramework
@@ -139,9 +140,9 @@
1
IBCocoaTouchFramework
-
+
NSImage
- setup_label.png
+ field_background.png
1
@@ -180,7 +181,7 @@
YES
IBCocoaTouchFramework
-
+
@@ -195,6 +196,7 @@
{{142, 211}, {37, 37}}
+
NO
NO
NO
@@ -220,7 +222,7 @@
{320, 460}
-
+
_NS:9
3
@@ -559,7 +561,7 @@
YES
button_background_default.png
button_background_over.png
- setup_label.png
+ field_background.png
YES
@@ -568,6 +570,6 @@
{542, 88}
- 1181
+ 1498
diff --git a/Classes/HistoryDetailsViewController.xib b/Classes/HistoryDetailsViewController.xib
index 6e340bd86..d22be8630 100644
--- a/Classes/HistoryDetailsViewController.xib
+++ b/Classes/HistoryDetailsViewController.xib
@@ -43,7 +43,7 @@
- 292
+ 290
{320, 58}
@@ -53,7 +53,7 @@
IBCocoaTouchFramework
NSImage
- history_details_bar_background.png
+ toolsbar_background.png
@@ -96,7 +96,7 @@
- 292
+ 289
{{160, 0}, {160, 58}}
@@ -139,7 +139,7 @@
- 292
+ 295
@@ -197,7 +197,7 @@
- 292
+ 290
{{101, 37}, {199, 43}}
@@ -240,7 +240,7 @@
- 292
+ 295
@@ -271,7 +271,7 @@
- 292
+ 290
{{57, 0}, {223, 21}}
@@ -307,7 +307,7 @@
- 292
+ 295
@@ -331,7 +331,7 @@
- 292
+ 290
{{88, 0}, {192, 21}}
@@ -360,7 +360,7 @@
- 292
+ 295
@@ -384,7 +384,7 @@
- 292
+ 290
{{65, 0}, {215, 21}}
@@ -413,11 +413,10 @@
- 292
+ 269
{{33, 273}, {255, 50}}
-
_NS:9
NO
IBCocoaTouchFramework
@@ -451,12 +450,11 @@
- {{0, 20}, {320, 460}}
+ {320, 460}
-
IBCocoaTouchFramework
@@ -900,7 +898,7 @@
{320, 117}
{320, 117}
{320, 117}
- {5, 117}
+ {5, 117}
1498
diff --git a/Classes/HistoryViewController.xib b/Classes/HistoryViewController.xib
index 76bab3437..832f4cb67 100644
--- a/Classes/HistoryViewController.xib
+++ b/Classes/HistoryViewController.xib
@@ -3,19 +3,20 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUIButton
- IBUITableView
- IBUIView
- IBUITableViewController
IBProxyObject
+ IBUIButton
+ IBUIImageView
+ IBUITableView
+ IBUITableViewController
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -39,8 +40,22 @@
- 288
+ 290
+
+
+ 290
+ {320, 58}
+
+
+ _NS:9
+ NO
+ IBCocoaTouchFramework
+
+ NSImage
+ toolsbar_background.png
+
+
292
@@ -111,7 +126,7 @@
- 292
+ 289
{{212, 0}, {108, 58}}
@@ -162,7 +177,6 @@
{{0, 58}, {320, 402}}
-
_NS:9
1
@@ -343,9 +357,10 @@
+
- header
+ toolsBar
4
@@ -378,6 +393,12 @@
tableController
+
+ 34
+
+
+ background
+
@@ -390,6 +411,7 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -402,7 +424,7 @@
- 33
+ 34
@@ -496,7 +518,8 @@
{213, 117}
{213, 117}
{214, 117}
+ {5, 117}
- 1181
+ 1498
diff --git a/Classes/InCallViewController-ipad.xib b/Classes/InCallViewController-ipad.xib
deleted file mode 100644
index 51b1dfa66..000000000
--- a/Classes/InCallViewController-ipad.xib
+++ /dev/null
@@ -1,1953 +0,0 @@
-
-
-
- 1280
- 11C74
- 1938
- 1138.23
- 567.00
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 933
-
-
- IBUIButton
- IBUIImageView
- IBUIViewController
- IBProxyObject
- IBUIActivityIndicatorView
- IBUITableView
- IBUIView
-
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
- PluginDependencyRecalculationVersion
-
-
-
-
- IBFilesOwner
- IBIPadFramework
-
-
- IBFirstResponder
- IBIPadFramework
-
-
-
-
- 274
-
-
-
- 274
-
-
-
- 292
- {768, 1024}
-
-
-
- _NS:569
- NO
- IBIPadFramework
-
-
-
- 292
- {{20, 956}, {28, 28}}
-
-
-
- _NS:567
- NO
- IBIPadFramework
-
-
-
- 292
- {{366, 493}, {37, 37}}
-
-
-
- _NS:1062
- NO
- IBIPadFramework
- NO
- 0
-
-
-
- 292
- {{598, 799}, {170, 225}}
-
-
-
-
- 3
- MQA
-
- 2
-
-
- IBIPadFramework
-
-
- {768, 1024}
-
-
-
- _NS:212
-
- 3
- MC42NjY2NjY2NjY3AA
-
- IBIPadFramework
-
-
-
- 292
- {{224, 740}, {320, 66}}
-
-
-
- NO
- IBIPadFramework
- 0
- 0
- 1
- Change camera
-
- 3
- MQA
-
-
- 1
- MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA
-
-
- 3
- MC41AA
-
-
- NSImage
- clavier-01-108px.png
-
-
- Helvetica-Bold
- Helvetica
- 2
- 15
-
-
- Helvetica-Bold
- 15
- 16
-
-
-
-
- 274
- {768, 805}
-
-
-
- _NS:408
-
- 3
- MSAwAA
-
-
- YES
- IBIPadFramework
- YES
- 0
- YES
- 80
- 22
- 22
-
-
-
- 292
-
-
-
- 292
- {{0, 1}, {320, 66}}
-
-
-
-
- 1
- MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
- NSImage
- stopcall-red.png
-
-
- NSImage
- clavier-01-106px.png
-
-
-
-
-
- {{224, 937}, {320, 77}}
-
-
-
- _NS:196
-
- 3
- MCAwAA
-
- IBIPadFramework
-
-
-
- 292
-
-
-
- 292
- {{80, 70}, {80, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
- NSImage
- grouper.png
-
-
- 2
- 17
-
-
- Helvetica-Bold
- 17
- 16
-
-
-
-
- 292
- {{0, 4}, {107, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
- NSImage
- mic_active.png
-
-
- NSImage
- micro_inverse.png
-
-
- NSImage
- micro.png
-
-
- 2
- 2
-
-
- Helvetica-Bold
- 18
- 16
-
-
-
-
- 292
- {{0, 70}, {80, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
- NSImage
- ajouter.png
-
-
-
-
-
-
- 292
- {{240, 70}, {80, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
- 1
- MCAwIDAAA
-
-
- NSImage
- contact.png
-
-
-
-
-
-
- -2147483356
- {{240, 70}, {80, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 1
- video
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
- NSImage
- clavier-01-160px.png
-
-
-
-
-
-
- 292
- {{160, 70}, {80, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- transfer
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
-
-
-
-
-
- 292
- {{262, 84}, {37, 37}}
-
-
-
- _NS:1062
- NO
- IBIPadFramework
- NO
- 0
-
-
-
- 292
- {{107, 4}, {106, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
- NSImage
- clavier.png
-
-
-
-
-
-
- 292
- {{213, 4}, {107, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- NO
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
- NSImage
- HP_inverse.png
-
-
- NSImage
- HP.png
-
-
-
-
-
-
- 292
- {{80, 70}, {80, 66}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
-
-
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
-
-
- NSImage
- pause_inactif.png
-
-
- NSImage
- pause.png
-
-
-
-
-
- {{224, 801.5}, {320, 135}}
-
-
-
-
- NO
- NO
- IBIPadFramework
-
-
-
- -2147483356
-
-
-
- 292
- {{119, 251}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- close
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{119, 193}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 0
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{31, 19}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 1
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{119, 19}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 2
-
-
-
-
-
-
-
-
- 292
- {{207, 19}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 3
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{31, 77}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 4
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{119, 77}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 5
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{207, 77}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 6
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{31, 135}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 7
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{119, 135}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 8
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{207, 135}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- 9
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{31, 193}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- *
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
-
- 292
- {{207, 193}, {82, 52}}
-
-
-
-
- NO
- NO
- IBIPadFramework
- 0
- 0
- #
-
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
-
-
- {{178, 146}, {320, 310}}
-
-
-
-
- 3
- MC4yNAA
-
- NO
- NO
- IBIPadFramework
-
-
- {{0, 20}, {768, 1004}}
-
-
-
- _NS:212
-
- IBIPadFramework
-
-
- 2
-
-
- 1
- 1
-
- IBIPadFramework
- NO
-
-
-
-
-
-
- callTableView
-
-
-
- 114
-
-
-
- endCtrl
-
-
-
- 119
-
-
-
- hangUpView
-
-
-
- 122
-
-
-
- speaker
-
-
-
- 132
-
-
-
- mute
-
-
-
- 125
-
-
-
- addVideo
-
-
-
- 113
-
-
-
- mergeCalls
-
-
-
- 124
-
-
-
- addCall
-
-
-
- 112
-
-
-
- contacts
-
-
-
- 116
-
-
-
- dialer
-
-
-
- 141
-
-
-
- pause
-
-
-
- 129
-
-
-
- controlSubView
-
-
-
- 117
-
-
-
- five
-
-
-
- 120
-
-
-
- nine
-
-
-
- 126
-
-
-
- seven
-
-
-
- 130
-
-
-
- six
-
-
-
- 131
-
-
-
- four
-
-
-
- 121
-
-
-
- three
-
-
-
- 134
-
-
-
- zero
-
-
-
- 137
-
-
-
- two
-
-
-
- 135
-
-
-
- close
-
-
-
- 115
-
-
-
- hash
-
-
-
- 123
-
-
-
- eight
-
-
-
- 118
-
-
-
- one
-
-
-
- 127
-
-
-
- star
-
-
-
- 133
-
-
-
- padSubView
-
-
-
- 128
-
-
-
- view
-
-
-
- 136
-
-
-
- videoGroup
-
-
-
- 159
-
-
-
- videoView
-
-
-
- 161
-
-
-
- videoPreview
-
-
-
- 162
-
-
-
- videoCallQuality
-
-
-
- 163
-
-
-
- videoCameraSwitch
-
-
-
- 164
-
-
-
- videoUpdateIndicator
-
-
-
- 167
-
-
-
- videoWaitingForFirstImage
-
-
-
- 168
-
-
-
- transfer
-
-
-
- 170
-
-
-
- dataSource
-
-
-
- 139
-
-
-
- delegate
-
-
-
- 140
-
-
-
- doAction:
-
-
- 7
-
- 144
-
-
-
- doAction:
-
-
- 7
-
- 142
-
-
-
- doAction:
-
-
- 7
-
- 143
-
-
-
-
-
- 0
-
-
-
-
-
- -1
-
-
- File's Owner
-
-
- -2
-
-
-
-
- 59
-
-
-
-
-
-
-
- 60
-
-
-
-
-
-
-
-
-
-
-
-
- 61
-
-
-
-
- 88
-
-
-
-
-
-
-
- 98
-
-
- end
-
-
- 89
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- controls
-
-
- 96
-
-
- speaker
-
-
- 92
-
-
- mute
-
-
- 90
-
-
- video
-
-
- 91
-
-
- merge
-
-
- 93
-
-
- addcall
-
-
- 94
-
-
- contacts
-
-
- 95
-
-
- dialer
-
-
- 97
-
-
- pauseresume
-
-
- 87
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- pad
-
-
- 99
-
-
- 5
-
-
- 100
-
-
- 9
-
-
- 101
-
-
- 7
-
-
- 102
-
-
- 6
-
-
- 103
-
-
- 4
-
-
- 104
-
-
- 3
-
-
- 105
-
-
- 0
-
-
- 106
-
-
- 2
-
-
- 107
-
-
- close
-
-
- 108
-
-
- hash
-
-
- 109
-
-
- 8
-
-
- 110
-
-
- 1
-
-
- 111
-
-
- star
-
-
- 152
-
-
-
-
-
-
-
-
- video
-
-
- 158
-
-
-
- video_preview
-
-
- 157
-
-
- video_view
-
-
- 153
-
-
- call_quality_video
-
-
- 154
-
-
-
-
- 165
-
-
- toggleVideoIndicator
-
-
- 166
-
-
-
-
- 169
-
-
- transfer
-
-
-
-
- IncallViewController
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIResponder
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UICamSwitch
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIToggleVideoButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- UIMuteButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UISpeakerButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- UIHangUpButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIDigitButton
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
- 170
-
-
-
-
- IncallViewController
- UIViewController
-
- doAction:
- id
-
-
- doAction:
-
- doAction:
- id
-
-
-
- UIButton
- UIToggleVideoButton
- UITableView
- UIButton
- UIViewController
- UIButton
- UIView
- UIButton
- UIButton
- UIButton
- UIButton
- UIButton
- UIView
- UIButton
- UIButton
- UIButton
- UIButton
- UIButton
- UIView
- UIButton
- UIButton
- UIButton
- UIButton
- UIButton
- UIButton
- UIButton
- UIButton
- UIImageView
- UICamSwitch
- UIView
- UIView
- UIActivityIndicatorView
- UIView
- VideoViewController
- UIActivityIndicatorView
- UIButton
-
-
-
- addCall
- UIButton
-
-
- addVideo
- UIToggleVideoButton
-
-
- callTableView
- UITableView
-
-
- close
- UIButton
-
-
- conferenceDetail
- UIViewController
-
-
- contacts
- UIButton
-
-
- controlSubView
- UIView
-
-
- dialer
- UIButton
-
-
- eight
- UIButton
-
-
- endCtrl
- UIButton
-
-
- five
- UIButton
-
-
- four
- UIButton
-
-
- hangUpView
- UIView
-
-
- hash
- UIButton
-
-
- mergeCalls
- UIButton
-
-
- mute
- UIButton
-
-
- nine
- UIButton
-
-
- one
- UIButton
-
-
- padSubView
- UIView
-
-
- pause
- UIButton
-
-
- seven
- UIButton
-
-
- six
- UIButton
-
-
- speaker
- UIButton
-
-
- star
- UIButton
-
-
- three
- UIButton
-
-
- transfer
- UIButton
-
-
- two
- UIButton
-
-
- videoCallQuality
- UIImageView
-
-
- videoCameraSwitch
- UICamSwitch
-
-
- videoGroup
- UIView
-
-
- videoPreview
- UIView
-
-
- videoUpdateIndicator
- UIActivityIndicatorView
-
-
- videoView
- UIView
-
-
- videoViewController
- VideoViewController
-
-
- videoWaitingForFirstImage
- UIActivityIndicatorView
-
-
- zero
- UIButton
-
-
-
- IBProjectSource
- ./Classes/IncallViewController.h
-
-
-
- UICamSwitch
- UIButton
-
- preview
- UIView
-
-
- preview
-
- preview
- UIView
-
-
-
- IBProjectSource
- ./Classes/UICamSwitch.h
-
-
-
- UIDigitButton
- UIButton
-
- IBProjectSource
- ./Classes/UIDigitButton.h
-
-
-
- UIHangUpButton
- UIButton
-
- IBProjectSource
- ./Classes/UIHangUpButton.h
-
-
-
- UIMuteButton
- UIToggleButton
-
- IBProjectSource
- ./Classes/UIMuteButton.h
-
-
-
- UISpeakerButton
- UIToggleButton
-
- IBProjectSource
- ./Classes/UISpeakerButton.h
-
-
-
- UIToggleButton
- UIButton
-
- IBProjectSource
- ./Classes/UIToggleButton.h
-
-
-
- UIToggleVideoButton
- UIButton
-
- videoUpdateIndicator
- UIActivityIndicatorView
-
-
- videoUpdateIndicator
-
- videoUpdateIndicator
- UIActivityIndicatorView
-
-
-
- IBProjectSource
- ./Classes/UIToggleVideoButton.h
-
-
-
- VideoViewController
- UIViewController
-
- UIImageView
- UIImageView
- UIImageView
- UICamSwitch
- UICamSwitch
- UICamSwitch
- UIView
- UIView
- UIView
- UIHangUpButton
- UIHangUpButton
- UIHangUpButton
- UIView
- UIView
- UIMuteButton
- UIMuteButton
- UIMuteButton
- UIView
- UIView
- UIView
- UIView
-
-
-
- mCallQuality
- UIImageView
-
-
- mCallQualityLandLeft
- UIImageView
-
-
- mCallQualityLandRight
- UIImageView
-
-
- mCamSwitch
- UICamSwitch
-
-
- mCamSwitchLandLeft
- UICamSwitch
-
-
- mCamSwitchLandRight
- UICamSwitch
-
-
- mDisplay
- UIView
-
-
- mDisplayLandLeft
- UIView
-
-
- mDisplayLandRight
- UIView
-
-
- mHangUp
- UIHangUpButton
-
-
- mHangUpLandLeft
- UIHangUpButton
-
-
- mHangUpLandRight
- UIHangUpButton
-
-
- mLandscapeLeft
- UIView
-
-
- mLandscapeRight
- UIView
-
-
- mMute
- UIMuteButton
-
-
- mMuteLandLeft
- UIMuteButton
-
-
- mMuteLandRight
- UIMuteButton
-
-
- mPortrait
- UIView
-
-
- mPreview
- UIView
-
-
- mPreviewLandLeft
- UIView
-
-
- mPreviewLandRight
- UIView
-
-
-
- IBProjectSource
- ./Classes/VideoViewController.h
-
-
-
-
- 0
- IBIPadFramework
- YES
- 3
-
- {107, 67}
- {107, 67}
- {107, 67}
- {106, 60}
- {108, 60}
- {160, 60}
- {106, 67}
- {107, 67}
- {106, 67}
- {20, 20}
- {107, 67}
- {107, 67}
- {106, 67}
- {106, 67}
- {62, 54}
-
- 933
-
-
diff --git a/Classes/IncomingCallViewController.xib b/Classes/IncomingCallViewController.xib
index da9fe2a4f..b2de27e48 100644
--- a/Classes/IncomingCallViewController.xib
+++ b/Classes/IncomingCallViewController.xib
@@ -3,19 +3,19 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
+ IBProxyObject
IBUIButton
IBUIImageView
- IBUIView
IBUILabel
- IBProxyObject
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -4615,7 +4615,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE
{{160, 0}, {160, 77}}
-
_NS:9
NO
@@ -4908,6 +4907,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE
{320, 154}
{640, 135}
- 1181
+ 1498
diff --git a/Classes/LinphoneApp.xib b/Classes/LinphoneApp.xib
index cc511507a..9839f1048 100644
--- a/Classes/LinphoneApp.xib
+++ b/Classes/LinphoneApp.xib
@@ -2,19 +2,19 @@
1296
- 11D50
- 2182
- 1138.32
- 568.00
+ 11E53
+ 2549
+ 1138.47
+ 569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUIWindow
+ IBProxyObject
IBUICustomObject
IBUIViewController
- IBProxyObject
+ IBUIWindow
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -48,12 +48,10 @@
NO
NO
-
IBCocoaTouchFramework
YES
- NO
PhoneMainView
@@ -189,8 +187,30 @@
- UICompositeViewController
+ TPMultiLayoutViewController
UIViewController
+
+ UIView
+ UIView
+
+
+
+ landscapeView
+ UIView
+
+
+ portraitView
+ UIView
+
+
+
+ IBProjectSource
+ ./Classes/TPMultiLayoutViewController.h
+
+
+
+ UICompositeViewController
+ TPMultiLayoutViewController
UIView
UIView
@@ -225,6 +245,6 @@
YES
3
- 1181
+ 1498
diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib
index 92cdf036a..7bf9dcf3c 100644
--- a/Classes/LinphoneUI/UIChatCell.xib
+++ b/Classes/LinphoneUI/UIChatCell.xib
@@ -3,19 +3,19 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
+ IBProxyObject
IBUIButton
IBUIImageView
- IBUIView
IBUILabel
- IBProxyObject
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -35,7 +35,7 @@
- 292
+ 274
@@ -123,7 +123,7 @@
- 292
+ 257
{{276, 0}, {44, 44}}
@@ -162,11 +162,10 @@
- 292
+ 257
{{276, 0}, {44, 44}}
-
_NS:9
NO
IBCocoaTouchFramework
@@ -418,6 +417,6 @@
{45, 45}
{45, 45}
- 1181
+ 1498
diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h
index 22891bdbb..cfc479c23 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.h
+++ b/Classes/LinphoneUI/UIChatRoomCell.h
@@ -41,7 +41,7 @@
@property (nonatomic, retain) IBOutlet UILabel *dateLabel;
- (id)initWithIdentifier:(NSString*)identifier;
-+ (CGFloat)height:(ChatModel*)chat;
++ (CGFloat)height:(ChatModel*)chat width:(int)width;
- (IBAction)onDeleteClick:(id)event;
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index 98f355cc5..edb6671ce 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -121,12 +121,12 @@ static UIFont *CELL_FONT = nil;
if(chat != nil) {
// Resize Content
CGRect contentFrame = [contentView frame];
- contentFrame.size = [UIChatRoomCell viewSize:[chat message]];
+ contentFrame.size = [UIChatRoomCell viewSize:[chat message] width:[self frame].size.width];
if([[chat direction] intValue]) { // Inverted
contentFrame.origin.x = 0.0f;
contentFrame.origin.y = 0.0f;
} else {
- contentFrame.origin.x = CELL_MAX_WIDTH - contentFrame.size.width;
+ contentFrame.origin.x = [self frame].size.width - contentFrame.size.width;
contentFrame.origin.y = 0.0f;
}
[contentView setFrame:contentFrame];
@@ -146,12 +146,12 @@ static UIFont *CELL_FONT = nil;
}
}
-+ (CGSize)viewSize:(NSString*)message {
++ (CGSize)viewSize:(NSString*)message width:(int)width {
if(CELL_FONT == nil) {
CELL_FONT = [UIFont systemFontOfSize:CELL_FONT_SIZE];
}
CGSize messageSize = [message sizeWithFont: CELL_FONT
- constrainedToSize: CGSizeMake(CELL_MAX_WIDTH - CELL_MESSAGE_X_MARGIN, 10000.0f)
+ constrainedToSize: CGSizeMake(width - CELL_MESSAGE_X_MARGIN, 10000.0f)
lineBreakMode: UILineBreakModeTailTruncation];
messageSize.height += CELL_MESSAGE_Y_MARGIN;
if(messageSize.height < CELL_MIN_HEIGHT)
@@ -162,8 +162,8 @@ static UIFont *CELL_FONT = nil;
return messageSize;
}
-+ (CGFloat)height:(ChatModel*)chat {
- return [UIChatRoomCell viewSize:[chat message]].height;
++ (CGFloat)height:(ChatModel*)chat width:(int)width {
+ return [UIChatRoomCell viewSize:[chat message] width:width].height;
}
diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m
index 547de4cb0..049ed47d2 100644
--- a/Classes/LinphoneUI/UICompositeViewController.m
+++ b/Classes/LinphoneUI/UICompositeViewController.m
@@ -133,6 +133,16 @@
#pragma mark - ViewController Functions
+- (void)viewDidLoad {
+ /* Force landscape view to match portrait view */
+ CGRect frame = [portraitView frame];
+ int height = frame.size.width;
+ frame.size.width = frame.size.height;
+ frame.size.height = height;
+ [landscapeView setFrame:frame];
+ [super viewDidLoad];
+}
+
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[contentViewController viewWillAppear:animated];
@@ -378,8 +388,6 @@
[UIView setAnimationBeginsFromCurrentState:TRUE];
}
- UIView *innerView = contentViewController.view;
-
CGRect contentFrame = contentView.frame;
CGRect viewFrame = [self.view frame];
@@ -421,18 +429,13 @@
if(currentViewDescription.fullscreen)
contentFrame.size.height = viewFrame.size.height - contentFrame.origin.y;
- // Resize innerView
- CGRect innerContentFrame = innerView.frame;
- innerContentFrame.origin.x = 0;
- innerContentFrame.origin.y = 0;
- innerContentFrame.size.width = contentFrame.size.width;
- innerContentFrame.size.height = contentFrame.size.height;
-
// Set frames
[contentView setFrame: contentFrame];
- [innerView setFrame: innerContentFrame];
+ [contentViewController.view setFrame: [contentView bounds]];
[tabBarView setFrame: tabFrame];
+ [tabBarViewController.view setFrame:[tabBarView bounds]];
[stateBarView setFrame: stateBarFrame];
+ [stateBarViewController.view setFrame:[stateBarView bounds]];
// Commit animation
if(tabBar != nil || fullscreen != nil) {
diff --git a/Classes/LinphoneUI/UICompositeViewController.xib b/Classes/LinphoneUI/UICompositeViewController.xib
index a2e27d760..2c4175b31 100644
--- a/Classes/LinphoneUI/UICompositeViewController.xib
+++ b/Classes/LinphoneUI/UICompositeViewController.xib
@@ -3,12 +3,12 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
IBProxyObject
@@ -37,7 +37,7 @@
314
- {{0, 23}, {320, 389}}
+ {{0, 23}, {320, 397}}
@@ -83,7 +83,6 @@
- NO
IBCocoaTouchFramework
@@ -93,7 +92,7 @@
314
- {{0, 24}, {480, 231}}
+ {{0, 23}, {480, 237}}
@@ -136,7 +135,6 @@
- NO
3
3
@@ -368,6 +366,6 @@
YES
3
- 1181
+ 1498
diff --git a/Classes/LinphoneUI/UIHistoryCell.xib b/Classes/LinphoneUI/UIHistoryCell.xib
index 20b98f889..e2fe52aa4 100644
--- a/Classes/LinphoneUI/UIHistoryCell.xib
+++ b/Classes/LinphoneUI/UIHistoryCell.xib
@@ -3,19 +3,19 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
+ IBProxyObject
IBUIButton
IBUIImageView
- IBUIView
IBUILabel
- IBProxyObject
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -35,7 +35,7 @@
- 292
+ 274
@@ -86,7 +86,7 @@
- 292
+ 257
{{276, 0}, {44, 44}}
@@ -125,7 +125,7 @@
- 292
+ 257
{{276, 0}, {44, 44}}
@@ -358,6 +358,6 @@
{45, 45}
{45, 45}
- 1181
+ 1498
diff --git a/Classes/LinphoneUI/UIStateBar.xib b/Classes/LinphoneUI/UIStateBar.xib
index 08f79fb0a..b25d2e859 100644
--- a/Classes/LinphoneUI/UIStateBar.xib
+++ b/Classes/LinphoneUI/UIStateBar.xib
@@ -3,18 +3,18 @@
1296
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
- IBUIImageView
- IBUIView
- IBUILabel
IBProxyObject
+ IBUIImageView
+ IBUILabel
+ IBUIView
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -34,11 +34,11 @@
- 292
+ 290
- 292
+ 274
{320, 23}
@@ -70,8 +70,8 @@
- 292
- {{22, 0}, {189, 20}}
+ 290
+ {{22, 0}, {222, 20}}
@@ -102,7 +102,7 @@
- 292
+ 289
{{252, 3}, {27, 17}}
@@ -114,11 +114,10 @@
- 292
+ 289
{{287, 3}, {27, 17}}
-
_NS:567
1
5
@@ -139,11 +138,11 @@
- 292
+ 290
- 292
+ 274
{480, 23}
@@ -169,8 +168,8 @@
- 292
- {{22, 0}, {189, 20}}
+ 290
+ {{22, 0}, {382, 20}}
@@ -191,7 +190,7 @@
- 292
+ 289
{{412, 3}, {27, 17}}
@@ -203,11 +202,10 @@
- 292
+ 289
{{447, 3}, {27, 17}}
-
_NS:567
1
5
@@ -313,6 +311,7 @@
+ Portrait View
6
@@ -355,6 +354,7 @@
+ Landscape View
20
@@ -482,6 +482,6 @@
{18, 17}
{640, 46}
- 1181
+ 1498
diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib
index da9802a57..f035483ed 100644
--- a/Classes/MoreViewController.xib
+++ b/Classes/MoreViewController.xib
@@ -2,33 +2,31 @@
784
- 10J567
- 823
- 1038.35
- 462.00
+ 11E53
+ 2549
+ 1138.47
+ 569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 132
+ 1498
-
+
YES
-
-
-
-
+ IBProxyObject
+ IBUIImageView
+ IBUILabel
+ IBUITableView
+ IBUITableViewCell
+ IBUITextView
+ IBUIViewController
YES
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- YES
-
- YES
-
-
- YES
-
+ PluginDependencyRecalculationVersion
+
YES
@@ -44,13 +42,14 @@
274
- {{0, 106}, {320, 247}}
+ {320, 247}
+
10
549453824
- {84, 1}
+ {512, 1}
YES
@@ -58,15 +57,44 @@
- TU0AKgAAAVjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
+ TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
-xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P8ADQEAAAMAAAABAFQAAAEB
-AAMAAAABAAEAAAECAAMAAAAEAAAB+gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAAEAAAEXAAQAAAABAAABUAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
+xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
+xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
+y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
+y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
+xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
+xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
+xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
+xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
+xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
+y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
+y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
+xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
+xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
+xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
+xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
+xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
+y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
+y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
+xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
+xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
+xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
+xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
+xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/
+y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
+y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
+xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
+xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
+xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
+xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/
+xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA
+AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA
+AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI
+AAgACAAIAAEAAQABAAE
@@ -91,15 +119,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
10
10
-
+ 1
1
IBCocoaTouchFramework
NO
-
+
292
YES
@@ -125,6 +153,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
1
10
+
+ 1
+ 17
+
+
+ Helvetica
+ 17
+ 16
+
{300, 44}
@@ -138,19 +175,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
{320, 44}
-
1
MSAxIDEAA
NO
IBCocoaTouchFramework
- 1
1
-
+
292
YES
@@ -176,6 +211,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
1
10
+
+
{300, 44}
@@ -189,16 +226,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
{320, 44}
-
NO
IBCocoaTouchFramework
- 1
1
-
+
292
YES
@@ -241,6 +276,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
2
IBCocoaTouchFramework
+
+
@@ -258,6 +295,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
1
10
1
+
+
{322, 230}
@@ -271,12 +310,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
{322, 230}
-
NO
NO
IBCocoaTouchFramework
- 1
@@ -337,7 +374,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
YES
0
-
+
+ YES
+
@@ -430,38 +469,32 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
YES
-1.CustomClassName
+ -1.IBPluginDependency
-2.CustomClassName
- 18.IBEditorWindowLastContentRect
+ -2.IBPluginDependency
18.IBPluginDependency
- 25.IBEditorWindowLastContentRect
25.IBPluginDependency
34.IBPluginDependency
- 38.IBEditorWindowLastContentRect
38.IBPluginDependency
39.IBPluginDependency
- 4.IBEditorWindowLastContentRect
4.IBPluginDependency
- 42.IBEditorWindowLastContentRect
42.IBPluginDependency
43.IBPluginDependency
45.IBPluginDependency
49.IBPluginDependency
-
+
YES
MoreViewController
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
UIResponder
- {{138, 864}, {320, 247}}
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- {{251, 502}, {320, 44}}
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- {{252, 1012}, {320, 44}}
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- {{79, 106}, {320, 480}}
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- {{100, 713}, {322, 230}}
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -471,17 +504,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
YES
-
- YES
-
+
YES
-
- YES
-
+
50
@@ -502,7 +531,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
web
weburi
-
+
YES
UITableViewCell
UITableViewCell
@@ -521,7 +550,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
web
weburi
-
+
YES
console
@@ -547,236 +576,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
IBProjectSource
- Classes/MoreViewController.h
-
-
-
-
- YES
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSError.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSFileManager.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSKeyValueCoding.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSKeyValueObserving.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSKeyedArchiver.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSObject.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSRunLoop.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSThread.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSURL.h
-
-
-
- NSObject
-
- IBFrameworkSource
- Foundation.framework/Headers/NSURLConnection.h
-
-
-
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UIAccessibility.h
-
-
-
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UINibLoading.h
-
-
-
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UIResponder.h
-
-
-
- UIImageView
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UIImageView.h
-
-
-
- UILabel
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UILabel.h
-
-
-
- UIResponder
- NSObject
-
-
-
- UIScrollView
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UIScrollView.h
-
-
-
- UISearchBar
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UISearchBar.h
-
-
-
- UISearchDisplayController
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UISearchDisplayController.h
-
-
-
- UITableView
- UIScrollView
-
- IBFrameworkSource
- UIKit.framework/Headers/UITableView.h
-
-
-
- UITableViewCell
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UITableViewCell.h
-
-
-
- UITableViewController
- UIViewController
-
- IBFrameworkSource
- UIKit.framework/Headers/UITableViewController.h
-
-
-
- UITextView
- UIScrollView
-
- IBFrameworkSource
- UIKit.framework/Headers/UITextView.h
-
-
-
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UIPrintFormatter.h
-
-
-
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UITextField.h
-
-
-
- UIView
- UIResponder
-
- IBFrameworkSource
- UIKit.framework/Headers/UIView.h
-
-
-
- UIViewController
-
- IBFrameworkSource
- UIKit.framework/Headers/UINavigationController.h
-
-
-
- UIViewController
-
- IBFrameworkSource
- UIKit.framework/Headers/UIPopoverController.h
-
-
-
- UIViewController
-
- IBFrameworkSource
- UIKit.framework/Headers/UISplitViewController.h
-
-
-
- UIViewController
-
- IBFrameworkSource
- UIKit.framework/Headers/UITabBarController.h
-
-
-
- UIViewController
- UIResponder
-
- IBFrameworkSource
- UIKit.framework/Headers/UIViewController.h
+ ./Classes/MoreViewController.h
@@ -789,19 +589,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS
-
+
com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3
YES
- ../linphone.xcodeproj
3
linphone-banner.png
{300, 100}
- 132
+ 1498
diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib
index 6ff46115c..119c7ab72 100644
--- a/Classes/PhoneMainView.xib
+++ b/Classes/PhoneMainView.xib
@@ -3,19 +3,19 @@
784
11E53
- 2182
+ 2549
1138.47
569.00
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 1181
+ 1498
YES
- IBUIViewController
+ IBProxyObject
IBUIImageView
IBUIView
- IBProxyObject
+ IBUIViewController
YES
@@ -68,13 +68,12 @@
IBCocoaTouchFramework
- NO
UICompositeViewController
-
1
1
+ YES
IBCocoaTouchFramework
NO
@@ -314,6 +313,6 @@
background.png
{640, 523}
- 1181
+ 1498
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index 72c09b0a3..c32ccc2bf 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -62,6 +62,34 @@
@implementation IASKSpecifierValuesViewControllerEx
+- (void)initIASKSpecifierValuesViewControllerEx {
+ [self.view setBackgroundColor:[UIColor clearColor]];
+}
+
+- (id)init {
+ self = [super init];
+ if(self != nil) {
+ [self initIASKSpecifierValuesViewControllerEx];
+ }
+ return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+ self = [super initWithCoder:aDecoder];
+ if(self != nil) {
+ [self initIASKSpecifierValuesViewControllerEx];
+ }
+ return self;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if(self != nil) {
+ [self initIASKSpecifierValuesViewControllerEx];
+ }
+ return self;
+}
+
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
UITableViewCell * cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
@@ -133,6 +161,8 @@
}
- (void)initIASKAppSettingsViewControllerEx {
+ [self.view setBackgroundColor:[UIColor clearColor]];
+
// Force kIASKSpecifierValuesViewControllerIndex
static int kIASKSpecifierValuesViewControllerIndex = 0;
_viewList = [[NSMutableArray alloc] init];
@@ -223,7 +253,7 @@
}
- (void)drawRect:(CGRect)rect {
- UIImage *img = [UIImage imageNamed:@"settings_bar_background.png"];
+ UIImage *img = [UIImage imageNamed:@"toolsbar_background.png"];
[img drawInRect:rect];
}
@@ -238,22 +268,30 @@
@implementation UINavigationControllerEx
+- (id)initWithRootViewController:(UIViewController *)rootViewController {
+ [UINavigationControllerEx removeBackground:rootViewController.view];
+ return [self initWithRootViewController:rootViewController];
+}
+
+ (void)removeTableBackground:(UIView*)view {
if([view isKindOfClass:[UITableView class]]) {
[view setBackgroundColor:[UIColor clearColor]];
}
+ if([view isKindOfClass:[UIImageView class]] && [[view superview] isKindOfClass:[UITableView class]]) {
+ [(UIImageView*)view setImage:nil];
+ }
for(UIView *subview in [view subviews]) {
[UINavigationControllerEx removeTableBackground:subview];
}
}
-- (id)initWithRootViewController:(UIViewController *)rootViewController {
- [UINavigationControllerEx removeTableBackground:rootViewController.view];
- return [super initWithRootViewController:rootViewController];
++ (void)removeBackground:(UIView*)view {
+ [view setBackgroundColor:[UIColor clearColor]];
+ [UINavigationControllerEx removeTableBackground:view];
}
- (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
- [UINavigationControllerEx removeTableBackground:viewController.view];
+ [UINavigationControllerEx removeBackground:viewController.view];
[viewController viewWillAppear:FALSE]; // Force load: Load Title
UILabel *labelTitleView = [[UILabel alloc] init];
@@ -272,14 +310,14 @@
- (void)setViewControllers:(NSArray *)viewControllers {
for(UIViewController *controller in viewControllers) {
- [UINavigationControllerEx removeTableBackground:controller.view];
+ [UINavigationControllerEx removeBackground:controller.view];
}
[super setViewControllers:viewControllers];
}
- (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated {
for(UIViewController *controller in viewControllers) {
- [UINavigationControllerEx removeTableBackground:controller.view];
+ [UINavigationControllerEx removeBackground:controller.view];
}
[super setViewControllers:viewControllers animated:animated];
}
@@ -337,6 +375,8 @@ static UICompositeViewDescription *compositeDescription = nil;
settingsController.hiddenKeys = [self findHiddenKeys];
settingsController.settingsStore = [[LinphoneManager instance] settingsStore];
+ [navigationController.view setBackgroundColor:[UIColor clearColor]];
+
navigationController.view.frame = self.view.frame;
[navigationController pushViewController:settingsController animated:FALSE];
[self.view addSubview: navigationController.view];
diff --git a/Classes/SettingsViewController.xib b/Classes/SettingsViewController.xib
index f4b4552a1..09f4282f4 100644
--- a/Classes/SettingsViewController.xib
+++ b/Classes/SettingsViewController.xib
@@ -40,7 +40,6 @@
{320, 460}
-
_NS:9
3
diff --git a/Resources/history_details_bar_background.png b/Resources/history_details_bar_background.png
deleted file mode 100644
index e3638e197..000000000
Binary files a/Resources/history_details_bar_background.png and /dev/null differ
diff --git a/Resources/settings_bar_background.png b/Resources/settings_bar_background.png
deleted file mode 100644
index e3638e197..000000000
Binary files a/Resources/settings_bar_background.png and /dev/null differ
diff --git a/Resources/contact_bar_background.png b/Resources/toolsbar_background.png
similarity index 100%
rename from Resources/contact_bar_background.png
rename to Resources/toolsbar_background.png
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index b62cd89b5..2d43fdff6 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -125,7 +125,6 @@
341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; };
34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; };
34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; };
- 3422AA5014975EC9000D4E8A /* InCallViewController-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */; };
344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDE71484E723007420B6 /* libzrtpcpp.a */; };
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, ); }; };
@@ -296,7 +295,6 @@
D34BD66015C13DB60070C209 /* conference_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3C31A0815BD8DED008ED271 /* conference_over_landscape.png */; };
D34BD66115C13DB60070C209 /* contact_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3128FE715AABE4E00A2147A /* contact_back_default.png */; };
D34BD66215C13DB60070C209 /* contact_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3128FE815AABE4E00A2147A /* contact_back_over.png */; };
- D34BD66315C13DB60070C209 /* contact_bar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D378906915AC37C800BD776C /* contact_bar_background.png */; };
D34BD66415C13DB60070C209 /* contact_cancel_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F3615B011AF00420DAC /* contact_cancel_default.png */; };
D34BD66515C13DB60070C209 /* contact_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F3715B011AF00420DAC /* contact_cancel_over.png */; };
D34BD66615C13DB60070C209 /* contact_edit_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3128FE915AABE4E00A2147A /* contact_edit_default.png */; };
@@ -496,7 +494,6 @@
D34BD72915C13DD40070C209 /* FirstLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */; };
D34BD72A15C13DD40070C209 /* HistoryDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C90FAA7815AF54E6002091CB /* HistoryDetailsViewController.xib */; };
D34BD72B15C13DD40070C209 /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */; };
- D34BD72C15C13DD40070C209 /* InCallViewController-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */; };
D34BD72D15C13DD40070C209 /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83EEB1582021700336684 /* InCallViewController.xib */; };
D34BD72E15C13DD40070C209 /* IncomingCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F26BF015986B72005F9CAB /* IncomingCallViewController.xib */; };
D34BD72F15C13DD40070C209 /* LinphoneApp.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F9115824D3500336684 /* LinphoneApp.xib */; };
@@ -589,7 +586,6 @@
D378906515AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */; };
D378906615AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */; };
D378906715AC373B00BD776C /* ContactDetailsLabelViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D378906415AC373B00BD776C /* ContactDetailsLabelViewController.xib */; };
- D378906A15AC37C800BD776C /* contact_bar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D378906915AC37C800BD776C /* contact_bar_background.png */; };
D378907515AC448A00BD776C /* UIView+ModalStack.m in Sources */ = {isa = PBXBuildFile; fileRef = D378907415AC448A00BD776C /* UIView+ModalStack.m */; };
D378907615AC448A00BD776C /* UIView+ModalStack.m in Sources */ = {isa = PBXBuildFile; fileRef = D378907415AC448A00BD776C /* UIView+ModalStack.m */; };
D37B96B715A1A6F20005CCD2 /* call_state_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D37B96B515A1A6F20005CCD2 /* call_state_delete_default.png */; };
@@ -668,6 +664,8 @@
D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; };
+ D3A74E5915C68162001500B9 /* toolsbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74E5815C68162001500B9 /* toolsbar_background.png */; };
+ D3A74E5A15C68162001500B9 /* toolsbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74E5815C68162001500B9 /* toolsbar_background.png */; };
D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
D3A8BB7115A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
D3A8BB7415A6C81A00F96BE5 /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7315A6C81A00F96BE5 /* UIChatRoomCell.xib */; };
@@ -676,10 +674,6 @@
D3A8BB7F15A6CC3200F96BE5 /* setup_back_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7815A6CC3200F96BE5 /* setup_back_disabled.png */; };
D3A8BB8115A6CC3200F96BE5 /* setup_cancel_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7915A6CC3200F96BE5 /* setup_cancel_disabled.png */; };
D3A8BB8315A6CC3200F96BE5 /* setup_start_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7A15A6CC3200F96BE5 /* setup_start_disabled.png */; };
- D3B82A0215C18A710036C93E /* history_details_bar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B82A0015C18A710036C93E /* history_details_bar_background.png */; };
- D3B82A0315C18A710036C93E /* history_details_bar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B82A0015C18A710036C93E /* history_details_bar_background.png */; };
- D3B82A0415C18A710036C93E /* settings_bar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B82A0115C18A710036C93E /* settings_bar_background.png */; };
- D3B82A0515C18A710036C93E /* settings_bar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B82A0115C18A710036C93E /* settings_bar_background.png */; };
D3B9A3DF15A58C450096EA4E /* chat_field.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B9A3DA15A58C440096EA4E /* chat_field.png */; };
D3B9A3E115A58C450096EA4E /* chat_ok_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B9A3DB15A58C440096EA4E /* chat_ok_default.png */; };
D3B9A3E315A58C450096EA4E /* chat_ok_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3B9A3DC15A58C440096EA4E /* chat_ok_over.png */; };
@@ -1185,7 +1179,6 @@
341FCA8D149798210084BC26 /* linphonerc-ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-ipad"; sourceTree = ""; };
34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoZoomHandler.h; path = LinphoneUI/VideoZoomHandler.h; sourceTree = ""; };
34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VideoZoomHandler.m; path = LinphoneUI/VideoZoomHandler.m; sourceTree = ""; };
- 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "InCallViewController-ipad.xib"; sourceTree = ""; };
344ABDE71484E723007420B6 /* libzrtpcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcpp.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcpp.a"; sourceTree = ""; };
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; };
@@ -1350,7 +1343,6 @@
D378906215AC373B00BD776C /* ContactDetailsLabelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsLabelViewController.h; sourceTree = ""; };
D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactDetailsLabelViewController.m; sourceTree = ""; };
D378906415AC373B00BD776C /* ContactDetailsLabelViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactDetailsLabelViewController.xib; sourceTree = ""; };
- D378906915AC37C800BD776C /* contact_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_bar_background.png; path = Resources/contact_bar_background.png; sourceTree = ""; };
D378907415AC448A00BD776C /* UIView+ModalStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+ModalStack.m"; sourceTree = ""; };
D378907715AC44A300BD776C /* UIView+ModalStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+ModalStack.h"; sourceTree = ""; };
D37B96B515A1A6F20005CCD2 /* call_state_delete_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = call_state_delete_default.png; path = Resources/call_state_delete_default.png; sourceTree = ""; };
@@ -1428,6 +1420,7 @@
D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = ""; };
D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = ""; };
D3A55FBE15877E69003FD403 /* UIContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIContactCell.xib; sourceTree = ""; };
+ D3A74E5815C68162001500B9 /* toolsbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = toolsbar_background.png; path = Resources/toolsbar_background.png; sourceTree = ""; };
D3A8BB6E15A6C7D500F96BE5 /* UIChatRoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIChatRoomCell.h; sourceTree = ""; };
D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIChatRoomCell.m; sourceTree = ""; };
D3A8BB7315A6C81A00F96BE5 /* UIChatRoomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIChatRoomCell.xib; sourceTree = ""; };
@@ -1436,8 +1429,6 @@
D3A8BB7815A6CC3200F96BE5 /* setup_back_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_back_disabled.png; path = Resources/setup_back_disabled.png; sourceTree = ""; };
D3A8BB7915A6CC3200F96BE5 /* setup_cancel_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_cancel_disabled.png; path = Resources/setup_cancel_disabled.png; sourceTree = ""; };
D3A8BB7A15A6CC3200F96BE5 /* setup_start_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_start_disabled.png; path = Resources/setup_start_disabled.png; sourceTree = ""; };
- D3B82A0015C18A710036C93E /* history_details_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_details_bar_background.png; path = Resources/history_details_bar_background.png; sourceTree = ""; };
- D3B82A0115C18A710036C93E /* settings_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settings_bar_background.png; path = Resources/settings_bar_background.png; sourceTree = ""; };
D3B90E1115C2CB5700F64F8C /* NinePatch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NinePatch.xcodeproj; path = Utils/NinePatch/NinePatch.xcodeproj; sourceTree = ""; };
D3B9A3DA15A58C440096EA4E /* chat_field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_field.png; path = Resources/chat_field.png; sourceTree = ""; };
D3B9A3DB15A58C440096EA4E /* chat_ok_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_ok_default.png; path = Resources/chat_ok_default.png; sourceTree = ""; };
@@ -1776,10 +1767,9 @@
D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */,
D31AAF5C159B3919002C6B02 /* InCallTableViewController.h */,
D31AAF5D159B3919002C6B02 /* InCallTableViewController.m */,
- 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */,
D3F83EE91582021700336684 /* InCallViewController.h */,
- D3F83EEA1582021700336684 /* InCallViewController.m */,
D3F83EEB1582021700336684 /* InCallViewController.xib */,
+ D3F83EEA1582021700336684 /* InCallViewController.m */,
D3F26BEE15986B71005F9CAB /* IncomingCallViewController.h */,
D3F26BEF15986B71005F9CAB /* IncomingCallViewController.m */,
D3F26BF015986B72005F9CAB /* IncomingCallViewController.xib */,
@@ -2317,7 +2307,6 @@
D3C31A0815BD8DED008ED271 /* conference_over_landscape.png */,
D3128FE715AABE4E00A2147A /* contact_back_default.png */,
D3128FE815AABE4E00A2147A /* contact_back_over.png */,
- D378906915AC37C800BD776C /* contact_bar_background.png */,
D3E84F3615B011AF00420DAC /* contact_cancel_default.png */,
D3E84F3715B011AF00420DAC /* contact_cancel_over.png */,
D3128FE915AABE4E00A2147A /* contact_edit_default.png */,
@@ -2367,7 +2356,6 @@
D3157A8915B4466F00DD8C4C /* history_details_add_over.png */,
D3157A8E15B446CB00DD8C4C /* history_details_back_default.png */,
D3157A8F15B446CB00DD8C4C /* history_details_back_over.png */,
- D3B82A0015C18A710036C93E /* history_details_bar_background.png */,
D3ED3E9415872EF1006C0DE4 /* history_edit_default.png */,
D3ED3E9515872EF1006C0DE4 /* history_edit_over.png */,
D3ED3E9715872EF1006C0DE4 /* history_missed_default.png */,
@@ -2462,7 +2450,6 @@
D3D6A3A5159B0EFE005F692C /* security_ko.png */,
D3D6A3A7159B0EFE005F692C /* security_ok.png */,
D3D6A3A6159B0EFE005F692C /* security_pending.png */,
- D3B82A0115C18A710036C93E /* settings_bar_background.png */,
D38327EF1580FE3A00FA0D23 /* settings_default.png */,
D38327FE158100E400FA0D23 /* settings_over.png */,
D38327F01580FE3A00FA0D23 /* settings_selected.png */,
@@ -2493,6 +2480,7 @@
D3C31A2915BD8DED008ED271 /* statebar_background_landscape.png */,
D35E757515931E5D0066B1C1 /* switch_camera_default.png */,
D35E757615931E5D0066B1C1 /* switch_camera_over.png */,
+ D3A74E5815C68162001500B9 /* toolsbar_background.png */,
D3C714B2159DB84400705B8E /* toy-mono.wav */,
C9C8254115AE204D00D493FA /* transfer_call_default.png */,
C9C8254E15AE256100D493FA /* transfer_call_disabled.png */,
@@ -2793,7 +2781,6 @@
2218A92612FBE1340088A667 /* FirstLoginViewController.xib in Resources */,
2214783D1386A2030020F8B8 /* Localizable.strings in Resources */,
70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */,
- 3422AA5014975EC9000D4E8A /* InCallViewController-ipad.xib in Resources */,
341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */,
34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */,
D347347A1580DDF1003C7B8C /* PhoneMainView.xib in Resources */,
@@ -3009,7 +2996,6 @@
D3C6526B15AC228A0092A874 /* contact_ok_default.png in Resources */,
D3C6526D15AC228A0092A874 /* contact_ok_over.png in Resources */,
D378906715AC373B00BD776C /* ContactDetailsLabelViewController.xib in Resources */,
- D378906A15AC37C800BD776C /* contact_bar_background.png in Resources */,
D3E8F68815ADE05B0065A226 /* UIContactDetailsFooter.xib in Resources */,
D32D5AA715ADE5D9008593F3 /* button_alert_background_default.png in Resources */,
D32D5AA915ADE5D9008593F3 /* button_alert_background_over.png in Resources */,
@@ -3077,8 +3063,7 @@
D3C31A8215BD8DED008ED271 /* video_on_default_landscape.png in Resources */,
D3C31A8415BD8DED008ED271 /* video_on_disabled_landscape.png in Resources */,
D3C31A8615BD8DED008ED271 /* video_on_over_landscape.png in Resources */,
- D3B82A0215C18A710036C93E /* history_details_bar_background.png in Resources */,
- D3B82A0415C18A710036C93E /* settings_bar_background.png in Resources */,
+ D3A74E5915C68162001500B9 /* toolsbar_background.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3121,7 +3106,6 @@
D34BD72915C13DD40070C209 /* FirstLoginViewController.xib in Resources */,
D34BD72A15C13DD40070C209 /* HistoryDetailsViewController.xib in Resources */,
D34BD72B15C13DD40070C209 /* HistoryViewController.xib in Resources */,
- D34BD72C15C13DD40070C209 /* InCallViewController-ipad.xib in Resources */,
D34BD72D15C13DD40070C209 /* InCallViewController.xib in Resources */,
D34BD72E15C13DD40070C209 /* IncomingCallViewController.xib in Resources */,
D34BD72F15C13DD40070C209 /* LinphoneApp.xib in Resources */,
@@ -3188,7 +3172,6 @@
D34BD66015C13DB60070C209 /* conference_over_landscape.png in Resources */,
D34BD66115C13DB60070C209 /* contact_back_default.png in Resources */,
D34BD66215C13DB60070C209 /* contact_back_over.png in Resources */,
- D34BD66315C13DB60070C209 /* contact_bar_background.png in Resources */,
D34BD66415C13DB60070C209 /* contact_cancel_default.png in Resources */,
D34BD66515C13DB60070C209 /* contact_cancel_over.png in Resources */,
D34BD66615C13DB60070C209 /* contact_edit_default.png in Resources */,
@@ -3383,8 +3366,7 @@
D34BD74115C13E250070C209 /* Localizable.strings in Resources */,
D34BD74215C13E350070C209 /* untitled.plist in Resources */,
D34BD74315C13ED70070C209 /* DialerViewController.xib in Resources */,
- D3B82A0315C18A710036C93E /* history_details_bar_background.png in Resources */,
- D3B82A0515C18A710036C93E /* settings_bar_background.png in Resources */,
+ D3A74E5A15C68162001500B9 /* toolsbar_background.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};