diff --git a/CredenialsView.xib b/CredenialsView.xib
deleted file mode 100644
index 2398a35..0000000
--- a/CredenialsView.xib
+++ /dev/null
@@ -1,420 +0,0 @@
-
-
-
- 1060
- 10J869
- 1306
- 1038.35
- 461.00
-
-
-
-
-
- YES
-
- NSObject
-
-
- FirstResponder
-
-
- NSApplication
-
-
- WRTStatusClient
-
-
- 1
- 2
- {{320, 343}, {340, 115}}
- 611844096
- WRT Login
- NSWindow
-
-
-
- 256
-
- YES
-
-
- 268
- {{20, 43}, {300, 52}}
-
-
-
- 2
- YES
- 2
- 1
-
- YES
-
- 343014977
- 205521920
-
-
- LucidaGrande
- 13
- 1044
-
-
- 70.93603515625
-
- 67239424
- 67108864
- Username:
-
-
-
-
-
- 343014977
- 205521920
-
-
-
- 1
- 70.93603515625
-
- 67239424
- 67108864
- Password:
-
-
-
-
-
- {300, 22}
- {1, 8}
- 67633152
- NSActionCell
-
- 343014976
- 205521920
-
-
- 70.93603515625
-
- 67239424
- 67108864
- Field:
-
-
-
- -1
- -1
-
- 6
- System
- controlColor
-
- 3
- MC42NjY2NjY2NjY3AA
-
-
-
- 3
- MQA
-
-
-
-
-
- 268
- {{260, 18}, {60, 17}}
-
-
-
- YES
-
- -2080244224
- 134348800
- Login
-
- LucidaGrande
- 11
- 3100
-
-
- -2038152961
- 164
-
- DQ
- 400
- 75
-
-
-
- {{7, 11}, {340, 115}}
-
-
-
-
- {{0, 0}, {2048, 1130}}
- {1e+13, 1e+13}
-
-
-
-
- YES
-
-
- delegate
-
-
-
- 19
-
-
-
- credentialsView
-
-
-
- 20
-
-
-
- hideCredentialsWindow
-
-
-
- 24
-
-
-
-
- YES
-
- 0
-
-
-
-
-
- -2
-
-
- File's Owner
-
-
- -1
-
-
- First Responder
-
-
- -3
-
-
- Application
-
-
- 11
-
-
-
-
- 13
-
-
- YES
-
-
-
-
-
- 14
-
-
- YES
-
-
-
-
-
-
- 15
-
-
- YES
-
-
-
-
-
-
-
- 16
-
-
-
-
- 17
-
-
-
-
- 18
-
-
-
-
- 21
-
-
- YES
-
-
-
-
-
- 22
-
-
-
-
-
-
- YES
-
- YES
- -1.IBPluginDependency
- -2.IBPluginDependency
- -3.IBPluginDependency
- 11.IBPluginDependency
- 13.IBPluginDependency
- 13.NSWindowTemplate.visibleAtLaunch
- 14.IBPluginDependency
- 15.IBPluginDependency
- 16.IBPluginDependency
- 17.IBPluginDependency
- 18.CustomClassName
- 18.IBPluginDependency
- 21.IBPluginDependency
- 22.IBPluginDependency
-
-
- YES
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- NSSecureTextFormCell
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
- YES
-
-
-
-
-
- YES
-
-
-
-
- 24
-
-
-
- YES
-
- WRTStatusClient
- NSObject
-
- YES
-
- YES
- buttonLogin
- credentialsWindow
- fieldPassword
- fieldUsername
-
-
- YES
- NSButton
- NSWindow
- NSSecureTextFieldCell
- NSFormCell
-
-
-
- YES
-
- YES
- buttonLogin
- credentialsWindow
- fieldPassword
- fieldUsername
-
-
- YES
-
- buttonLogin
- NSButton
-
-
- credentialsWindow
- NSWindow
-
-
- fieldPassword
- NSSecureTextFieldCell
-
-
- fieldUsername
- NSFormCell
-
-
-
-
- IBProjectSource
- ./Classes/WRTStatusClient.h
-
-
-
-
- 0
- IBCocoaFramework
-
- com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3
-
-
- YES
- 3
-
-
diff --git a/DDWRT_MonitorAppDelegate.h b/DDWRT_MonitorAppDelegate.h
index 124c8e8..7ae499c 100644
--- a/DDWRT_MonitorAppDelegate.h
+++ b/DDWRT_MonitorAppDelegate.h
@@ -32,12 +32,13 @@
IBOutlet id configButtonSave;
// System Menu Outlets
- IBOutlet NSMenuItem *menuSystem;
- IBOutlet NSMenuItem *menuSystemUptime;
- IBOutlet NSMenuItem *menuSystemLoad;
- IBOutlet NSMenuItem *menuSystemName;
- IBOutlet NSMenuItem *menuSystemDomain;
- IBOutlet NSMenuItem *menuSystemMemory;
+ IBOutlet NSMenuItem *menuSystem;
+ IBOutlet NSMenuItem *menuSystemUptime;
+ IBOutlet NSMenuItem *menuSystemLoad;
+ IBOutlet NSMenuItem *menuSystemName;
+ IBOutlet NSMenuItem *menuSystemDomain;
+ IBOutlet NSMenuItem *menuSystemMemory;
+ IBOutlet NSProgressIndicator *menuSystemMemoryIndicator;
// Wan Menu Outlets
IBOutlet NSMenuItem *menuWan;
diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m
index 1d2626b..4574d84 100644
--- a/DDWRT_MonitorAppDelegate.m
+++ b/DDWRT_MonitorAppDelegate.m
@@ -492,10 +492,14 @@
NSArray *memData = [memInfo componentsSeparatedByString:@","];
uint32_t memTotal = strtoull([[memData objectAtIndex:8] UTF8String], NULL, 0);
- uint32_t memFree = strtoull([[memData objectAtIndex:9] UTF8String], NULL, 0);
+ uint32_t memUsed = strtoull([[memData objectAtIndex:9] UTF8String], NULL, 0);
- NSString *memTitle = [NSString stringWithFormat:@"Memory %@/%@", [self stringFromSize:memFree withUnits:false], [self stringFromSize:memTotal]];
+ NSString *memTitle = [NSString stringWithFormat:@"Memory %@/%@", [self stringFromSize:memUsed withUnits:false], [self stringFromSize:memTotal]];
[menuSystemMemory setTitle:memTitle];
+
+ [menuSystemMemoryIndicator setMaxValue: memTotal];
+ [menuSystemMemoryIndicator setDoubleValue: memUsed];
+
}
- (void) populateMenuWan
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index b30a6c7..66d2ba4 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -33,6 +33,7 @@
NSSliderCell
NSMatrix
NSCustomObject
+ NSCustomView
NSView
NSWindowTemplate
NSTextField
@@ -68,11 +69,11 @@
System Status
2147483647
-
+
NSImage
NSMenuCheckmark
-
+
NSImage
NSMenuMixedState
@@ -88,8 +89,8 @@
router-name
2147483647
-
-
+
+
-
@@ -137,8 +147,8 @@
WAN Status
2147483647
-
-
+
+
submenuAction:
@@ -233,8 +243,8 @@
DNS
2147483647
-
-
+
+
submenuAction:
@@ -270,8 +280,8 @@
dns1
2147483647
-
-
+
+
submenuAction:
@@ -294,8 +304,8 @@
dns2
2147483647
-
-
+
+
submenuAction:
@@ -321,8 +331,8 @@
View Bandwidth Graph
2147483647
-
-
+
+
@@ -333,8 +343,8 @@
Clients
2147483647
-
-
+
+
submenuAction:
@@ -409,8 +419,8 @@
IP
2147483647
-
-
+
+
submenuAction:
@@ -432,8 +442,8 @@
MAC
2147483647
-
-
+
+
submenuAction:
@@ -455,24 +465,24 @@
Connections
2147483647
-
-
+
+
@@ -487,8 +497,8 @@
2147483647
-
-
+
+
@@ -1086,6 +1096,33 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
YES
+
+
+ 268
+
+ YES
+
+
+ 1282
+
+ {{19, -2}, {170, 12}}
+
+
+
+ YES
+ 2
+ 16648
+ 100
+
+
+ {188, 10}
+
+
+
+ YES
+ 2
+ NSView
+
@@ -1510,7 +1547,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
menuSystemUptime
-
+
844
@@ -1518,7 +1555,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
menuSystemLoad
-
+
845
@@ -1554,14 +1591,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
850
-
-
- menuSystemMemory
-
-
-
- 853
-
menuSystemName
@@ -1578,6 +1607,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
855
+
+
+ view
+
+
+
+ 866
+
+
+
+ menuSystemMemory
+
+
+
+ 867
+
+
+
+ menuSystemMemoryIndicator
+
+
+
+ 868
+
@@ -1723,9 +1776,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
YES
-
-
+
+
+
@@ -2297,12 +2351,32 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
842
-
+
843
-
+
+
+
+
+ 857
+
+
+ YES
+
+
+
+ MemoryProgressIndicator
+
+
+ 860
+
+
+
+
+ 863
+
@@ -2439,6 +2513,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
794.IBPluginDependency
842.IBPluginDependency
843.IBPluginDependency
+ 857.IBAttributePlaceholdersKey
+ 857.IBPluginDependency
+ 860.IBPluginDependency
+ 863.IBPluginDependency
YES
@@ -2608,6 +2686,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ YES
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
@@ -2622,7 +2708,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- 855
+ 868
@@ -2733,6 +2819,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
menuSystemDomain
menuSystemLoad
menuSystemMemory
+ menuSystemMemoryIndicator
menuSystemName
menuSystemUptime
menuWan
@@ -2775,6 +2862,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
NSMenuItem
NSMenuItem
NSMenuItem
+ NSProgressIndicator
NSMenuItem
NSMenuItem
NSMenuItem
@@ -2820,6 +2908,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
menuSystemDomain
menuSystemLoad
menuSystemMemory
+ menuSystemMemoryIndicator
menuSystemName
menuSystemUptime
menuWan
@@ -2937,6 +3026,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
menuSystemMemory
NSMenuItem
+
+ menuSystemMemoryIndicator
+ NSProgressIndicator
+
menuSystemName
NSMenuItem