commit 2dffcf508f83b38b0685909378b532a75efd467c
author Ilya Moiseenko <iliamo@ucla.edu> Fri Sep 27 15:08:04 2013 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Fri Sep 27 15:08:04 2013 -0700
tree afe09df6a6f6e3a7b5151ef75b15beac10d93999
parent 0126432c76f03d9fd1707e3e6979c3c6dea146c4

Daemon Start/Stop + Preferences panel working

Change-Id: I375c4deb01b653edc2dcb7678d70a9b94a8504b2

osx/menu-delegate.mm

diff --git a/osx/menu-delegate.mm b/osx/menu-delegate.mm
index 1e2b1c1..c4c0790 100644
--- a/osx/menu-delegate.mm
+++ b/osx/menu-delegate.mm
@@ -8,6 +8,10 @@
 
 #import "menu-delegate.h"
 
+#define NDND_START_COMMAND @"/opt/local/bin/ndndstart"
+#define NDND_STOP_COMMAND @"/opt/local/bin/ndndstop"
+#define NDND_STATUS_COMMAND @"/opt/local/bin/ndndstatus"
+
 @implementation MenuDelegate
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
@@ -21,7 +25,6 @@
   [statusItem setMenu:statusMenu];
   [statusItem setToolTip:@"NDN Control Center"];
   [statusItem setEnabled:YES];
-  //[statusItem setTitle:@"Status"];
   [statusItem setHighlightMode:YES];
   //[statusItem setTarget:self];
 
@@ -32,13 +35,13 @@
   [statusItem setImage:menuIcon];
   
   
-  
   [connectionStatus setView: connectionStatusView];
   [connectionStatus setTarget:self];
   [daemonStatus setView: daemonStatusView];
   [daemonStatus setTarget:self];
 
   daemonStarted = false;
+  [NSApp activateIgnoringOtherApps:YES];
 }
 
 -(IBAction)switchDaemon:(id)sender
@@ -47,9 +50,12 @@
   {
     daemonStarted = false;
     [sender setTitle:@"Start"];
-    //[connectionStatus setTitle:@"NDN disconnected"];
     [connectionStatusText setStringValue:@"Disconnected"];
     
+    NSTask *task = [[NSTask alloc] init];
+    [task setLaunchPath: NDND_STOP_COMMAND];
+    [task launch];
+    
     NSBundle *bundle = [NSBundle bundleForClass:[self class]];
     NSString *path = [bundle pathForResource:@"FlatDisconnected" ofType:@"png"];
     menuIcon = [[NSImage alloc] initWithContentsOfFile:path];
@@ -59,9 +65,12 @@
   {
     daemonStarted = true;
     [sender setTitle:@"Stop"];
-    //[connectionStatus setTitle:@"NDN connected"];
     [connectionStatusText setStringValue:@"Connected"];
     
+    NSTask *task = [[NSTask alloc] init];
+    [task setLaunchPath: NDND_START_COMMAND];
+    [task launch];
+    
     NSBundle *bundle = [NSBundle bundleForClass:[self class]];
     NSString *path = [bundle pathForResource:@"FlatConnected" ofType:@"png"];
     menuIcon = [[NSImage alloc] initWithContentsOfFile:path];
@@ -104,4 +113,10 @@
   }
 }
 
+-(IBAction)openNDNDPreferences:(id)sender
+{
+  [preferencesPanel makeKeyAndOrderFront:sender];
+  [preferencesPanel setLevel: NSStatusWindowLevel];
+}
+//
 @end