commit 0126432c76f03d9fd1707e3e6979c3c6dea146c4
author Ilya Moiseenko <iliamo@ucla.edu> Thu Sep 26 15:34:21 2013 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Thu Sep 26 15:34:21 2013 -0700
tree d209e4fc9046c3f2ce68e0b53a49d3203379ddb9
parent a10ef8dc3edf3783f6ca960b560decb676da9739

Daemon status popup works

Change-Id: Ic58070ce80578593053c6f4d68df6c785dff7442

osx/menu-delegate.mm

diff --git a/osx/menu-delegate.mm b/osx/menu-delegate.mm
index 35e3881..1e2b1c1 100644
--- a/osx/menu-delegate.mm
+++ b/osx/menu-delegate.mm
@@ -31,6 +31,13 @@
   [statusItem setTitle:@""];
   [statusItem setImage:menuIcon];
   
+  
+  
+  [connectionStatus setView: connectionStatusView];
+  [connectionStatus setTarget:self];
+  [daemonStatus setView: daemonStatusView];
+  [daemonStatus setTarget:self];
+
   daemonStarted = false;
 }
 
@@ -40,7 +47,8 @@
   {
     daemonStarted = false;
     [sender setTitle:@"Start"];
-    [connectionStatus setTitle:@"NDN disconnected"];
+    //[connectionStatus setTitle:@"NDN disconnected"];
+    [connectionStatusText setStringValue:@"Disconnected"];
     
     NSBundle *bundle = [NSBundle bundleForClass:[self class]];
     NSString *path = [bundle pathForResource:@"FlatDisconnected" ofType:@"png"];
@@ -51,7 +59,8 @@
   {
     daemonStarted = true;
     [sender setTitle:@"Stop"];
-    [connectionStatus setTitle:@"NDN connected"];
+    //[connectionStatus setTitle:@"NDN connected"];
+    [connectionStatusText setStringValue:@"Connected"];
     
     NSBundle *bundle = [NSBundle bundleForClass:[self class]];
     NSString *path = [bundle pathForResource:@"FlatConnected" ofType:@"png"];
@@ -62,11 +71,6 @@
 
 -(IBAction)openDaemonStatus:(id)sender
 {
-  [statusPopover showRelativeToRect:[[daemonStatus view] bounds]
-                 ofView:[daemonStatus view]
-                 preferredEdge:NSMinXEdge];
-
-  //[statusPopover showRelativeToRect:[sender bounds] ofView:sender preferredEdge:NSMinYEdge];
 }
 
 -(IBAction)openRoutingStatusPage:(id)sender
@@ -84,4 +88,20 @@
   [[NSWorkspace sharedWorkspace] openURL: pageURL];
 }
 
+-(void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item
+{
+
+  if( ([item view]!=nil) && (item == daemonStatus) )
+  {
+    [statusPopover showRelativeToRect:[[item view] bounds]
+                 ofView:[item view]
+                 preferredEdge:NSMinXEdge];
+    
+  }
+  else
+  {
+    [statusPopover performClose:nil];
+  }
+}
+
 @end