Merge pull request #10 from Onix-Systems/feature/first-release

Prepare for 0.1.0 release

Author: derpoliuk

LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2017 Onix-Systems
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -0,0 +1,22 @@
+# status-bar-todo
+
+Simple macOS app to keep TODO-list in status bar.
+
+This app can do limited number of tasks:
+
+1. Add TODO
+1. Mark/unmark TODO as completed
+1. Delete one or all TODOs
+1. Edit single todo
+
+Here's how it look like:
+
+<img width="487" alt="screen shot 2017-01-05 at 7 00 49 pm" src="https://cloud.githubusercontent.com/assets/1434418/21689532/52b0c1ba-d379-11e6-882a-b16d4f8fce00.png">
+
+## Installation
+
+Clone project and run it.
+
+## LICENSE
+
+status-bar-todo is released under the MIT license. See [LICENSE](LICENSE) for details.

todo-status-bar.xcodeproj/project.pbxproj renamed to status-bar-todo.xcodeproj/project.pbxproj

@@ -16,10 +16,12 @@
 		1E8FB7561E0BCD6400BF6D20 /* TodoItemsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E8FB7551E0BCD6400BF6D20 /* TodoItemsController.swift */; };
 		1E8FB75D1E0BF88300BF6D20 /* AddTodoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E8FB75B1E0BF88300BF6D20 /* AddTodoViewController.swift */; };
 		1E8FB75E1E0BF88300BF6D20 /* AddTodoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E8FB75C1E0BF88300BF6D20 /* AddTodoViewController.xib */; };
+		1EC8A5F21E1EAD5E003E401F /* CheckboxTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EC8A5F11E1EAD5D003E401F /* CheckboxTableCellView.swift */; };
+		1EC8A5F41E1EAD75003E401F /* TodoItemTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EC8A5F31E1EAD75003E401F /* TodoItemTableCellView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		1E545FC41E0AD7E500D19810 /* todo-status-bar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "todo-status-bar.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1E545FC41E0AD7E500D19810 /* status-bar-todo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "status-bar-todo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1E545FC71E0AD7E500D19810 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1E545FC91E0AD7E500D19810 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		1E545FCC1E0AD7E500D19810 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -30,6 +32,8 @@
 		1E8FB7551E0BCD6400BF6D20 /* TodoItemsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodoItemsController.swift; sourceTree = "<group>"; };
 		1E8FB75B1E0BF88300BF6D20 /* AddTodoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddTodoViewController.swift; sourceTree = "<group>"; };
 		1E8FB75C1E0BF88300BF6D20 /* AddTodoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddTodoViewController.xib; sourceTree = "<group>"; };
+		1EC8A5F11E1EAD5D003E401F /* CheckboxTableCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxTableCellView.swift; sourceTree = "<group>"; };
+		1EC8A5F31E1EAD75003E401F /* TodoItemTableCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodoItemTableCellView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,7 +58,7 @@
 		1E545FC51E0AD7E500D19810 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1E545FC41E0AD7E500D19810 /* todo-status-bar.app */,
+				1E545FC41E0AD7E500D19810 /* status-bar-todo.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -67,21 +71,24 @@
 				1E8FB7551E0BCD6400BF6D20 /* TodoItemsController.swift */,
 				1E8FB75B1E0BF88300BF6D20 /* AddTodoViewController.swift */,
 				1E8FB75C1E0BF88300BF6D20 /* AddTodoViewController.xib */,
-				1E545FD41E0AE62400D19810 /* EditTodosWindowController.swift */,
 				1E545FD51E0AE62400D19810 /* EditTodosWindowController.xib */,
+				1E545FD41E0AE62400D19810 /* EditTodosWindowController.swift */,
+				1EC8A5F11E1EAD5D003E401F /* CheckboxTableCellView.swift */,
+				1EC8A5F31E1EAD75003E401F /* TodoItemTableCellView.swift */,
 				1E545FC91E0AD7E500D19810 /* Assets.xcassets */,
 				1E545FCB1E0AD7E500D19810 /* MainMenu.xib */,
 				1E545FCE1E0AD7E500D19810 /* Info.plist */,
 			);
-			path = "todo-status-bar";
+			name = "todo-status-bar";
+			path = "status-bar-todo";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		1E545FC31E0AD7E500D19810 /* todo-status-bar */ = {
+		1E545FC31E0AD7E500D19810 /* status-bar-todo */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1E545FD11E0AD7E500D19810 /* Build configuration list for PBXNativeTarget "todo-status-bar" */;
+			buildConfigurationList = 1E545FD11E0AD7E500D19810 /* Build configuration list for PBXNativeTarget "status-bar-todo" */;
 			buildPhases = (
 				1E545FC01E0AD7E500D19810 /* Sources */,
 				1E545FC11E0AD7E500D19810 /* Frameworks */,
@@ -91,9 +98,9 @@
 			);
 			dependencies = (
 			);
-			name = "todo-status-bar";
+			name = "status-bar-todo";
 			productName = "todo-status-bar";
-			productReference = 1E545FC41E0AD7E500D19810 /* todo-status-bar.app */;
+			productReference = 1E545FC41E0AD7E500D19810 /* status-bar-todo.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -113,7 +120,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 1E545FBF1E0AD7E500D19810 /* Build configuration list for PBXProject "todo-status-bar" */;
+			buildConfigurationList = 1E545FBF1E0AD7E500D19810 /* Build configuration list for PBXProject "status-bar-todo" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -126,7 +133,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				1E545FC31E0AD7E500D19810 /* todo-status-bar */,
+				1E545FC31E0AD7E500D19810 /* status-bar-todo */,
 			);
 		};
 /* End PBXProject section */
@@ -152,6 +159,8 @@
 			files = (
 				1E8FB7561E0BCD6400BF6D20 /* TodoItemsController.swift in Sources */,
 				1E545FC81E0AD7E500D19810 /* AppDelegate.swift in Sources */,
+				1EC8A5F21E1EAD5E003E401F /* CheckboxTableCellView.swift in Sources */,
+				1EC8A5F41E1EAD75003E401F /* TodoItemTableCellView.swift in Sources */,
 				1E8FB7541E0BCD5200BF6D20 /* TodoItem.swift in Sources */,
 				1E8FB75D1E0BF88300BF6D20 /* AddTodoViewController.swift in Sources */,
 				1E545FD61E0AE62400D19810 /* EditTodosWindowController.swift in Sources */,
@@ -268,9 +277,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = GJX986XEH7;
-				INFOPLIST_FILE = "todo-status-bar/Info.plist";
+				INFOPLIST_FILE = "$(TARGET_NAME)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.onix-systems.todo-status-bar";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.onix-systems.status-bar-todo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};
@@ -282,9 +291,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = GJX986XEH7;
-				INFOPLIST_FILE = "todo-status-bar/Info.plist";
+				INFOPLIST_FILE = "$(TARGET_NAME)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.onix-systems.todo-status-bar";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.onix-systems.status-bar-todo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};
@@ -293,7 +302,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		1E545FBF1E0AD7E500D19810 /* Build configuration list for PBXProject "todo-status-bar" */ = {
+		1E545FBF1E0AD7E500D19810 /* Build configuration list for PBXProject "status-bar-todo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1E545FCF1E0AD7E500D19810 /* Debug */,
@@ -302,7 +311,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1E545FD11E0AD7E500D19810 /* Build configuration list for PBXNativeTarget "todo-status-bar" */ = {
+		1E545FD11E0AD7E500D19810 /* Build configuration list for PBXNativeTarget "status-bar-todo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1E545FD21E0AD7E500D19810 /* Debug */,

todo-status-bar.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to status-bar-todo.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,14 +2,15 @@
 //  AddTodoViewController.swift
 //  todo-status-bar
 //
-//  Created by derp on 12/22/16.
+//  Created by Stanislav Derpoliuk on 12/22/16.
 //  Copyright © 2016 Onix-Systems. All rights reserved.
 //
 
 import Cocoa
 
 protocol AddTodoViewControllerDelegate: class {
     func addTodoViewController(_ controller: AddTodoViewController, didAddTodoWith title: String)
+    func addTodoViewControllerDidCancel(_ controller: AddTodoViewController)
 }
 
 class AddTodoViewController: NSViewController, NSControlTextEditingDelegate {
@@ -21,5 +22,9 @@ class AddTodoViewController: NSViewController, NSControlTextEditingDelegate {
         delegate?.addTodoViewController(self, didAddTodoWith: string)
         return true
     }
+
+    override func cancelOperation(_ sender: Any?) {
+        delegate?.addTodoViewControllerDidCancel(self)
+    }
 
 }

todo-status-bar/AddTodoViewController.swift renamed to status-bar-todo/AddTodoViewController.swift

@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  todo-status-bar
 //
-//  Created by derp on 12/21/16.
+//  Created by Stanislav Derpoliuk on 12/21/16.
 //  Copyright © 2016 Onix-Systems. All rights reserved.
 //
 
@@ -21,10 +21,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, EditTodosWindowControllerDel
         updateStatusItem()
     }
 
-    func applicationWillTerminate(_ aNotification: Notification) {
-        // Insert code here to tear down your application
-    }
-
     // MARK: - Validate Menu Item
 
     override func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
@@ -65,6 +61,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, EditTodosWindowControllerDel
         todoItems.forEach { todoItem in
             let todo = NSMenuItem(title: todoItem.title, action: #selector(menuTodoItemPressed(_:)), keyEquivalent: "")
             todo.representedObject = todoItem
+            if todoItem.completed {
+                let attributes = [
+                    NSStrikethroughStyleAttributeName: NSNumber(value: NSUnderlineStyle.styleSingle.rawValue),
+                    NSFontAttributeName: NSFont.menuBarFont(ofSize: 0)
+                ]
+                let attributedString = NSAttributedString(string: todoItem.title, attributes: attributes)
+                todo.attributedTitle = attributedString
+            }
             items.append(todo)
         }
         return items
@@ -83,6 +87,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, EditTodosWindowControllerDel
     @objc private func menuTodoItemPressed(_ sender: NSMenuItem) {
         guard let todoItem = sender.representedObject as? TodoItem else { return }
         todoItem.completed = !todoItem.completed
+        updateStatusItem()
     }
 
     @objc private func menuEditItemPressed(_ sender: NSMenuItem) {

todo-status-bar/AddTodoViewController.xib renamed to status-bar-todo/AddTodoViewController.xib

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,11 +20,11 @@
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
             <items>
-                <menuItem title="todo-status-bar" id="1Xt-HY-uBw">
+                <menuItem title="status-bar-todo" id="1Xt-HY-uBw">
                     <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="todo-status-bar" systemMenu="apple" id="uQy-DD-JDr">
+                    <menu key="submenu" title="status-bar-todo" systemMenu="apple" id="uQy-DD-JDr">
                         <items>
-                            <menuItem title="About todo-status-bar" id="5kV-Vb-QxS">
+                            <menuItem title="About status-bar-todo" id="5kV-Vb-QxS">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
@@ -39,7 +38,7 @@
                                 <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                            <menuItem title="Hide todo-status-bar" keyEquivalent="h" id="Olw-nP-bQN">
+                            <menuItem title="Hide status-bar-todo" keyEquivalent="h" id="Olw-nP-bQN">
                                 <connections>
                                     <action selector="hide:" target="-1" id="PnN-Uc-m68"/>
                                 </connections>
@@ -57,7 +56,7 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                            <menuItem title="Quit todo-status-bar" keyEquivalent="q" id="4sb-4s-VLi">
+                            <menuItem title="Quit status-bar-todo" keyEquivalent="q" id="4sb-4s-VLi">
                                 <connections>
                                     <action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
                                 </connections>
@@ -670,7 +669,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                         <items>
-                            <menuItem title="todo-status-bar Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                            <menuItem title="status-bar-todo Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
                                 </connections>
@@ -680,7 +679,7 @@
                 </menuItem>
             </items>
         </menu>
-        <window title="todo-status-bar" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="status-bar-todo" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>

todo-status-bar/AppDelegate.swift renamed to status-bar-todo/AppDelegate.swift

@@ -0,0 +1,15 @@
+//
+//  CheckboxTableCellView.swift
+//  todo-status-bar
+//
+//  Created by Stanislav Derpoliuk on 1/5/17.
+//  Copyright © 2017 Onix-Systems. All rights reserved.
+//
+
+import Cocoa
+
+final class CheckboxTableCellView: NSTableCellView {
+
+    @IBOutlet var checkboxButton: NSButton!
+    
+}