diff --git a/Classes/BuschJaegerMainView.xib b/Classes/BuschJaegerMainView.xib index f9c0e37a3..6f8cc6bda 100644 --- a/Classes/BuschJaegerMainView.xib +++ b/Classes/BuschJaegerMainView.xib @@ -34,76 +34,13 @@ IBFirstResponder IBCocoaTouchFramework - - BuschJaegerCallView - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - BuschJaegerWelcomeView - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - BuschJaegerSettingsView - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - - 1 - 1 - - YES - IBCocoaTouchFramework - NO - - - 256 - {0, 0} - _NS:15 - IBCocoaTouchFramework - - - - - - Root View Controller - IBCocoaTouchFramework - - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - YES - - + 292 {320, 460} + _NS:9 3 @@ -114,6 +51,70 @@ IBCocoaTouchFramework + + BuschJaegerCallView + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + BuschJaegerWelcomeView + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + BuschJaegerSettingsView + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + + 1 + 1 + + YES + IBCocoaTouchFramework + NO + + + 256 + {0, 0} + _NS:15 + IBCocoaTouchFramework + + + + + + Root View Controller + IBCocoaTouchFramework + + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + YES + @@ -121,7 +122,7 @@ callView - + 11 @@ -129,7 +130,7 @@ settingsView - + 12 @@ -137,7 +138,7 @@ welcomeView - + 13 @@ -145,7 +146,7 @@ navigationController - + 20 @@ -153,7 +154,7 @@ view - + 22 @@ -179,50 +180,50 @@ 9 - + 10 - + 6 - + 16 - + - - + + 17 - - + + 18 - + - + - + 19 - - + + 21 - + @@ -248,7 +249,7 @@ - 22 + 23 @@ -320,9 +321,10 @@ BuschJaegerMainView - UINavigationController + UIViewController BuschJaegerCallView + UINavigationController BuschJaegerSettingsView BuschJaegerWelcomeView @@ -331,6 +333,10 @@ callView BuschJaegerCallView + + navigationController + UINavigationController + settingsView BuschJaegerSettingsView diff --git a/Classes/BuschJaegerSettingsView.m b/Classes/BuschJaegerSettingsView.m index bdcf12f00..2c415eea2 100644 --- a/Classes/BuschJaegerSettingsView.m +++ b/Classes/BuschJaegerSettingsView.m @@ -107,6 +107,8 @@ [errorView show]; [errorView release]; [waitView setHidden:TRUE]; + NSDictionary *dict = [NSDictionary dictionaryWithObject:[[LinphoneManager instance] configuration] forKey:@"configuration"]; + [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneConfigurationUpdate object:self userInfo:dict]; } - (void)buschJaegerConfigParserError:(NSString *)error { @@ -118,6 +120,8 @@ [errorView show]; [errorView release]; [waitView setHidden:TRUE]; + NSDictionary *dict = [NSDictionary dictionaryWithObject:[[LinphoneManager instance] configuration] forKey:@"configuration"]; + [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneConfigurationUpdate object:self userInfo:dict]; } @end diff --git a/Classes/BuschJaegerStationViewController.h b/Classes/BuschJaegerStationViewController.h new file mode 100644 index 000000000..55a2328b0 --- /dev/null +++ b/Classes/BuschJaegerStationViewController.h @@ -0,0 +1,26 @@ +/* BuschJaegerStationViewController.h + * + * Copyright (C) 2011 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 BuschJaegerStationViewController : UITableViewController + +@property (nonatomic, copy) NSArray *stations; + +@end diff --git a/Classes/BuschJaegerStationViewController.m b/Classes/BuschJaegerStationViewController.m new file mode 100644 index 000000000..874ea4f2c --- /dev/null +++ b/Classes/BuschJaegerStationViewController.m @@ -0,0 +1,60 @@ +/* BuschJaegerStationViewController.m + * + * Copyright (C) 2011 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 "BuschJaegerStationViewController.h" +#import "UIStationCell.h" + +@implementation BuschJaegerStationViewController + +@synthesize stations; + +- (void)setStations:(NSArray *)astations { + if ([astations isEqualToArray:stations]) { + return; + } + + [stations release]; + stations = [astations copy]; + [self.tableView reloadData]; +} + +#pragma mark - UITableViewDataSource Functions + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [stations count]; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *kCellId = @"UIStationCell"; + UIStationCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId]; + if (cell == nil) { + cell = [[[UIStationCell alloc] initWithIdentifier:kCellId] autorelease]; + } + + [cell setStation:[stations objectAtIndex:[indexPath row]]]; + + return cell; +} + + +@end diff --git a/Classes/BuschJaegerWelcomeView.h b/Classes/BuschJaegerWelcomeView.h index fd77af458..ce0c95334 100644 --- a/Classes/BuschJaegerWelcomeView.h +++ b/Classes/BuschJaegerWelcomeView.h @@ -18,12 +18,15 @@ */ #import +#import "BuschJaegerStationViewController.h" @interface BuschJaegerWelcomeView : UIViewController { UIButton* settingsButton; + BuschJaegerStationViewController *tableController; } @property (nonatomic, retain) IBOutlet UIButton* settingsButton; +@property (nonatomic, retain) IBOutlet BuschJaegerStationViewController *tableController; - (IBAction)settingsClick:(id)sender; diff --git a/Classes/BuschJaegerWelcomeView.m b/Classes/BuschJaegerWelcomeView.m index d52729c1e..7442acf5b 100644 --- a/Classes/BuschJaegerWelcomeView.m +++ b/Classes/BuschJaegerWelcomeView.m @@ -23,6 +23,62 @@ @implementation BuschJaegerWelcomeView @synthesize settingsButton; +@synthesize tableController; + +#pragma mark - Lifecycle Functions + +- (void)dealloc { + [settingsButton release]; + [tableController release]; + + // Remove all observer + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [super dealloc]; +} + + +#pragma mark - ViewController Functions + +- (void)viewDidLoad { + [super viewDidLoad]; + + [self updateConfiguration:[LinphoneManager instance].configuration]; + [tableController.view setBackgroundColor:[UIColor clearColor]]; +} + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + // Set observer + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(configurationUpdateEvent:) + name:kLinphoneConfigurationUpdate + object:nil]; +} + +- (void)vieWillDisappear:(BOOL)animated{ + [super viewWillDisappear:animated]; + + // Remove observer + [[NSNotificationCenter defaultCenter] removeObserver:self + name:kLinphoneConfigurationUpdate + object:nil]; +} + + +#pragma mark - Event Functions + +- (void)configurationUpdateEvent: (NSNotification*) notif { + BuschJaegerConfigParser *configuration = [notif.userInfo objectForKey:@"configuration"]; + [self updateConfiguration:configuration]; +} + +- (void)updateConfiguration:(BuschJaegerConfigParser *)configuration { + [tableController setStations:[NSArray arrayWithArray:[[configuration outdoorStations] allObjects]]]; +} + + +#pragma mark - - (IBAction)settingsClick:(id)sender { [[BuschJaegerMainView instance].navigationController pushViewController:[BuschJaegerMainView instance].settingsView animated:TRUE]; diff --git a/Classes/BuschJaegerWelcomeView.xib b/Classes/BuschJaegerWelcomeView.xib index 7ade9762b..5551f1fdc 100644 --- a/Classes/BuschJaegerWelcomeView.xib +++ b/Classes/BuschJaegerWelcomeView.xib @@ -14,6 +14,8 @@ IBProxyObject IBUIButton IBUILabel + IBUITableView + IBUITableViewController IBUIView @@ -76,7 +78,7 @@ {{236, 13}, {64, 64}} - + _NS:9 NO IBCocoaTouchFramework @@ -86,7 +88,7 @@ 10 10 10 - + 3 MQA @@ -112,6 +114,23 @@ 16 + + + 274 + {{0, 85}, {320, 375}} + + + _NS:9 + + YES + IBCocoaTouchFramework + YES + 0 + YES + 100 + 22 + 22 + {{0, 20}, {320, 460}} @@ -124,6 +143,15 @@ IBCocoaTouchFramework + + + + 1 + 1 + + IBCocoaTouchFramework + NO + @@ -143,6 +171,14 @@ 6 + + + tableController + + + + 14 + settingsClick: @@ -152,6 +188,30 @@ 7 + + + dataSource + + + + 15 + + + + delegate + + + + 16 + + + + view + + + + 13 + @@ -167,6 +227,7 @@ + @@ -192,6 +253,17 @@ Button - Settings + + 8 + + + + + 9 + + + + @@ -202,17 +274,29 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + BuschJaegerStationViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 7 + 16 + + BuschJaegerStationViewController + UITableViewController + + IBProjectSource + ./Classes/BuschJaegerStationViewController.h + + BuschJaegerWelcomeView + UIViewController settingsClick: id @@ -224,6 +308,20 @@ id + + UIButton + BuschJaegerStationViewController + + + + settingsButton + UIButton + + + tableController + BuschJaegerStationViewController + + IBProjectSource ./Classes/BuschJaegerWelcomeView.h diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 7aa5870f1..9996d3bd6 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -36,6 +36,9 @@ extern NSString *const kLinphoneTextReceivedSound; extern NSString *const kLinphoneCallUpdate; extern NSString *const kLinphoneRegistrationUpdate; extern NSString *const kLinphoneMainViewChange; +/* MODIFICATION: Add buschjaeger configuration event */ +extern NSString *const kLinphoneConfigurationUpdate; +/**/ extern NSString *const kLinphoneAddressBookUpdate; extern NSString *const kContactSipField; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 0176c2513..1643ab926 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -40,6 +40,9 @@ NSString *const kLinphoneTextReceived = @"LinphoneTextReceived"; NSString *const kLinphoneTextReceivedSound = @"LinphoneTextReceivedSound"; NSString *const kLinphoneCallUpdate = @"LinphoneCallUpdate"; NSString *const kLinphoneRegistrationUpdate = @"LinphoneRegistrationUpdate"; +/* MODIFICATION: Add buschjaeger configuration event */ +NSString *const kLinphoneConfigurationUpdate = @"LinphoneConfigurationUpdate"; +/**/ NSString *const kLinphoneAddressBookUpdate = @"LinphoneAddressBookUpdate"; NSString *const kLinphoneMainViewChange = @"LinphoneMainViewChange"; NSString *const kContactSipField = @"SIP"; @@ -1176,6 +1179,11 @@ static LinphoneCoreVTable linphonec_vtable = { return YES; } - +// no proxy configured alert +- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { + if (buttonIndex == 1) { + [[NSUserDefaults standardUserDefaults] setBool:true forKey:@"check_config_disable_preference"]; + } +} @end diff --git a/Classes/LinphoneUI/UIStationCell.h b/Classes/LinphoneUI/UIStationCell.h new file mode 100644 index 000000000..e97c53674 --- /dev/null +++ b/Classes/LinphoneUI/UIStationCell.h @@ -0,0 +1,33 @@ +/* UIStationCell.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 +#import "OutdoorStation.h" + +@interface UIStationCell : UITableViewCell + + +@property (nonatomic, retain) OutdoorStation *station; + +@property (nonatomic, retain) IBOutlet UIImageView *stationImage; +@property (nonatomic, retain) IBOutlet UILabel *stationName; + +- (id)initWithIdentifier:(NSString*)identifier; + +@end diff --git a/Classes/LinphoneUI/UIStationCell.m b/Classes/LinphoneUI/UIStationCell.m new file mode 100644 index 000000000..2e0825b59 --- /dev/null +++ b/Classes/LinphoneUI/UIStationCell.m @@ -0,0 +1,72 @@ +/* UIStationCell.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 "UIStationCell.h" + +@implementation UIStationCell + +@synthesize stationImage; +@synthesize stationName; +@synthesize station; + +#pragma mark - Lifecycle Functions + +- (id)initWithIdentifier:(NSString*)identifier { + if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) { + NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIStationCell" + owner:self + options:nil]; + + if ([arrayOfViews count] >= 1) { + [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; + } + } + return self; +} + +- (void)dealloc { + [stationImage release]; + [stationName release]; + + [super dealloc]; +} + + +#pragma mark - Property Functions + + +- (void)setStation:(OutdoorStation *)astation { + if(astation == station) { + return; + } + [station release]; + station = [astation retain]; + [self update]; +} + + +#pragma mark - + + +- (void)update { + [stationName setText:station.name]; +} + + +@end diff --git a/Classes/LinphoneUI/UIStationCell.xib b/Classes/LinphoneUI/UIStationCell.xib new file mode 100644 index 000000000..9424c6aec --- /dev/null +++ b/Classes/LinphoneUI/UIStationCell.xib @@ -0,0 +1,209 @@ + + + + 1296 + 11E53 + 2549 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1498 + + + IBProxyObject + IBUIImageView + IBUILabel + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {{11, 10}, {80, 80}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + + + 292 + {{109, 20}, {191, 21}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Station 1 + + 3 + MQA + + + 3 + MC42NjY2NjY2NjY3AA + + 0 + 10 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + {320, 100} + + + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + + + + stationImage + + + + 6 + + + + stationName + + + + 7 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + 3 + + + stationImage + + + 5 + + + stationName + + + + + UIStationCell + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 7 + + + + + UIStationCell + UITableViewCell + + UIImageView + UILabel + + + + stationImage + UIImageView + + + stationName + UILabel + + + + IBProjectSource + ./Classes/UIStationCell.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1498 + + diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 19222f0af..c9a42a11e 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -212,6 +212,12 @@ D37CD38D15E22FDC0028869A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D37CD38B15E22FD60028869A /* libiconv.dylib */; }; D37CD38F15E2331C0028869A /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D37CD38E15E2331C0028869A /* Settings.bundle */; }; D37CD39015E2331C0028869A /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D37CD38E15E2331C0028869A /* Settings.bundle */; }; + D37CD39A15E244D10028869A /* UIStationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD39915E244D10028869A /* UIStationCell.m */; }; + D37CD39B15E244D10028869A /* UIStationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD39915E244D10028869A /* UIStationCell.m */; }; + D37CD39D15E244E40028869A /* UIStationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D37CD39C15E244E40028869A /* UIStationCell.xib */; }; + D37CD39E15E244E40028869A /* UIStationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D37CD39C15E244E40028869A /* UIStationCell.xib */; }; + D37CD3A115E2452C0028869A /* BuschJaegerStationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD3A015E2452B0028869A /* BuschJaegerStationViewController.m */; }; + D37CD3A215E2452C0028869A /* BuschJaegerStationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD3A015E2452B0028869A /* BuschJaegerStationViewController.m */; }; D37DC7181594AF3400B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; }; D37DC7191594AF3F00B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; }; D380800515C28A7A005BE9BC /* UILinphone.m in Sources */ = {isa = PBXBuildFile; fileRef = D380800415C28A7A005BE9BC /* UILinphone.m */; }; @@ -596,6 +602,11 @@ D37CD38615E22C010028869A /* BuschJaegerMainView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BuschJaegerMainView.xib; sourceTree = ""; }; D37CD38B15E22FD60028869A /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; }; D37CD38E15E2331C0028869A /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; + D37CD39815E244D10028869A /* UIStationCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIStationCell.h; sourceTree = ""; }; + D37CD39915E244D10028869A /* UIStationCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIStationCell.m; sourceTree = ""; }; + D37CD39C15E244E40028869A /* UIStationCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIStationCell.xib; sourceTree = ""; }; + D37CD39F15E245290028869A /* BuschJaegerStationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerStationViewController.h; sourceTree = ""; }; + D37CD3A015E2452B0028869A /* BuschJaegerStationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerStationViewController.m; sourceTree = ""; }; D37DC7171594AF3400B2A5EB /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; D380800415C28A7A005BE9BC /* UILinphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILinphone.m; sourceTree = ""; }; D380801115C29984005BE9BC /* ColorSpaceUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorSpaceUtilities.h; path = Utils/ColorSpaceUtilities.h; sourceTree = ""; }; @@ -733,6 +744,8 @@ D37CD30615E21E320028869A /* BuschJaegerSettingsView.h */, D37CD30715E21E320028869A /* BuschJaegerSettingsView.m */, D37CD30815E21E330028869A /* BuschJaegerSettingsView.xib */, + D37CD39F15E245290028869A /* BuschJaegerStationViewController.h */, + D37CD3A015E2452B0028869A /* BuschJaegerStationViewController.m */, D37CD30915E21E330028869A /* BuschJaegerUtils.h */, D37CD30A15E21E330028869A /* BuschJaegerUtils.m */, D37CD37D15E22B6F0028869A /* BuschJaegerWelcomeView.h */, @@ -982,6 +995,9 @@ D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */, 22968A5D12F875C600588287 /* UISpeakerButton.h */, 22968A5E12F875C600588287 /* UISpeakerButton.m */, + D37CD39815E244D10028869A /* UIStationCell.h */, + D37CD39915E244D10028869A /* UIStationCell.m */, + D37CD39C15E244E40028869A /* UIStationCell.xib */, D32648421588F6FA00930C67 /* UIToggleButton.h */, D32648431588F6FB00930C67 /* UIToggleButton.m */, D3196D3C15A32BD7007FEEBA /* UITransferButton.h */, @@ -1397,6 +1413,7 @@ D37CD38215E22B700028869A /* BuschJaegerWelcomeView.xib in Resources */, D37CD38915E22C020028869A /* BuschJaegerMainView.xib in Resources */, D37CD38F15E2331C0028869A /* Settings.bundle in Resources */, + D37CD39D15E244E40028869A /* UIStationCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1434,6 +1451,7 @@ D37CD38315E22B700028869A /* BuschJaegerWelcomeView.xib in Resources */, D37CD38A15E22C020028869A /* BuschJaegerMainView.xib in Resources */, D37CD39015E2331C0028869A /* Settings.bundle in Resources */, + D37CD39E15E244E40028869A /* UIStationCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1509,6 +1527,8 @@ D37CD35315E22A470028869A /* OutdoorStation.m in Sources */, D37CD38015E22B700028869A /* BuschJaegerWelcomeView.m in Sources */, D37CD38715E22C020028869A /* BuschJaegerMainView.m in Sources */, + D37CD39A15E244D10028869A /* UIStationCell.m in Sources */, + D37CD3A115E2452C0028869A /* BuschJaegerStationViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1552,6 +1572,8 @@ D37CD35415E22A470028869A /* OutdoorStation.m in Sources */, D37CD38115E22B700028869A /* BuschJaegerWelcomeView.m in Sources */, D37CD38815E22C020028869A /* BuschJaegerMainView.m in Sources */, + D37CD39B15E244D10028869A /* UIStationCell.m in Sources */, + D37CD3A215E2452C0028869A /* BuschJaegerStationViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };