commit 90f40c95b305e35fde41d9c66d065efb042f0cf4
author Ilya Moiseenko <iliamo@ucla.edu> Fri Sep 27 15:52:01 2013 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Fri Sep 27 15:52:01 2013 -0700
tree 89e68fe591e2f7947641a36c4ab178b6b9adb096
parent 2dffcf508f83b38b0685909378b532a75efd467c

Simple logic for Preferences

Change-Id: I9eda67bc5c8c60f803c2c7fb885fafb431c6384f

osx/menu-delegate.mm

diff --git a/osx/menu-delegate.mm b/osx/menu-delegate.mm
index c4c0790..d91e780 100644
--- a/osx/menu-delegate.mm
+++ b/osx/menu-delegate.mm
@@ -41,7 +41,7 @@
   [daemonStatus setTarget:self];
 
   daemonStarted = false;
-  [NSApp activateIgnoringOtherApps:YES];
+  //[NSApp activateIgnoringOtherApps:YES];
 }
 
 -(IBAction)switchDaemon:(id)sender
@@ -105,7 +105,6 @@
     [statusPopover showRelativeToRect:[[item view] bounds]
                  ofView:[item view]
                  preferredEdge:NSMinXEdge];
-    
   }
   else
   {
@@ -115,8 +114,48 @@
 
 -(IBAction)openNDNDPreferences:(id)sender
 {
+  [preferencesPanel setContentView:generalSettingsView];
   [preferencesPanel makeKeyAndOrderFront:sender];
   [preferencesPanel setLevel: NSStatusWindowLevel];
 }
-//
+
+-(IBAction)openGeneralSettings:(id)sender
+{
+  [preferencesPanel setContentView:generalSettingsView];
+}
+
+-(IBAction)openForwardingSettings:(id)sender
+{
+  [preferencesPanel setContentView:forwardingSettingsView];
+}
+
+-(IBAction)openSecuritySettings:(id)sender
+{
+  [preferencesPanel setContentView:securitySettingsView];
+}
+
+-(IBAction)switchSoftwareUpdates:(id)sender
+{
+  if ([(NSButton*)sender state] == NSOnState)
+  {
+    allowSoftwareUpdates = true;
+  }
+  else
+  {
+    allowSoftwareUpdates = false;
+  }
+}
+
+-(IBAction)switchHubDiscovery:(id)sender
+{
+  if ([(NSButton*)sender state] == NSOnState)
+  {
+    enableHubDiscovery = true;
+  }
+  else
+  {
+    enableHubDiscovery = false;
+  }
+}
+
 @end