Merged issue-226 branch back into trunk, fixed issue 226.

Application interface is now decomposed into smaller nib files. For example, each of the preferences views is now managed by its own view controller subclass. Same for an account window and its views, and for a call window and its views. Started using XSWindowController and XSViewController to manage such decomposed interface. Those view controller subviews are now doing some of the work that a higher level controller was doing before. For example, AccountPreferencesViewController is now responsible for adding and removing accounts (PreferenceController was doing this work before).

PreferenceController renamed to PreferencesController.

AKSIPURIFormatter.m

@@ -31,7 +31,7 @@
 #import "AKSIPURIFormatter.h"
 
 #import "AKNSString+Scanning.h"
-#import "PreferenceController.h"
+#import "PreferencesController.h"
 #import "AKSIPURI.h"
 #import "AKTelephoneNumberFormatter.h"
 

AKSIPUserAgent.h

@@ -152,7 +152,7 @@ extern NSString * const AKSIPUserAgentWillRemoveAccountNotification;
 // Receiver's call data.
 @property(nonatomic, readonly, assign) AKSIPUserAgentCallData *callData;
 
-// A pool used by the underlying PJSUA libraty of the receiver.
+// A pool used by the underlying PJSUA library of the receiver.
 @property(readonly, assign) pj_pool_t *pjPool;
 
 @property(readonly, assign) NSInteger ringbackSlot;
@@ -164,8 +164,8 @@ extern NSString * const AKSIPUserAgentWillRemoveAccountNotification;
 @property(nonatomic, copy) NSArray *nameservers;
 
 // SIP proxy host to visit for all outgoing requests. Will be used for all
-// accounts. The final route set for outgoing requests consists of the this
-// proxy and proxy configured for the account.
+// accounts. The final route set for outgoing requests consists of this proxy
+// and proxy configured for the account.
 @property(nonatomic, copy) NSString *outboundProxyHost;
 
 // Network port to use with the outbound proxy.

AccountController.h

@@ -31,6 +31,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "AKSIPAccount.h"
+#import "XSWindowController.h"
 
 
 // Account states.
@@ -43,16 +44,11 @@ enum {
 // Address Book label for SIP address in the email field.
 extern NSString * const kEmailSIPLabel;
 
-// Posted whenever an AccountController object changes account's username and
-// password.
-// The notification object is the AccountController object that changed
-// username and password.
-extern NSString * const AKAccountControllerDidChangeUsernameAndPasswordNotification;
-
-@class AKSIPAccount, AKNetworkReachability;
+@class AKSIPURI, AKNetworkReachability;
+@class ActiveAccountViewController, AuthenticationFailureController;
 
 // A SIP account controller.
-@interface AccountController : NSWindowController <AKSIPAccountDelegate> {
+@interface AccountController : XSWindowController <AKSIPAccountDelegate> {
  @private
   BOOL enabled_;
   AKSIPAccount *account_;
@@ -69,19 +65,10 @@ extern NSString * const AKAccountControllerDidChangeUsernameAndPasswordNotificat
   BOOL substitutesPlusCharacter_;
   NSString *plusCharacterSubstitution_;
   
-  NSView *activeAccountView_;
-  NSView *offlineAccountView_;
-  NSPopUpButton *accountStatePopUp_;
-  NSTokenField *callDestinationField_;
-  NSUInteger callDestinationURIIndex_;
+  ActiveAccountViewController *activeAccountViewController_;
+  AuthenticationFailureController *authenticationFailureController_;
   
-  // Authentication failure sheet elements.
-  NSWindow *authenticationFailureSheet_;
-  NSTextField *authenticationFailureInformativeText_;
-  NSTextField *updatedUsernameField_;
-  NSTextField *updatedPasswordField_;
-  NSButton *mustSaveCheckBox_;
-  NSButton *authenticationFailureCancelButton_;
+  NSPopUpButton *accountStatePopUp_;
 }
 
 // A Boolean value indicating whether receiver is enabled.
@@ -131,37 +118,15 @@ extern NSString * const AKAccountControllerDidChangeUsernameAndPasswordNotificat
 // A replacement for the plus character in the phone number.
 @property(nonatomic, copy) NSString *plusCharacterSubstitution;
 
-// Outlets.
-
-// Active account view outlet.
-@property(nonatomic, retain) IBOutlet NSView *activeAccountView;
+// An active account view controller.
+@property(nonatomic, readonly) ActiveAccountViewController *activeAccountViewController;
 
-// Offline account view outlet.
-@property(nonatomic, retain) IBOutlet NSView *offlineAccountView;
+// An authentication failure controller.
+@property(nonatomic, readonly) AuthenticationFailureController *authenticationFailureController;
 
 // Account state pop-up button outlet.
 @property(nonatomic, retain) IBOutlet NSPopUpButton *accountStatePopUp;
 
-// Call destination token field outlet.
-@property(nonatomic, retain) IBOutlet NSTokenField *callDestinationField;
-
-// Authentication failure sheet outlet.
-@property(nonatomic, retain) IBOutlet NSWindow *authenticationFailureSheet;
-
-// Informative text outlet of the authentication failure sheet.
-@property(nonatomic, retain) IBOutlet NSTextField *authenticationFailureInformativeText;
-
-// |User Name| field outlet of the authentication failure sheet.
-@property(nonatomic, retain) IBOutlet NSTextField *updatedUsernameField;
-
-// |Password| field outlet of the authentication failure sheet.
-@property(nonatomic, retain) IBOutlet NSTextField *updatedPasswordField;
-
-// |Save in the Keychain| checkbox outlet.
-@property(nonatomic, retain) IBOutlet NSButton *mustSaveCheckBox;
-
-// Cancel button outlet of the authentication failure sheet.
-@property(nonatomic, retain) IBOutlet NSButton *authenticationFailureCancelButton;
 
 // Designated initializer.
 // Initializes an AccountController object with a given account.
@@ -178,21 +143,15 @@ extern NSString * const AKAccountControllerDidChangeUsernameAndPasswordNotificat
 // Removes account from the user agent.
 - (void)removeAccountFromUserAgent;
 
-// Makes a call.
-- (IBAction)makeCall:(id)sender;
+// Makes a call to a given destination URI with a given phone label.
+// Host part of the |destinationURI| can be empty, in which case host part from
+// the account's |registrationURI| will be taken.
+- (void)makeCallToURI:(AKSIPURI *)destinationURI
+           phoneLabel:(NSString *)phoneLabel;
 
 // Changes account state.
 - (IBAction)changeAccountState:(id)sender;
 
-// Sets new user name and password when authentication fails.
-- (IBAction)changeUsernameAndPassword:(id)sender;
-
-// Closes a sheet.
-- (IBAction)closeSheet:(id)sender;
-
-// Changes the active SIP URI index in the call destination token.
-- (IBAction)changeCallDestinationURIIndex:(id)sender;
-
 // Shows alert saying that connection to the registrar failed.
 - (void)showRegistrarConnectionErrorSheetWithError:(NSString *)error;