diff --git a/Classes/BuschJaegerMainView.h b/Classes/BuschJaegerMainView.h index 95a87cedc..2bcbf7c65 100644 --- a/Classes/BuschJaegerMainView.h +++ b/Classes/BuschJaegerMainView.h @@ -21,6 +21,7 @@ #import "BuschJaegerCallView.h" #import "BuschJaegerSettingsView.h" +#import "BuschJaegerManualSettingsView.h" #import "BuschJaegerWelcomeView.h" #import "BuschJaegerHistoryView.h" #import "BuschJaegerHistoryDetailsView.h" @@ -36,6 +37,7 @@ @property (nonatomic, retain) IBOutlet UINavigationControllerEx *navigationController; @property (nonatomic, retain) IBOutlet BuschJaegerCallView *callView; @property (nonatomic, retain) IBOutlet BuschJaegerSettingsView *settingsView; +@property (nonatomic, retain) IBOutlet BuschJaegerManualSettingsView *manualSettingsView; @property (nonatomic, retain) IBOutlet BuschJaegerWelcomeView *welcomeView; @property (nonatomic, retain) IBOutlet BuschJaegerHistoryView *historyView; @property (nonatomic, retain) IBOutlet BuschJaegerHistoryDetailsView *historyDetailsView; diff --git a/Classes/BuschJaegerMainView.m b/Classes/BuschJaegerMainView.m index e4e4cdc58..72f36dcb1 100644 --- a/Classes/BuschJaegerMainView.m +++ b/Classes/BuschJaegerMainView.m @@ -60,6 +60,7 @@ @synthesize navigationController; @synthesize callView; @synthesize settingsView; +@synthesize manualSettingsView; @synthesize welcomeView; @synthesize historyView; @synthesize historyDetailsView; @@ -103,6 +104,7 @@ static BuschJaegerMainView* mainViewInstance=nil; [navigationController release]; [callView release]; [settingsView release]; + [manualSettingsView release]; [welcomeView release]; [historyView release]; [historyDetailsView release]; diff --git a/Classes/BuschJaegerMainView.xib b/Classes/BuschJaegerMainView.xib index fb98710bf..9832f2873 100644 --- a/Classes/BuschJaegerMainView.xib +++ b/Classes/BuschJaegerMainView.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -40,7 +40,6 @@ {320, 480} - _NS:9 3 @@ -81,6 +80,16 @@ IBCocoaTouchFramework NO + + BuschJaegerManualSettingsView + + + 1 + 1 + + IBCocoaTouchFramework + NO + BuschJaegerHistoryView @@ -193,6 +202,14 @@ 27 + + + manualSettingsView + + + + 29 + @@ -271,6 +288,11 @@ + + 28 + + + @@ -290,6 +312,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin BuschJaegerHistoryDetailsView com.apple.InterfaceBuilder.IBCocoaTouchPlugin + BuschJaegerManualSettingsView + com.apple.InterfaceBuilder.IBCocoaTouchPlugin BuschJaegerWelcomeView com.apple.InterfaceBuilder.IBCocoaTouchPlugin BuschJaegerSettingsView @@ -299,7 +323,7 @@ - 27 + 29 @@ -524,6 +548,7 @@ BuschJaegerCallView BuschJaegerHistoryDetailsView BuschJaegerHistoryView + BuschJaegerManualSettingsView UINavigationControllerEx BuschJaegerSettingsView BuschJaegerWelcomeView @@ -541,6 +566,10 @@ historyView BuschJaegerHistoryView + + manualSettingsView + BuschJaegerManualSettingsView + navigationController UINavigationControllerEx @@ -559,11 +588,49 @@ ./Classes/BuschJaegerMainView.h + + BuschJaegerManualSettingsView + UIViewController + + UITextField + UIView + UITextField + UITextField + UIView + + + + addressField + UITextField + + + backButton + UIView + + + passwordField + UITextField + + + usernameField + UITextField + + + validButton + UIView + + + + IBProjectSource + ./Classes/BuschJaegerManualSettingsView.h + + BuschJaegerSettingsView UIViewController id + id id @@ -571,6 +638,10 @@ onBackClick: id + + onManualClick: + id + onScanClick: id @@ -578,6 +649,7 @@ UIView + UIView UIView UIView @@ -586,6 +658,10 @@ backButton UIView + + manualButton + UIView + scanButton UIView diff --git a/Classes/BuschJaegerManualSettingsView.h b/Classes/BuschJaegerManualSettingsView.h new file mode 100644 index 000000000..78639b178 --- /dev/null +++ b/Classes/BuschJaegerManualSettingsView.h @@ -0,0 +1,35 @@ +/* BuschJagerManualSettingsView.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +@interface BuschJaegerManualSettingsView : UIViewController { + +} + +@property (nonatomic, retain) IBOutlet UITextField *addressField; +@property (nonatomic, retain) IBOutlet UITextField *usernameField; +@property (nonatomic, retain) IBOutlet UITextField *passwordField; + +@property (nonatomic, retain) IBOutlet UIView *validButton; +@property (nonatomic, retain) IBOutlet UIView *backButton; + +- (void)reset; + +@end diff --git a/Classes/BuschJaegerManualSettingsView.m b/Classes/BuschJaegerManualSettingsView.m new file mode 100644 index 000000000..e5b3425a4 --- /dev/null +++ b/Classes/BuschJaegerManualSettingsView.m @@ -0,0 +1,122 @@ +/* BuschJagerManualSettingsView.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "BuschJaegerManualSettingsView.h" +#import "BuschJaegerUtils.h" +#import "BuschJaegerMainView.h" + +@implementation BuschJaegerManualSettingsView + +@synthesize addressField; +@synthesize usernameField; +@synthesize passwordField; + +@synthesize validButton; +@synthesize backButton; + +#pragma mark - Lifecycle Functions + +- (void)initBuschJaegerManualSettingsView { +} + +- (id)init { + self = [super init]; + if(self != nil) { + [self initBuschJaegerManualSettingsView]; + } + return self; +} + +- (id)initWithCoder:(NSCoder *)aDecoder { + self = [super initWithCoder:aDecoder]; + if(self != nil) { + [self initBuschJaegerManualSettingsView]; + } + return self; +} + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if(self != nil) { + [self initBuschJaegerManualSettingsView]; + } + return self; +} + +- (void)dealloc { + [addressField release]; + [usernameField release]; + [passwordField release]; + + [validButton release]; + [backButton release]; + [super dealloc]; +} + + +#pragma mark - ViewController Functions + +- (void)viewDidLoad { + [super viewDidLoad]; + + /* init gradients */ + { + UIColor* col1 = BUSCHJAEGER_NORMAL_COLOR; + UIColor* col2 = BUSCHJAEGER_NORMAL_COLOR2; + + [BuschJaegerUtils createGradientForView:validButton withTopColor:col1 bottomColor:col2 cornerRadius:BUSCHJAEGER_DEFAULT_CORNER_RADIUS]; + [BuschJaegerUtils createGradientForView:backButton withTopColor:col1 bottomColor:col2 cornerRadius:BUSCHJAEGER_DEFAULT_CORNER_RADIUS]; + } +} + + +#pragma mark - Action Functions + +- (IBAction)onValidClick:(id)sender { + if([[addressField text] length] && [[usernameField text] length] && [[passwordField text] length]) { + [[BuschJaegerMainView instance].navigationController popViewControllerAnimated:FALSE]; + [[BuschJaegerMainView instance].settingsView setConfiguration:[addressField text] username:[usernameField text] password:[passwordField text]]; + } +} + +- (IBAction)onBackClick:(id)sender { + [[BuschJaegerMainView instance].navigationController popViewControllerAnimated:FALSE]; +} + + +#pragma mark - + +- (void)reset { + [addressField setText:@""]; + [usernameField setText:@""]; + [passwordField setText:@""]; + [addressField resignFirstResponder]; + [usernameField resignFirstResponder]; + [passwordField resignFirstResponder]; +} + + +#pragma mark - UITextFieldDelegate Functions + +- (BOOL)textFieldShouldReturn:(UITextField *)textField { + [textField resignFirstResponder]; + return TRUE; +} + +@end diff --git a/Classes/BuschJaegerManualSettingsView.xib b/Classes/BuschJaegerManualSettingsView.xib new file mode 100644 index 000000000..85c70e74f --- /dev/null +++ b/Classes/BuschJaegerManualSettingsView.xib @@ -0,0 +1,533 @@ + + + + 1536 + 11G56 + 2840 + 1138.51 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIButton + IBUILabel + IBUITextField + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 293 + {{20, 20}, {280, 30}} + + + + _NS:9 + NO + YES + IBCocoaTouchFramework + 0 + + 3 + Address + + 3 + MAA + + 2 + + + YES + 17 + + 1 + IBCocoaTouchFramework + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 293 + {{20, 80}, {280, 30}} + + + + _NS:9 + NO + YES + IBCocoaTouchFramework + 0 + + 3 + Username + + 3 + MAA + + + YES + 17 + + 1 + IBCocoaTouchFramework + + + + + + + 293 + {{20, 140}, {280, 30}} + + + + _NS:9 + NO + YES + IBCocoaTouchFramework + 0 + + 3 + Password + + 3 + MAA + + + YES + 17 + + 1 + IBCocoaTouchFramework + + + + + + + 293 + + + + 274 + {280, 40} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Valid + + 3 + MQA + + + 0 + 10 + 1 + + 1 + 24 + + + Helvetica + 24 + 16 + + + + + 274 + {280, 40} + + + + _NS:9 + + 3 + MCAwAA + + NO + IBCocoaTouchFramework + 0 + 0 + + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + {{20, 190}, {280, 40}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 269 + + + + 274 + {280, 40} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Back + + + 0 + 10 + 1 + + + + + + 274 + {280, 40} + + + _NS:9 + + NO + IBCocoaTouchFramework + 0 + 0 + + + + + + + + {{20, 410}, {280, 40}} + + + + _NS:9 + + IBCocoaTouchFramework + + + {320, 460} + + + + + 3 + MAA + + IBCocoaTouchFramework + + + + + + + addressField + + + + 15 + + + + backButton + + + + 17 + + + + passwordField + + + + 18 + + + + usernameField + + + + 19 + + + + validButton + + + + 20 + + + + view + + + + 21 + + + + delegate + + + + 24 + + + + delegate + + + + 25 + + + + delegate + + + + 26 + + + + onBackClick: + + + 7 + + 22 + + + + onValidClick: + + + 7 + + 23 + + + + + + 0 + + + + + + 1 + + + + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 6 + + + addressField + + + 7 + + + usernameField + + + 8 + + + passwordField + + + 9 + + + + + + + Back Button View + + + 11 + + + + + 10 + + + + + 12 + + + + + + + Valid Button View + + + 13 + + + + + 14 + + + + + + + BuschJaegerManualSettingsView + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + 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 + + + + + + 26 + + + + + BuschJaegerManualSettingsView + UIViewController + + UITextField + UIView + UITextField + UITextField + UIView + + + + addressField + UITextField + + + backButton + UIView + + + passwordField + UITextField + + + usernameField + UITextField + + + validButton + UIView + + + + IBProjectSource + ./Classes/BuschJaegerManualSettingsView.h + + + + + 0 + IBCocoaTouchFramework + YES + 3 + 1926 + + diff --git a/Classes/BuschJaegerSettingsView.h b/Classes/BuschJaegerSettingsView.h index b2250535e..3b122a67f 100644 --- a/Classes/BuschJaegerSettingsView.h +++ b/Classes/BuschJaegerSettingsView.h @@ -28,11 +28,14 @@ } @property (nonatomic, retain) IBOutlet UIView *scanButton; +@property (nonatomic, retain) IBOutlet UIView *manualButton; @property (nonatomic, retain) IBOutlet UIView *backButton; @property (nonatomic, retain) IBOutlet UIView *waitView; - - (IBAction)onScanClick:(id)sender; +- (IBAction)onManualClick:(id)sender; - (IBAction)onBackClick:(id)sender; +- (void)setConfiguration:(NSString*)address username:(NSString*)username password:(NSString*)password; + @end diff --git a/Classes/BuschJaegerSettingsView.m b/Classes/BuschJaegerSettingsView.m index 9c2473f69..6edb4e3ab 100644 --- a/Classes/BuschJaegerSettingsView.m +++ b/Classes/BuschJaegerSettingsView.m @@ -24,6 +24,7 @@ @implementation BuschJaegerSettingsView @synthesize scanButton; +@synthesize manualButton; @synthesize backButton; @synthesize waitView; @@ -61,6 +62,9 @@ - (void)dealloc { [scanController release]; + [scanButton release]; + [manualButton release]; + [waitView release]; [super dealloc]; } @@ -75,6 +79,7 @@ UIColor* col2 = BUSCHJAEGER_NORMAL_COLOR2; [BuschJaegerUtils createGradientForView:scanButton withTopColor:col1 bottomColor:col2 cornerRadius:BUSCHJAEGER_DEFAULT_CORNER_RADIUS]; + [BuschJaegerUtils createGradientForView:manualButton withTopColor:col1 bottomColor:col2 cornerRadius:BUSCHJAEGER_DEFAULT_CORNER_RADIUS]; [BuschJaegerUtils createGradientForView:backButton withTopColor:col1 bottomColor:col2 cornerRadius:BUSCHJAEGER_DEFAULT_CORNER_RADIUS]; } [waitView setHidden:TRUE]; @@ -87,11 +92,26 @@ [self presentModalViewController:scanController animated:FALSE]; } +- (IBAction)onManualClick:(id)sender { + [[BuschJaegerMainView instance].manualSettingsView reset]; + [[BuschJaegerMainView instance].navigationController pushViewController:[BuschJaegerMainView instance].manualSettingsView animated:FALSE]; +} + - (IBAction)onBackClick:(id)sender { [[BuschJaegerMainView instance].navigationController popViewControllerAnimated:FALSE]; } +#pragma mark - + +- (void)setConfiguration:(NSString*)address username:(NSString*)username password:(NSString*)password { + NSString *dataString = [NSString stringWithFormat:@"URL=%@ USER=%@ PW=%@", address, username, password]; + if([[[LinphoneManager instance] configuration] parseQRCode:dataString delegate:self]) { + [waitView setHidden:FALSE]; + } +} + + #pragma mark - ZBarReaderDelegate Functions - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { diff --git a/Classes/BuschJaegerSettingsView.xib b/Classes/BuschJaegerSettingsView.xib index 2fc950344..ba35638fa 100644 --- a/Classes/BuschJaegerSettingsView.xib +++ b/Classes/BuschJaegerSettingsView.xib @@ -1,14 +1,14 @@ - 1296 - 11E53 - 2549 - 1138.47 + 1536 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -52,7 +52,7 @@ _NS:9 NO IBCocoaTouchFramework - + NSImage bj_barcode.png @@ -63,7 +63,7 @@ {{102, 0}, {178, 100}} - + _NS:9 NO YES @@ -129,6 +129,71 @@ IBCocoaTouchFramework + + + 290 + + + + -2147483356 + {{20, 13}, {74, 74}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + + + + 274 + {{102, 0}, {178, 100}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Manual pairing + + + 0 + 10 + + + + + + 274 + {280, 100} + + + + _NS:9 + + NO + IBCocoaTouchFramework + 0 + 0 + + + + + + + + {{20, 128}, {280, 100}} + + + + _NS:9 + + IBCocoaTouchFramework + 269 @@ -161,6 +226,7 @@ {280, 40} + _NS:9 NO @@ -192,7 +258,6 @@ {{142, 211}, {37, 37}} - _NS:9 NO IBCocoaTouchFramework @@ -216,7 +281,7 @@ {320, 460} - + _NS:9 3 @@ -259,6 +324,14 @@ 24 + + + manualButton + + + + 31 + onScanClick: @@ -277,6 +350,15 @@ 21 + + + onManualClick: + + + 7 + + 30 + @@ -304,6 +386,7 @@ + @@ -367,6 +450,32 @@ + + 25 + + + + + + + + Manual Button View + + + 26 + + + + + 28 + + + + + 27 + + + @@ -381,6 +490,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 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -391,7 +505,7 @@ - 24 + 31 @@ -400,6 +514,7 @@ UIViewController id + id id @@ -407,6 +522,10 @@ onBackClick: id + + onManualClick: + id + onScanClick: id @@ -414,6 +533,7 @@ UIView + UIView UIView UIView @@ -422,6 +542,10 @@ backButton UIView + + manualButton + UIView + scanButton UIView @@ -442,7 +566,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -450,6 +574,6 @@ bj_barcode.png {148, 148} - 1498 + 1926 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 754926902..f00f52bec 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -111,6 +111,10 @@ 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; }; 70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; }; + D30B942316358C7F00D53C46 /* BuschJaegerManualSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */; }; + D30B942416358C7F00D53C46 /* BuschJaegerManualSettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */; }; + D30B942816358DD600D53C46 /* BuschJaegerManualSettingsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D30B942716358DD600D53C46 /* BuschJaegerManualSettingsView.m */; }; + D30B942916358DD600D53C46 /* BuschJaegerManualSettingsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D30B942716358DD600D53C46 /* BuschJaegerManualSettingsView.m */; }; D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D3196D3D15A32BD8007FEEBA /* UITransferButton.m */; }; D3196D3F15A32BD8007FEEBA /* UITransferButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D3196D3D15A32BD8007FEEBA /* UITransferButton.m */; }; D321FF9915E628CB0098B5F4 /* linphonerc~ipad in Resources */ = {isa = PBXBuildFile; fileRef = D321FF9815E628CB0098B5F4 /* linphonerc~ipad */; }; @@ -582,6 +586,9 @@ 70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* buschjaeger-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "buschjaeger-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; C9B3A6FD15B485DB006F52EE /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = Utils/Utils.h; sourceTree = ""; }; + D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BuschJaegerManualSettingsView.xib; sourceTree = ""; }; + D30B942616358DD600D53C46 /* BuschJaegerManualSettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerManualSettingsView.h; sourceTree = ""; }; + D30B942716358DD600D53C46 /* BuschJaegerManualSettingsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerManualSettingsView.m; sourceTree = ""; }; D3196D3C15A32BD7007FEEBA /* UITransferButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransferButton.h; sourceTree = ""; }; D3196D3D15A32BD8007FEEBA /* UITransferButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransferButton.m; sourceTree = ""; }; D321FF9815E628CB0098B5F4 /* linphonerc~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc~ipad"; path = "Resources/linphonerc~ipad"; sourceTree = ""; }; @@ -866,6 +873,9 @@ D37CD38415E22C000028869A /* BuschJaegerMainView.h */, D37CD38515E22C000028869A /* BuschJaegerMainView.m */, D37CD38615E22C010028869A /* BuschJaegerMainView.xib */, + D30B942616358DD600D53C46 /* BuschJaegerManualSettingsView.h */, + D30B942716358DD600D53C46 /* BuschJaegerManualSettingsView.m */, + D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */, D37CD30615E21E320028869A /* BuschJaegerSettingsView.h */, D37CD30715E21E320028869A /* BuschJaegerSettingsView.m */, D37CD30815E21E330028869A /* BuschJaegerSettingsView.xib */, @@ -1394,16 +1404,6 @@ path = Utils/ZBarSDK; sourceTree = ""; }; - D37E3ECA1619C27A0087659A /* CAAnimationBlocks */ = { - isa = PBXGroup; - children = ( - D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */, - D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */, - ); - name = CAAnimationBlocks; - path = Utils/CAAnimationBlocks; - sourceTree = ""; - }; D37CD35615E22B0C0028869A /* Headers */ = { isa = PBXGroup; children = ( @@ -1458,6 +1458,16 @@ path = Resources; sourceTree = ""; }; + D37E3ECA1619C27A0087659A /* CAAnimationBlocks */ = { + isa = PBXGroup; + children = ( + D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */, + D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */, + ); + name = CAAnimationBlocks; + path = Utils/CAAnimationBlocks; + sourceTree = ""; + }; D37EE15F160377D7003608A6 /* DTFoundation */ = { isa = PBXGroup; children = ( @@ -1613,6 +1623,7 @@ D32EDDA71600C8FC009A84C7 /* ringtone_03_1600_loop.wav in Resources */, D32EDDA91600C8FC009A84C7 /* ringtone_04_1600_loop.wav in Resources */, D32EDDAB1600C8FC009A84C7 /* ringtone_05_1600_loop.wav in Resources */, + D30B942316358C7F00D53C46 /* BuschJaegerManualSettingsView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1672,6 +1683,7 @@ D32EDDA81600C8FC009A84C7 /* ringtone_03_1600_loop.wav in Resources */, D32EDDAA1600C8FC009A84C7 /* ringtone_04_1600_loop.wav in Resources */, D32EDDAC1600C8FC009A84C7 /* ringtone_05_1600_loop.wav in Resources */, + D30B942416358C7F00D53C46 /* BuschJaegerManualSettingsView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1760,6 +1772,7 @@ D32EDD9B1600C450009A84C7 /* LevelPushButton.m in Sources */, D37490841612E3F200A62D02 /* NSURLConnection+SynchronousDelegate.m in Sources */, D37E3ECD1619C27A0087659A /* CAAnimation+Blocks.m in Sources */, + D30B942816358DD600D53C46 /* BuschJaegerManualSettingsView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1816,6 +1829,7 @@ D32EDD9C1600C450009A84C7 /* LevelPushButton.m in Sources */, D37490851612E3F200A62D02 /* NSURLConnection+SynchronousDelegate.m in Sources */, D37E3ECE1619C27A0087659A /* CAAnimation+Blocks.m in Sources */, + D30B942916358DD600D53C46 /* BuschJaegerManualSettingsView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };