From 1bf2124fa46efe2e1c1f3cef3975230c85ce5b5b Mon Sep 17 00:00:00 2001
From: Travis McArthur <travis@sectionfive.net>
Date: Sat, 18 Jul 2015 01:15:04 -0700
Subject: [PATCH] Wire up menus correctly

---
 .../UnrealIRCd.xcodeproj/project.pbxproj      |  1 +
 src/macosx/UnrealIRCd/AppDelegate.swift       |  8 +--
 .../UnrealIRCd/Base.lproj/Main.storyboard     | 53 +++++++++++--------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj b/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj
index 27d247279..48090d314 100644
--- a/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj
+++ b/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj
@@ -160,6 +160,7 @@
 		1FE784E71B3DF0DD006CB6DD /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = "UnrealIRCd Team";
 				TargetAttributes = {
diff --git a/src/macosx/UnrealIRCd/AppDelegate.swift b/src/macosx/UnrealIRCd/AppDelegate.swift
index 510318a44..8727f5164 100644
--- a/src/macosx/UnrealIRCd/AppDelegate.swift
+++ b/src/macosx/UnrealIRCd/AppDelegate.swift
@@ -26,21 +26,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     }
     
-    @IBAction func startDaemon(sender: AnyObject) {
+    @IBAction func startDaemon(sender: NSMenuItem) {
         
     }
     
-    @IBAction func stopDaemon(sender: AnyObject) {
+    @IBAction func stopDaemon(sender: NSMenuItem) {
         
     }
     
-    @IBAction func configureDaemon(sender: AnyObject) {
+    @IBAction func configureDaemon(sender: NSMenuItem) {
         let storyboard = NSStoryboard(name: "Main", bundle:nil)
         let controller = storyboard!.instantiateControllerWithIdentifier("Configuration")
         controller!.showWindow(self)
     }
     
-    @IBAction func help(sender: AnyObject) {
+    @IBAction func help(sender: NSMenuItem) {
         
     }
 
diff --git a/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard b/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard
index 00ab067a0..45382d8ae 100644
--- a/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard
+++ b/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard
@@ -10,29 +10,36 @@
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
-                            <menuItem title="Configure UnrealIRCd" id="dMs-cI-mzQ">
+                            <menuItem title="Menu" id="arB-Ko-zYF">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="configureDaemon:" target="Voe-Tx-rLC" id="jAU-2P-oeO"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Start UnrealIRCd" id="aUF-d1-5bR">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="startDaemon:" target="Voe-Tx-rLC" id="JJ6-R9-Yqf"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Stop UnrealIRCd" id="wpr-3q-Mcd">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="stopDaemon:" target="Voe-Tx-rLC" id="EhI-ZX-pmo"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Help" id="GJF-j3-lpm">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="help:" target="Voe-Tx-rLC" id="ljC-El-YsA"/>
-                                </connections>
+                                <menu key="submenu" title="Menu" id="nGf-dN-dCb">
+                                    <items>
+                                        <menuItem title="Configure UnrealIRCd" id="hg4-Jt-NlG">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="configureDaemon:" target="Voe-Tx-rLC" id="lTe-kQ-PcS"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Start UnrealIRCd" id="sdz-uA-JlO">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="startDaemon:" target="Voe-Tx-rLC" id="pAe-Ca-hpE"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop UnrealIRCd" id="mWB-m4-eGp">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="stopDaemon:" target="Voe-Tx-rLC" id="nCK-J9-mwB"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Help" id="Z7I-ow-aOT">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="help:" target="Voe-Tx-rLC" id="3u2-Sx-rc5"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
                             </menuItem>
                         </items>
                     </menu>
@@ -42,7 +49,7 @@
                 </application>
                 <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="UnrealIRCd" customModuleProvider="target">
                     <connections>
-                        <outlet property="mainMenu" destination="AYu-sK-qS6" id="YPC-KJ-UJI"/>
+                        <outlet property="mainMenu" destination="nGf-dN-dCb" id="k5P-Yl-n8g"/>
                     </connections>
                 </customObject>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>