diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m
index 756e5df..2dd51d9 100644
--- a/DDWRT_MonitorAppDelegate.m
+++ b/DDWRT_MonitorAppDelegate.m
@@ -33,6 +33,7 @@
[AppMenu release];
[_appMenu release];
[ConfigPanel release];
+ [BandwidthViewer release];
[super dealloc];
}
@@ -60,6 +61,11 @@
- (void) deinitialize
{
+ if (_updateTimer != nil) {
+ [_updateTimer invalidate];
+ _updateTimer = nil;
+ }
+
[wrt_update_client release];
wrt_update_client = nil;
@@ -67,6 +73,18 @@
wrt_request_client = nil;
}
+- (void) showBandwidthViewer:(id)sender
+{
+ [ [BandwidthViewerWebView mainFrame] loadRequest: [wrt_update_client requestForBandwidthViewerForInterface:[wrt_update_client getWanPort]] ];
+
+ // Failed attempt at automagically setting the bit/byte mode in the svg graph
+ //WebScriptObject *scriptObject = [BandwidthViewerWebView windowScriptObject];
+ //[scriptObject callWebScriptMethod:@"alert" withArguments:[NSArray arrayWithObject:@"Will"]];
+ //[scriptObject setValue:@"bits" forKey:@"unit"];
+
+ [BandwidthViewer makeKeyAndOrderFront:nil];
+}
+
# pragma mark -
# pragma mark Menu Methods:
- (void) showMenubar
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 8e1961c..14fd394 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1053,7 +1053,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
{555, 275}
-
YES
2
@@ -1087,7 +1086,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
{{7, 11}, {555, 275}}
-
YES
2
@@ -1326,14 +1324,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
775
-
AppMenu
@@ -1342,14 +1332,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
779
-
-
- refreshSystemMenu:
-
-
-
- 780
-
menuWanUptime
@@ -1358,14 +1340,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
782
-
-
- refreshWanMenu:
-
-
-
- 784
-
menuDNS
@@ -2655,10 +2629,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
YES
copyParentMenuTitle:
- refreshClientsMenu:
+ hideConfigPanel:
refreshMenu:
- refreshSystemMenu:
- refreshWanMenu:
+ saveConfig:
+ setConfigProtocol:
+ setConfigRefresh:
+ showConfigPanel:
YES
@@ -2667,6 +2643,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
id
id
id
+ id
+ id
@@ -2674,10 +2652,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
YES
copyParentMenuTitle:
- refreshClientsMenu:
+ hideConfigPanel:
refreshMenu:
- refreshSystemMenu:
- refreshWanMenu:
+ saveConfig:
+ setConfigProtocol:
+ setConfigRefresh:
+ showConfigPanel:
YES
@@ -2686,7 +2666,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
id
- refreshClientsMenu:
+ hideConfigPanel:
id
@@ -2694,11 +2674,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
id
- refreshSystemMenu:
+ saveConfig:
+ id
+
+
+ setConfigProtocol:
+ id
+
+
+ setConfigRefresh:
id
- refreshWanMenu:
+ showConfigPanel:
id
diff --git a/WRTStatusClient.m b/WRTStatusClient.m
index 6b738a4..16f1ad7 100644
--- a/WRTStatusClient.m
+++ b/WRTStatusClient.m
@@ -112,10 +112,10 @@
} else {
NSString *stringData = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
NSRange pageValid = [stringData rangeOfString:@"Bandwidth Monitoring"];
+ NSRange startRange = [stringData rangeOfString:@"WAN"];
- if (pageValid.location != NSNotFound) {
+ if (pageValid.location != NSNotFound && startRange.location != NSNotFound) {
// grab the wan port name
- NSRange startRange = [stringData rangeOfString:@"WAN"];
stringData = [stringData substringFromIndex:startRange.location];
NSString *key = @"