diff --git a/Classes/en.lproj/IncomingCallViewController.xib b/Classes/en.lproj/IncomingCallViewController.xib index f51eba906..c2a334da3 100644 --- a/Classes/en.lproj/IncomingCallViewController.xib +++ b/Classes/en.lproj/IncomingCallViewController.xib @@ -42,6 +42,7 @@ 274 {320, 460} + _NS:9 NO @@ -63,6 +64,7 @@ 290 {{0, 49}, {320, 63}} + _NS:9 NO @@ -77,11 +79,12 @@ 290 {320, 68} - + + _NS:9 NO - Incoming call + IBCocoaTouchFramework @@ -90,11 +93,46 @@ header_incoming.png + + + 290 + {{20, 0}, {280, 50}} + + + + _NS:9 + NO + YES + 7 + NO + + Incoming call + + IBCocoaTouchFramework + Incoming call + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + + 0 + + 2 + 27 + + + Helvetica-Bold + 27 + 16 + + NO + 292 {{10, 53}, {300, 51}} + _NS:9 NO @@ -4518,6 +4556,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{0, 96}, {320, 262}} + _NS:9 NO @@ -4532,6 +4571,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{80, 113}, {160, 170}} + _NS:9 NO @@ -4549,6 +4589,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 395} + _NS:9 @@ -4563,6 +4604,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483374 {{0, 10}, {320, 67}} + _NS:9 @@ -4581,6 +4623,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 278 {160, 77} + _NS:9 NO @@ -4617,6 +4660,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 275 {{160, 0}, {160, 77}} + + _NS:9 NO @@ -4640,6 +4685,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {{0, 383}, {320, 77}} + _NS:9 @@ -4648,6 +4694,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 460} + _NS:9 @@ -4743,6 +4790,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE + @@ -4805,6 +4853,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE acceptButton + + 31 + + + headerLabel + @@ -4818,6 +4872,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 @@ -4831,9 +4886,48 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - 30 + 31 + + + + + IncomingCallViewController + UIViewController + + id + id + + + + onAcceptClick: + id + + + onDeclineClick: + id + + + + UILabel + UIImageView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + + IBProjectSource + ./Classes/IncomingCallViewController.h + + + - 0 IBCocoaTouchFramework YES diff --git a/Classes/fr.lproj/IncomingCallViewController.xib b/Classes/fr.lproj/IncomingCallViewController.xib index 2c7cd6cdc..5ee8399cf 100644 --- a/Classes/fr.lproj/IncomingCallViewController.xib +++ b/Classes/fr.lproj/IncomingCallViewController.xib @@ -77,11 +77,11 @@ 290 {320, 68} - + _NS:9 NO - Appel entrant + IBCocoaTouchFramework @@ -90,6 +90,39 @@ header_incoming.png + + + 290 + {{20, 0}, {280, 50}} + + + _NS:9 + NO + YES + 7 + NO + + Appel entrant + + IBCocoaTouchFramework + Appel entrant + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + + 0 + NO + + 2 + 27 + + + Helvetica-Bold + 27 + 16 + + 292 @@ -4742,6 +4775,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE + @@ -4804,6 +4838,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE acceptButton + + 31 + + + headerLabel + @@ -4817,6 +4857,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 @@ -4830,9 +4871,48 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - 30 + 31 + + + + + IncomingCallViewController + UIViewController + + id + id + + + + onAcceptClick: + id + + + onDeclineClick: + id + + + + UILabel + UIImageView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + + IBProjectSource + ./Classes/IncomingCallViewController.h + + + - 0 IBCocoaTouchFramework YES diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index a9a0ea715..3dea95b1d 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -3497,17 +3497,17 @@ backup - 4 + 6 class BLWrapperHandle name - Classes/IncomingCallViewController/4/IncomingCallViewController.xib + Classes/IncomingCallViewController/6/IncomingCallViewController.xib change date - 2012-09-25T09:16:20Z + 2012-09-25T14:18:43Z changed values class @@ -3517,7 +3517,7 @@ flags 0 hash - b540fdc804ad4e5382cd8c8e57936e4b + e42cdcfa6dd0a955773c32c95c8bb4f7 name IncomingCallViewController.xib @@ -3629,13 +3629,38 @@ class BLStringKeyObject comment - Class = "IBUIImageView"; accessibilityLabel = "Incoming call"; ObjectID = "12"; + Class = "IBUIImageView"; accessibilityLabel = "Contact's avatar"; ObjectID = "19"; errors flags 0 key - 12.accessibilityLabel + 19.accessibilityLabel + localizations + + en + Contact's avatar + fr + Avatar du contact + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Incoming call"; ObjectID = "31"; + errors + + flags + 0 + key + 31.accessibilityLabel localizations en @@ -3654,34 +3679,62 @@ class BLStringKeyObject comment - Class = "IBUIImageView"; accessibilityLabel = "Contact's avatar"; ObjectID = "19"; + Class = "IBUILabel"; text = "Incoming call"; ObjectID = "31"; errors flags 0 key - 19.accessibilityLabel + 31.text localizations en - Contact's avatar + Incoming call fr - Avatar du contact + Appel entrant snapshots old objects - + + + change date + 2001-01-01T00:00:00Z + changed values + + <reference> + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Incoming call"; ObjectID = "12"; + errors + + flags + 0 + key + 12.accessibilityLabel + localizations + + en + Incoming call + fr + Appel entrant + + snapshots + + + snapshots versions en - 4 + 6 fr - 4 + 6 diff --git a/linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib b/linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib similarity index 98% rename from linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib rename to linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib index f51eba906..c2a334da3 100644 --- a/linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib +++ b/linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib @@ -42,6 +42,7 @@ 274 {320, 460} + _NS:9 NO @@ -63,6 +64,7 @@ 290 {{0, 49}, {320, 63}} + _NS:9 NO @@ -77,11 +79,12 @@ 290 {320, 68} - + + _NS:9 NO - Incoming call + IBCocoaTouchFramework @@ -90,11 +93,46 @@ header_incoming.png + + + 290 + {{20, 0}, {280, 50}} + + + + _NS:9 + NO + YES + 7 + NO + + Incoming call + + IBCocoaTouchFramework + Incoming call + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + + 0 + + 2 + 27 + + + Helvetica-Bold + 27 + 16 + + NO + 292 {{10, 53}, {300, 51}} + _NS:9 NO @@ -4518,6 +4556,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{0, 96}, {320, 262}} + _NS:9 NO @@ -4532,6 +4571,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{80, 113}, {160, 170}} + _NS:9 NO @@ -4549,6 +4589,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 395} + _NS:9 @@ -4563,6 +4604,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483374 {{0, 10}, {320, 67}} + _NS:9 @@ -4581,6 +4623,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 278 {160, 77} + _NS:9 NO @@ -4617,6 +4660,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 275 {{160, 0}, {160, 77}} + + _NS:9 NO @@ -4640,6 +4685,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {{0, 383}, {320, 77}} + _NS:9 @@ -4648,6 +4694,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 460} + _NS:9 @@ -4743,6 +4790,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE + @@ -4805,6 +4853,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE acceptButton + + 31 + + + headerLabel + @@ -4818,6 +4872,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 @@ -4831,9 +4886,48 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - 30 + 31 + + + + + IncomingCallViewController + UIViewController + + id + id + + + + onAcceptClick: + id + + + onDeclineClick: + id + + + + UILabel + UIImageView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + + IBProjectSource + ./Classes/IncomingCallViewController.h + + + - 0 IBCocoaTouchFramework YES