From cc0983860cdc267337ec8539cc88eb8bde0728cb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 6 Dec 2012 17:44:03 +0100 Subject: [PATCH] improve customazation process --- Classes/AboutViewController.h | 3 + Classes/AboutViewController.m | 14 +- Classes/AboutViewController.xib | 25 ++- Classes/ContactDetailsTableViewController.m | 2 +- Classes/ContactsViewController.m | 5 +- Classes/LinphoneAppDelegate.m | 5 + Classes/PhoneMainView.m | 2 +- Classes/SettingsViewController.m | 5 +- .../ContactDetailsLabelViewController.xib | 6 +- .../en.lproj/ContactDetailsViewController.xib | 194 +---------------- Classes/en.lproj/ContactsViewController.xib | 94 +++++++- Resources/en.lproj/Localizable.strings | Bin 17904 -> 18562 bytes Resources/fr.lproj/Localizable.strings | Bin 18524 -> 19158 bytes linphone.ldb/Contents.plist | 202 +++++++++++++++--- .../Localizable/1/Localizable.strings | Bin 17904 -> 18562 bytes 15 files changed, 315 insertions(+), 242 deletions(-) diff --git a/Classes/AboutViewController.h b/Classes/AboutViewController.h index a486efbd1..041031e06 100644 --- a/Classes/AboutViewController.h +++ b/Classes/AboutViewController.h @@ -24,10 +24,13 @@ @interface AboutViewController : UIViewController { } +@property (nonatomic, retain) IBOutlet UILabel *linphoneLabel; @property (nonatomic, retain) IBOutlet UILabel *linphoneIphoneVersionLabel; @property (nonatomic, retain) IBOutlet UILabel *linphoneCoreVersionLabel; @property (nonatomic, retain) IBOutlet UIView *contentView; @property (nonatomic, retain) IBOutlet UILabel *linkLabel; +@property (nonatomic, retain) IBOutlet UILabel *copyrightLabel; +@property (nonatomic, retain) IBOutlet UILabel *licenseLabel; @property (nonatomic, retain) IBOutlet UIWebView *licensesView; @property (nonatomic, retain) IBOutlet UITapGestureRecognizer *linkTapGestureRecognizer; diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m index 1e2b5dddc..d85a80874 100644 --- a/Classes/AboutViewController.m +++ b/Classes/AboutViewController.m @@ -25,11 +25,14 @@ @implementation AboutViewController @synthesize linphoneCoreVersionLabel; +@synthesize linphoneLabel; @synthesize linphoneIphoneVersionLabel; @synthesize contentView; @synthesize linkTapGestureRecognizer; @synthesize linkLabel; @synthesize licensesView; +@synthesize licenseLabel; +@synthesize copyrightLabel; #pragma mark - Lifecycle Functions @@ -59,15 +62,22 @@ - (void)viewDidLoad { [super viewDidLoad]; + [linkLabel setText:NSLocalizedString(@"http://www.linphone.org", nil)]; + [licenseLabel setText:NSLocalizedString(@"GNU General Public License V2 ", nil)]; + [copyrightLabel setText:NSLocalizedString(@"© 2010-2012 Belledonne Communications ", nil)]; + [linkLabel addGestureRecognizer:linkTapGestureRecognizer]; UIScrollView *scrollView = (UIScrollView *)self.view; [scrollView addSubview:contentView]; [scrollView setContentSize:[contentView bounds].size]; - [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"Linphone iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; + [linphoneLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]]; + + [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + ,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; - [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"Linphone Core %s", linphone_core_get_version()]]; + [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"%@ Core %s", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], linphone_core_get_version()]]; if([LinphoneManager runningOnIpad]) { [LinphoneUtils adjustFontSize:self.view mult:2.22f]; diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index 7c0a4570c..f24b5c75a 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 YES @@ -43,7 +43,6 @@ {320, 460} - _NS:9 YES YES @@ -246,7 +245,6 @@ {{10, 380}, {300, 210}} - _NS:9 IBCocoaTouchFramework 2 @@ -315,6 +313,14 @@ 70 + + + linphoneLabel + + + + 71 + @@ -461,7 +467,7 @@ - 70 + 71 @@ -490,6 +496,7 @@ linkTapGestureRecognizer linphoneCoreVersionLabel linphoneIphoneVersionLabel + linphoneLabel YES @@ -499,6 +506,7 @@ UITapGestureRecognizer UILabel UILabel + UILabel @@ -511,6 +519,7 @@ linkTapGestureRecognizer linphoneCoreVersionLabel linphoneIphoneVersionLabel + linphoneLabel YES @@ -538,6 +547,10 @@ linphoneIphoneVersionLabel UILabel + + linphoneLabel + UILabel + @@ -563,6 +576,6 @@ linphone_logo.png {512, 512} - 1926 + 1930 diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 74a47a6fe..1fbd28ba8 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -74,7 +74,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C - (void)initContactDetailsTableViewController { dataCache = [[NSMutableArray alloc] init]; labelArray = [[NSMutableArray alloc] initWithObjects: - @"Linphone", + [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], [NSString stringWithString:(NSString*)kABPersonPhoneMobileLabel], [NSString stringWithString:(NSString*)kABPersonPhoneIPhoneLabel], [NSString stringWithString:(NSString*)kABPersonPhoneMainLabel], nil]; diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 94d36acf0..ae80673f2 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -168,7 +168,10 @@ static UICompositeViewDescription *compositeDescription = nil; [linphoneButton setBackgroundImage:[UIImage imageNamed:@"contacts_linphone_selected.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [LinphoneUtils buttonFixStates:linphoneButton]; + [linphoneButton setTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + forState:UIControlStateNormal]; + + [LinphoneUtils buttonFixStates:linphoneButton]; // Set selected+over background: IB lack ! [allButton setBackgroundImage:[UIImage imageNamed:@"contacts_all_selected.png"] diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 13f849f29..d2846823d 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -122,6 +122,11 @@ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: @"YES", @"start_at_boot_preference", @"YES", @"backgroundmode_preference", +#ifdef DEBUG + @"YES",@"debugenable_preference", +#else + @"NO",@"debugenable_preference", +#endif nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 5aa1c3fae..7f629700d 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -342,7 +342,7 @@ static PhoneMainView* phoneMainViewInstance=nil; } else { // Change to default view const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]); - if(list != NULL) { + if(list != NULL || ([[LinphoneManager instance] lpConfigBoolForKey:@"hide_wizard_preference"] == true)) { [self changeCurrentView: [DialerViewController compositeViewDescription]]; } else { WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController); diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 02c27d79b..0fcd374f2 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -634,7 +634,10 @@ static UICompositeViewDescription *compositeDescription = nil; if(![LinphoneManager runningOnIpad]) { [hiddenKeys addObject:@"preview_preference"]; } - + if([[LinphoneManager instance] lpConfigBoolForKey:@"hide_run_assistant_preference"]) { + [hiddenKeys addObject:@"wizard_button"]; + } + return hiddenKeys; } diff --git a/Classes/en.lproj/ContactDetailsLabelViewController.xib b/Classes/en.lproj/ContactDetailsLabelViewController.xib index 5a1cdfbe1..18e50e4a0 100644 --- a/Classes/en.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/en.lproj/ContactDetailsLabelViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -318,6 +318,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/en.lproj/ContactDetailsViewController.xib b/Classes/en.lproj/ContactDetailsViewController.xib index b17eb8066..b1421d105 100644 --- a/Classes/en.lproj/ContactDetailsViewController.xib +++ b/Classes/en.lproj/ContactDetailsViewController.xib @@ -2,13 +2,13 @@ 1536 - 11G56 - 2840 - 1138.51 + 11E53 + 2844 + 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -110,7 +108,6 @@ -2147483356 {160, 44} - _NS:9 NO @@ -148,7 +145,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -191,7 +187,6 @@ {320, 44} - _NS:9 @@ -208,7 +203,6 @@ 306 {{0, 44}, {320, 416}} - _NS:9 1 @@ -238,7 +232,6 @@ {320, 460} - 3 @@ -533,182 +526,7 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES @@ -723,6 +541,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/en.lproj/ContactsViewController.xib b/Classes/en.lproj/ContactsViewController.xib index fef3173c9..5b7aeaebc 100644 --- a/Classes/en.lproj/ContactsViewController.xib +++ b/Classes/en.lproj/ContactsViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -47,6 +47,7 @@ 290 {320, 44} + _NS:9 NO @@ -65,6 +66,7 @@ 292 {107, 44} + _NS:9 NO @@ -117,6 +119,7 @@ 289 {{107, 0}, {107, 44}} + _NS:9 NO @@ -151,6 +154,7 @@ {{106, 0}, {214, 44}} + _NS:9 @@ -167,6 +171,7 @@ 292 {107, 44} + _NS:9 NO @@ -214,6 +219,7 @@ -2147483356 {107, 44} + _NS:9 NO @@ -246,6 +252,7 @@ {320, 44} + _NS:9 @@ -260,6 +267,7 @@ 274 {{0, 44}, {320, 416}} + _NS:10 3 @@ -291,6 +299,7 @@ {320, 460} + _NS:9 @@ -555,7 +564,84 @@ 94 - + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + 0 IBCocoaTouchFramework YES @@ -571,6 +657,6 @@ {213, 88} {5, 88} - 1926 + 1930 diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index a85e45a154b8dc2544795341e82c4a1d027d501d..784e448609bd1dba7d86e2cba65e3b86cadd2149 100644 GIT binary patch delta 382 zcmey+&Db=NalHsc21$zJh diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 55e7ada2569d53f3d4dad40351245d192b3bad32..31236f4fd87969fcd29e922afdd3247201c80ba1 100644 GIT binary patch delta 1118 zcmbVL-Ahwp7=PZaA*P>0)lB?iXJd*0`~&+qyEy-Txd@tJ!2!xzj_ zfn3Vc1m&nq6>{~ePuHnFuI?V!X2Sz@G6k(gC48spwkJ72T9k&}GHzYSc@LAOB258V z!JkbQt9VF%Yc$m1tz0+&i(@f&*|Dzal5t3d#pjye49*hbN^V{heq&bI+7;oHIjXYy zh55REuatnq0lf>*H2x%Ehcet0ZQ-6in`_|{`g_}w+Os9>phGh-5l0qfr~@tvxGB;d zNKzr(^5;m1d!iq7Eo%Gj4^xURK{4z>1>~R(i$(yw4k?EQS#;4m#aY?QYK#)NjbWei z&j0q}BWtdDIXj7jD`-(K9mBfiE!&G;!0jXokZ#yGU5t1m?zZeW7#r8N^)k>@LXpyq z6rH6}#OJT=rXFkm;ty@&5iLWnpB`NaU_jDU8PE(E#UQOKNPYENuNdx04Y>bQRjS0TeHNa;Yc7Qm4dH4;dy2>2uw)X$S7n02K)PX3Q zM@&B564CSBj|0kK}2O&AQFQi+Oi~fbanx9viOg8%4u1aTwqYj2&1O+On zP&$=f@0d`0?bXOgGSCV_WVw}>Bm{9_DQ~RoX{2j8LGWCEs7|yi-f9Af0LvdBPUdryTgG>4Ot#RfgL NZQrqLW!tPZuuWn%DYXZS zXAd?!yodc zRHG`EL#xyzzx|{r?*$fn0~X!jACV=Q2tO90!0q|-DVr>+Qw#eyKpRN0kklX_>k3)? zVIVG#A~BIJP=;(k>wvfbZQ$D=52q2D#%^K&dIts<_( zm2VZ#z|6me@6bFg{8xB~UnLEBY+7A%Km9t`uT)h1?LUQ;#Z10C`d26A+spZ$ejDml zxTzrHA=Dj?=JH&+6yo7QOEz+|f?tlG4eHMG%&5cJvEkkVh*1Nc$;5@~)Lyv5yvgbK zGQSv&02$+jt3CX2Xb>C;;qdn%laG=iX^bBP*~*rjvkh%KXbr$o;9qK%bfg z)npe7eUjVLqC2dbaUX#eZSvEbsZ3|SY(170ywq2wU`@@6t1YhZchange date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLBundleObject errors @@ -31,20 +33,29 @@ name Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib + 6 + + class + BLWrapperHandle + name + Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib + change date - 2012-10-12T07:54:44Z + 2012-12-06T16:14:16Z changed values - + + <reference> + class BLNibFileObject errors flags - 0 + 1 hash - f826110f6bb9c9f39b9191f041a2e184 + 5a206fff1944a6ff2a10814f0ff35a15 name ContactDetailsViewController.xib @@ -54,7 +65,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -79,7 +92,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -104,7 +119,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -129,7 +146,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -154,7 +173,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -179,7 +200,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -204,7 +227,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -233,7 +258,7 @@ versions en - 5 + 6 fr 5 @@ -250,20 +275,29 @@ name Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib + 5 + + class + BLWrapperHandle + name + Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib + change date - 2012-09-25T09:16:19Z + 2012-12-06T16:14:16Z changed values - + + <reference> + class BLNibFileObject errors flags - 0 + 1 hash - 5c405771bb00fa3b9d58151b4f959205 + 1628c1686cfb982660e726c2f8118ebb name ContactDetailsLabelViewController.xib @@ -273,7 +307,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -298,7 +334,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -327,7 +365,7 @@ versions en - 4 + 5 fr 4 @@ -1055,20 +1093,29 @@ name Classes/ContactsViewController/13/ContactsViewController.xib + 14 + + class + BLWrapperHandle + name + Classes/ContactsViewController/14/ContactsViewController.xib + change date - 2012-09-25T09:16:19Z + 2012-12-06T16:04:33Z changed values - + + <reference> + class BLNibFileObject errors flags - 0 + 1 hash - 8e543e6857c6d386b26dfcbb630432f3 + 55cfac63b99a2e8b631ee79f15a579c5 name ContactsViewController.xib @@ -1078,7 +1125,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1103,7 +1152,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1128,7 +1179,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1153,7 +1206,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1178,7 +1233,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1203,7 +1260,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1228,7 +1287,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1253,7 +1314,9 @@ change date 2001-01-01T00:00:00Z changed values - + + <reference> + class BLStringKeyObject comment @@ -1358,7 +1421,7 @@ versions en - 13 + 14 fr 13 @@ -12175,7 +12238,7 @@ change date - 2012-10-16T09:25:05Z + 2012-12-06T16:35:25Z changed values class @@ -12185,7 +12248,7 @@ flags 0 hash - c50a71e6174b7a7b723ffa38dd90788b + 5d8dda6d0a22dfa9f07da63202a55cbb name Localizable.strings @@ -13219,6 +13282,52 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + GNU General Public License V2 + localizations + + en + GNU General Public License V2 + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + http://www.linphone.org + localizations + + en + http://www.linphone.org + + snapshots + + change date 2001-01-01T00:00:00Z @@ -14511,6 +14620,29 @@ Activer l'application dans Réglages > Confidentialité > Contactssnapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + © 2010-2012 Belledonne Communications + localizations + + en + © 2010-2012 Belledonne Communications + + snapshots + + old objects diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index a85e45a154b8dc2544795341e82c4a1d027d501d..784e448609bd1dba7d86e2cba65e3b86cadd2149 100644 GIT binary patch delta 382 zcmey+&Db=NalHsc21$zJh