Start Welcome View

This commit is contained in:
Yann Diorcet 2012-08-20 13:25:15 +02:00
parent 23a55d699f
commit efe9624076
13 changed files with 690 additions and 90 deletions

View file

@ -34,76 +34,13 @@
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIViewController" id="105759972">
<string key="IBUINibName">BuschJaegerCallView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUIViewController" id="660452430">
<string key="IBUINibName">BuschJaegerWelcomeView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUIViewController" id="396228537">
<string key="IBUINibName">BuschJaegerSettingsView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUINavigationController" id="292382756">
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<bool key="IBUIDefinesPresentationContext">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationBar" key="IBUINavigationBar" id="62639881">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{0, 0}</string>
<string key="NSReuseIdentifierKey">_NS:15</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<array class="NSMutableArray" key="IBUIViewControllers">
<object class="IBUIViewController" id="831081166">
<object class="IBUINavigationItem" key="IBUINavigationItem" id="786979008">
<reference key="IBUINavigationBar"/>
<string key="IBUITitle">Root View Controller</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="292382756"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
</array>
<bool key="IBUINavigationBarHidden">YES</bool>
</object>
<object class="IBUIView" id="192697182">
<object class="IBUIView" id="168986707">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@ -114,6 +51,70 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIViewController" id="503124518">
<string key="IBUINibName">BuschJaegerCallView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUIViewController" id="205165019">
<string key="IBUINibName">BuschJaegerWelcomeView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUIViewController" id="829372912">
<string key="IBUINibName">BuschJaegerSettingsView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUINavigationController" id="864273647">
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<bool key="IBUIDefinesPresentationContext">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationBar" key="IBUINavigationBar" id="711683312">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{0, 0}</string>
<string key="NSReuseIdentifierKey">_NS:15</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<array class="NSMutableArray" key="IBUIViewControllers">
<object class="IBUIViewController" id="702913231">
<object class="IBUINavigationItem" key="IBUINavigationItem" id="885531587">
<reference key="IBUINavigationBar"/>
<string key="IBUITitle">Root View Controller</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="864273647"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
</array>
<bool key="IBUINavigationBarHidden">YES</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
@ -121,7 +122,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">callView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="105759972"/>
<reference key="destination" ref="503124518"/>
</object>
<int key="connectionID">11</int>
</object>
@ -129,7 +130,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">settingsView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="396228537"/>
<reference key="destination" ref="829372912"/>
</object>
<int key="connectionID">12</int>
</object>
@ -137,7 +138,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">welcomeView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="660452430"/>
<reference key="destination" ref="205165019"/>
</object>
<int key="connectionID">13</int>
</object>
@ -145,7 +146,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">navigationController</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="292382756"/>
<reference key="destination" ref="864273647"/>
</object>
<int key="connectionID">20</int>
</object>
@ -153,7 +154,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="192697182"/>
<reference key="destination" ref="168986707"/>
</object>
<int key="connectionID">22</int>
</object>
@ -179,50 +180,50 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="396228537"/>
<reference key="object" ref="829372912"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="105759972"/>
<reference key="object" ref="503124518"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="660452430"/>
<reference key="object" ref="205165019"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">16</int>
<reference key="object" ref="292382756"/>
<reference key="object" ref="864273647"/>
<array class="NSMutableArray" key="children">
<reference ref="62639881"/>
<reference ref="831081166"/>
<reference ref="711683312"/>
<reference ref="702913231"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="62639881"/>
<reference key="parent" ref="292382756"/>
<reference key="object" ref="711683312"/>
<reference key="parent" ref="864273647"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="831081166"/>
<reference key="object" ref="702913231"/>
<array class="NSMutableArray" key="children">
<reference ref="786979008"/>
<reference ref="885531587"/>
</array>
<reference key="parent" ref="292382756"/>
<reference key="parent" ref="864273647"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">19</int>
<reference key="object" ref="786979008"/>
<reference key="parent" ref="831081166"/>
<reference key="object" ref="885531587"/>
<reference key="parent" ref="702913231"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="192697182"/>
<reference key="object" ref="168986707"/>
<reference key="parent" ref="0"/>
</object>
</array>
@ -248,7 +249,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">22</int>
<int key="maxID">23</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -320,9 +321,10 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerMainView</string>
<string key="superclassName">UINavigationController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="callView">BuschJaegerCallView</string>
<string key="navigationController">UINavigationController</string>
<string key="settingsView">BuschJaegerSettingsView</string>
<string key="welcomeView">BuschJaegerWelcomeView</string>
</dictionary>
@ -331,6 +333,10 @@
<string key="name">callView</string>
<string key="candidateClassName">BuschJaegerCallView</string>
</object>
<object class="IBToOneOutletInfo" key="navigationController">
<string key="name">navigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo" key="settingsView">
<string key="name">settingsView</string>
<string key="candidateClassName">BuschJaegerSettingsView</string>

View file

@ -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

View file

@ -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 <UIKit/UIKit.h>
@interface BuschJaegerStationViewController : UITableViewController
@property (nonatomic, copy) NSArray *stations;
@end

View file

@ -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

View file

@ -18,12 +18,15 @@
*/
#import <UIKit/UIKit.h>
#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;

View file

@ -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];

View file

@ -14,6 +14,8 @@
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUILabel</string>
<string>IBUITableView</string>
<string>IBUITableViewController</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
@ -76,7 +78,7 @@
<string key="NSFrame">{{236, 13}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<reference key="NSNextKeyView" ref="312564754"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -86,7 +88,7 @@
<double key="IBUIContentEdgeInsets.bottom">10</double>
<double key="IBUIContentEdgeInsets.left">10</double>
<double key="IBUIContentEdgeInsets.right">10</double>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<object class="NSColor" key="IBUIHighlightedTitleColor" id="866892554">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
@ -112,6 +114,23 @@
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUITableView" id="312564754">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 85}, {320, 375}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="866892554"/>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIAlwaysBounceVertical">YES</bool>
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
<float key="IBUIRowHeight">100</float>
<float key="IBUISectionHeaderHeight">22</float>
<float key="IBUISectionFooterHeight">22</float>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
@ -124,6 +143,15 @@
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUITableViewController" id="69648657">
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
@ -143,6 +171,14 @@
</object>
<int key="connectionID">6</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">tableController</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="69648657"/>
</object>
<int key="connectionID">14</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">settingsClick:</string>
@ -152,6 +188,30 @@
</object>
<int key="connectionID">7</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
<reference key="source" ref="312564754"/>
<reference key="destination" ref="69648657"/>
</object>
<int key="connectionID">15</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="312564754"/>
<reference key="destination" ref="69648657"/>
</object>
<int key="connectionID">16</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="69648657"/>
<reference key="destination" ref="312564754"/>
</object>
<int key="connectionID">13</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@ -167,6 +227,7 @@
<array class="NSMutableArray" key="children">
<reference ref="324231259"/>
<reference ref="606095570"/>
<reference ref="312564754"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -192,6 +253,17 @@
<reference key="parent" ref="191373211"/>
<string key="objectName">Button - Settings</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="312564754"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="69648657"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="0"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -202,17 +274,29 @@
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.CustomClassName">BuschJaegerStationViewController</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">7</int>
<int key="maxID">16</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerStationViewController</string>
<string key="superclassName">UITableViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BuschJaegerStationViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerWelcomeView</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">settingsClick:</string>
<string key="NS.object.0">id</string>
@ -224,6 +308,20 @@
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="settingsButton">UIButton</string>
<string key="tableController">BuschJaegerStationViewController</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="settingsButton">
<string key="name">settingsButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="tableController">
<string key="name">tableController</string>
<string key="candidateClassName">BuschJaegerStationViewController</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BuschJaegerWelcomeView.h</string>

View file

@ -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;

View file

@ -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

View file

@ -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 <UIKit/UIKit.h>
#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

View file

@ -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

View file

@ -0,0 +1,209 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1498</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="841351856">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="371349661">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="909827972">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="565522139">
<reference key="NSNextResponder" ref="909827972"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{11, 10}, {80, 80}}</string>
<reference key="NSSuperview" ref="909827972"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="751205060"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUILabel" id="751205060">
<reference key="NSNextResponder" ref="909827972"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{109, 20}, {191, 21}}</string>
<reference key="NSSuperview" ref="909827972"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Station 1</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUIHighlightedColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">17</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica</string>
<double key="NSSize">17</double>
<int key="NSfFlags">16</int>
</object>
</object>
</array>
<string key="NSFrameSize">{320, 100}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="565522139"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">stationImage</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="565522139"/>
</object>
<int key="connectionID">6</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">stationName</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="751205060"/>
</object>
<int key="connectionID">7</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="841351856"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="371349661"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="909827972"/>
<array class="NSMutableArray" key="children">
<reference ref="565522139"/>
<reference ref="751205060"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="565522139"/>
<reference key="parent" ref="909827972"/>
<string key="objectName">stationImage</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="751205060"/>
<reference key="parent" ref="909827972"/>
<string key="objectName">stationName</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">UIStationCell</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">7</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">UIStationCell</string>
<string key="superclassName">UITableViewCell</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="stationImage">UIImageView</string>
<string key="stationName">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="stationImage">
<string key="name">stationImage</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="stationName">
<string key="name">stationName</string>
<string key="candidateClassName">UILabel</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIStationCell.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">1498</string>
</data>
</archive>

View file

@ -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 = "<group>"; };
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 = "<group>"; };
D37CD39815E244D10028869A /* UIStationCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIStationCell.h; sourceTree = "<group>"; };
D37CD39915E244D10028869A /* UIStationCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIStationCell.m; sourceTree = "<group>"; };
D37CD39C15E244E40028869A /* UIStationCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIStationCell.xib; sourceTree = "<group>"; };
D37CD39F15E245290028869A /* BuschJaegerStationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerStationViewController.h; sourceTree = "<group>"; };
D37CD3A015E2452B0028869A /* BuschJaegerStationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerStationViewController.m; sourceTree = "<group>"; };
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 = "<group>"; };
D380801115C29984005BE9BC /* ColorSpaceUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorSpaceUtilities.h; path = Utils/ColorSpaceUtilities.h; sourceTree = "<group>"; };
@ -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;
};