Skip to content
This repository has been archived by the owner on Nov 24, 2017. It is now read-only.

Commit

Permalink
more updates
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.deepdarc.com/code/miredo-osx/trunk@404 d48f582a-3cf3-0310-b784-83b2ddae21dc
  • Loading branch information
@darconeous
darconeous committed Apr 20, 2011
1 parent ee6c6d6 commit 90285b5
Show file tree
Hide file tree
Showing 8 changed files with 551 additions and 1,336 deletions.
2 changes: 2 additions & 0 deletions MiredoPreferencePane/MiredoPref.h
View file
Expand Up @@ -24,6 +24,7 @@
NSImage* redLight;
NSImage* greenLight;
NSImage* yellowLight;
NSImage* grayLight;
SCDynamicStoreRef dynamic_store;
}
- (IBAction)modeChanged:(id)sender;
Expand All @@ -39,6 +40,7 @@
- (void)restartMiredo;
- (BOOL)isMiredoRunning;
- (BOOL)isMiredoEnabled;
- (BOOL)hasNativeIPv6;
- (NSString*)getMiredoAddress;

- (NSDictionary*)currentSettings;
Expand Down
24 changes: 20 additions & 4 deletions MiredoPreferencePane/MiredoPref.m
View file
Expand Up @@ -48,6 +48,7 @@ - (void) mainViewDidLoad
redLight=[[NSImage alloc] initWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"red" ofType:@"tiff"]];
yellowLight=[[NSImage alloc] initWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"yellow" ofType:@"tiff"]];
greenLight=[[NSImage alloc] initWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"green" ofType:@"tiff"]];
grayLight=[[NSImage alloc] initWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"gray" ofType:@"tiff"]];

if([self isMiredoEnabled]) {
[teredoEnabled setState:NSOnState];
Expand Down Expand Up @@ -141,11 +142,15 @@ - (BOOL)isMiredoEnabled {

- (void) refresh {
if([self isMiredoRunning]) {
NSString* addr=[self getMiredoAddress];
if([addr length]>6 && [[addr substringToIndex:6] isEqual:@"2001::"]) {
[statusLight setImage:greenLight];
if(![self hasNativeIPv6]) {
NSString* addr=[self getMiredoAddress];
if([addr length]>6 && [[addr substringToIndex:6] isEqual:@"2001::"]) {
[statusLight setImage:greenLight];
} else {
[statusLight setImage:yellowLight];
}
} else {
[statusLight setImage:yellowLight];
[statusLight setImage:grayLight];
}
[currentAddress setStringValue:[self getMiredoAddress]];
} else {
Expand All @@ -154,6 +159,17 @@ - (void) refresh {
}
}

- (BOOL)hasNativeIPv6 {
NSDictionary* plist;

plist=(NSDictionary*)SCDynamicStoreCopyValue(dynamic_store,CFSTR("State:/Network/Global/IPv6"));
if(!plist) {
return NO;
}
[plist autorelease];
return YES;
}

- (NSString*)getMiredoAddress {
NSDictionary* plist;

Expand Down
90 changes: 32 additions & 58 deletions MiredoPreferencePane/MiredoPreferencePane.xcodeproj/darco.mode1
View file
Expand Up @@ -185,48 +185,7 @@
<key>Notifications</key>
<array/>
<key>OpenEditors</key>
<array>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>A6A1386B0B949BCA0010686C</string>
<key>PBXProjectModuleLabel</key>
<string>addrwatch.c</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>A6A1386C0B949BCA0010686C</string>
<key>PBXProjectModuleLabel</key>
<string>addrwatch.c</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>A610F4240B94A0AC00E247CF</string>
<key>history</key>
<array>
<string>A6A1387A0B949EC40010686C</string>
</array>
</dict>
<key>SplitCount</key>
<string>1</string>
</dict>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>Geometry</key>
<dict>
<key>Frame</key>
<string>{{0, 20}, {1220, 634}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>66 177 1220 675 0 0 1440 878 </string>
</dict>
</dict>
</array>
<array/>
<key>PerspectiveWidths</key>
<array>
<integer>-1</integer>
Expand Down Expand Up @@ -309,14 +268,17 @@
<string>A6BE23F30B9104BF0018CC3D</string>
<string>19C28FB8FE9D52D311CA2CBB</string>
<string>1C37FBAC04509CD000000102</string>
<string>A6AF33E50B97523500EDBA70</string>
<string>A6AF33E60B97523500EDBA70</string>
<string>089C167DFE841241C02AAC07</string>
<string>1C37FAAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>31</integer>
<integer>30</integer>
<integer>13</integer>
<integer>12</integer>
<integer>0</integer>
</array>
</array>
Expand Down Expand Up @@ -356,19 +318,19 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>MiredoPref.m</string>
<string>gray.tiff</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>MiredoPref.m</string>
<string>gray.tiff</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>A610F4230B94A0AC00E247CF</string>
<string>A6AF33FC0B975AF100EDBA70</string>
<key>history</key>
<array>
<string>A623AE3B0B8B63BC00BA6ED4</string>
Expand All @@ -379,9 +341,6 @@
<string>A69874660B8FB7EE00D51BC4</string>
<string>A69874A30B8FD6DD00D51BC4</string>
<string>A6BE23690B90FB7C0018CC3D</string>
<string>A6BE237A0B90FCFB0018CC3D</string>
<string>A6BE237B0B90FCFB0018CC3D</string>
<string>A6BE237C0B90FCFB0018CC3D</string>
<string>A6BE240E0B91076E0018CC3D</string>
<string>A6BE24100B91076E0018CC3D</string>
<string>A6BE24120B91076E0018CC3D</string>
Expand All @@ -392,10 +351,14 @@
<string>A6A138550B949BCA0010686C</string>
<string>A6A138570B949BCA0010686C</string>
<string>A6A138590B949BCA0010686C</string>
<string>A6A1385B0B949BCA0010686C</string>
<string>A6A138730B949D280010686C</string>
<string>A610F4050B94A03400E247CF</string>
<string>A610F4060B94A03400E247CF</string>
<string>A6AF33BE0B97500E00EDBA70</string>
<string>A6AF33E70B97523500EDBA70</string>
<string>A6AF33E80B97523500EDBA70</string>
<string>A6AF33E90B97523500EDBA70</string>
<string>A6AF33EA0B97523500EDBA70</string>
<string>A6AF33EB0B97523500EDBA70</string>
<string>A6AF33FB0B975AF100EDBA70</string>
</array>
<key>prevStack</key>
<array>
Expand All @@ -420,7 +383,19 @@
<string>A6A1385F0B949BCA0010686C</string>
<string>A6A138610B949BCA0010686C</string>
<string>A6A138630B949BCA0010686C</string>
<string>A610F4070B94A03400E247CF</string>
<string>A6AF33C00B97500E00EDBA70</string>
<string>A6AF33ED0B97523500EDBA70</string>
<string>A6AF33EE0B97523500EDBA70</string>
<string>A6AF33EF0B97523500EDBA70</string>
<string>A6AF33F00B97523500EDBA70</string>
<string>A6AF33F10B97523500EDBA70</string>
<string>A6AF33F20B97523500EDBA70</string>
<string>A6AF33F30B97523500EDBA70</string>
<string>A6AF33F40B97523500EDBA70</string>
<string>A6AF33F50B97523500EDBA70</string>
<string>A6AF33F60B97523500EDBA70</string>
<string>A6AF33F70B97523500EDBA70</string>
<string>A6AF33F80B97523500EDBA70</string>
</array>
</dict>
<key>SplitCount</key>
Expand Down Expand Up @@ -478,9 +453,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>A610F4090B94A03400E247CF</string>
<string>A6AF33C20B97500E00EDBA70</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>A610F40A0B94A03400E247CF</string>
<string>A6AF33C30B97500E00EDBA70</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
Expand Down Expand Up @@ -615,7 +590,6 @@
<key>WindowOrderList</key>
<array>
<string>A69A401A0B89033D00C72E19</string>
<string>A6A1386B0B949BCA0010686C</string>
<string>/Users/darco/Projects/miredo-osx/MiredoPreferencePane/MiredoPreferencePane.xcodeproj</string>
</array>
<key>WindowString</key>
Expand Down Expand Up @@ -696,7 +670,7 @@
<key>TableOfContents</key>
<array>
<string>A69A401A0B89033D00C72E19</string>
<string>A610F4250B94A0AC00E247CF</string>
<string>A6AF33FA0B97523500EDBA70</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
Expand Down

0 comments on commit 90285b5

Please sign in to comment.