From 3391af8ce573729edc233b9932ba199c1783883c Mon Sep 17 00:00:00 2001
From: Matthieu Lalonde <matth_web_git@lalonde.me>
Date: Tue, 7 Jun 2011 11:18:09 -0400
Subject: [PATCH] ADDED - Pulling of monthly traffic data

---
 DDWRT_MonitorAppDelegate.h |  14 +-
 DDWRT_MonitorAppDelegate.m | 105 +++++++++-
 English.lproj/MainMenu.xib | 379 ++++++++++++++++++++++---------------
 3 files changed, 333 insertions(+), 165 deletions(-)

diff --git a/DDWRT_MonitorAppDelegate.h b/DDWRT_MonitorAppDelegate.h
index bdd412c..6a96af3 100644
--- a/DDWRT_MonitorAppDelegate.h
+++ b/DDWRT_MonitorAppDelegate.h
@@ -57,6 +57,9 @@
 	IBOutlet NSMenuItem	*menuWanDNSItem2;
 	IBOutlet NSMenuItem	*menuWanBandwidthGraph;
 	
+	IBOutlet NSMenu		*menuWanTraffic;
+	IBOutlet NSMenuItem	*menuWanTrafficItem;
+	
 	// Clients Menu Outlets
 	IBOutlet NSMenu		*menuClients;
 	IBOutlet NSMenuItem	*menuClientsItem;
@@ -91,8 +94,12 @@
 	uint64_t		_lastOutThroughput;
 	
 @private
-	uint8_t		_statusDataRequestNumber;
-	NSString	*_statusStringData;
+	uint8_t			_statusDataRequestNumber;
+	NSString		*_statusStringData;
+	
+	uint8_t			_transferDataRequestNumber;
+	NSString		*_transferStringData;
+	NSMutableArray	*_transferData;
 }
 
 # pragma mark Application Delegates:
@@ -125,12 +132,14 @@
 - (void) cbUpdateStatus;
 - (void) getThroughput:(NSTimer *)timer;
 - (void) cbThroughput:(NSData *)data;
+- (void) getMonthlyTransfers:(NSData *)data;
 - (void) getRouterData:(NSData *)data;
 
 # pragma mark Menu Handlers:
 - (IBAction) refreshMenu:(id)sender;
 - (void) populateMenuSystem;
 - (void) populateMenuWan;
+- (void) populateMenuWanTransfers;
 - (void) populateMenuClients;
 - (NSMenu *) createCopyMenuItem;
 
@@ -140,5 +149,6 @@
 - (NSString *) stringFromSize:(uint64_t)theBytes withUnits:(BOOL)withUnits;
 - (NSString *) stringFromSpeed:(uint64_t)theBytes;
 - (uint64_t) secondsFromUptimeString:(NSString *)uptime;
+- (NSDate *) dateFromMonthsBack:(uint8_t)monthsBack;
 
 @end
diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m
index 7de31b1..b3549c3 100644
--- a/DDWRT_MonitorAppDelegate.m
+++ b/DDWRT_MonitorAppDelegate.m
@@ -333,6 +333,7 @@
 		}
 		
 		[self enableDynamicMenus];
+		[self getMonthlyTransfers:nil];
 		
 		if (_updateTimer != nil) {
 			[_updateTimer invalidate];
@@ -401,6 +402,54 @@
 	_lastOutThroughput		= ifOut;
 }
 
+- (void) getMonthlyTransfers:(NSData *)data
+{
+	if (data != nil) {
+		NSString *stringData	= [[NSString alloc] initWithData:data  encoding:NSASCIIStringEncoding];
+		NSRange startRange		= [stringData rangeOfString:@"id=\"label\""];
+		NSString *smallData		= [NSString stringWithString:[stringData substringFromIndex:startRange.location]];
+		
+		NSString *keyIn			= @"Incoming: ";
+		NSString *keyOut		= @"Outgoing: ";
+		NSString *strMBytesIn	= [smallData substringFromIndex:([smallData rangeOfString:keyIn].location + [keyIn length])];
+		strMBytesIn				= [strMBytesIn substringToIndex:[strMBytesIn rangeOfString:@" "].location];
+		NSString *strMBytesOut	= [smallData substringFromIndex:([smallData rangeOfString:keyOut].location + [keyOut length])];
+		strMBytesOut			= [strMBytesOut substringToIndex:[strMBytesOut rangeOfString:@" "].location];
+		
+		if ([strMBytesIn isEqualToString:@"0"] == false) {
+			NSArray		*monthData	= [NSArray arrayWithObjects: strMBytesIn, strMBytesOut, nil];
+			
+			[_transferData addObject:monthData];
+		}
+		
+		[stringData	release];
+		[smallData release];
+	} else {
+		//NSLog(@"%@", [NSDate date]);
+		_transferDataRequestNumber	= 0;
+		[_transferData release];
+		_transferData				= [[NSMutableArray alloc]init];
+	}
+	
+	if (_transferDataRequestNumber < 12) {
+		NSDate *previousMonthDate = [self dateFromMonthsBack:_transferDataRequestNumber];
+		
+		NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
+		[dateFormat setDateFormat:@"M-yyyy"];
+		
+		NSString *url	= [NSString stringWithFormat:@"ttgraph.cgi?%@", [dateFormat stringFromDate:previousMonthDate]];
+		[wrt_request_client getStatusUpdate:url delegate:self callback:@selector(getMonthlyTransfers:)];
+		_transferDataRequestNumber++;
+	} else {
+		/*uint8_t ii;
+		NSLog(@"%@", [NSDate date]);
+		for (ii=0; ii< [_transferData count]; ii++) {
+			NSLog(@"%d %@ %@", ii, [[_transferData objectAtIndex:ii] objectAtIndex:0], [[_transferData objectAtIndex:ii] objectAtIndex:1]);
+		}*/
+		[self populateMenuWanTransfers];
+	}
+}
+
 - (void) getRouterData:(NSData *)data
 {
 	if (data != nil) {
@@ -538,18 +587,18 @@
 		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);
+		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;
+		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;
+		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]]];
@@ -586,14 +635,39 @@
 	}
 }
 
+- (void) populateMenuWanTransfers
+{
+	int8_t ii;
+	uint8_t count	= [_transferData count];
+	NSMenuItem *monthlyMenu;
+	for (ii = 0; ii < count; ii++) {
+		NSDate *previousMonthDate = [self dateFromMonthsBack:ii];
+		
+		NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
+		[dateFormat setDateFormat:@"M-yyyy"];
+		
+		uint64_t bytesIn	= ([[[_transferData objectAtIndex:ii] objectAtIndex:0] longLongValue] * 1024 * 1024);
+		uint64_t bytesOut	= ([[[_transferData objectAtIndex:ii] objectAtIndex:1] longLongValue] * 1024 * 1024);
+		
+		NSString *strMonthtlyTitle	= [NSString stringWithFormat:@"%@:	%@/%@", [dateFormat stringFromDate:previousMonthDate], [self stringFromSize:bytesIn], [self stringFromSize:bytesOut]];
+		
+		monthlyMenu	= [[NSMenuItem alloc] initWithTitle:strMonthtlyTitle action:nil keyEquivalent:@""];
+		[menuWanTraffic addItem:monthlyMenu];
+	}
+}
+
 - (void) populateMenuClients
 {
+	/*
 	NSString * clientsStringData;
 	
 	NSString *keyData		= @"{arp_table::";
 	
 	clientsStringData		= [ _statusStringData substringFromIndex:([_statusStringData rangeOfString:keyData].location + [keyData length]) ];
 	clientsStringData		= [ clientsStringData substringToIndex:[clientsStringData rangeOfString:@"}"].location ];
+	*/
+	
+	NSString *clientsStringData = [wrt_request_client getKey:_statusStringData key:@"arp_table"];
 	
 	// Remove any white spaces
 	NSArray *parts			= [clientsStringData componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
@@ -776,4 +850,21 @@
 	return seconds;
 }
 
+- (NSDate *) dateFromMonthsBack:(uint8_t)monthsBack
+{
+	NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+	
+	NSDateComponents *components = [[NSDateComponents alloc] init];
+	[components setMonth:(-monthsBack)];
+	
+	NSDate *prevMonth	= [gregorian dateByAddingComponents:components toDate:[NSDate date] options:0];
+	
+	NSDateComponents *previoustMonthComponents = [gregorian components:NSYearCalendarUnit | NSMonthCalendarUnit fromDate:prevMonth];
+	
+	[components release];
+	[gregorian autorelease];
+	
+	return [gregorian dateFromComponents:previoustMonthComponents];
+}
+
 @end
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index e46834f..6c02b30 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -69,11 +69,11 @@
 						<string key="NSTitle">System Status</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="944548564">
+						<object class="NSCustomResource" key="NSOnImage" id="366791456">
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">NSMenuCheckmark</string>
 						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="697702749">
+						<object class="NSCustomResource" key="NSMixedImage" id="66026061">
 							<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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
-								<object class="NSMenuItem" id="133997064">
+								<object class="NSMenuItem" id="230656130">
 									<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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
-								<object class="NSMenuItem" id="935489706">
+								<object class="NSMenuItem" id="893746159">
 									<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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
-								<object class="NSMenuItem" id="92225735">
+								<object class="NSMenuItem" id="485989775">
 									<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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
-								<object class="NSMenuItem" id="910670850">
+								<object class="NSMenuItem" id="880668425">
 									<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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</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="944548564"/>
-						<reference key="NSMixedImage" ref="697702749"/>
+						<reference key="NSOnImage" ref="366791456"/>
+						<reference key="NSMixedImage" ref="66026061"/>
 						<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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
 								<object class="NSMenuItem" id="901173717">
 									<reference key="NSMenu" ref="744971508"/>
@@ -201,18 +201,18 @@
 									<string key="NSTitle">incoming-bandwidth</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
-								<object class="NSMenuItem" id="31928660">
+								<object class="NSMenuItem" id="849698697">
 									<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"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
 								<object class="NSMenuItem" id="1013238910">
 									<reference key="NSMenu" ref="744971508"/>
@@ -221,18 +221,33 @@
 									<string key="NSTitle">outgoing-bandwidth</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
-								<object class="NSMenuItem" id="589338958">
+								<object class="NSMenuItem" id="692360686">
 									<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"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
+								</object>
+								<object class="NSMenuItem" id="779552728">
+									<reference key="NSMenu" ref="744971508"/>
+									<string key="NSTitle">Monthly Traffic</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="765955920">
+										<string key="NSTitle">Monthly Traffic</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+									</object>
 								</object>
 								<object class="NSMenuItem" id="574203895">
 									<reference key="NSMenu" ref="744971508"/>
@@ -241,16 +256,16 @@
 									<string key="NSTitle"/>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</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="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 									<string key="NSAction">submenuAction:</string>
 									<object class="NSMenu" key="NSSubmenu" id="974512259">
 										<string key="NSTitle">WAN IP</string>
@@ -261,8 +276,8 @@
 												<string key="NSTitle">Copy</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 											</object>
 										</object>
 									</object>
@@ -273,8 +288,8 @@
 									<string key="NSTitle">DNS</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 									<string key="NSAction">submenuAction:</string>
 									<object class="NSMenu" key="NSSubmenu" id="282367862">
 										<string key="NSTitle">DNS</string>
@@ -286,8 +301,8 @@
 												<string key="NSTitle">dns0</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 												<string key="NSAction">submenuAction:</string>
 												<object class="NSMenu" key="NSSubmenu" id="461587580">
 													<string key="NSTitle">dns0</string>
@@ -298,8 +313,8 @@
 															<string key="NSTitle">Copy</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="944548564"/>
-															<reference key="NSMixedImage" ref="697702749"/>
+															<reference key="NSOnImage" ref="366791456"/>
+															<reference key="NSMixedImage" ref="66026061"/>
 														</object>
 													</object>
 												</object>
@@ -310,8 +325,8 @@
 												<string key="NSTitle">dns1</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 												<string key="NSAction">submenuAction:</string>
 												<object class="NSMenu" key="NSSubmenu" id="444998812">
 													<string key="NSTitle">dns1</string>
@@ -322,8 +337,8 @@
 															<string key="NSTitle">Copy</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="944548564"/>
-															<reference key="NSMixedImage" ref="697702749"/>
+															<reference key="NSOnImage" ref="366791456"/>
+															<reference key="NSMixedImage" ref="66026061"/>
 														</object>
 													</object>
 												</object>
@@ -334,8 +349,8 @@
 												<string key="NSTitle">dns2</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 												<string key="NSAction">submenuAction:</string>
 												<object class="NSMenu" key="NSSubmenu" id="584623476">
 													<string key="NSTitle">dns2</string>
@@ -346,8 +361,8 @@
 															<string key="NSTitle">Copy</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="944548564"/>
-															<reference key="NSMixedImage" ref="697702749"/>
+															<reference key="NSOnImage" ref="366791456"/>
+															<reference key="NSMixedImage" ref="66026061"/>
 														</object>
 													</object>
 												</object>
@@ -361,8 +376,8 @@
 									<string key="NSTitle">View Bandwidth Graph</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
 							</object>
 						</object>
@@ -373,8 +388,8 @@
 						<string key="NSTitle">Clients</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="944548564"/>
-						<reference key="NSMixedImage" ref="697702749"/>
+						<reference key="NSOnImage" ref="366791456"/>
+						<reference key="NSMixedImage" ref="66026061"/>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="242724865">
 							<string key="NSTitle">Clients</string>
@@ -386,8 +401,8 @@
 									<string key="NSTitle">clients-count</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
 								<object class="NSMenuItem" id="745173154">
 									<reference key="NSMenu" ref="242724865"/>
@@ -395,8 +410,8 @@
 									<string key="NSTitle">connections</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
 								<object class="NSMenuItem" id="876337058">
 									<reference key="NSMenu" ref="242724865"/>
@@ -405,8 +420,8 @@
 									<string key="NSTitle"/>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 								</object>
 								<object class="NSMenuItem" id="857276619">
 									<reference key="NSMenu" ref="242724865"/>
@@ -414,8 +429,8 @@
 									<string key="NSTitle">host-list-item</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="944548564"/>
-									<reference key="NSMixedImage" ref="697702749"/>
+									<reference key="NSOnImage" ref="366791456"/>
+									<reference key="NSMixedImage" ref="66026061"/>
 									<string key="NSAction">submenuAction:</string>
 									<object class="NSMenu" key="NSSubmenu" id="161159245">
 										<string key="NSTitle">host-list-item</string>
@@ -426,8 +441,8 @@
 												<string key="NSTitle">Hostname</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 												<string key="NSAction">submenuAction:</string>
 												<object class="NSMenu" key="NSSubmenu" id="718017639">
 													<string key="NSTitle">Hostname</string>
@@ -438,8 +453,8 @@
 															<string key="NSTitle">Copy</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="944548564"/>
-															<reference key="NSMixedImage" ref="697702749"/>
+															<reference key="NSOnImage" ref="366791456"/>
+															<reference key="NSMixedImage" ref="66026061"/>
 														</object>
 													</object>
 												</object>
@@ -449,8 +464,8 @@
 												<string key="NSTitle">IP</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 												<string key="NSAction">submenuAction:</string>
 												<object class="NSMenu" key="NSSubmenu" id="48933424">
 													<string key="NSTitle">IP</string>
@@ -461,8 +476,8 @@
 															<string key="NSTitle">Copy</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="944548564"/>
-															<reference key="NSMixedImage" ref="697702749"/>
+															<reference key="NSOnImage" ref="366791456"/>
+															<reference key="NSMixedImage" ref="66026061"/>
 														</object>
 													</object>
 												</object>
@@ -472,8 +487,8 @@
 												<string key="NSTitle">MAC</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 												<string key="NSAction">submenuAction:</string>
 												<object class="NSMenu" key="NSSubmenu" id="663393009">
 													<string key="NSTitle">MAC</string>
@@ -484,8 +499,8 @@
 															<string key="NSTitle">Copy</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="944548564"/>
-															<reference key="NSMixedImage" ref="697702749"/>
+															<reference key="NSOnImage" ref="366791456"/>
+															<reference key="NSMixedImage" ref="66026061"/>
 														</object>
 													</object>
 												</object>
@@ -495,24 +510,24 @@
 												<string key="NSTitle">Connections</string>
 												<string key="NSKeyEquiv"/>
 												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 											</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="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 											</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="944548564"/>
-												<reference key="NSMixedImage" ref="697702749"/>
+												<reference key="NSOnImage" ref="366791456"/>
+												<reference key="NSMixedImage" ref="66026061"/>
 											</object>
 										</object>
 									</object>
@@ -527,8 +542,8 @@
 						<string key="NSTitle"/>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="944548564"/>
-						<reference key="NSMixedImage" ref="697702749"/>
+						<reference key="NSOnImage" ref="366791456"/>
+						<reference key="NSMixedImage" ref="66026061"/>
 					</object>
 					<object class="NSMenuItem" id="277776424">
 						<reference key="NSMenu" ref="1033903501"/>
@@ -537,8 +552,8 @@
 						<string key="NSTitle">About</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="944548564"/>
-						<reference key="NSMixedImage" ref="697702749"/>
+						<reference key="NSOnImage" ref="366791456"/>
+						<reference key="NSMixedImage" ref="66026061"/>
 					</object>
 					<object class="NSMenuItem" id="203471460">
 						<reference key="NSMenu" ref="1033903501"/>
@@ -546,8 +561,8 @@
 						<string key="NSKeyEquiv">,</string>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="944548564"/>
-						<reference key="NSMixedImage" ref="697702749"/>
+						<reference key="NSOnImage" ref="366791456"/>
+						<reference key="NSMixedImage" ref="66026061"/>
 					</object>
 					<object class="NSMenuItem" id="637415609">
 						<reference key="NSMenu" ref="1033903501"/>
@@ -555,8 +570,8 @@
 						<string key="NSKeyEquiv">q</string>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="944548564"/>
-						<reference key="NSMixedImage" ref="697702749"/>
+						<reference key="NSOnImage" ref="366791456"/>
+						<reference key="NSMixedImage" ref="66026061"/>
 					</object>
 				</object>
 			</object>
@@ -1126,7 +1141,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<object class="NSUserDefaultsController" id="853147290">
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
-			<object class="NSWindowTemplate" id="652361798">
+			<object class="NSWindowTemplate" id="17800429">
 				<int key="NSWindowStyleMask">8219</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{313, 762}, {768, 368}}</string>
@@ -1134,19 +1149,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="NSWindowTitle">Syslog Viewer</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
-				<object class="NSView" key="NSWindowView" id="127523100">
+				<object class="NSView" key="NSWindowView" id="888156115">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="275206485">
-							<reference key="NSNextResponder" ref="127523100"/>
+						<object class="NSTextField" id="823449428">
+							<reference key="NSNextResponder" ref="888156115"/>
 							<int key="NSvFlags">274</int>
 							<string key="NSFrame">{{0, 237}, {768, 131}}</string>
-							<reference key="NSSuperview" ref="127523100"/>
+							<reference key="NSSuperview" ref="888156115"/>
 							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1000845422">
+							<object class="NSTextFieldCell" key="NSCell" id="770041926">
 								<int key="NSCellFlags">-2073952767</int>
 								<int key="NSCellFlags2">272764928</int>
 								<string type="base64-UTF8" key="NSContents">PDg1Pkp1biAgNiAxNzo0NzoyOCBkcm9wYmVhclsyMDExNl06IHB1YmtleSBhdXRoIHN1Y2NlZWRlZCBm
@@ -1158,7 +1173,7 @@ ZCBFTk9CVUZTIGZyb20gc2VuZHRvKCksIHRlbXBvcmFyeSBzaG9ydGFnZSBvZiBidWZmZXIgbWVtb3J5
 CjwzMD5KdW4gIDYgMTc6NTM6MDIgaG9zdGFwZDogYXRoMTogU1RBIDAwOjFiOjYzOjE1OjI4OjZlIFdQ
 QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="275206485"/>
+								<reference key="NSControlView" ref="823449428"/>
 								<bool key="NSDrawsBackground">YES</bool>
 								<reference key="NSBackgroundColor" ref="1007268004"/>
 								<reference key="NSTextColor" ref="625843884"/>
@@ -1167,41 +1182,41 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					</object>
 					<string key="NSFrame">{{7, 11}, {768, 368}}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView" ref="275206485"/>
+					<reference key="NSNextKeyView" ref="823449428"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2048, 1130}}</string>
 				<string key="NSMaxSize">{1e+13, 1e+13}</string>
 			</object>
-			<object class="NSCustomView" id="505774060">
+			<object class="NSCustomView" id="921139168">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="890949679">
-						<reference key="NSNextResponder" ref="505774060"/>
+					<object class="NSTextField" id="1024319180">
+						<reference key="NSNextResponder" ref="921139168"/>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{19, 1}, {170, 11}}</string>
-						<reference key="NSSuperview" ref="505774060"/>
+						<reference key="NSSuperview" ref="921139168"/>
 						<reference key="NSNextKeyView"/>
 						<int key="NSViewLayerContentsRedrawPolicy">2</int>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="46723760">
+						<object class="NSTextFieldCell" key="NSCell" id="198607408">
 							<int key="NSCellFlags">68288064</int>
 							<int key="NSCellFlags2">138675200</int>
 							<string key="NSContents">000%</string>
 							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="890949679"/>
+							<reference key="NSControlView" ref="1024319180"/>
 							<reference key="NSBackgroundColor" ref="580331023"/>
 							<reference key="NSTextColor" ref="796079922"/>
 						</object>
 					</object>
-					<object class="NSProgressIndicator" id="542299856">
-						<reference key="NSNextResponder" ref="505774060"/>
+					<object class="NSProgressIndicator" id="436901578">
+						<reference key="NSNextResponder" ref="921139168"/>
 						<int key="NSvFlags">1282</int>
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
 						<string key="NSFrame">{{19, 0}, {172, 12}}</string>
-						<reference key="NSSuperview" ref="505774060"/>
-						<reference key="NSNextKeyView" ref="890949679"/>
+						<reference key="NSSuperview" ref="921139168"/>
+						<reference key="NSNextKeyView" ref="1024319180"/>
 						<bool key="NSViewIsLayerTreeHost">YES</bool>
 						<int key="NSViewLayerContentsRedrawPolicy">2</int>
 						<int key="NSpiFlags">16648</int>
@@ -1210,7 +1225,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 				</object>
 				<string key="NSFrameSize">{192, 13}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView" ref="542299856"/>
+				<reference key="NSNextKeyView" ref="436901578"/>
 				<bool key="NSViewIsLayerTreeHost">YES</bool>
 				<int key="NSViewLayerContentsRedrawPolicy">2</int>
 				<string key="NSClassName">NSView</string>
@@ -1639,7 +1654,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuSystemUptime</string>
 						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="133997064"/>
+						<reference key="destination" ref="230656130"/>
 					</object>
 					<int key="connectionID">844</int>
 				</object>
@@ -1647,7 +1662,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuSystemLoad</string>
 						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="935489706"/>
+						<reference key="destination" ref="893746159"/>
 					</object>
 					<int key="connectionID">845</int>
 				</object>
@@ -1702,8 +1717,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view</string>
-						<reference key="source" ref="92225735"/>
-						<reference key="destination" ref="505774060"/>
+						<reference key="source" ref="485989775"/>
+						<reference key="destination" ref="921139168"/>
 					</object>
 					<int key="connectionID">866</int>
 				</object>
@@ -1719,7 +1734,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuSystemMemoryIndicator</string>
 						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="542299856"/>
+						<reference key="destination" ref="436901578"/>
 					</object>
 					<int key="connectionID">868</int>
 				</object>
@@ -1727,7 +1742,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuSystemMemoryPercentage</string>
 						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="46723760"/>
+						<reference key="destination" ref="198607408"/>
 					</object>
 					<int key="connectionID">881</int>
 				</object>
@@ -1735,7 +1750,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuWanAvrgSpeedIn</string>
 						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="31928660"/>
+						<reference key="destination" ref="849698697"/>
 					</object>
 					<int key="connectionID">884</int>
 				</object>
@@ -1743,10 +1758,26 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menuWanAvrgSpeedOut</string>
 						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="589338958"/>
+						<reference key="destination" ref="692360686"/>
 					</object>
 					<int key="connectionID">885</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menuWanTrafficItem</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="779552728"/>
+					</object>
+					<int key="connectionID">889</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menuWanTraffic</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="765955920"/>
+					</object>
+					<int key="connectionID">890</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1867,8 +1898,9 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 							<reference ref="574203895"/>
 							<reference ref="901173717"/>
 							<reference ref="1013238910"/>
-							<reference ref="589338958"/>
-							<reference ref="31928660"/>
+							<reference ref="692360686"/>
+							<reference ref="849698697"/>
+							<reference ref="779552728"/>
 						</object>
 						<reference key="parent" ref="1061072709"/>
 					</object>
@@ -1894,11 +1926,11 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="229847922"/>
 							<reference ref="716346780"/>
-							<reference ref="133997064"/>
-							<reference ref="935489706"/>
+							<reference ref="230656130"/>
+							<reference ref="893746159"/>
 							<reference ref="619491201"/>
-							<reference ref="92225735"/>
-							<reference ref="910670850"/>
+							<reference ref="485989775"/>
+							<reference ref="880668425"/>
 						</object>
 						<reference key="parent" ref="148702963"/>
 					</object>
@@ -2470,98 +2502,115 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">842</int>
-						<reference key="object" ref="935489706"/>
+						<reference key="object" ref="893746159"/>
 						<reference key="parent" ref="283170046"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">843</int>
-						<reference key="object" ref="133997064"/>
+						<reference key="object" ref="230656130"/>
 						<reference key="parent" ref="283170046"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">857</int>
-						<reference key="object" ref="505774060"/>
+						<reference key="object" ref="921139168"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="542299856"/>
-							<reference ref="890949679"/>
+							<reference ref="436901578"/>
+							<reference ref="1024319180"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">MemoryProgressIndicator</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">860</int>
-						<reference key="object" ref="542299856"/>
-						<reference key="parent" ref="505774060"/>
+						<reference key="object" ref="436901578"/>
+						<reference key="parent" ref="921139168"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">863</int>
-						<reference key="object" ref="92225735"/>
+						<reference key="object" ref="485989775"/>
 						<reference key="parent" ref="283170046"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">869</int>
-						<reference key="object" ref="910670850"/>
+						<reference key="object" ref="880668425"/>
 						<reference key="parent" ref="283170046"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">870</int>
-						<reference key="object" ref="652361798"/>
+						<reference key="object" ref="17800429"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="127523100"/>
+							<reference ref="888156115"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">SyslogViewer</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">871</int>
-						<reference key="object" ref="127523100"/>
+						<reference key="object" ref="888156115"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="275206485"/>
+							<reference ref="823449428"/>
 						</object>
-						<reference key="parent" ref="652361798"/>
+						<reference key="parent" ref="17800429"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">876</int>
-						<reference key="object" ref="275206485"/>
+						<reference key="object" ref="823449428"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1000845422"/>
+							<reference ref="770041926"/>
 						</object>
-						<reference key="parent" ref="127523100"/>
+						<reference key="parent" ref="888156115"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">877</int>
-						<reference key="object" ref="1000845422"/>
-						<reference key="parent" ref="275206485"/>
+						<reference key="object" ref="770041926"/>
+						<reference key="parent" ref="823449428"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">878</int>
-						<reference key="object" ref="890949679"/>
+						<reference key="object" ref="1024319180"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="46723760"/>
+							<reference ref="198607408"/>
 						</object>
-						<reference key="parent" ref="505774060"/>
+						<reference key="parent" ref="921139168"/>
 						<string key="objectName">MemoryIndicatorPercentage</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">879</int>
-						<reference key="object" ref="46723760"/>
-						<reference key="parent" ref="890949679"/>
+						<reference key="object" ref="198607408"/>
+						<reference key="parent" ref="1024319180"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">882</int>
-						<reference key="object" ref="589338958"/>
+						<reference key="object" ref="692360686"/>
 						<reference key="parent" ref="744971508"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">883</int>
-						<reference key="object" ref="31928660"/>
+						<reference key="object" ref="849698697"/>
+						<reference key="parent" ref="744971508"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">886</int>
+						<reference key="object" ref="779552728"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="765955920"/>
+						</object>
 						<reference key="parent" ref="744971508"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">887</int>
+						<reference key="object" ref="765955920"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="parent" ref="779552728"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2710,6 +2759,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 					<string>879.IBPluginDependency</string>
 					<string>882.IBPluginDependency</string>
 					<string>883.IBPluginDependency</string>
+					<string>886.IBPluginDependency</string>
+					<string>887.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2897,6 +2948,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">
@@ -2911,7 +2964,7 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">885</int>
+			<int key="maxID">890</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3037,7 +3090,9 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 							<string>menuWanIP</string>
 							<string>menuWanSeparator</string>
 							<string>menuWanStatus</string>
+							<string>menuWanTraffic</string>
 							<string>menuWanTrafficIn</string>
+							<string>menuWanTrafficItem</string>
 							<string>menuWanTrafficOut</string>
 							<string>menuWanUptime</string>
 						</object>
@@ -3083,6 +3138,8 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
+							<string>NSMenu</string>
+							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
@@ -3132,7 +3189,9 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 							<string>menuWanIP</string>
 							<string>menuWanSeparator</string>
 							<string>menuWanStatus</string>
+							<string>menuWanTraffic</string>
 							<string>menuWanTrafficIn</string>
+							<string>menuWanTrafficItem</string>
 							<string>menuWanTrafficOut</string>
 							<string>menuWanUptime</string>
 						</object>
@@ -3298,10 +3357,18 @@ QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA</string>
 								<string key="name">menuWanStatus</string>
 								<string key="candidateClassName">NSMenuItem</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">menuWanTraffic</string>
+								<string key="candidateClassName">NSMenu</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">menuWanTrafficIn</string>
 								<string key="candidateClassName">NSMenuItem</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">menuWanTrafficItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">menuWanTrafficOut</string>
 								<string key="candidateClassName">NSMenuItem</string>