Added icon v1

- Fixed status item menu

Clippr/Clippr/AppDelegate.swift

@@ -86,15 +86,35 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
 
             self.windowController?.openWindowAtCenter()
         }
+
+        menuItem?.shutdownHandler = {
+            NSRunningApplication.current.forceTerminate()
+        }
+
         menuItem?.install()
 
         setupShortcut()
 
         if !introShown {
+            Preferences.launchOnLogin = true
             handleOpen()
         }
     }
 
+    func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
+        let eventDescriptor = NSAppleEventManager.shared().currentAppleEvent?.attributeDescriptor(forKeyword: "why?")
+
+        if eventDescriptor?.typeCodeValue == "rest" || // Restart
+           eventDescriptor?.typeCodeValue == "shut" || // Shutdown
+           eventDescriptor?.typeCodeValue == "rlgo" {  // Logout
+            return .terminateNow
+        }
+        windowController?.close()
+        NSApp.setActivationPolicy(.accessory)
+
+        return .terminateCancel
+    }
+
     func handleOpen() {
         NSApp.setActivationPolicy(.regular)
 

Clippr/Clippr/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
   "images" : [
     {
-      "size" : "16x16",
+      "filename" : "AppIcon16.png",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-1.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "16x16"
     },
     {
-      "size" : "16x16",
+      "filename" : "[email protected]",
       "idiom" : "mac",
-      "filename" : "clipboard-flat.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "16x16"
     },
     {
-      "size" : "32x32",
+      "filename" : "AppIcon32.png",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-2.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "32x32"
     },
     {
-      "size" : "32x32",
+      "filename" : "[email protected]",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-3.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "32x32"
     },
     {
-      "size" : "128x128",
+      "filename" : "AppIcon128.png",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-6.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "128x128"
     },
     {
-      "size" : "128x128",
+      "filename" : "[email protected]",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-7.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "128x128"
     },
     {
-      "size" : "256x256",
+      "filename" : "AppIcon256.png",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-8.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "256x256"
     },
     {
-      "size" : "256x256",
+      "filename" : "[email protected]",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-9.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "256x256"
     },
     {
-      "size" : "512x512",
+      "filename" : "AppIcon512.png",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-4.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "512x512"
     },
     {
-      "size" : "512x512",
+      "filename" : "[email protected]",
       "idiom" : "mac",
-      "filename" : "clipboard-flat-5.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "512x512"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Clippr/Clippr/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Clippr/Clippr/Assets.xcassets/MenuIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "MenuIcon.png",
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "mac",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Clippr/Clippr/Info.plist

@@ -30,9 +30,5 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>NSSupportsAutomaticTermination</key>
-	<true/>
-	<key>NSSupportsSuddenTermination</key>
-	<true/>
 </dict>
 </plist>

Clippr/Clippr/MainUI/Menu/MenuItem.swift

@@ -12,20 +12,25 @@ class MenuItem {
     private lazy var statusItem = NSStatusBar.system.statusItem(withLength: 32)
     var openHandler: (() -> Void)?
     var clipboardHandler: (() -> Void)?
+    var shutdownHandler: (() -> Void)?
 
     func install() {
-        self.statusItem.image = #imageLiteral(resourceName: "MAC")
+        self.statusItem.image = #imageLiteral(resourceName: "MenuIcon")
 
         let menu = NSMenu()
 
-        let windowItem = NSMenuItem(title: NSLocalizedString("Open Clippr!", comment: ""), action: #selector(self.window(sender:)), keyEquivalent: "")
+        let windowItem = NSMenuItem(title: NSLocalizedString("Open Clippr", comment: ""), action: #selector(self.window(sender:)), keyEquivalent: "")
         windowItem.target = self
         menu.addItem(windowItem)
 
         let clipboardItem = NSMenuItem(title: NSLocalizedString("Clipboard history", comment: ""), action: #selector(self.clipboard(sender:)), keyEquivalent: "")
         clipboardItem.target = self
         menu.addItem(clipboardItem)
 
+        let shutdownItem = NSMenuItem(title: NSLocalizedString("Shut down", comment: ""), action: #selector(self.shutdown(sender:)), keyEquivalent: "")
+        shutdownItem.target = self
+        menu.addItem(shutdownItem)
+
         self.statusItem.menu = menu
     }
 
@@ -38,4 +43,9 @@ class MenuItem {
     func clipboard(sender: Any) {
         clipboardHandler?()
     }
+
+    @objc private
+    func shutdown(sender: Any) {
+        shutdownHandler?()
+    }
 }