1
0
Fork 0

ADDED - Average transfer speed since WAN uptime.

master
Matthieu Lalonde 13 years ago
parent 74a1cdc617
commit 0f976d963a

@ -48,6 +48,8 @@
IBOutlet NSMenuItem *menuWanUptime;
IBOutlet NSMenuItem *menuWanTrafficIn;
IBOutlet NSMenuItem *menuWanTrafficOut;
IBOutlet NSMenuItem *menuWanAvrgSpeedIn;
IBOutlet NSMenuItem *menuWanAvrgSpeedOut;
IBOutlet NSMenuItem *menuWanSeparator;
IBOutlet NSMenuItem *menuWanDNS;
IBOutlet NSMenuItem *menuWanDNSItem0;
@ -137,5 +139,6 @@
- (NSString *) stringFromSize:(uint64_t)theBytes;
- (NSString *) stringFromSize:(uint64_t)theBytes withUnits:(BOOL)withUnits;
- (NSString *) stringFromSpeed:(uint64_t)theBytes;
- (uint64_t) secondsFromUptimeString:(NSString *)uptime;
@end

@ -525,29 +525,44 @@
NSString *wanUptime = [wrt_request_client getKey:_statusStringData key:@"wan_uptime"];
if ([wanStatus isEqualToString:@"Connected"] == true) {
[menuWanUptime setTitle:[NSString stringWithFormat:@"Up %@", wanUptime]];
[menuWanUptime setHidden:false];
[menuWanSeparator setHidden:false];
[menuWanBandwidthGraph setEnabled:true];
[menuWanTrafficIn setHidden:false];
[menuWanTrafficOut setHidden:false];
[menuWanAvrgSpeedIn setHidden:false];
[menuWanAvrgSpeedOut setHidden:false];
[menuWanUptime setTitle:[NSString stringWithFormat:@"Up %@", wanUptime]];
NSString *trafficIn = [wrt_request_client getKey:_statusStringData key:@"ttraff_in"];
NSString *trafficOut = [wrt_request_client getKey:_statusStringData key:@"ttraff_out"];
uint64_t bytesIn = ([trafficIn longLongValue] * 1024 * 1024);
uint64_t bytesOut = ([trafficOut longLongValue] * 1024 * 1024);
[menuWanTrafficIn setTitle:[NSString stringWithFormat:@"In: %@", [self stringFromSize:bytesIn]]];
[menuWanTrafficOut setTitle:[NSString stringWithFormat:@"Out: %@", [self stringFromSize:bytesOut]]];
uint64_t secondsUp = [self secondsFromUptimeString:wanUptime];
double speedIn = bytesIn / secondsUp;
double speedOut = bytesOut / secondsUp;
speedIn = round(2.2f * speedIn) / 2.2f;
speedOut = round(2.2f * speedOut) / 2.2f;
[menuWanAvrgSpeedIn setTitle:[NSString stringWithFormat:@"Avrg In: %@/s", [self stringFromSpeed:speedIn]]];
[menuWanAvrgSpeedOut setTitle:[NSString stringWithFormat:@"Avrg Out: %@/s", [self stringFromSpeed:speedOut]]];
} else {
[menuWanUptime setHidden:true];
[menuWanSeparator setHidden:true];
[menuWanBandwidthGraph setEnabled:false];
[menuWanTrafficIn setHidden:true];
[menuWanTrafficOut setHidden:true];
[menuWanAvrgSpeedIn setHidden:true];
[menuWanAvrgSpeedOut setHidden:true];
}
NSString *trafficIn = [wrt_request_client getKey:_statusStringData key:@"ttraff_in"];
NSString *trafficOut = [wrt_request_client getKey:_statusStringData key:@"ttraff_out"];
trafficIn = [self stringFromSize:([trafficIn longLongValue] * 1024 * 1024)];
trafficOut = [self stringFromSize:([trafficOut longLongValue] * 1024 * 1024)];
[menuWanTrafficIn setTitle:[NSString stringWithFormat:@"In: %@", trafficIn]];
[menuWanTrafficOut setTitle:[NSString stringWithFormat:@"Out: %@", trafficOut]];
}
NSString *wanDNS0 = [wrt_request_client getKey:_statusStringData key:@"wan_dns0"];
NSString *wanDNS1 = [wrt_request_client getKey:_statusStringData key:@"wan_dns1"];
NSString *wanDNS2 = [wrt_request_client getKey:_statusStringData key:@"wan_dns2"];
@ -727,4 +742,41 @@
return([NSString stringWithFormat:@"%1.2f%@", floatSize, suffix]);
}
- (uint64_t) secondsFromUptimeString:(NSString *)uptime
{
NSString *strUptime = [NSString stringWithString:uptime];
uint64_t seconds = 0;
NSString *keyDay = @" day, ";
NSRange rangeDay = [strUptime rangeOfString:keyDay];
NSString *keyDays = @" days, ";
NSRange rangeDays = [strUptime rangeOfString:keyDays];
if (rangeDay.location != NSNotFound) {
NSLog(@"1 day");
seconds += 86400; // One day extra
strUptime = [strUptime substringFromIndex:(rangeDay.location + [keyDay length])];
} else if (rangeDays.location != NSNotFound) {
uint32_t days = strtoull([[strUptime substringToIndex:rangeDays.location] UTF8String], NULL, 0);
NSLog(@"%u days", days);
seconds += (days * 86400);
strUptime = [strUptime substringFromIndex:(rangeDays.location + [keyDays length])];
}
NSArray *parts = [strUptime componentsSeparatedByString:@":"];
uint8_t ii;
for (ii = 0; ii < [parts count]; ii++) {
double multiplicator = pow(60, (2 - ii));
if (multiplicator == 0)
multiplicator = 1;
NSLog(@"Multiplicator %f", multiplicator);
seconds += (multiplicator * strtoull([[parts objectAtIndex:ii] UTF8String], NULL, 0));
}
return seconds;
}
@end

@ -69,11 +69,11 @@
<string key="NSTitle">System Status</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<object class="NSCustomResource" key="NSOnImage" id="116250241">
<object class="NSCustomResource" key="NSOnImage" id="944548564">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuCheckmark</string>
</object>
<object class="NSCustomResource" key="NSMixedImage" id="125642750">
<object class="NSCustomResource" key="NSMixedImage" id="697702749">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuMixedState</string>
</object>
@ -89,8 +89,8 @@
<string key="NSTitle">router-name</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="619491201">
<reference key="NSMenu" ref="283170046"/>
@ -99,26 +99,26 @@
<string key="NSTitle">domain</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="784666372">
<object class="NSMenuItem" id="133997064">
<reference key="NSMenu" ref="283170046"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">uptime</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="224151098">
<object class="NSMenuItem" id="935489706">
<reference key="NSMenu" ref="283170046"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">load-average</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="716346780">
<reference key="NSMenu" ref="283170046"/>
@ -126,27 +126,27 @@
<string key="NSTitle">memory</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="2979379">
<object class="NSMenuItem" id="92225735">
<reference key="NSMenu" ref="283170046"/>
<bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">memory-indicator</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="76619599">
<object class="NSMenuItem" id="910670850">
<reference key="NSMenu" ref="283170046"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsHidden">YES</bool>
<string key="NSTitle">syslog-viewer</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -157,8 +157,8 @@
<string key="NSTitle">WAN Status</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="744971508">
<string key="NSTitle">WAN Status</string>
@ -170,8 +170,8 @@
<string key="NSTitle">Disconnected</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="1037495304">
<reference key="NSMenu" ref="744971508"/>
@ -180,8 +180,8 @@
<string key="NSTitle">wan-uptime</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="409315605">
<reference key="NSMenu" ref="744971508"/>
@ -191,8 +191,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="901173717">
<reference key="NSMenu" ref="744971508"/>
@ -201,8 +201,18 @@
<string key="NSTitle">incoming-bandwidth</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="31928660">
<reference key="NSMenu" ref="744971508"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsHidden">YES</bool>
<string key="NSTitle">incoming-avrg-speed</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="1013238910">
<reference key="NSMenu" ref="744971508"/>
@ -211,8 +221,18 @@
<string key="NSTitle">outgoing-bandwidth</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="589338958">
<reference key="NSMenu" ref="744971508"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsHidden">YES</bool>
<string key="NSTitle">outgoing-avrg-speed</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="574203895">
<reference key="NSMenu" ref="744971508"/>
@ -221,16 +241,16 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="501550435">
<reference key="NSMenu" ref="744971508"/>
<string key="NSTitle">WAN IP</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="974512259">
<string key="NSTitle">WAN IP</string>
@ -241,8 +261,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -253,8 +273,8 @@
<string key="NSTitle">DNS</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="282367862">
<string key="NSTitle">DNS</string>
@ -266,8 +286,8 @@
<string key="NSTitle">dns0</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="461587580">
<string key="NSTitle">dns0</string>
@ -278,8 +298,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -290,8 +310,8 @@
<string key="NSTitle">dns1</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="444998812">
<string key="NSTitle">dns1</string>
@ -302,8 +322,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -314,8 +334,8 @@
<string key="NSTitle">dns2</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="584623476">
<string key="NSTitle">dns2</string>
@ -326,8 +346,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -341,8 +361,8 @@
<string key="NSTitle">View Bandwidth Graph</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -353,8 +373,8 @@
<string key="NSTitle">Clients</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="242724865">
<string key="NSTitle">Clients</string>
@ -366,8 +386,8 @@
<string key="NSTitle">clients-count</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="745173154">
<reference key="NSMenu" ref="242724865"/>
@ -375,8 +395,8 @@
<string key="NSTitle">connections</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="876337058">
<reference key="NSMenu" ref="242724865"/>
@ -385,8 +405,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="857276619">
<reference key="NSMenu" ref="242724865"/>
@ -394,8 +414,8 @@
<string key="NSTitle">host-list-item</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="161159245">
<string key="NSTitle">host-list-item</string>
@ -406,8 +426,8 @@
<string key="NSTitle">Hostname</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="718017639">
<string key="NSTitle">Hostname</string>
@ -418,8 +438,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -429,8 +449,8 @@
<string key="NSTitle">IP</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="48933424">
<string key="NSTitle">IP</string>
@ -441,8 +461,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -452,8 +472,8 @@
<string key="NSTitle">MAC</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="663393009">
<string key="NSTitle">MAC</string>
@ -464,8 +484,8 @@
<string key="NSTitle">Copy</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -475,24 +495,24 @@
<string key="NSTitle">Connections</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="505978498">
<reference key="NSMenu" ref="161159245"/>
<string key="NSTitle">Interface</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="933909401">
<reference key="NSMenu" ref="161159245"/>
<string key="NSTitle">Lease</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -507,8 +527,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="277776424">
<reference key="NSMenu" ref="1033903501"/>
@ -517,8 +537,8 @@
<string key="NSTitle">About</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="203471460">
<reference key="NSMenu" ref="1033903501"/>
@ -526,8 +546,8 @@
<string key="NSKeyEquiv">,</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
<object class="NSMenuItem" id="637415609">
<reference key="NSMenu" ref="1033903501"/>
@ -535,8 +555,8 @@
<string key="NSKeyEquiv">q</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="116250241"/>
<reference key="NSMixedImage" ref="125642750"/>
<reference key="NSOnImage" ref="944548564"/>
<reference key="NSMixedImage" ref="697702749"/>
</object>
</object>
</object>
@ -1106,7 +1126,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSUserDefaultsController" id="853147290">
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSWindowTemplate" id="253739979">
<object class="NSWindowTemplate" id="652361798">
<int key="NSWindowStyleMask">8219</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{313, 762}, {768, 368}}</string>
@ -1114,19 +1134,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSWindowTitle">Syslog Viewer</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
<object class="NSView" key="NSWindowView" id="1054415199">
<object class="NSView" key="NSWindowView" id="127523100">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="980133833">
<reference key="NSNextResponder" ref="1054415199"/>
<object class="NSTextField" id="275206485">
<reference key="NSNextResponder" ref="127523100"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 237}, {768, 131}}</string>
<reference key="NSSuperview" ref="1054415199"/>
<reference key="NSSuperview" ref="127523100"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="92875574">
<object class="NSTextFieldCell" key="NSCell" id="1000845422">
<int key="NSCellFlags">-2073952767</int>
<int key="NSCellFlags2">272764928</int>
<string type="base64-UTF8" key="NSContents">PDg1Pkp1biAgNiAxNzo0NzoyOCBkcm9wYmVhclsyMDExNl06IHB1YmtleSBhdXRoIHN1Y2NlZWRlZCBm
@ -1138,7 +1158,7 @@ ZCBFTk9CVUZTIGZyb20gc2VuZHRvKCksIHRlbXBvcmFyeSBzaG9ydGFnZSBvZiBidWZmZXIgbWVtb3J5
CjwzMD5KdW4gIDYgMTc6NTM6MDIgaG9zdGFwZDogYXRoMTogU1RBIDAwOjFiOjYzOjE1OjI4OjZlIFdQ
QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="980133833"/>
<reference key="NSControlView" ref="275206485"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="1007268004"/>
<reference key="NSTextColor" ref="625843884"/>
@ -1147,43 +1167,41 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
</object>
<string key="NSFrame">{{7, 11}, {768, 368}}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="980133833"/>
<reference key="NSNextKeyView" ref="275206485"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2048, 1130}}</string>
<string key="NSMaxSize">{1e+13, 1e+13}</string>
</object>
<object class="NSCustomView" id="678383611">
<object class="NSCustomView" id="505774060">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="111488109">
<reference key="NSNextResponder" ref="678383611"/>
<object class="NSTextField" id="890949679">
<reference key="NSNextResponder" ref="505774060"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{19, 1}, {170, 11}}</string>
<reference key="NSSuperview" ref="678383611"/>
<reference key="NSWindow"/>
<reference key="NSSuperview" ref="505774060"/>
<reference key="NSNextKeyView"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="200692191">
<object class="NSTextFieldCell" key="NSCell" id="46723760">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">138675200</int>
<string key="NSContents">000%</string>
<reference key="NSSupport" ref="22"/>
<reference key="NSControlView" ref="111488109"/>
<reference key="NSControlView" ref="890949679"/>
<reference key="NSBackgroundColor" ref="580331023"/>
<reference key="NSTextColor" ref="796079922"/>
</object>
</object>
<object class="NSProgressIndicator" id="973827818">
<reference key="NSNextResponder" ref="678383611"/>
<object class="NSProgressIndicator" id="542299856">
<reference key="NSNextResponder" ref="505774060"/>
<int key="NSvFlags">1282</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{19, 0}, {172, 12}}</string>
<reference key="NSSuperview" ref="678383611"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="111488109"/>
<reference key="NSSuperview" ref="505774060"/>
<reference key="NSNextKeyView" ref="890949679"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<int key="NSpiFlags">16648</int>
@ -1192,8 +1210,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
</object>
<string key="NSFrameSize">{192, 13}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="973827818"/>
<reference key="NSNextKeyView" ref="542299856"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSClassName">NSView</string>
@ -1622,7 +1639,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<object class="IBOutletConnection" key="connection">
<string key="label">menuSystemUptime</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="784666372"/>
<reference key="destination" ref="133997064"/>
</object>
<int key="connectionID">844</int>
</object>
@ -1630,7 +1647,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<object class="IBOutletConnection" key="connection">
<string key="label">menuSystemLoad</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="224151098"/>
<reference key="destination" ref="935489706"/>
</object>
<int key="connectionID">845</int>
</object>
@ -1685,8 +1702,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="2979379"/>
<reference key="destination" ref="678383611"/>
<reference key="source" ref="92225735"/>
<reference key="destination" ref="505774060"/>
</object>
<int key="connectionID">866</int>
</object>
@ -1702,7 +1719,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<object class="IBOutletConnection" key="connection">
<string key="label">menuSystemMemoryIndicator</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="973827818"/>
<reference key="destination" ref="542299856"/>
</object>
<int key="connectionID">868</int>
</object>
@ -1710,10 +1727,26 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<object class="IBOutletConnection" key="connection">
<string key="label">menuSystemMemoryPercentage</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="200692191"/>
<reference key="destination" ref="46723760"/>
</object>
<int key="connectionID">881</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menuWanAvrgSpeedIn</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="31928660"/>
</object>
<int key="connectionID">884</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menuWanAvrgSpeedOut</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="589338958"/>
</object>
<int key="connectionID">885</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1834,6 +1867,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<reference ref="574203895"/>
<reference ref="901173717"/>
<reference ref="1013238910"/>
<reference ref="589338958"/>
<reference ref="31928660"/>
</object>
<reference key="parent" ref="1061072709"/>
</object>
@ -1859,11 +1894,11 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="229847922"/>
<reference ref="716346780"/>
<reference ref="784666372"/>
<reference ref="224151098"/>
<reference ref="133997064"/>
<reference ref="935489706"/>
<reference ref="619491201"/>
<reference ref="2979379"/>
<reference ref="76619599"/>
<reference ref="92225735"/>
<reference ref="910670850"/>
</object>
<reference key="parent" ref="148702963"/>
</object>
@ -2435,87 +2470,97 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">842</int>
<reference key="object" ref="224151098"/>
<reference key="object" ref="935489706"/>
<reference key="parent" ref="283170046"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">843</int>
<reference key="object" ref="784666372"/>
<reference key="object" ref="133997064"/>
<reference key="parent" ref="283170046"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">857</int>
<reference key="object" ref="678383611"/>
<reference key="object" ref="505774060"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="973827818"/>
<reference ref="111488109"/>
<reference ref="542299856"/>
<reference ref="890949679"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">MemoryProgressIndicator</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">860</int>
<reference key="object" ref="973827818"/>
<reference key="parent" ref="678383611"/>
<reference key="object" ref="542299856"/>
<reference key="parent" ref="505774060"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">863</int>
<reference key="object" ref="2979379"/>
<reference key="object" ref="92225735"/>
<reference key="parent" ref="283170046"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">869</int>
<reference key="object" ref="76619599"/>
<reference key="object" ref="910670850"/>
<reference key="parent" ref="283170046"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">870</int>
<reference key="object" ref="253739979"/>
<reference key="object" ref="652361798"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1054415199"/>
<reference ref="127523100"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">SyslogViewer</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">871</int>
<reference key="object" ref="1054415199"/>
<reference key="object" ref="127523100"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="980133833"/>
<reference ref="275206485"/>
</object>
<reference key="parent" ref="253739979"/>
<reference key="parent" ref="652361798"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">876</int>
<reference key="object" ref="980133833"/>
<reference key="object" ref="275206485"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="92875574"/>
<reference ref="1000845422"/>
</object>
<reference key="parent" ref="1054415199"/>
<reference key="parent" ref="127523100"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">877</int>
<reference key="object" ref="92875574"/>
<reference key="parent" ref="980133833"/>
<reference key="object" ref="1000845422"/>
<reference key="parent" ref="275206485"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">878</int>
<reference key="object" ref="111488109"/>
<reference key="object" ref="890949679"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="200692191"/>
<reference ref="46723760"/>
</object>
<reference key="parent" ref="678383611"/>
<reference key="parent" ref="505774060"/>
<string key="objectName">MemoryIndicatorPercentage</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">879</int>
<reference key="object" ref="200692191"/>
<reference key="parent" ref="111488109"/>
<reference key="object" ref="46723760"/>
<reference key="parent" ref="890949679"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">882</int>
<reference key="object" ref="589338958"/>
<reference key="parent" ref="744971508"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">883</int>
<reference key="object" ref="31928660"/>
<reference key="parent" ref="744971508"/>
</object>
</object>
</object>
@ -2663,6 +2708,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<string>877.IBPluginDependency</string>
<string>878.IBPluginDependency</string>
<string>879.IBPluginDependency</string>
<string>882.IBPluginDependency</string>
<string>883.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2848,6 +2895,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -2862,7 +2911,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">881</int>
<int key="maxID">885</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2978,6 +3027,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<string>menuSystemName</string>
<string>menuSystemUptime</string>
<string>menuWan</string>
<string>menuWanAvrgSpeedIn</string>
<string>menuWanAvrgSpeedOut</string>
<string>menuWanBandwidthGraph</string>
<string>menuWanDNS</string>
<string>menuWanDNSItem0</string>
@ -3033,6 +3084,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -3069,6 +3122,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<string>menuSystemName</string>
<string>menuSystemUptime</string>
<string>menuWan</string>
<string>menuWanAvrgSpeedIn</string>
<string>menuWanAvrgSpeedOut</string>
<string>menuWanBandwidthGraph</string>
<string>menuWanDNS</string>
<string>menuWanDNSItem0</string>
@ -3203,6 +3258,14 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
<string key="name">menuWan</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">menuWanAvrgSpeedIn</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">menuWanAvrgSpeedOut</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">menuWanBandwidthGraph</string>
<string key="candidateClassName">NSMenuItem</string>

Loading…
Cancel
Save