[macOS] Close app on red button click. (#16)

* Make app name consistent throughout menu items. * Make app exit on window close.
hyvart · Nov 26, 2019 · 8248661 · 8248661
1 parent 2d63f2f
commit 8248661
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/macOS/AppDelegate.cs b/macOS/AppDelegate.cs
@@ -8,8 +8,8 @@ namespace Jammit.macOS
   [Register("AppDelegate")]
   public partial class AppDelegate : FormsApplicationDelegate
   {
-    NSWindow _window;
-
+    NSWindow _window;
+
     public AppDelegate()
     {
       var style = NSWindowStyle.Closable | NSWindowStyle.Resizable | NSWindowStyle.Titled;
@@ -65,6 +65,20 @@ void ShowHelp(NSObject sender)
     public override void WillTerminate(NSNotification notification)
     {
       // Insert code here to tear down your application
-    }
+    }
+
+    #region NSApplicationDelegate overrides
+
+    /// <summary>
+    /// Make application exit when closing the main window.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <returns></returns>
+    public override bool ApplicationShouldTerminateAfterLastWindowClosed(NSApplication sender)
+    {
+      return true;
+    }
+
+    #endregion NSApplicationDelegate overrides
   }
 }
diff --git a/macOS/MainMenu.xib b/macOS/MainMenu.xib
@@ -15,7 +15,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Unjammit!" systemMenu="apple" id="57">
                         <items>
-                            <menuItem title="About Unjammit..." id="58">
+                            <menuItem title="About Unjammit!..." id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
@@ -29,7 +29,7 @@
                                 <menu key="submenu" title="Services" systemMenu="services" id="130"/>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="144"/>
-                            <menuItem title="Hide Unjammit" keyEquivalent="h" id="134">
+                            <menuItem title="Hide Unjammit!" keyEquivalent="h" id="134">
                                 <connections>
                                     <action selector="hide:" target="-1" id="367"/>
                                 </connections>
@@ -47,7 +47,7 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="149"/>
-                            <menuItem title="Quit Unjammit" keyEquivalent="q" id="136">
+                            <menuItem title="Quit Unjammit!" keyEquivalent="q" id="136">
                                 <connections>
                                     <action selector="terminate:" target="-1" id="369"/>
                                 </connections>
@@ -142,7 +142,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="106">
                         <items>
-                            <menuItem title="Unjammit Help" keyEquivalent="?" id="111">
+                            <menuItem title="Unjammit! Help" keyEquivalent="?" id="111">
                                 <connections>
                                     <action selector="customHelp:" target="-1" id="tdR-jf-Hmc"/>
                                 </connections>

diff --git a/macOS/ViewController.cs b/macOS/ViewController.cs
@@ -3,7 +3,7 @@
 using AppKit;
 using Foundation;
 
-namespace Jam.NET.macOS
+namespace Jammit.macOS
 {
   public partial class ViewController : NSViewController
   {

diff --git a/macOS/ViewController.designer.cs b/macOS/ViewController.designer.cs