diff --git a/CredenialsView.xib b/CredenialsView.xib
new file mode 100644
index 0000000..2398a35
--- /dev/null
+++ b/CredenialsView.xib
@@ -0,0 +1,420 @@
+
+
+
+ 1060
+ 10J869
+ 1306
+ 1038.35
+ 461.00
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+
+ YES
+ 3
+
+
diff --git a/DDWRT-Monitor.xcodeproj/project.pbxproj b/DDWRT-Monitor.xcodeproj/project.pbxproj
index afb17a2..df966f2 100644
--- a/DDWRT-Monitor.xcodeproj/project.pbxproj
+++ b/DDWRT-Monitor.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
F2511F5C13914A120053990C /* MenuIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = F2511F5B13914A120053990C /* MenuIcon.png */; };
F2511FFB1391543E0053990C /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2511FFA1391543E0053990C /* WebKit.framework */; };
F25120A213918CD10053990C /* AppIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = F25120A113918CD10053990C /* AppIcon.icns */; };
+ F2736BD0139BDAC20019957B /* CredenialsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F2736BCF139BDAC20019957B /* CredenialsView.xib */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -38,6 +39,7 @@
F2511F5B13914A120053990C /* MenuIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MenuIcon.png; sourceTree = ""; };
F2511FFA1391543E0053990C /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
F25120A113918CD10053990C /* AppIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon.icns; sourceTree = ""; };
+ F2736BCF139BDAC20019957B /* CredenialsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CredenialsView.xib; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -120,6 +122,7 @@
8D1107310486CEB800E47090 /* DDWRT_Monitor-Info.plist */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
+ F2736BCF139BDAC20019957B /* CredenialsView.xib */,
);
name = Resources;
sourceTree = "";
@@ -190,6 +193,7 @@
F2511F5C13914A120053990C /* MenuIcon.png in Resources */,
F25120A213918CD10053990C /* AppIcon.icns in Resources */,
F215851213931CF000853C55 /* MenuIconDisabled.png in Resources */,
+ F2736BD0139BDAC20019957B /* CredenialsView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/DDWRT_MonitorAppDelegate.h b/DDWRT_MonitorAppDelegate.h
index ecb3713..7b5635f 100644
--- a/DDWRT_MonitorAppDelegate.h
+++ b/DDWRT_MonitorAppDelegate.h
@@ -120,6 +120,8 @@
- (void) cbClientsRequest:(NSData *)data;
- (void) saveConfig:(id)sender;
+
+- (void) updateStatus;
- (void) updateThroughput:(NSTimer *)timer;
- (void) throughputCallback:(NSData *)data;
- (void) doUpdateStatus:(NSData *)data;
diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m
index 832cb47..236ff24 100644
--- a/DDWRT_MonitorAppDelegate.m
+++ b/DDWRT_MonitorAppDelegate.m
@@ -19,8 +19,6 @@
// Insert code here to initialize your application
[self showMenubar];
- _wrtReachable = false;
-
defaults = [NSUserDefaults standardUserDefaults];
// check if the app is configured yet
@@ -39,8 +37,9 @@
// initialize the client
wrt_client = [[WRTStatusClient alloc] initWithHostname:hostname port:port protocol:protocol username:username password:password];
+ [wrt_client registerStatusCallback:self callback:@selector(updateStatus)];
+
[wrt_client getConnectionStatus];
- [self updateThroughput:nil];
}
- (void) deinitialize
@@ -127,8 +126,8 @@
{
NSLog(@"Showing Menu Item");
- NSStatusBar* bar = [NSStatusBar systemStatusBar];
- _appMenu = [bar statusItemWithLength:NSVariableStatusItemLength];
+ NSStatusBar *bar = [NSStatusBar systemStatusBar];
+ _appMenu = [bar statusItemWithLength:NSVariableStatusItemLength];
[_appMenu setAction:@selector(refreshMenu:)];
[_appMenu setTarget:self];
[_appMenu retain];
@@ -147,9 +146,9 @@
- (void) hideMenubar
{
[_appMenu release];
- _appMenu = nil;
+ _appMenu = nil;
[AppMenu release];
- AppMenu = nil;
+ AppMenu = nil;
}
- (void) showMenubarIcon:(BOOL)enabled
@@ -208,7 +207,6 @@
[configFieldProtocolHTTPS setState:1];
}
-
[ConfigPanel makeKeyAndOrderFront:nil];
}
@@ -288,6 +286,30 @@
}
+- (void) refreshMenu:(id)sender
+{
+ NSLog(@"Refresh Menu");
+ if ([wrt_client getWrtReachable] == true) {
+ [_readTimer invalidate];
+ _readTimer = nil;
+
+ [wrt_client getStatusUpdate:@"Status_Router.live.asp" delegate:self callback:@selector(doUpdateStatus:)];
+ } else {
+ [_appMenu popUpStatusItemMenu:AppMenu];
+ }
+
+}
+
+- (void) refreshSystemMenu:(id)sender
+{
+
+}
+
+- (void) refreshWanMenu:(id)sender
+{
+
+}
+
- (void) saveConfig:(id)sender
{
[self deinitialize];
@@ -295,9 +317,9 @@
[configStateStatus startAnimation:nil];
[configStateStatus setHidden:false];
- hostname = [configFieldHostname stringValue];
+ hostname = [configFieldHostname stringValue];
- port = [configFieldPort intValue];
+ port = [configFieldPort intValue];
if ([configFieldProtocolHTTP state] == 1) {
protocol = @"http";
@@ -305,15 +327,9 @@
protocol = @"https";
}
- refreshTime = [configFieldRefresh integerValue];
+ refreshTime = [configFieldRefresh integerValue];
- useBytes = ([configFieldUseBytes state] == 1 ? true: false);
-
- if ([configFieldShowIcon state] == NSOffState && [defaults boolForKey:@"showMenuIcon"] == true) {
- [self hideMenubarIcon];
- } else if ([configFieldShowIcon state] == NSOnState && [defaults boolForKey:@"showMenuIcon"] == false) {
- [self showMenubarIcon:[wrt_client wrtReachable]];
- }
+ useBytes = ([configFieldUseBytes state] == 1 ? true: false);
showMenuIcon = ([configFieldShowIcon state] == 1 ? true: false);
@@ -329,44 +345,44 @@
[self hideConfigPanel:nil];
}
-- (void) updateThroughput:(NSTimer *)timer
+- (void) updateStatus
{
- //NSLog(@"Status %@ wan port: %@", ([wrt_client wrtReachable] ? @"Up" : @"Down"), [wrt_client getWanPort]);
- if ([wrt_client wrtReachable] == true && _wrtReachable == false) {
- _wrtReachable = true;
+ NSLog(@"Status %@ wan port: %@", ([wrt_client getWrtReachable] ? @"Up" : @"Down"), [wrt_client getWanPort]);
+ if ([wrt_client getWrtReachable] == true) {
if (showMenuIcon == true) {
[self showMenubarIcon:true];
} else {
[self hideMenubarIcon];
}
- } else if ([wrt_client wrtReachable] == false && _wrtReachable == true) {
- _wrtReachable = false;
+
+ if (_readTimer == nil) {
+ _readTimer = [NSTimer scheduledTimerWithTimeInterval:refreshTime+1 target:self selector:@selector(updateThroughput:) userInfo:nil repeats:YES];
+
+ [_readTimer fire];
+ }
+ } else if ([wrt_client getWrtReachable] == false) {
[self showMenubarIcon:false];
- }
-
- if (_wrtReachable == true) {
- [wrt_client getStatusUpdate:[NSString stringWithFormat:@"fetchif.cgi?%@", [wrt_client getWanPort]] delegate:self callback:@selector(throughputCallback:)];
- }
-
- if (_readTimer == nil) {
- _readTimer = [NSTimer scheduledTimerWithTimeInterval:refreshTime+1 target:self selector:@selector(updateThroughput:) userInfo:nil repeats:YES];
- [_readTimer fire];
+ [_readTimer invalidate];
+ _readTimer = nil;
}
}
+- (void) updateThroughput:(NSTimer *)timer
+{
+ NSLog(@"Status %@ wan port: %@", ([wrt_client getWrtReachable] ? @"Up" : @"Down"), [wrt_client getWanPort]);
+ [wrt_client getStatusUpdate:[NSString stringWithFormat:@"fetchif.cgi?%@", [wrt_client getWanPort]] delegate:self callback:@selector(throughputCallback:)];
+}
+
- (void) throughputCallback:(NSData *)data
{
NSString *stringData = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
-
+ NSLog(stringData);
NSString *key = [NSString stringWithFormat:@"%@:", [wrt_client getWanPort]];
stringData = [stringData substringFromIndex:([stringData rangeOfString:key].location + [key length])];
NSArray *parts = [stringData componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
- NSArray *filteredArray = [parts filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF != ''"]];
- stringData = [filteredArray componentsJoinedByString:@" "];
-
- NSArray *listItems = [stringData componentsSeparatedByString:@" "];
+ NSArray *listItems = [parts filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF != ''"]];
uint64_t ifIn = strtoull([[listItems objectAtIndex:0] UTF8String], NULL, 0);
uint64_t ifOut = strtoull([[listItems objectAtIndex:8] UTF8String], NULL, 0);
@@ -451,30 +467,6 @@
*/
}
-- (void) refreshMenu:(id)sender
-{
- NSLog(@"Refresh Menu");
- if ([wrt_client wrtReachable] == true) {
- [_readTimer invalidate];
- _readTimer = nil;
-
- [wrt_client getStatusUpdate:@"Status_Router.live.asp" delegate:self callback:@selector(doUpdateStatus:)];
- } else {
- [_appMenu popUpStatusItemMenu:AppMenu];
- }
-
-}
-
-- (void) refreshSystemMenu:(id)sender
-{
-
-}
-
-- (void) refreshWanMenu:(id)sender
-{
-
-}
-
- (void) wanRequestCallback:(NSData *)data
{
[wrt_client getStatusUpdate:@"Status_Lan.live.asp" delegate:self callback:@selector(cbClientsRequest:)];
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 71e22a6..f67811a 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -533,7 +533,7 @@
@@ -1037,12 +1038,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
8219
2
{{823, 723}, {555, 275}}
- 611844096
+ -461897728
Bandwidth Viewer
NSPanel
{{7, 11}, {555, 275}}
+
+
YES
2
@@ -2658,7 +2662,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- 826
+ 833