matth
/
ddwrt_monitor
1
0
Fork 0
Code Releases Wiki Activity

FIXED - Crashing bandwidth view window (uncheck "release on hide")

Browse Source
master
Matthieu Lalonde 14 years ago
parent d04a5a192c
commit 7842a01f47
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
DDWRT_MonitorAppDelegate.m
Unescape View File

@ -370,14 +370,14 @@
- (void) updateThroughput:(NSTimer *)timer - (void) updateThroughput:(NSTimer *)timer
{ {
NSLog(@"Status %@ wan port: %@", ([wrt_client getWrtReachable] ? @"Up" : @"Down"), [wrt_client getWanPort]); //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:)]; [wrt_client getStatusUpdate:[NSString stringWithFormat:@"fetchif.cgi?%@", [wrt_client getWanPort]] delegate:self callback:@selector(throughputCallback:)];
} }
- (void) throughputCallback:(NSData *)data - (void) throughputCallback:(NSData *)data
{ {
NSString *stringData = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding]; NSString *stringData = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
NSLog(stringData);
NSString *key = [NSString stringWithFormat:@"%@:", [wrt_client getWanPort]]; NSString *key = [NSString stringWithFormat:@"%@:", [wrt_client getWanPort]];
stringData = [stringData substringFromIndex:([stringData rangeOfString:key].location + [key length])]; stringData = [stringData substringFromIndex:([stringData rangeOfString:key].location + [key length])];

26
English.lproj/MainMenu.xib
Unescape View File

@ -539,7 +539,7 @@
<string key="NSWindowClass">NSPanel</string> <string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/> <nil key="NSViewClass"/>
<object class="NSView" key="NSWindowView" id="284387334"> <object class="NSView" key="NSWindowView" id="284387334">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -558,7 +558,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{129, 55}, {125, 17}}</string> <string key="NSFrame">{{129, 55}, {125, 17}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="635692332"/> <reference key="NSNextKeyView" ref="635692332"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="272108650"> <object class="NSSliderCell" key="NSCell" id="272108650">
@ -586,7 +585,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 56}, {62, 14}}</string> <string key="NSFrame">{{15, 56}, {62, 14}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="166127716"/> <reference key="NSNextKeyView" ref="166127716"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="341827300"> <object class="NSTextFieldCell" key="NSCell" id="341827300">
@ -620,7 +618,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{79, 56}, {45, 14}}</string> <string key="NSFrame">{{79, 56}, {45, 14}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="307276419"/> <reference key="NSNextKeyView" ref="307276419"/>
<int key="NSTag">1</int> <int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@ -640,7 +637,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{82, 125}, {171, 16}}</string> <string key="NSFrame">{{82, 125}, {171, 16}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="163286529"/> <reference key="NSNextKeyView" ref="163286529"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="795612448"> <object class="NSTextFieldCell" key="NSCell" id="795612448">
@ -677,7 +673,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 125}, {62, 14}}</string> <string key="NSFrame">{{15, 125}, {62, 14}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="808975838"/> <reference key="NSNextKeyView" ref="808975838"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="826089764"> <object class="NSTextFieldCell" key="NSCell" id="826089764">
@ -695,7 +690,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 105}, {62, 14}}</string> <string key="NSFrame">{{15, 105}, {62, 14}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="348326688"/> <reference key="NSNextKeyView" ref="348326688"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="667385484"> <object class="NSTextFieldCell" key="NSCell" id="667385484">
@ -713,7 +707,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{82, 103}, {126, 18}}</string> <string key="NSFrame">{{82, 103}, {126, 18}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="925158413"/> <reference key="NSNextKeyView" ref="925158413"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<int key="NSNumRows">1</int> <int key="NSNumRows">1</int>
@ -827,7 +820,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{82, 82}, {39, 16}}</string> <string key="NSFrame">{{82, 82}, {39, 16}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1066090534"/> <reference key="NSNextKeyView" ref="1066090534"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="794333226"> <object class="NSTextFieldCell" key="NSCell" id="794333226">
@ -847,7 +839,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 82}, {62, 14}}</string> <string key="NSFrame">{{15, 82}, {62, 14}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1065807232"/> <reference key="NSNextKeyView" ref="1065807232"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1037922107"> <object class="NSTextFieldCell" key="NSCell" id="1037922107">
@ -865,7 +856,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 32}, {74, 18}}</string> <string key="NSFrame">{{15, 32}, {74, 18}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="170030078"/> <reference key="NSNextKeyView" ref="170030078"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="809457279"> <object class="NSButtonCell" key="NSCell" id="809457279">
@ -894,7 +884,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 12}, {76, 18}}</string> <string key="NSFrame">{{15, 12}, {76, 18}}</string>
<reference key="NSSuperview" ref="812058280"/> <reference key="NSSuperview" ref="812058280"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="371817589"/> <reference key="NSNextKeyView" ref="371817589"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1072996452"> <object class="NSButtonCell" key="NSCell" id="1072996452">
@ -916,13 +905,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<string key="NSFrame">{{1, 1}, {272, 152}}</string> <string key="NSFrame">{{1, 1}, {272, 152}}</string>
<reference key="NSSuperview" ref="306918856"/> <reference key="NSSuperview" ref="306918856"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="588704663"/> <reference key="NSNextKeyView" ref="588704663"/>
</object> </object>
</object> </object>
<string key="NSFrame">{{17, 41}, {274, 168}}</string> <string key="NSFrame">{{17, 41}, {274, 168}}</string>
<reference key="NSSuperview" ref="284387334"/> <reference key="NSSuperview" ref="284387334"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="812058280"/> <reference key="NSNextKeyView" ref="812058280"/>
<string key="NSOffsets">{0, 0}</string> <string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell"> <object class="NSTextFieldCell" key="NSTitleCell">
@ -947,7 +934,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">-2147483380</int> <int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{156, 195}, {135, 17}}</string> <string key="NSFrame">{{156, 195}, {135, 17}}</string>
<reference key="NSSuperview" ref="284387334"/> <reference key="NSSuperview" ref="284387334"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="7094024"/> <reference key="NSNextKeyView" ref="7094024"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="190007600"> <object class="NSTextFieldCell" key="NSCell" id="190007600">
@ -968,8 +954,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">289</int> <int key="NSvFlags">289</int>
<string key="NSFrame">{{213, 20}, {75, 17}}</string> <string key="NSFrame">{{213, 20}, {75, 17}}</string>
<reference key="NSSuperview" ref="284387334"/> <reference key="NSSuperview" ref="284387334"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="373752751"> <object class="NSButtonCell" key="NSCell" id="373752751">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">-2080244224</int>
@ -990,7 +974,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{130, 20}, {75, 17}}</string> <string key="NSFrame">{{130, 20}, {75, 17}}</string>
<reference key="NSSuperview" ref="284387334"/> <reference key="NSSuperview" ref="284387334"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="179819426"/> <reference key="NSNextKeyView" ref="179819426"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="367012609"> <object class="NSButtonCell" key="NSCell" id="367012609">
@ -1013,7 +996,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSPSMatrix" key="NSDrawMatrix"/> <object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{20, 20}, {16, 16}}</string> <string key="NSFrame">{{20, 20}, {16, 16}}</string>
<reference key="NSSuperview" ref="284387334"/> <reference key="NSSuperview" ref="284387334"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="184594776"/> <reference key="NSNextKeyView" ref="184594776"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<int key="NSpiFlags">20746</int> <int key="NSpiFlags">20746</int>
@ -1021,8 +1003,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
</object> </object>
<string key="NSFrame">{{7, 11}, {308, 232}}</string> <string key="NSFrame">{{7, 11}, {308, 232}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="306918856"/> <reference key="NSNextKeyView" ref="306918856"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {2048, 1130}}</string> <string key="NSScreenRect">{{0, 0}, {2048, 1130}}</string>
@ -1038,7 +1018,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSWindowStyleMask">8219</int> <int key="NSWindowStyleMask">8219</int>
<int key="NSWindowBacking">2</int> <int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{823, 723}, {555, 275}}</string> <string key="NSWindowRect">{{823, 723}, {555, 275}}</string>
<int key="NSWTFlags">-461897728</int> <int key="NSWTFlags">1685585920</int>
<string key="NSWindowTitle">Bandwidth Viewer</string> <string key="NSWindowTitle">Bandwidth Viewer</string>
<string key="NSWindowClass">NSPanel</string> <string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/> <nil key="NSViewClass"/>
@ -2662,7 +2642,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="dict.values" ref="0"/> <reference key="dict.values" ref="0"/>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">833</int> <int key="maxID">840</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">

6
WRTStatusClient.m
Unescape View File

@ -52,7 +52,7 @@
uri]; uri];
NSLog(@"Building request form %@", urlAddress); //NSLog(@"Building request form %@", urlAddress);
NSURL *url = [NSURL URLWithString:urlAddress]; NSURL *url = [NSURL URLWithString:urlAddress];
@ -270,14 +270,14 @@
- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace - (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
{ {
NSLog(@"1.0.1"); //NSLog(@"1.0.1");
return NO; // FIXME this need to return YES if an entry doesn't already exist in the keychain and the user will need to be prompted for credentials return NO; // FIXME this need to return YES if an entry doesn't already exist in the keychain and the user will need to be prompted for credentials
} }
- (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection *)connection - (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection *)connection
{ {
NSLog(@"1.0.2"); //NSLog(@"1.0.2");
return YES; return YES;
} }

Write Preview
Loading…
Cancel
Save