Add manual settings view

2026-01-29 17:29:20 +00:00 · 2012-10-22 17:05:08 +02:00 · 2012-10-22 17:05:08 +02:00 · 73969c0b55
commit 73969c0b55
parent f49b0d0482
10 changed files with 958 additions and 27 deletions
--- 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;
--- 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];
--- a/Classes/BuschJaegerMainView.xib
+++ b/Classes/BuschJaegerMainView.xib
@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.SystemVersion">11G56</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -40,7 +40,6 @@
 				<string key="NSFrameSize">{320, 480}</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>
@ -81,6 +80,16 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
+			<object class="IBUIViewController" id="230186423">
+				<string key="IBUINibName">BuschJaegerManualSettingsView</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="675784258">
 				<string key="IBUINibName">BuschJaegerHistoryView</string>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@ -193,6 +202,14 @@
 					</object>
 					<int key="connectionID">27</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">manualSettingsView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="230186423"/>
+					</object>
+					<int key="connectionID">29</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@ -271,6 +288,11 @@
 						<reference key="object" ref="309615416"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="230186423"/>
+						<reference key="parent" ref="0"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -290,6 +312,8 @@
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="26.CustomClassName">BuschJaegerHistoryDetailsView</string>
 				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="28.CustomClassName">BuschJaegerManualSettingsView</string>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="6.CustomClassName">BuschJaegerWelcomeView</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.CustomClassName">BuschJaegerSettingsView</string>
@ -299,7 +323,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">27</int>
+			<int key="maxID">29</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -524,6 +548,7 @@
 						<string key="callView">BuschJaegerCallView</string>
 						<string key="historyDetailsView">BuschJaegerHistoryDetailsView</string>
 						<string key="historyView">BuschJaegerHistoryView</string>
+						<string key="manualSettingsView">BuschJaegerManualSettingsView</string>
 						<string key="navigationController">UINavigationControllerEx</string>
 						<string key="settingsView">BuschJaegerSettingsView</string>
 						<string key="welcomeView">BuschJaegerWelcomeView</string>
@ -541,6 +566,10 @@
 							<string key="name">historyView</string>
 							<string key="candidateClassName">BuschJaegerHistoryView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="manualSettingsView">
+							<string key="name">manualSettingsView</string>
+							<string key="candidateClassName">BuschJaegerManualSettingsView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="navigationController">
 							<string key="name">navigationController</string>
 							<string key="candidateClassName">UINavigationControllerEx</string>
@ -559,11 +588,49 @@
 						<string key="minorKey">./Classes/BuschJaegerMainView.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">BuschJaegerManualSettingsView</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addressField">UITextField</string>
+						<string key="backButton">UIView</string>
+						<string key="passwordField">UITextField</string>
+						<string key="usernameField">UITextField</string>
+						<string key="validButton">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addressField">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="backButton">
+							<string key="name">backButton</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="passwordField">
+							<string key="name">passwordField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="usernameField">
+							<string key="name">usernameField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="validButton">
+							<string key="name">validButton</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/BuschJaegerManualSettingsView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">BuschJaegerSettingsView</string>
 					<string key="superclassName">UIViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="onBackClick:">id</string>
+						<string key="onManualClick:">id</string>
 						<string key="onScanClick:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@ -571,6 +638,10 @@
 							<string key="name">onBackClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onManualClick:">
+							<string key="name">onManualClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onScanClick:">
 							<string key="name">onScanClick:</string>
 							<string key="candidateClassName">id</string>
@ -578,6 +649,7 @@
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="backButton">UIView</string>
+						<string key="manualButton">UIView</string>
 						<string key="scanButton">UIView</string>
 						<string key="waitView">UIView</string>
 					</dictionary>
@ -586,6 +658,10 @@
 							<string key="name">backButton</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="manualButton">
+							<string key="name">manualButton</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="scanButton">
 							<string key="name">scanButton</string>
 							<string key="candidateClassName">UIView</string>
--- a/Classes/BuschJaegerManualSettingsView.h
+++ 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 <UIKit/UIKit.h>
+
+@interface BuschJaegerManualSettingsView : UIViewController<UITextFieldDelegate> {
+    
+}
+
+@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
--- a/Classes/BuschJaegerManualSettingsView.m
+++ 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
--- a/Classes/BuschJaegerManualSettingsView.xib
+++ b/Classes/BuschJaegerManualSettingsView.xib
@ -0,0 +1,533 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1536</int>
+		<string key="IBDocument.SystemVersion">11G56</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
+		<string key="IBDocument.AppKitVersion">1138.51</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">1926</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIButton</string>
+			<string>IBUILabel</string>
+			<string>IBUITextField</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="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="191373211">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUITextField" id="459338305">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">293</int>
+						<string key="NSFrame">{{20, 20}, {280, 30}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="756992276"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<string key="IBUIText"/>
+						<int key="IBUIBorderStyle">3</int>
+						<string key="IBUIPlaceholder">Address</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+							<object class="NSColorSpace" key="NSCustomColorSpace" id="333226863">
+								<int key="NSID">2</int>
+							</object>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+						<float key="IBUIMinimumFontSize">17</float>
+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="497742268">
+							<int key="type">1</int>
+							<double key="pointSize">14</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="79355075">
+							<string key="NSName">Helvetica</string>
+							<double key="NSSize">14</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
+					<object class="IBUITextField" id="756992276">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">293</int>
+						<string key="NSFrame">{{20, 80}, {280, 30}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="529128259"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<string key="IBUIText"/>
+						<int key="IBUIBorderStyle">3</int>
+						<string key="IBUIPlaceholder">Username</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+							<reference key="NSCustomColorSpace" ref="333226863"/>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+						<float key="IBUIMinimumFontSize">17</float>
+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<reference key="IBUIFontDescription" ref="497742268"/>
+						<reference key="IBUIFont" ref="79355075"/>
+					</object>
+					<object class="IBUITextField" id="529128259">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">293</int>
+						<string key="NSFrame">{{20, 140}, {280, 30}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1072473102"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<string key="IBUIText"/>
+						<int key="IBUIBorderStyle">3</int>
+						<string key="IBUIPlaceholder">Password</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+							<reference key="NSCustomColorSpace" ref="333226863"/>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+						<float key="IBUIMinimumFontSize">17</float>
+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<reference key="IBUIFontDescription" ref="497742268"/>
+						<reference key="IBUIFont" ref="79355075"/>
+					</object>
+					<object class="IBUIView" id="1072473102">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">293</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="947037574">
+								<reference key="NSNextResponder" ref="1072473102"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="1072473102"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="72682009"/>
+								<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">Valid</string>
+								<object class="NSColor" key="IBUITextColor" id="573709621">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUITextAlignment">1</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="94643122">
+									<int key="type">1</int>
+									<double key="pointSize">24</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="41123896">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">24</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+							<object class="IBUIButton" id="72682009">
+								<reference key="NSNextResponder" ref="1072473102"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="1072473102"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="608654542"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="19053402">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="573709621"/>
+								<reference key="IBUINormalTitleColor" ref="573709621"/>
+								<object class="NSColor" key="IBUINormalTitleShadowColor" id="3185899">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="978062215">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="679660866">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</array>
+						<string key="NSFrame">{{20, 190}, {280, 40}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="947037574"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<reference key="IBUIBackgroundColor" ref="19053402"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="608654542">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">269</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="677583599">
+								<reference key="NSNextResponder" ref="608654542"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="608654542"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="473562072"/>
+								<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">Back</string>
+								<reference key="IBUITextColor" ref="573709621"/>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUITextAlignment">1</int>
+								<reference key="IBUIFontDescription" ref="94643122"/>
+								<reference key="IBUIFont" ref="41123896"/>
+							</object>
+							<object class="IBUIButton" id="473562072">
+								<reference key="NSNextResponder" ref="608654542"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 40}</string>
+								<reference key="NSSuperview" ref="608654542"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="19053402"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="573709621"/>
+								<reference key="IBUINormalTitleColor" ref="573709621"/>
+								<reference key="IBUINormalTitleShadowColor" ref="3185899"/>
+								<reference key="IBUIFontDescription" ref="978062215"/>
+								<reference key="IBUIFont" ref="679660866"/>
+							</object>
+						</array>
+						<string key="NSFrame">{{20, 410}, {280, 40}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="677583599"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<reference key="IBUIBackgroundColor" ref="19053402"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="459338305"/>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">3</int>
+					<bytes key="NSWhite">MAA</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">addressField</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="459338305"/>
+					</object>
+					<int key="connectionID">15</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="608654542"/>
+					</object>
+					<int key="connectionID">17</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">passwordField</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="529128259"/>
+					</object>
+					<int key="connectionID">18</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">usernameField</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="756992276"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">validButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1072473102"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="191373211"/>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="459338305"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="756992276"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">25</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="529128259"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="473562072"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onValidClick:</string>
+						<reference key="source" ref="72682009"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">23</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="191373211"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="459338305"/>
+							<reference ref="529128259"/>
+							<reference ref="756992276"/>
+							<reference ref="608654542"/>
+							<reference ref="1072473102"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<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="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="459338305"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">addressField</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="756992276"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">usernameField</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="529128259"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">passwordField</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="608654542"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="677583599"/>
+							<reference ref="473562072"/>
+						</array>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">Back Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="677583599"/>
+						<reference key="parent" ref="608654542"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="473562072"/>
+						<reference key="parent" ref="608654542"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="1072473102"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="72682009"/>
+							<reference ref="947037574"/>
+						</array>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">Valid Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="72682009"/>
+						<reference key="parent" ref="1072473102"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="947037574"/>
+						<reference key="parent" ref="1072473102"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">BuschJaegerManualSettingsView</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="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="10.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="13.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</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">26</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">BuschJaegerManualSettingsView</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addressField">UITextField</string>
+						<string key="backButton">UIView</string>
+						<string key="passwordField">UITextField</string>
+						<string key="usernameField">UITextField</string>
+						<string key="validButton">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addressField">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="backButton">
+							<string key="name">backButton</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="passwordField">
+							<string key="name">passwordField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="usernameField">
+							<string key="name">usernameField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="validButton">
+							<string key="name">validButton</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/BuschJaegerManualSettingsView.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
+	</data>
+</archive>
--- 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
--- 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 {
--- a/Classes/BuschJaegerSettingsView.xib
+++ b/Classes/BuschJaegerSettingsView.xib
@ -1,14 +1,14 @@
 <?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>
+		<int key="IBDocument.SystemTarget">1536</int>
+		<string key="IBDocument.SystemVersion">11G56</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
+		<string key="IBDocument.AppKitVersion">1138.51</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>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
@ -52,7 +52,7 @@
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage">
+								<object class="NSCustomResource" key="IBUIImage" id="444927610">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">bj_barcode.png</string>
 								</object>
@ -63,7 +63,7 @@
 								<string key="NSFrame">{{102, 0}, {178, 100}}</string>
 								<reference key="NSSuperview" ref="432106977"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="558519328"/>
+								<reference key="NSNextKeyView" ref="290853868"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@ -129,6 +129,71 @@
 						<reference key="IBUIBackgroundColor" ref="446909226"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
+					<object class="IBUIView" id="290853868">
+						<reference key="NSNextResponder" ref="823940774"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="108362131">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">-2147483356</int>
+								<string key="NSFrame">{{20, 13}, {74, 74}}</string>
+								<reference key="NSSuperview" ref="290853868"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="978723389"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="444927610"/>
+							</object>
+							<object class="IBUILabel" id="978723389">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrame">{{102, 0}, {178, 100}}</string>
+								<reference key="NSSuperview" ref="290853868"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="558519328"/>
+								<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">Manual pairing</string>
+								<reference key="IBUITextColor" ref="475419136"/>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">0</int>
+								<float key="IBUIMinimumFontSize">10</float>
+								<reference key="IBUIFontDescription" ref="398741963"/>
+								<reference key="IBUIFont" ref="153354414"/>
+							</object>
+							<object class="IBUIButton" id="463635404">
+								<reference key="NSNextResponder" ref="290853868"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 100}</string>
+								<reference key="NSSuperview" ref="290853868"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="108362131"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="446909226"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleColor" ref="475419136"/>
+								<reference key="IBUINormalTitleShadowColor" ref="459298159"/>
+								<reference key="IBUIFontDescription" ref="26925302"/>
+								<reference key="IBUIFont" ref="316540384"/>
+							</object>
+						</array>
+						<string key="NSFrame">{{20, 128}, {280, 100}}</string>
+						<reference key="NSSuperview" ref="823940774"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="463635404"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<reference key="IBUIBackgroundColor" ref="446909226"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
 					<object class="IBUIView" id="558519328">
 						<reference key="NSNextResponder" ref="823940774"/>
 						<int key="NSvFlags">269</int>
@ -161,6 +226,7 @@
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="558519328"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="508446153"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="446909226"/>
 								<bool key="IBUIOpaque">NO</bool>
@ -192,7 +258,6 @@
 								<string key="NSFrame">{{142, 211}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="508446153"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="432106977"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -216,7 +281,7 @@
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="508446153"/>
+				<reference key="NSNextKeyView" ref="432106977"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -259,6 +324,14 @@
 					</object>
 					<int key="connectionID">24</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">manualButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="290853868"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onScanClick:</string>
@ -277,6 +350,15 @@
 					</object>
 					<int key="connectionID">21</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onManualClick:</string>
+						<reference key="source" ref="463635404"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@ -304,6 +386,7 @@
 							<reference ref="432106977"/>
 							<reference ref="558519328"/>
 							<reference ref="508446153"/>
+							<reference ref="290853868"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@ -367,6 +450,32 @@
 						<reference key="object" ref="759552209"/>
 						<reference key="parent" ref="508446153"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="290853868"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="978723389"/>
+							<reference ref="463635404"/>
+							<reference ref="108362131"/>
+						</array>
+						<reference key="parent" ref="823940774"/>
+						<string key="objectName">Manual Button View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="978723389"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="108362131"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="463635404"/>
+						<reference key="parent" ref="290853868"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -381,6 +490,11 @@
 				<real value="0.0" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="27.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -391,7 +505,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">24</int>
+			<int key="maxID">31</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -400,6 +514,7 @@
 					<string key="superclassName">UIViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="onBackClick:">id</string>
+						<string key="onManualClick:">id</string>
 						<string key="onScanClick:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@ -407,6 +522,10 @@
 							<string key="name">onBackClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onManualClick:">
+							<string key="name">onManualClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onScanClick:">
 							<string key="name">onScanClick:</string>
 							<string key="candidateClassName">id</string>
@ -414,6 +533,7 @@
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="backButton">UIView</string>
+						<string key="manualButton">UIView</string>
 						<string key="scanButton">UIView</string>
 						<string key="waitView">UIView</string>
 					</dictionary>
@ -422,6 +542,10 @@
 							<string key="name">backButton</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="manualButton">
+							<string key="name">manualButton</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="scanButton">
 							<string key="name">scanButton</string>
 							<string key="candidateClassName">UIView</string>
@ -442,7 +566,7 @@
 		<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"/>
+			<real value="1536" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
@ -450,6 +574,6 @@
 			<string key="NS.key.0">bj_barcode.png</string>
 			<string key="NS.object.0">{148, 148}</string>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">1498</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
--- 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 = "<group>"; };
 		C9B3A6FD15B485DB006F52EE /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = Utils/Utils.h; sourceTree = "<group>"; };
+		D30B942216358C7F00D53C46 /* BuschJaegerManualSettingsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BuschJaegerManualSettingsView.xib; sourceTree = "<group>"; };
+		D30B942616358DD600D53C46 /* BuschJaegerManualSettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerManualSettingsView.h; sourceTree = "<group>"; };
+		D30B942716358DD600D53C46 /* BuschJaegerManualSettingsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerManualSettingsView.m; sourceTree = "<group>"; };
 		D3196D3C15A32BD7007FEEBA /* UITransferButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransferButton.h; sourceTree = "<group>"; };
 		D3196D3D15A32BD8007FEEBA /* UITransferButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransferButton.m; sourceTree = "<group>"; };
 		D321FF9815E628CB0098B5F4 /* linphonerc~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc~ipad"; path = "Resources/linphonerc~ipad"; sourceTree = "<group>"; };
@ -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 = "<group>";
 		};
-		D37E3ECA1619C27A0087659A /* CAAnimationBlocks */ = {
-			isa = PBXGroup;
-			children = (
-				D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */,
-				D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */,
-			);
-			name = CAAnimationBlocks;
-			path = Utils/CAAnimationBlocks;
-			sourceTree = "<group>";
-		};
 		D37CD35615E22B0C0028869A /* Headers */ = {
 			isa = PBXGroup;
 			children = (
@ -1458,6 +1458,16 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
+		D37E3ECA1619C27A0087659A /* CAAnimationBlocks */ = {
+			isa = PBXGroup;
+			children = (
+				D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */,
+				D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */,
+			);
+			name = CAAnimationBlocks;
+			path = Utils/CAAnimationBlocks;
+			sourceTree = "<group>";
+		};
 		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;
 		};