diff --git a/DDWRT_MonitorAppDelegate.h b/DDWRT_MonitorAppDelegate.h index 7ae499c..4a4e9a6 100644 --- a/DDWRT_MonitorAppDelegate.h +++ b/DDWRT_MonitorAppDelegate.h @@ -39,6 +39,7 @@ IBOutlet NSMenuItem *menuSystemDomain; IBOutlet NSMenuItem *menuSystemMemory; IBOutlet NSProgressIndicator *menuSystemMemoryIndicator; + IBOutlet NSTextFieldCell *menuSystemMemoryPercentage; // Wan Menu Outlets IBOutlet NSMenuItem *menuWan; diff --git a/DDWRT_MonitorAppDelegate.m b/DDWRT_MonitorAppDelegate.m index 1298931..6bb9cdf 100644 --- a/DDWRT_MonitorAppDelegate.m +++ b/DDWRT_MonitorAppDelegate.m @@ -500,6 +500,7 @@ [menuSystemMemoryIndicator setMaxValue: memTotal]; [menuSystemMemoryIndicator setDoubleValue: memUsed]; + [menuSystemMemoryPercentage setTitle:[NSString stringWithFormat:@"%3.0f%%", ((memUsed / (double) memTotal)*100)]]; } - (void) populateMenuWan @@ -726,4 +727,4 @@ return([NSString stringWithFormat:@"%1.2f%@", floatSize, suffix]); } -@end \ No newline at end of file +@end diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 66d2ba4..28c4d0f 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -69,11 +69,11 @@ System Status 2147483647 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState @@ -89,8 +89,8 @@ router-name 2147483647 - - + + @@ -99,26 +99,26 @@ domain 2147483647 - - + + - + YES uptime 2147483647 - - + + - + YES load-average 2147483647 - - + + @@ -126,17 +126,27 @@ memory 2147483647 - - + + - + YES memory-indicator 2147483647 - - + + + + + + YES + YES + syslog-viewer + + 2147483647 + + @@ -147,8 +157,8 @@ WAN Status 2147483647 - - + + submenuAction: WAN Status @@ -160,8 +170,8 @@ Disconnected 2147483647 - - + + @@ -170,8 +180,8 @@ wan-uptime 2147483647 - - + + @@ -181,8 +191,8 @@ 2147483647 - - + + @@ -191,8 +201,8 @@ incoming-bandwidth 2147483647 - - + + @@ -201,8 +211,8 @@ outgoing-bandwidth 2147483647 - - + + @@ -211,16 +221,16 @@ 2147483647 - - + + WAN IP 2147483647 - - + + submenuAction: WAN IP @@ -231,8 +241,8 @@ Copy 2147483647 - - + + @@ -243,8 +253,8 @@ DNS 2147483647 - - + + submenuAction: DNS @@ -256,8 +266,8 @@ dns0 2147483647 - - + + submenuAction: dns0 @@ -268,8 +278,8 @@ Copy 2147483647 - - + + @@ -280,8 +290,8 @@ dns1 2147483647 - - + + submenuAction: dns1 @@ -292,8 +302,8 @@ Copy 2147483647 - - + + @@ -304,8 +314,8 @@ dns2 2147483647 - - + + submenuAction: dns2 @@ -316,8 +326,8 @@ Copy 2147483647 - - + + @@ -331,8 +341,8 @@ View Bandwidth Graph 2147483647 - - + + @@ -343,8 +353,8 @@ Clients 2147483647 - - + + submenuAction: Clients @@ -356,8 +366,8 @@ clients-count 2147483647 - - + + @@ -365,8 +375,8 @@ connections 2147483647 - - + + @@ -375,8 +385,8 @@ 2147483647 - - + + @@ -384,8 +394,8 @@ host-list-item 2147483647 - - + + submenuAction: host-list-item @@ -396,8 +406,8 @@ Hostname 2147483647 - - + + submenuAction: Hostname @@ -408,8 +418,8 @@ Copy 2147483647 - - + + @@ -419,8 +429,8 @@ IP 2147483647 - - + + submenuAction: IP @@ -431,8 +441,8 @@ Copy 2147483647 - - + + @@ -442,8 +452,8 @@ MAC 2147483647 - - + + submenuAction: MAC @@ -454,8 +464,8 @@ Copy 2147483647 - - + + @@ -465,24 +475,24 @@ Connections 2147483647 - - + + Interface 2147483647 - - + + Lease 2147483647 - - + + @@ -497,8 +507,8 @@ 2147483647 - - + + @@ -507,8 +517,8 @@ About 2147483647 - - + + @@ -516,8 +526,8 @@ , 1048576 2147483647 - - + + @@ -525,8 +535,8 @@ q 1048576 2147483647 - - + + @@ -1096,29 +1106,94 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + + 8219 + 2 + {{313, 762}, {768, 368}} + 1685585920 + Syslog Viewer + NSPanel + + + + 256 + + YES + + + 274 + {{0, 237}, {768, 131}} + + + YES + + -2073952767 + 272764928 + PDg1Pkp1biAgNiAxNzo0NzoyOCBkcm9wYmVhclsyMDExNl06IHB1YmtleSBhdXRoIHN1Y2NlZWRlZCBm +b3IgJ3Jvb3QnIHdpdGgga2V5IG1kNSAxNzoyNToyNjo4MjplNzowZDo5ODo2NToxNzowNDpiMToyMzow +NDphMzozNzo2NiBmcm9tIDE5Mi4xNjguMC4xNDo1NDg2OQo8Mjk+SnVuICA2IDE3OjQ4OjE1IGJjcmVs +YXlbMTk0ODddOiBpZ25vcmVkIEVOT0JVRlMgZnJvbSBzZW5kdG8oKSwgdGVtcG9yYXJ5IHNob3J0YWdl +IG9mIGJ1ZmZlciBtZW1vcnkKPDI5Pkp1biAgNiAxNzo1MTowNSBiY3JlbGF5WzE5NDg3XTogaWdub3Jl +ZCBFTk9CVUZTIGZyb20gc2VuZHRvKCksIHRlbXBvcmFyeSBzaG9ydGFnZSBvZiBidWZmZXIgbWVtb3J5 +CjwzMD5KdW4gIDYgMTc6NTM6MDIgaG9zdGFwZDogYXRoMTogU1RBIDAwOjFiOjYzOjE1OjI4OjZlIFdQ +QTogZ3JvdXAga2V5IGhhbmRzaGFrZSBjb21wbGV0ZWQgKFJTTikKA + + + YES + + + + + + {{7, 11}, {768, 368}} + + + + {{0, 0}, {2048, 1130}} + {1e+13, 1e+13} + + 268 YES - - + + + 268 + {{19, 1}, {170, 11}} + + + + 2 + YES + + 68288064 + 138675200 + 000% + + + + + + + + 1282 - {{19, -2}, {170, 12}} - + {{19, 0}, {172, 12}} + - + YES 2 16648 100 - {188, 10} + {192, 13} - + YES 2 NSView @@ -1547,7 +1622,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA menuSystemUptime - + 844 @@ -1555,7 +1630,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA menuSystemLoad - + 845 @@ -1610,8 +1685,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA view - - + + 866 @@ -1627,10 +1702,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA menuSystemMemoryIndicator - + 868 + + + menuSystemMemoryPercentage + + + + 881 + @@ -1776,10 +1859,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - + + - + + @@ -2351,34 +2435,88 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 842 - + 843 - + 857 - + YES - + + MemoryProgressIndicator 860 - - + + 863 - + + + 869 + + + + + 870 + + + YES + + + + SyslogViewer + + + 871 + + + YES + + + + + + 876 + + + YES + + + + + + 877 + + + + + 878 + + + YES + + + + MemoryIndicatorPercentage + + + 879 + + + @@ -2517,6 +2655,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 857.IBPluginDependency 860.IBPluginDependency 863.IBPluginDependency + 869.IBPluginDependency + 870.IBPluginDependency + 870.NSWindowTemplate.visibleAtLaunch + 871.IBPluginDependency + 876.IBPluginDependency + 877.IBPluginDependency + 878.IBPluginDependency + 879.IBPluginDependency YES @@ -2694,6 +2840,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 + com.apple.InterfaceBuilder.CocoaPlugin @@ -2708,7 +2862,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 868 + 881 @@ -2820,6 +2974,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA menuSystemLoad menuSystemMemory menuSystemMemoryIndicator + menuSystemMemoryPercentage menuSystemName menuSystemUptime menuWan @@ -2863,6 +3018,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSMenuItem NSMenuItem NSProgressIndicator + NSTextFieldCell NSMenuItem NSMenuItem NSMenuItem @@ -2909,6 +3065,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA menuSystemLoad menuSystemMemory menuSystemMemoryIndicator + menuSystemMemoryPercentage menuSystemName menuSystemUptime menuWan @@ -3030,6 +3187,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA menuSystemMemoryIndicator NSProgressIndicator + + menuSystemMemoryPercentage + NSTextFieldCell + menuSystemName NSMenuItem