Permalink
Browse files

120 columns in AppController

  • Loading branch information...
1 parent b584f29 commit 89fa95432ed6a8575de444a3a690ec5efe631826 @eofster committed Nov 24, 2012
Showing with 1,720 additions and 1,990 deletions.
  1. +31 −39 Classes/AppController.h
  2. +1,687 −1,949 Classes/AppController.m
  3. +2 −2 Telephone.xcodeproj/project.pbxproj
View
70 Classes/AppController.h
@@ -49,30 +49,29 @@ extern NSString * const kGrowlNotificationCallEnded;
@class AccountSetupController;
// Application controller and NSApplication delegate.
-@interface AppController : NSObject <AKSIPUserAgentDelegate,
-GrowlApplicationBridgeDelegate> {
- @private
- AKSIPUserAgent *userAgent_;
- NSMutableArray *accountControllers_;
- PreferencesController *preferencesController_;
- AccountSetupController *accountSetupController_;
- NSArray *audioDevices_;
- NSInteger soundInputDeviceIndex_;
- NSInteger soundOutputDeviceIndex_;
- NSInteger ringtoneOutputDeviceIndex_;
- BOOL shouldSetUserAgentSoundIO_;
- NSSound *ringtone_;
- NSTimer *ringtoneTimer_;
- BOOL shouldRegisterAllAccounts_;
- BOOL shouldRestartUserAgentASAP_;
- BOOL terminating_;
- BOOL didPauseITunes_;
- BOOL shouldPresentUserAgentLaunchError_;
- NSTimer *userAttentionTimer_;
-
- NSArray *accountsMenuItems_;
- NSMenu *windowMenu_;
- NSMenuItem *preferencesMenuItem_;
+@interface AppController : NSObject <AKSIPUserAgentDelegate, GrowlApplicationBridgeDelegate> {
+ @private
+ AKSIPUserAgent *userAgent_;
+ NSMutableArray *accountControllers_;
+ PreferencesController *preferencesController_;
+ AccountSetupController *accountSetupController_;
+ NSArray *audioDevices_;
+ NSInteger soundInputDeviceIndex_;
+ NSInteger soundOutputDeviceIndex_;
+ NSInteger ringtoneOutputDeviceIndex_;
+ BOOL shouldSetUserAgentSoundIO_;
+ NSSound *ringtone_;
+ NSTimer *ringtoneTimer_;
+ BOOL shouldRegisterAllAccounts_;
+ BOOL shouldRestartUserAgentASAP_;
+ BOOL terminating_;
+ BOOL didPauseITunes_;
+ BOOL shouldPresentUserAgentLaunchError_;
+ NSTimer *userAttentionTimer_;
+
+ NSArray *accountsMenuItems_;
+ NSMenu *windowMenu_;
+ NSMenuItem *preferencesMenuItem_;
}
// SIP user agent.
@@ -112,8 +111,7 @@ GrowlApplicationBridgeDelegate> {
// Ringtone timer.
@property (nonatomic, assign) NSTimer *ringtoneTimer;
-// A Boolean value indicating whether accounts should be registered ASAP,
-// e.g. when the user agent finishes starting.
+// A Boolean value indicating whether accounts should be registered ASAP, e.g. when the user agent finishes starting.
@property (nonatomic, assign) BOOL shouldRegisterAllAccounts;
// A Boolean value indicating whether user agent should be restarted ASAP.
@@ -123,12 +121,10 @@ GrowlApplicationBridgeDelegate> {
// We need to destroy the user agent gracefully on quit.
@property (nonatomic, assign, getter=isTerminating) BOOL terminating;
-// A Boolean value indicating whether there are any call controllers with
-// the incoming calls.
+// A Boolean value indicating whether there are any call controllers with the incoming calls.
@property (nonatomic, readonly, assign) BOOL hasIncomingCallControllers;
-// A Boolean value indicating whether there are any call controllers with
-// the active calls.
+// A Boolean value indicating whether there are any call controllers with the active calls.
@property (nonatomic, readonly, assign) BOOL hasActiveCallControllers;
// An array of nameservers currently in use in the OS.
@@ -137,8 +133,7 @@ GrowlApplicationBridgeDelegate> {
// A Boolean value indicating whether the receiver has paused iTunes.
@property (nonatomic, assign) BOOL didPauseITunes;
-// A Boolean value indicating whether user agent launch error should be
-// presented to the user.
+// A Boolean value indicating whether user agent launch error should be presented to the user.
@property (nonatomic, assign) BOOL shouldPresentUserAgentLaunchError;
// Unhandled incoming calls count.
@@ -156,12 +151,10 @@ GrowlApplicationBridgeDelegate> {
// Preferences menu item outlet.
@property (nonatomic, retain) IBOutlet NSMenuItem *preferencesMenuItem;
-// Stops and destroys SIP user agent hanging up all calls and unregistering all
-// accounts.
+// Stops and destroys SIP user agent hanging up all calls and unregistering all accounts.
- (void)stopUserAgent;
-// A shortcut to restart user agent. Sets appropriate flags to start user agent,
-// and then calls |stopUserAgent|.
+// A shortcut to restart user agent. Sets appropriate flags to start user agent, and then calls |stopUserAgent|.
- (void)restartUserAgent;
// Updates list of available audio devices.
@@ -212,9 +205,8 @@ GrowlApplicationBridgeDelegate> {
// Makes account winfow key or hides it.
- (IBAction)toggleAccountWindow:(id)sender;
-// Installs Address Book plug-ins to |~/Library/Address Book Plug-Ins|. Updates
-// plug-ins if the installed versions are outdated. Does not guaranteed to
-// return a valid |error| if the method returns NO.
+// Installs Address Book plug-ins to |~/Library/Address Book Plug-Ins|. Updates plug-ins if the installed versions are
+// outdated. Does not guaranteed to return a valid |error| if the method returns NO.
- (BOOL)installAddressBookPlugInsAndReturnError:(NSError **)error;
// Returns a localized string describing a given SIP response code.
View
3,636 Classes/AppController.m
1,687 additions, 1,949 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
4 Telephone.xcodeproj/project.pbxproj
@@ -207,8 +207,8 @@
AA3F65691072C926000511E8 /* AuthenticationFailureController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = AuthenticationFailureController.m; sourceTree = "<group>"; tabWidth = 2; };
AA4BD4C60E07C28E005A71B2 /* AKSIPUserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AKSIPUserAgent.h; sourceTree = "<group>"; tabWidth = 4; };
AA4BD4C70E07C28E005A71B2 /* AKSIPUserAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = AKSIPUserAgent.m; sourceTree = "<group>"; tabWidth = 4; };
- AA4BD4D60E07C305005A71B2 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; tabWidth = 2; };
- AA4BD4D70E07C305005A71B2 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; tabWidth = 2; };
+ AA4BD4D60E07C305005A71B2 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; tabWidth = 4; };
+ AA4BD4D70E07C305005A71B2 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; tabWidth = 4; };
AA4BD4DC0E07C51E005A71B2 /* AKSIPAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AKSIPAccount.h; sourceTree = "<group>"; tabWidth = 4; };
AA4BD4DD0E07C51E005A71B2 /* AKSIPAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = AKSIPAccount.m; sourceTree = "<group>"; tabWidth = 4; };
AA4FD3A10E1E895D00D4E6A6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };

0 comments on commit 89fa954

Please sign in to comment.