From a637205875889c457ff4e66a0fa339cd8fe26e83 Mon Sep 17 00:00:00 2001 From: Brett Jackson Date: Mon, 8 Jul 2013 21:47:32 -0500 Subject: [PATCH] updated for osx 10.9 --- commotion-meshbook.xcodeproj/project.pbxproj | 32 +- commotion-meshbook/AppDelegate.m | 2 +- commotion-meshbook/Network/NetworkService.h | 8 +- commotion-meshbook/Network/NetworkService.m | 45 +- .../ViewControllers/StatusViewController.m | 2 +- .../ViewControllers/StatusViewController.xib | 704 +++------------ commotion-meshbook/en.lproj/MainMenu.xib | 835 ++---------------- 7 files changed, 251 insertions(+), 1377 deletions(-) diff --git a/commotion-meshbook.xcodeproj/project.pbxproj b/commotion-meshbook.xcodeproj/project.pbxproj index 33c1623..cc9bce1 100644 --- a/commotion-meshbook.xcodeproj/project.pbxproj +++ b/commotion-meshbook.xcodeproj/project.pbxproj @@ -50,15 +50,15 @@ 1CD4E9AF16C5CDD300BDF1B3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD4E9AC16C5CDD300BDF1B3 /* AppDelegate.m */; }; 1CD4E9B316C5CDFF00BDF1B3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD4E9B216C5CDFF00BDF1B3 /* main.m */; }; 1CD4E9BB16C5CE1100BDF1B3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1CD4E9B816C5CE1100BDF1B3 /* InfoPlist.strings */; }; - 1CD9F83A16D18C2B0097D188 /* CoreWLAN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD9F83916D18C2B0097D188 /* CoreWLAN.framework */; }; - 1CD9F83C16D18C3C0097D188 /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD9F83B16D18C3C0097D188 /* SecurityInterface.framework */; }; 1CD9F84316D19AB70097D188 /* menuMeshStatus.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD9F83F16D19AB70097D188 /* menuMeshStatus.png */; }; 1CD9F84516D19AB70097D188 /* menuNetworkStatus.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD9F84116D19AB70097D188 /* menuNetworkStatus.png */; }; - 1CD9F8DB16D2FF080097D188 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD9F8DA16D2FF080097D188 /* CoreFoundation.framework */; }; - 1CD9F8DD16D2FF340097D188 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD9F8DC16D2FF340097D188 /* SystemConfiguration.framework */; }; 1CE3A94016DF5A3A00D6C086 /* NetworkService.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CE3A93F16DF5A3A00D6C086 /* NetworkService.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated"; }; }; 1CFACFD416DC27ED00DBBA58 /* ProfilesDoc.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CFACFD316DC27ED00DBBA58 /* ProfilesDoc.m */; }; 1CFACFD716DC2E5700DBBA58 /* ProfilesDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CFACFD616DC2E5600DBBA58 /* ProfilesDatabase.m */; }; + 7FAA1A1B178BA02A00DE22DA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FAA1A1A178BA02A00DE22DA /* SystemConfiguration.framework */; }; + 7FAA1A1D178BA03700DE22DA /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FAA1A1C178BA03700DE22DA /* CoreFoundation.framework */; }; + 7FAA1A1F178BA04100DE22DA /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FAA1A1E178BA04100DE22DA /* SecurityInterface.framework */; }; + 7FAA1A21178BA04900DE22DA /* CoreWLAN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FAA1A20178BA04900DE22DA /* CoreWLAN.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -137,18 +137,18 @@ 1CD4E9B716C5CE1100BDF1B3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = "commotion-meshbook/en.lproj/Credits.rtf"; sourceTree = SOURCE_ROOT; }; 1CD4E9B916C5CE1100BDF1B3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = "commotion-meshbook/en.lproj/InfoPlist.strings"; sourceTree = SOURCE_ROOT; }; 1CD4E9BF16C5CF1C00BDF1B3 /* commotion-meshbook-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "commotion-meshbook-Info.plist"; path = "commotion-meshbook/commotion-meshbook-Info.plist"; sourceTree = SOURCE_ROOT; }; - 1CD9F83916D18C2B0097D188 /* CoreWLAN.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreWLAN.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreWLAN.framework; sourceTree = DEVELOPER_DIR; }; - 1CD9F83B16D18C3C0097D188 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/SecurityInterface.framework; sourceTree = DEVELOPER_DIR; }; 1CD9F83F16D19AB70097D188 /* menuMeshStatus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menuMeshStatus.png; path = "commotion-meshbook/Images/menuMeshStatus.png"; sourceTree = SOURCE_ROOT; }; 1CD9F84116D19AB70097D188 /* menuNetworkStatus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menuNetworkStatus.png; path = "commotion-meshbook/Images/menuNetworkStatus.png"; sourceTree = SOURCE_ROOT; }; - 1CD9F8DA16D2FF080097D188 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; }; - 1CD9F8DC16D2FF340097D188 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; 1CE3A93E16DF5A3A00D6C086 /* NetworkService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkService.h; path = "commotion-meshbook/Network/NetworkService.h"; sourceTree = SOURCE_ROOT; }; 1CE3A93F16DF5A3A00D6C086 /* NetworkService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkService.m; path = "commotion-meshbook/Network/NetworkService.m"; sourceTree = SOURCE_ROOT; }; 1CFACFD216DC27ED00DBBA58 /* ProfilesDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProfilesDoc.h; path = "commotion-meshbook/Data/ProfilesDoc.h"; sourceTree = SOURCE_ROOT; }; 1CFACFD316DC27ED00DBBA58 /* ProfilesDoc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProfilesDoc.m; path = "commotion-meshbook/Data/ProfilesDoc.m"; sourceTree = SOURCE_ROOT; }; 1CFACFD516DC2E5600DBBA58 /* ProfilesDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProfilesDatabase.h; path = "commotion-meshbook/Data/ProfilesDatabase.h"; sourceTree = SOURCE_ROOT; }; 1CFACFD616DC2E5600DBBA58 /* ProfilesDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProfilesDatabase.m; path = "commotion-meshbook/Data/ProfilesDatabase.m"; sourceTree = SOURCE_ROOT; }; + 7FAA1A1A178BA02A00DE22DA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 7FAA1A1C178BA03700DE22DA /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; + 7FAA1A1E178BA04100DE22DA /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; }; + 7FAA1A20178BA04900DE22DA /* CoreWLAN.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreWLAN.framework; path = System/Library/Frameworks/CoreWLAN.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -156,12 +156,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7FAA1A21178BA04900DE22DA /* CoreWLAN.framework in Frameworks */, + 7FAA1A1F178BA04100DE22DA /* SecurityInterface.framework in Frameworks */, + 7FAA1A1D178BA03700DE22DA /* CoreFoundation.framework in Frameworks */, + 7FAA1A1B178BA02A00DE22DA /* SystemConfiguration.framework in Frameworks */, 1C8656F816EDCD9100F9F201 /* WebKit.framework in Frameworks */, 1C53A3F416EBE2F100E861A9 /* Growl.framework in Frameworks */, - 1CD9F8DD16D2FF340097D188 /* SystemConfiguration.framework in Frameworks */, - 1CD9F8DB16D2FF080097D188 /* CoreFoundation.framework in Frameworks */, - 1CD9F83C16D18C3C0097D188 /* SecurityInterface.framework in Frameworks */, - 1CD9F83A16D18C2B0097D188 /* CoreWLAN.framework in Frameworks */, 1C83035016D087D0003A59FB /* Security.framework in Frameworks */, 1CC5211416B66BEC001951D8 /* libicucore.dylib in Frameworks */, 1CC520F016B66128001951D8 /* Cocoa.framework in Frameworks */, @@ -327,6 +327,10 @@ 1CC520EE16B66128001951D8 /* Frameworks */ = { isa = PBXGroup; children = ( + 7FAA1A20178BA04900DE22DA /* CoreWLAN.framework */, + 7FAA1A1E178BA04100DE22DA /* SecurityInterface.framework */, + 7FAA1A1C178BA03700DE22DA /* CoreFoundation.framework */, + 7FAA1A1A178BA02A00DE22DA /* SystemConfiguration.framework */, 1CD9F83D16D18C520097D188 /* Linked Frameworks */, 1CD9F83E16D18C650097D188 /* Other Frameworks */, ); @@ -382,12 +386,8 @@ children = ( 1C8656F716EDCD9100F9F201 /* WebKit.framework */, 1C53A3F216EBE2AD00E861A9 /* Growl.framework */, - 1CD9F8DC16D2FF340097D188 /* SystemConfiguration.framework */, - 1CD9F8DA16D2FF080097D188 /* CoreFoundation.framework */, 1CC520EF16B66128001951D8 /* Cocoa.framework */, 1C83034F16D087CF003A59FB /* Security.framework */, - 1CD9F83B16D18C3C0097D188 /* SecurityInterface.framework */, - 1CD9F83916D18C2B0097D188 /* CoreWLAN.framework */, 1CC520F316B66128001951D8 /* CoreData.framework */, 1CC5211316B66BEC001951D8 /* libicucore.dylib */, ); diff --git a/commotion-meshbook/AppDelegate.m b/commotion-meshbook/AppDelegate.m index 1519bee..d8e51f9 100644 --- a/commotion-meshbook/AppDelegate.m +++ b/commotion-meshbook/AppDelegate.m @@ -283,7 +283,7 @@ -(void) updateUserWifiMenuItems:(NSNotification *)fetchedWifiData { [menuNetworkStatus setTitle:[NSString stringWithFormat:@"Power: %@", fetchedWifiState]]; [menuNetworkSSID setTitle:[NSString stringWithFormat:@"Network (SSID): %@", fetchedWifiSSID]]; [menuNetworkBSSID setTitle:[NSString stringWithFormat:@"BSSID: %@", fetchedWifiBSSID]]; - [menuNetworkChannel setTitle:[NSString stringWithFormat:@"Channel: %@", fetchedWifiChannel]]; + [menuNetworkChannel setTitle:[NSString stringWithFormat:@"Channel: %@", [fetchedWifiChannel valueForKey:@"channelNumber"]]]; [self menuNeedsUpdate:nil]; [self menuWillOpen:nil]; diff --git a/commotion-meshbook/Network/NetworkService.h b/commotion-meshbook/Network/NetworkService.h index 01fb0f2..bd70c55 100644 --- a/commotion-meshbook/Network/NetworkService.h +++ b/commotion-meshbook/Network/NetworkService.h @@ -7,7 +7,7 @@ #import -@class CWInterface, CWConfiguration, CWNetwork, SFAuthorizationView; +@class CWInterface, CWConfiguration, CWNetwork, SFAuthorizationView, CWChannel; @interface NetworkService : NSObject { @@ -19,16 +19,16 @@ NSString *ip; NSString *ssid; NSString *bssid; - NSNumber *channel; + CWChannel *channel; // Scanned Networks Data //NSDictionary *scannedNetworkData; //NSMutableDictionary *scannedNetworks; - NSMutableArray *scannedNetworks; + NSMutableSet *scannedNetworks; } @property (readwrite, retain) CWInterface *currentInterface; -@property (readwrite, retain) NSMutableArray *scanResults; +@property (readwrite, retain) NSMutableSet *scanResults; #pragma mark - #pragma mark Initialization diff --git a/commotion-meshbook/Network/NetworkService.m b/commotion-meshbook/Network/NetworkService.m index 8938b62..6f3b8c8 100644 --- a/commotion-meshbook/Network/NetworkService.m +++ b/commotion-meshbook/Network/NetworkService.m @@ -9,6 +9,7 @@ #import #import #import "BLAuthentication.h" +#import #import "NetworkService.h" @@ -42,11 +43,12 @@ -(id) init { // get interface array (common == 'en1') - NSArray *supportedInterfaces = [CWInterface supportedInterfaces]; + + NSSet *supportedInterfaces = [CWInterface interfaceNames]; //NSLog(@"[supportedInterfaces objectAtIndex:0: %@", [supportedInterfaces objectAtIndex:0]); // init network interface with 'en1' - currentInterface = [CWInterface interfaceWithName:[supportedInterfaces objectAtIndex:0]]; + currentInterface = [CWInterface interfaceWithName:[[supportedInterfaces allObjects] objectAtIndex:0]]; //NSLog(@"currentInterface: %@", currentInterface); return self; @@ -59,13 +61,13 @@ -(id) init { - (void) scanUserWifiSettings { // get data from CoreWLAN wireless interface - powerState = [currentInterface power]; + powerState = [currentInterface powerOn]; NSString *power; if (powerState==NO) { power=@"Off"; } else { power=@"On";} ssid = ([currentInterface ssid] ? : @""); bssid = ([currentInterface bssid] ? : @""); - channel = ([currentInterface channel] ? : 0); + channel = ([currentInterface wlanChannel] ? : 0); // get scanned wifi networks NSArray *availableNetworks = [self scanAvailableNetworks]; @@ -87,24 +89,25 @@ - (void) scanUserWifiSettings { [[NSNotificationCenter defaultCenter] postNotificationName:@"wifiDataProcessingComplete" object:nil userInfo:userWifiData]; } -- (NSMutableArray *)scanAvailableNetworks { +- (NSMutableSet *)scanAvailableNetworks { NSError *err = nil; CWNetwork *currentNetwork = nil; - NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:nil]; + //NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:nil]; //unneeded now? - scanResults = [NSMutableArray arrayWithArray:[currentInterface scanForNetworksWithParameters:params error:&err]]; + + scanResults = [[currentInterface scanForNetworksWithSSID:nil error:nil] mutableCopy]; //NSLog(@"scanResults: %@",scanResults); if( err ) { NSLog(@"%s-Cannot scan networks. Was wifi power lost? %@", __FUNCTION__, err); } else { - [scanResults sortUsingDescriptors:[NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"ssid" ascending:YES selector:@selector(caseInsensitiveCompare:)]]]; + [scanResults sortedArrayUsingDescriptors:[NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"ssid" ascending:YES selector:@selector(caseInsensitiveCompare:)]]]; } //scannedNetworkData = [NSDictionary dictionary]; //scannedNetworks = [NSMutableDictionary dictionary]; - scannedNetworks = [[NSMutableArray alloc] init]; + scannedNetworks = [[NSMutableSet alloc] init]; for (currentNetwork in scanResults) { @@ -135,16 +138,16 @@ - (NSMutableArray *)scanAvailableNetworks { - (CWNetwork *)checkAvailableNetwork:(NSString *)networkName { NSError *err = nil; CWNetwork *currentNetwork = nil; - NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:nil]; + //NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:nil]; //unneeded now? - scanResults = [NSMutableArray arrayWithArray:[currentInterface scanForNetworksWithParameters:params error:&err]]; + scanResults = [[currentInterface scanForNetworksWithSSID:nil error:nil] mutableCopy]; //NSLog(@"scanResults: %@",scanResults); if( err ) { NSLog(@"error: %@",err); } else { - [scanResults sortUsingDescriptors:[NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"ssid" ascending:YES selector:@selector(caseInsensitiveCompare:)]]]; + [scanResults sortedArrayUsingDescriptors:[NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"ssid" ascending:YES selector:@selector(caseInsensitiveCompare:)]]]; } for (currentNetwork in scanResults) { @@ -188,18 +191,18 @@ - (BOOL) createIBSSNetwork:(NSString *)networkName withChannel:(NSString*)passed NSMutableDictionary *ibssParamsForCreate = [NSMutableDictionary dictionaryWithCapacity:0]; if( networkName && [networkName length] ) { - [ibssParamsForCreate setValue:networkName forKey:kCWIBSSKeySSID]; + [ibssParamsForCreate setValue:networkName forKey:@"kCWIBSSKeySSID"]; } if( channelNumber && [channelNumber intValue] > 0 ) { - [ibssParamsForCreate setValue:channelNumber forKey:kCWIBSSKeyChannel]; + [ibssParamsForCreate setValue:channelNumber forKey:@"kCWIBSSKeyChannel"]; } else { NSRunAlertPanel(@"Error: Can't Create Mesh", @"Invalid Channel. Please ensure you entered a channel, 1-11.", @"OK", nil, nil); return NO; } if( passphrase && [passphrase length] ) { - [ibssParamsForCreate setValue:passphrase forKey:kCWIBSSKeyPassphrase]; + [ibssParamsForCreate setValue:passphrase forKey:@"kCWIBSSKeyPassphrase"]; } //NSLog(@"networkName: %@", networkName); @@ -208,8 +211,9 @@ - (BOOL) createIBSSNetwork:(NSString *)networkName withChannel:(NSString*)passed NSError *error = nil; - BOOL created = [currentInterface enableIBSSWithParameters:[NSDictionary dictionaryWithDictionary:ibssParamsForCreate] error:&error]; - + //BOOL created = [currentInterface enableIBSSWithParameters:[NSDictionary dictionaryWithDictionary:ibssParamsForCreate] error:&error]; + BOOL created = [currentInterface startIBSSModeWithSSID:[ibssParamsForCreate objectForKey:@"kCWIBSSKeySSID"] security:kCWIBSSModeSecurityWEP104 channel:[ibssParamsForCreate objectForKey:@"kCWIBSSKeyChannel"] password:[ibssParamsForCreate objectForKey:@"kCWIBSSKeyPassphrase"] error:nil]; + if( !created ) { [[NSAlert alertWithError:error] runModal]; @@ -249,14 +253,17 @@ - (BOOL) joinIBSSNetwork:(NSString *)networkName { NSMutableDictionary *ibssParamsForJoin = [NSMutableDictionary dictionaryWithCapacity:0]; if( networkName ) { - [ibssParamsForJoin setValue:networkName forKey:kCWIBSSKeySSID]; + [ibssParamsForJoin setValue:networkName forKey:@"kCWIBSSKeySSID"]; } //[ibssParamsForJoin setValue:passphrase forKey:kCWAssocKeyPassphrase]; //NSLog(@"networkName: %@", networkName); NSError *error = nil; - BOOL joined = [currentInterface associateToNetwork:selectedNetwork parameters:[NSDictionary dictionaryWithDictionary:ibssParamsForJoin] error:&error]; + //BOOL joined = [currentInterface associateToNetwork:selectedNetwork parameters:[NSDictionary dictionaryWithDictionary:ibssParamsForJoin] error:&error]; +#warning need to handle password somehow + BOOL joined = [currentInterface associateToNetwork:selectedNetwork password:nil error:nil]; + //BOOL joined = [currentInterface associateToNetwork:selectedNetwork password:[ibssParamsForJoin objectForKey:kCWAssocKeyPassphrase] error:nil]; if( !joined ) { diff --git a/commotion-meshbook/ViewControllers/StatusViewController.m b/commotion-meshbook/ViewControllers/StatusViewController.m index 9f6f197..8807893 100644 --- a/commotion-meshbook/ViewControllers/StatusViewController.m +++ b/commotion-meshbook/ViewControllers/StatusViewController.m @@ -73,7 +73,7 @@ -(void) proccessWifiStatusData:(NSNotification *)fetchedWifiData { [networkName setStringValue:[NSString stringWithFormat:@"%@", wifiSSID]]; [networkSSID setStringValue:[NSString stringWithFormat:@"SSID: %@", wifiSSID]]; [networkBSSID setStringValue:[NSString stringWithFormat:@"BSSID: %@", wifiBSSID]]; - [networkChannel setStringValue:[NSString stringWithFormat:@"Channel: %@", wifiChannel]]; + [networkChannel setStringValue:[NSString stringWithFormat:@"Channel: %@", [wifiChannel valueForKey:@"channelNumber"]]]; //NSLog(@"%s: wifiData: %@", __FUNCTION__, wifiData); diff --git a/commotion-meshbook/ViewControllers/StatusViewController.xib b/commotion-meshbook/ViewControllers/StatusViewController.xib index 8bf0c61..ec51952 100644 --- a/commotion-meshbook/ViewControllers/StatusViewController.xib +++ b/commotion-meshbook/ViewControllers/StatusViewController.xib @@ -1,599 +1,105 @@ - - - - 1070 - 12C60 - 3084 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 3084 - - - NSBox - NSCustomObject - NSCustomView - NSTextField - NSTextFieldCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - StatusViewController - - - FirstResponder - - - NSApplication - - - - 268 - - - - 268 - {{47, 94}, {385, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - OLSRD: - - LucidaGrande - 12 - 16 - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - - 268 - {{47, 120}, {385, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Channel: - - _NS:1535 - - - - - NO - - - - 268 - {{47, 145}, {385, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - BSSID: - - _NS:1535 - - - - - NO - - - - 268 - {{47, 171}, {385, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - IP Address: - - _NS:1535 - - - - - NO - - - - 268 - {{47, 197}, {385, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - SSID: - - _NS:1535 - - - - - NO - - - - 268 - {{47, 219}, {385, 31}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Network Name - - LucidaGrande - 19 - 16 - - _NS:1535 - - - - - NO - - - - 12 - {{50, 37}, {379, 5}} - - - - _NS:9 - {0, 0} - - 67108864 - 0 - Box - - LucidaGrande - 13 - 1044 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - - 12 - {{50, 271}, {379, 5}} - - - - _NS:9 - {0, 0} - - 67108864 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - - 268 - {{141, 297}, {196, 23}} - - - - _NS:1535 - {250, 750} - YES - - 68157504 - 272630784 - Your Mesh Status - - LucidaGrande - 22 - 16 - - _NS:1535 - - YES - - - - NO - - - {480, 353} - - - - NSView - - - - - - - networkName - - - - 19 - - - - networkSSID - - - - 20 - - - - localIP - - - - 21 - - - - view - - - - 22 - - - - olsrdStatus - - - - 29 - - - - networkChannel - - - - 30 - - - - networkBSSID - - - - 31 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - - - - - - - Status View - - - 3 - - - - - - - - 4 - - - - - 9 - - - - - 10 - - - - - 12 - - - - - - - - 13 - - - - - 14 - - - - - - - - 15 - - - - - 16 - - - - - - Static Text - IP Address: - - - 17 - - - - - 23 - - - - - - Static Text - IP Address: - - - 24 - - - - - 25 - - - - - - Static Text - IP Address: - - - 26 - - - - - 27 - - - - - - Static Text - IP Address: - - - 28 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - 31 - - - - - StatusViewController - NSViewController - - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSView - - - - localIP - NSTextField - - - networkBSSID - NSTextField - - - networkChannel - NSTextField - - - networkName - NSTextField - - - networkSSID - NSTextField - - - olsrdStatus - NSTextField - - - statusView - NSView - - - - IBProjectSource - ./Classes/StatusViewController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commotion-meshbook/en.lproj/MainMenu.xib b/commotion-meshbook/en.lproj/MainMenu.xib index 0878a9a..4afa08f 100755 --- a/commotion-meshbook/en.lproj/MainMenu.xib +++ b/commotion-meshbook/en.lproj/MainMenu.xib @@ -1,737 +1,98 @@ - - - - 1070 - 12C60 - 3084 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 3084 - - - NSCustomObject - NSMenu - NSMenuItem - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - NSApplication - - - FirstResponder - - - NSApplication - - - - - - - YES - Wi-Fi Status - - 2147483647 - - NSImage - menuNetworkStatus - - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - - - - YES - Power: Off - - 2147483647 - - - - - - YES - Network (SSID): - - 2147483647 - - - - - - YES - BSSID: - - 2147483647 - - - - - - YES - Channel: - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Active Mesh - - 2147483647 - - NSImage - menuMeshStatus - - - - - - - YES - <Not Connected> - - 2147483647 - - - - - - YES - OLSRD: Stopped - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Create a Mesh Network - - 2147483647 - - NSImage - profileThumb - - - - - - - YES - YES - - - 2147483647 - - - 1 - - - - YES - YES - - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Join a Mesh Network - - 2147483647 - - - - - - - YES - YES - - - 2147483647 - - - 2 - - - - YES - YES - - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Show Mesh Status - s - 1048576 - 2147483647 - - - - - - Manage Profiles - p - 1048576 - 2147483647 - - - - - - View Help - h - 1048576 - 2147483647 - - - - - - Show Log - l - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Quit - q - 1048576 - 2147483647 - - - - - - - AppDelegate - - - - - - - terminate: - - - - 541 - - - - delegate - - - - 875 - - - - statusMenu - - - - 552 - - - - menuQuit - - - - 664 - - - - openSettings: - - - - 846 - - - - menuNetworkStatus - - - - 854 - - - - menuNetworkBSSID - - - - 856 - - - - menuNetworkChannel - - - - 857 - - - - menuMeshStatus - - - - 858 - - - - openSettings: - - - - 863 - - - - openSettings: - - - - 865 - - - - openSettings: - - - - 867 - - - - menuNetworkSSID - - - - 878 - - - - menuSelectedNetwork - - - - 901 - - - - menuActiveMesh - - - - 906 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 494 - - - AppDelegate - - - 533 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Status Menu - - - 534 - - - - - 536 - - - - - 537 - - - - - - 545 - - - - - 555 - - - - - 848 - - - - - 850 - - - - - - 851 - - - - - 852 - - - - - 853 - - - - - 862 - - - - - 864 - - - - - 866 - - - - - 868 - - - - - - 869 - - - - - 870 - - - - - 874 - - - - - 893 - - - - - 849 - - - - - 898 - - - - - 899 - - - - - 900 - - - - - 904 - - - - - 905 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 907 - - - - - AppDelegate - NSObject - - openSettings: - id - - - openSettings: - - openSettings: - id - - - - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenu - - - - menuActiveMesh - NSMenuItem - - - menuMeshSSID - NSMenuItem - - - menuMeshStatus - NSMenuItem - - - menuNetworkBSSID - NSMenuItem - - - menuNetworkChannel - NSMenuItem - - - menuNetworkSSID - NSMenuItem - - - menuNetworkStatus - NSMenuItem - - - menuQuit - NSMenuItem - - - menuSelectedNetwork - NSMenuItem - - - statusMenu - NSMenu - - - - IBProjectSource - ./Classes/AppDelegate.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {11, 11} - {10, 3} - {20, 20} - {20, 20} - {20, 20} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file