From 1b355c8f7df12cdd4caaed3f754e5d8060a49b22 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 16 Oct 2012 16:32:37 +0200 Subject: [PATCH] Add message button to history details --- Classes/HistoryDetailsViewController.h | 8 +- Classes/HistoryDetailsViewController.m | 88 ++++- Classes/en.lproj/DialerViewController.xib | 9 +- Classes/en.lproj/FirstLoginViewController.xib | 4 +- .../en.lproj/HistoryDetailsViewController.xib | 349 ++++++++++++++++-- Classes/fr.lproj/DialerViewController.xib | 30 +- Classes/fr.lproj/FirstLoginViewController.xib | 22 +- .../fr.lproj/HistoryDetailsViewController.xib | 336 +++++++++++++++-- linphone.ldb/Contents.plist | 167 +++++++-- .../{5 => 6}/DialerViewController.xib | 9 +- .../{5 => 6}/FirstLoginViewController.xib | 4 +- .../{5 => 8}/HistoryDetailsViewController.xib | 349 ++++++++++++++++-- 12 files changed, 1195 insertions(+), 180 deletions(-) rename linphone.ldb/Resources/Classes/DialerViewController/{5 => 6}/DialerViewController.xib (99%) rename linphone.ldb/Resources/Classes/FirstLoginViewController/{5 => 6}/FirstLoginViewController.xib (99%) rename linphone.ldb/Resources/Classes/HistoryDetailsViewController/{5 => 8}/HistoryDetailsViewController.xib (73%) diff --git a/Classes/HistoryDetailsViewController.h b/Classes/HistoryDetailsViewController.h index a9140badd..de8e57b62 100644 --- a/Classes/HistoryDetailsViewController.h +++ b/Classes/HistoryDetailsViewController.h @@ -36,13 +36,17 @@ @property (nonatomic, retain) IBOutlet UILabel *durationHeaderLabel; @property (nonatomic, retain) IBOutlet UILabel *typeLabel; @property (nonatomic, retain) IBOutlet UILabel *typeHeaderLabel; -@property (nonatomic, retain) IBOutlet UIButton *addressButton; +@property (nonatomic, retain) IBOutlet UILabel *plainAddressLabel; +@property (nonatomic, retain) IBOutlet UILabel *plainAddressHeaderLabel; +@property (nonatomic, retain) IBOutlet UIButton *callButton; +@property (nonatomic, retain) IBOutlet UIButton *messageButton; @property (nonatomic, retain) IBOutlet UIButton *addContactButton; @property (nonatomic, assign) LinphoneCallLog *callLog; - (IBAction)onBackClick:(id)event; - (IBAction)onContactClick:(id)event; - (IBAction)onAddContactClick:(id)event; -- (IBAction)onAddressClick:(id)event; +- (IBAction)onCallClick:(id)event; +- (IBAction)onMessageClick:(id)event; @end diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m index 89ea294cf..58b480b51 100644 --- a/Classes/HistoryDetailsViewController.m +++ b/Classes/HistoryDetailsViewController.m @@ -33,7 +33,10 @@ @synthesize durationHeaderLabel; @synthesize typeLabel; @synthesize typeHeaderLabel; -@synthesize addressButton; +@synthesize plainAddressLabel; +@synthesize plainAddressHeaderLabel; +@synthesize callButton; +@synthesize messageButton; @synthesize addContactButton; #pragma mark - LifeCycle Functions @@ -63,7 +66,10 @@ [durationHeaderLabel release]; [typeLabel release]; [typeHeaderLabel release]; - [addressButton release]; + [plainAddressLabel release]; + [plainAddressHeaderLabel release]; + [callButton release]; + [messageButton release]; [addContactButton release]; [super dealloc]; @@ -105,7 +111,9 @@ static UICompositeViewDescription *compositeDescription = nil; [HistoryDetailsViewController adaptSize:dateHeaderLabel field:dateLabel]; [HistoryDetailsViewController adaptSize:durationHeaderLabel field:durationLabel]; [HistoryDetailsViewController adaptSize:typeHeaderLabel field:typeLabel]; - [addressButton.titleLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! + [HistoryDetailsViewController adaptSize:plainAddressHeaderLabel field:plainAddressLabel]; + [callButton.titleLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! + [messageButton.titleLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! } - (void)viewWillAppear:(BOOL)animated { @@ -240,18 +248,24 @@ static UICompositeViewDescription *compositeDescription = nil; int duration = callLog->duration; [durationLabel setText:[NSString stringWithFormat:@"%02i:%02i", (duration/60), duration - 60 * (duration / 60), nil]]; + // contact name + [plainAddressLabel setText:@""]; if (addr != NULL) { - // contact name char* lAddress = linphone_address_as_string_uri_only(addr); if(lAddress != NULL) { - [addressButton setTitle:[NSString stringWithUTF8String:lAddress] forState:UIControlStateNormal]; - [addressButton setHidden:FALSE]; + [plainAddressLabel setText:[NSString stringWithUTF8String:lAddress]]; ms_free(lAddress); } else { - [addressButton setHidden:TRUE]; + } + } + + if (addr != NULL) { + [callButton setHidden:FALSE]; + [messageButton setHidden:FALSE]; } else { - [addressButton setHidden:TRUE]; + [callButton setHidden:TRUE]; + [messageButton setHidden:TRUE]; } } @@ -274,15 +288,28 @@ static UICompositeViewDescription *compositeDescription = nil; } - (IBAction)onAddContactClick:(id)event { - [ContactSelection setSelectionMode:ContactSelectionModeEdit]; - [ContactSelection setAddAddress:[[addressButton titleLabel] text]]; - [ContactSelection setSipFilter:FALSE]; - ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); - if(controller != nil) { + LinphoneAddress* addr = NULL; + if (callLog->dir == LinphoneCallIncoming) { + addr = callLog->from; + } else { + addr = callLog->to; + } + if (addr != NULL) { + char* lAddress = linphone_address_as_string_uri_only(addr); + if(lAddress != NULL) { + [ContactSelection setAddAddress:[NSString stringWithUTF8String:lAddress]]; + [ContactSelection setSelectionMode:ContactSelectionModeEdit]; + + [ContactSelection setSipFilter:FALSE]; + ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); + if(controller != nil) { + } + ms_free(lAddress); + } } } -- (IBAction)onAddressClick:(id)event { +- (IBAction)onCallClick:(id)event { LinphoneAddress* addr; if (callLog->dir == LinphoneCallIncoming) { addr = callLog->from; @@ -318,4 +345,37 @@ static UICompositeViewDescription *compositeDescription = nil; ms_free(lAddress); } +- (IBAction)onMessageClick:(id)event { + LinphoneAddress* addr; + if (callLog->dir == LinphoneCallIncoming) { + addr = callLog->from; + } else { + addr = callLog->to; + } + + char* lAddress = linphone_address_as_string_uri_only(addr); + if(lAddress == NULL) + return; + + NSString *displayName = nil; + if(contact != nil) { + displayName = [FastAddressBook getContactDisplayName:contact]; + } else { + const char* lDisplayName = linphone_address_get_display_name(addr); + const char* lUserName = linphone_address_get_username(addr); + if (lDisplayName) + displayName = [NSString stringWithUTF8String:lDisplayName]; + else if(lUserName) + displayName = [NSString stringWithUTF8String:lUserName]; + } + + // Go to ChatRoom view + [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]]; + ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); + if(controller != nil) { + [controller setRemoteAddress:[NSString stringWithUTF8String:lAddress]]; + } + ms_free(lAddress); +} + @end diff --git a/Classes/en.lproj/DialerViewController.xib b/Classes/en.lproj/DialerViewController.xib index 1e7b15ea5..ec480cb70 100644 --- a/Classes/en.lproj/DialerViewController.xib +++ b/Classes/en.lproj/DialerViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -651,6 +651,7 @@ {{214, 0}, {106, 69}} + _NS:9 NO @@ -1722,10 +1723,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/en.lproj/FirstLoginViewController.xib b/Classes/en.lproj/FirstLoginViewController.xib index e4232bdce..c6d76bf38 100644 --- a/Classes/en.lproj/FirstLoginViewController.xib +++ b/Classes/en.lproj/FirstLoginViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/Classes/en.lproj/HistoryDetailsViewController.xib b/Classes/en.lproj/HistoryDetailsViewController.xib index cd83816fa..4c36ca270 100644 --- a/Classes/en.lproj/HistoryDetailsViewController.xib +++ b/Classes/en.lproj/HistoryDetailsViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -46,6 +46,7 @@ 290 {320, 44} + _NS:9 NO @@ -60,6 +61,7 @@ 292 {160, 44} + _NS:9 NO @@ -110,6 +112,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -142,6 +145,7 @@ {320, 44} + _NS:9 @@ -162,6 +166,7 @@ 292 {320, 100} + _NS:9 NO @@ -195,6 +200,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -209,6 +215,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -228,6 +235,7 @@ 290 {{101, 37}, {199, 43}} + _NS:9 NO @@ -259,6 +267,7 @@ {{0, 44}, {320, 100}} + _NS:9 @@ -276,6 +285,7 @@ 292 {49, 21} + _NS:9 NO @@ -305,6 +315,7 @@ 290 {{57, 0}, {223, 21}} + _NS:9 NO @@ -331,8 +342,9 @@ - {{20, 166}, {280, 21}} + {{20, 152}, {280, 21}} + _NS:9 @@ -347,6 +359,7 @@ 292 {80, 21} + _NS:9 NO @@ -369,6 +382,7 @@ 290 {{88, 0}, {192, 21}} + _NS:9 NO @@ -388,8 +402,9 @@ - {{20, 195}, {280, 21}} + {{20, 181}, {280, 21}} + _NS:9 @@ -404,6 +419,7 @@ 292 {57, 21} + _NS:9 NO @@ -426,7 +442,8 @@ 290 {{65, 0}, {215, 21}} - + + _NS:9 NO YES @@ -445,18 +462,81 @@ - {{20, 224}, {280, 21}} + {{20, 210}, {280, 21}} + _NS:9 IBCocoaTouchFramework + + + 295 + + + + 292 + {78, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Address: + + 0 + 10 + + + + + + 290 + {{86, 0}, {194, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Address + + + IBCocoaTouchFramework + 0102030405 + + 0 + 10 + + + + + {{20, 239}, {280, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + 293 - {{33, 323}, {255, 50}} + {{33, 268}, {255, 50}} + + _NS:9 NO @@ -471,30 +551,60 @@ 10 10 10 - 0102030405 + Call - + NSImage button_background_over.png - + NSImage button_background_default.png - + 2 20 - + Helvetica-Bold 20 16 + + + 293 + {{33, 326}, {255, 50}} + + + + _NS:9 + NO + + Send message + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 10 + 10 + 10 + 10 + Send message + + + + + + + {320, 460} + IBCocoaTouchFramework @@ -510,14 +620,6 @@ 10 - - - addressButton - - - - 41 - addressLabel @@ -590,6 +692,38 @@ 52 + + + callButton + + + + 61 + + + + messageButton + + + + 62 + + + + plainAddressHeaderLabel + + + + 63 + + + + plainAddressLabel + + + + 64 + onBackClick: @@ -601,12 +735,12 @@ - onAddressClick: + onCallClick: 7 - 39 + 65 @@ -626,6 +760,15 @@ 53 + + + onMessageClick: + + + 7 + + 66 + @@ -655,7 +798,9 @@ + + @@ -714,12 +859,6 @@ durationView - - 31 - - - durationHeaderLabel - 32 @@ -782,7 +921,7 @@ 37 - addressButton + callButton 38 @@ -796,6 +935,40 @@ addButton + + 54 + + + + + + + plainAddressView + + + 55 + + + plainAddressHeaderLabel + + + 56 + + + plainAddressLabel + + + 59 + + + messageButton + + + 31 + + + durationHeaderLabel + @@ -823,6 +996,11 @@ 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 @@ -833,9 +1011,118 @@ - 53 + 66 + + + + + HistoryDetailsViewController + UIViewController + + id + id + id + id + id + + + + onAddContactClick: + id + + + onBackClick: + id + + + onCallClick: + id + + + onContactClick: + id + + + onMessageClick: + id + + + + UIButton + UILabel + UIImageView + UIButton + UILabel + UILabel + UILabel + UILabel + UIButton + UILabel + UILabel + UILabel + UILabel + + + + addContactButton + UIButton + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + callButton + UIButton + + + dateHeaderLabel + UILabel + + + dateLabel + UILabel + + + durationHeaderLabel + UILabel + + + durationLabel + UILabel + + + messageButton + UIButton + + + plainAddressHeaderLabel + UILabel + + + plainAddressLabel + UILabel + + + typeHeaderLabel + UILabel + + + typeLabel + UILabel + + + + IBProjectSource + ./Classes/HistoryDetailsViewController.h + + + - 0 IBCocoaTouchFramework YES diff --git a/Classes/fr.lproj/DialerViewController.xib b/Classes/fr.lproj/DialerViewController.xib index 1fb5e7b17..33b83a279 100644 --- a/Classes/fr.lproj/DialerViewController.xib +++ b/Classes/fr.lproj/DialerViewController.xib @@ -2,21 +2,21 @@ 784 - 11E53 - 1938 - 1138.47 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 YES + IBProxyObject IBUIButton IBUIImageView - IBUIView IBUITextField - IBProxyObject + IBUIView YES @@ -1275,7 +1275,7 @@ 41.IBPluginDependency 41.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - + YES DialerViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1370,7 +1370,7 @@ onAddressChange: onBackClick: - + YES id id @@ -1385,7 +1385,7 @@ onAddressChange: onBackClick: - + YES onAddContactClick: @@ -1428,7 +1428,7 @@ videoPreview zeroButton - + YES UICallButton UIButton @@ -1481,7 +1481,7 @@ videoPreview zeroButton - + YES addCallButton @@ -1697,10 +1697,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1755,7 +1751,7 @@ transfer_call_disabled.png transfer_call_over.png - + YES {214, 138} {214, 138} @@ -1802,6 +1798,6 @@ {214, 138} - 933 + 1926 diff --git a/Classes/fr.lproj/FirstLoginViewController.xib b/Classes/fr.lproj/FirstLoginViewController.xib index 14f23a56e..c454020bb 100644 --- a/Classes/fr.lproj/FirstLoginViewController.xib +++ b/Classes/fr.lproj/FirstLoginViewController.xib @@ -2,21 +2,21 @@ 784 - 11E53 - 1938 - 1138.47 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 YES - IBUIButton - IBUIActivityIndicatorView - IBUIView - IBUITextField IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUITextField + IBUIView YES @@ -415,7 +415,7 @@ 64.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 8.IBPluginDependency - + YES FirstLoginViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -466,13 +466,13 @@ button_background_over.png field_background.png - + YES {550, 101} {550, 101} {542, 88} - 933 + 1926 diff --git a/Classes/fr.lproj/HistoryDetailsViewController.xib b/Classes/fr.lproj/HistoryDetailsViewController.xib index d418215d7..2e0c9b45e 100644 --- a/Classes/fr.lproj/HistoryDetailsViewController.xib +++ b/Classes/fr.lproj/HistoryDetailsViewController.xib @@ -1,21 +1,21 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 + IBProxyObject IBUIButton IBUIImageView - IBUIView IBUILabel - IBProxyObject + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -331,7 +331,7 @@ - {{20, 166}, {280, 21}} + {{20, 152}, {280, 21}} _NS:9 @@ -388,7 +388,7 @@ - {{20, 195}, {280, 21}} + {{20, 181}, {280, 21}} _NS:9 @@ -426,7 +426,7 @@ 290 {{65, 0}, {215, 21}} - + _NS:9 NO YES @@ -445,18 +445,76 @@ - {{20, 224}, {280, 21}} + {{20, 210}, {280, 21}} _NS:9 IBCocoaTouchFramework + + + 295 + + + + 292 + {78, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Adresse: + + 0 + 10 + + + + + + 290 + {{86, 0}, {194, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Adresse + + + IBCocoaTouchFramework + 0102030405 + + 0 + 10 + + + + + {{20, 239}, {280, 21}} + + + _NS:9 + + IBCocoaTouchFramework + 293 - {{33, 323}, {255, 50}} + {{33, 268}, {255, 50}} + _NS:9 NO @@ -471,27 +529,54 @@ 10 10 10 - 0102030405 + Call - + NSImage button_background_over.png - + NSImage button_background_default.png - + 2 20 - + Helvetica-Bold 20 16 + + + 293 + {{33, 326}, {255, 50}} + + _NS:9 + NO + + Envoyer un message + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 10 + 10 + 10 + 10 + Envoyer un message + + + + + + + {320, 460} @@ -509,14 +594,6 @@ 10 - - - addressButton - - - - 41 - addressLabel @@ -589,6 +666,38 @@ 52 + + + callButton + + + + 61 + + + + messageButton + + + + 62 + + + + plainAddressHeaderLabel + + + + 63 + + + + plainAddressLabel + + + + 64 + onBackClick: @@ -600,12 +709,12 @@ - onAddressClick: + onCallClick: 7 - 39 + 65 @@ -625,6 +734,15 @@ 53 + + + onMessageClick: + + + 7 + + 66 + @@ -654,7 +772,9 @@ + + @@ -713,12 +833,6 @@ durationView - - 31 - - - durationHeaderLabel - 32 @@ -781,7 +895,7 @@ 37 - addressButton + callButton 38 @@ -795,6 +909,40 @@ addButton + + 54 + + + + + + + plainAddressView + + + 55 + + + plainAddressHeaderLabel + + + 56 + + + plainAddressLabel + + + 59 + + + messageButton + + + 31 + + + durationHeaderLabel + @@ -822,6 +970,11 @@ 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 @@ -832,9 +985,118 @@ - 53 + 66 + + + + + HistoryDetailsViewController + UIViewController + + id + id + id + id + id + + + + onAddContactClick: + id + + + onBackClick: + id + + + onCallClick: + id + + + onContactClick: + id + + + onMessageClick: + id + + + + UIButton + UILabel + UIImageView + UIButton + UILabel + UILabel + UILabel + UILabel + UIButton + UILabel + UILabel + UILabel + UILabel + + + + addContactButton + UIButton + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + callButton + UIButton + + + dateHeaderLabel + UILabel + + + dateLabel + UILabel + + + durationHeaderLabel + UILabel + + + durationLabel + UILabel + + + messageButton + UIButton + + + plainAddressHeaderLabel + UILabel + + + plainAddressLabel + UILabel + + + typeHeaderLabel + UILabel + + + typeLabel + UILabel + + + + IBProjectSource + ./Classes/HistoryDetailsViewController.h + + + - 0 IBCocoaTouchFramework YES @@ -850,6 +1112,6 @@ {320, 88} {5, 88} - 933 + 1926 diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index e0e84a8c9..e08e48542 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -1368,17 +1368,17 @@ backup - 5 + 6 class BLWrapperHandle name - Classes/DialerViewController/5/DialerViewController.xib + Classes/DialerViewController/6/DialerViewController.xib change date - 2012-09-26T14:58:35Z + 2012-10-16T12:36:35Z changed values class @@ -1388,7 +1388,7 @@ flags 0 hash - 9e26a5888ff9dabd85d7cca675540636 + db230136d1bdea7fda72ecf324a5a159 name DialerViewController.xib @@ -1902,9 +1902,9 @@ versions en - 5 + 6 fr - 5 + 6 @@ -2481,17 +2481,17 @@ backup - 5 + 6 class BLWrapperHandle name - Classes/FirstLoginViewController/5/FirstLoginViewController.xib + Classes/FirstLoginViewController/6/FirstLoginViewController.xib change date - 2012-09-25T09:16:19Z + 2012-10-16T14:13:48Z changed values class @@ -2501,7 +2501,7 @@ flags 0 hash - 955b765235e9de0f0fc6f830777dae53 + d4cf9755b94184e4eb59331c42b1b4e4 name FirstLoginViewController.xib @@ -2665,9 +2665,9 @@ versions en - 5 + 6 fr - 5 + 6 @@ -2675,17 +2675,17 @@ backup - 5 + 8 class BLWrapperHandle name - Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib + Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib change date - 2012-09-25T09:16:19Z + 2012-10-16T14:28:47Z changed values class @@ -2695,7 +2695,7 @@ flags 0 hash - e32663fb7bb499508cfde62e883bded0 + cafa067232a482fd15bc0222fa7c9d45 name HistoryDetailsViewController.xib @@ -3076,17 +3076,19 @@ class BLStringKeyObject comment - Class = "IBUIButton"; normalTitle = "0102030405"; ObjectID = "37"; + Class = "IBUIButton"; normalTitle = "Call"; ObjectID = "37"; errors flags - 2 + 3 key 37.normalTitle localizations en - 0102030405 + Call + fr + Appeler snapshots @@ -3141,6 +3143,129 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Address:"; ObjectID = "55"; + errors + + flags + 0 + key + 55.text + localizations + + en + Address: + fr + Adresse: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Address"; ObjectID = "56"; + errors + + flags + 0 + key + 56.accessibilityLabel + localizations + + en + Address + fr + Adresse + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "0102030405"; ObjectID = "56"; + errors + + flags + 2 + key + 56.text + localizations + + en + 0102030405 + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Send message"; ObjectID = "59"; + errors + + flags + 0 + key + 59.accessibilityLabel + localizations + + en + Send message + fr + Envoyer un message + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Send message"; ObjectID = "59"; + errors + + flags + 0 + key + 59.normalTitle + localizations + + en + Send message + fr + Envoyer un message + + snapshots + + old objects @@ -3149,9 +3274,9 @@ versions en - 5 + 8 fr - 5 + 8 diff --git a/linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib b/linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib rename to linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib index 1e7b15ea5..ec480cb70 100644 --- a/linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib +++ b/linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -651,6 +651,7 @@ {{214, 0}, {106, 69}} + _NS:9 NO @@ -1722,10 +1723,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib b/linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib rename to linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib index e4232bdce..c6d76bf38 100644 --- a/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib +++ b/linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib similarity index 73% rename from linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib rename to linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib index cd83816fa..4c36ca270 100644 --- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -46,6 +46,7 @@ 290 {320, 44} + _NS:9 NO @@ -60,6 +61,7 @@ 292 {160, 44} + _NS:9 NO @@ -110,6 +112,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -142,6 +145,7 @@ {320, 44} + _NS:9 @@ -162,6 +166,7 @@ 292 {320, 100} + _NS:9 NO @@ -195,6 +200,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -209,6 +215,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -228,6 +235,7 @@ 290 {{101, 37}, {199, 43}} + _NS:9 NO @@ -259,6 +267,7 @@ {{0, 44}, {320, 100}} + _NS:9 @@ -276,6 +285,7 @@ 292 {49, 21} + _NS:9 NO @@ -305,6 +315,7 @@ 290 {{57, 0}, {223, 21}} + _NS:9 NO @@ -331,8 +342,9 @@ - {{20, 166}, {280, 21}} + {{20, 152}, {280, 21}} + _NS:9 @@ -347,6 +359,7 @@ 292 {80, 21} + _NS:9 NO @@ -369,6 +382,7 @@ 290 {{88, 0}, {192, 21}} + _NS:9 NO @@ -388,8 +402,9 @@ - {{20, 195}, {280, 21}} + {{20, 181}, {280, 21}} + _NS:9 @@ -404,6 +419,7 @@ 292 {57, 21} + _NS:9 NO @@ -426,7 +442,8 @@ 290 {{65, 0}, {215, 21}} - + + _NS:9 NO YES @@ -445,18 +462,81 @@ - {{20, 224}, {280, 21}} + {{20, 210}, {280, 21}} + _NS:9 IBCocoaTouchFramework + + + 295 + + + + 292 + {78, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Address: + + 0 + 10 + + + + + + 290 + {{86, 0}, {194, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Address + + + IBCocoaTouchFramework + 0102030405 + + 0 + 10 + + + + + {{20, 239}, {280, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + 293 - {{33, 323}, {255, 50}} + {{33, 268}, {255, 50}} + + _NS:9 NO @@ -471,30 +551,60 @@ 10 10 10 - 0102030405 + Call - + NSImage button_background_over.png - + NSImage button_background_default.png - + 2 20 - + Helvetica-Bold 20 16 + + + 293 + {{33, 326}, {255, 50}} + + + + _NS:9 + NO + + Send message + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 10 + 10 + 10 + 10 + Send message + + + + + + + {320, 460} + IBCocoaTouchFramework @@ -510,14 +620,6 @@ 10 - - - addressButton - - - - 41 - addressLabel @@ -590,6 +692,38 @@ 52 + + + callButton + + + + 61 + + + + messageButton + + + + 62 + + + + plainAddressHeaderLabel + + + + 63 + + + + plainAddressLabel + + + + 64 + onBackClick: @@ -601,12 +735,12 @@ - onAddressClick: + onCallClick: 7 - 39 + 65 @@ -626,6 +760,15 @@ 53 + + + onMessageClick: + + + 7 + + 66 + @@ -655,7 +798,9 @@ + + @@ -714,12 +859,6 @@ durationView - - 31 - - - durationHeaderLabel - 32 @@ -782,7 +921,7 @@ 37 - addressButton + callButton 38 @@ -796,6 +935,40 @@ addButton + + 54 + + + + + + + plainAddressView + + + 55 + + + plainAddressHeaderLabel + + + 56 + + + plainAddressLabel + + + 59 + + + messageButton + + + 31 + + + durationHeaderLabel + @@ -823,6 +996,11 @@ 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 @@ -833,9 +1011,118 @@ - 53 + 66 + + + + + HistoryDetailsViewController + UIViewController + + id + id + id + id + id + + + + onAddContactClick: + id + + + onBackClick: + id + + + onCallClick: + id + + + onContactClick: + id + + + onMessageClick: + id + + + + UIButton + UILabel + UIImageView + UIButton + UILabel + UILabel + UILabel + UILabel + UIButton + UILabel + UILabel + UILabel + UILabel + + + + addContactButton + UIButton + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + callButton + UIButton + + + dateHeaderLabel + UILabel + + + dateLabel + UILabel + + + durationHeaderLabel + UILabel + + + durationLabel + UILabel + + + messageButton + UIButton + + + plainAddressHeaderLabel + UILabel + + + plainAddressLabel + UILabel + + + typeHeaderLabel + UILabel + + + typeLabel + UILabel + + + + IBProjectSource + ./Classes/HistoryDetailsViewController.h + + + - 0 IBCocoaTouchFramework YES