diff --git a/TouchBarBar.xcodeproj/project.pbxproj b/TouchBarBar.xcodeproj/project.pbxproj index ddaa328..3853c5c 100644 --- a/TouchBarBar.xcodeproj/project.pbxproj +++ b/TouchBarBar.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 1968E2811DC2E22100422BFE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1968E2801DC2E22100422BFE /* AppDelegate.swift */; }; - 1968E2831DC2E22100422BFE /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1968E2821DC2E22100422BFE /* ViewController.swift */; }; 1968E2851DC2E22100422BFE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1968E2841DC2E22100422BFE /* Assets.xcassets */; }; 1968E2881DC2E22100422BFE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1968E2861DC2E22100422BFE /* Main.storyboard */; }; 1968E29E1DC2E71000422BFE /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1968E29D1DC2E71000422BFE /* WindowController.swift */; }; @@ -31,7 +30,6 @@ /* Begin PBXFileReference section */ 1968E27D1DC2E22100422BFE /* TouchBarBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TouchBarBar.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1968E2801DC2E22100422BFE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 1968E2821DC2E22100422BFE /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 1968E2841DC2E22100422BFE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 1968E2871DC2E22100422BFE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 1968E2891DC2E22100422BFE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -84,7 +82,6 @@ A4936DAE1DED8F5900B4FE0D /* Bar */, 1968E2801DC2E22100422BFE /* AppDelegate.swift */, 1968E29D1DC2E71000422BFE /* WindowController.swift */, - 1968E2821DC2E22100422BFE /* ViewController.swift */, 1968E2841DC2E22100422BFE /* Assets.xcassets */, 1968E2861DC2E22100422BFE /* Main.storyboard */, 1968E2891DC2E22100422BFE /* Info.plist */, @@ -210,7 +207,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1968E2831DC2E22100422BFE /* ViewController.swift in Sources */, 1968E29E1DC2E71000422BFE /* WindowController.swift in Sources */, 1968E2811DC2E22100422BFE /* AppDelegate.swift in Sources */, ); diff --git a/TouchBarBar.xcodeproj/project.xcworkspace/xcuserdata/gui.xcuserdatad/UserInterfaceState.xcuserstate b/TouchBarBar.xcodeproj/project.xcworkspace/xcuserdata/gui.xcuserdatad/UserInterfaceState.xcuserstate index a55d554..deca745 100644 Binary files a/TouchBarBar.xcodeproj/project.xcworkspace/xcuserdata/gui.xcuserdatad/UserInterfaceState.xcuserstate and b/TouchBarBar.xcodeproj/project.xcworkspace/xcuserdata/gui.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TouchBarBar/AppDelegate.swift b/TouchBarBar/AppDelegate.swift index 923f51f..688cdc5 100644 --- a/TouchBarBar/AppDelegate.swift +++ b/TouchBarBar/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// TouchFart +// TouchBarBar // // Created by Guidouil on 10/29/16. // Copyright © 2016 Guidouil. All rights reserved. @@ -11,8 +11,6 @@ import Cocoa @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { - - func applicationDidFinishLaunching(_ aNotification: Notification) { // Insert code here to initialize your application } @@ -20,7 +18,4 @@ class AppDelegate: NSObject, NSApplicationDelegate { func applicationWillTerminate(_ aNotification: Notification) { // Insert code here to tear down your application } - - } - diff --git a/TouchBarBar/Base.lproj/Main.storyboard b/TouchBarBar/Base.lproj/Main.storyboard index ed4a003..cf32c62 100644 --- a/TouchBarBar/Base.lproj/Main.storyboard +++ b/TouchBarBar/Base.lproj/Main.storyboard @@ -681,7 +681,7 @@ - + diff --git a/TouchBarBar/ViewController.swift b/TouchBarBar/ViewController.swift deleted file mode 100644 index 54240f5..0000000 --- a/TouchBarBar/ViewController.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// ViewController.swift -// TouchFart -// -// Created by Guidouil on 10/29/16. -// Copyright © 2016 Guidouil. All rights reserved. -// - -import Cocoa - -class ViewController: NSViewController { - - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - override var representedObject: Any? { - didSet { - // Update the view, if already loaded. - } - } - - -} - diff --git a/TouchBarBar/WindowController.swift b/TouchBarBar/WindowController.swift index 81837c3..8af05db 100644 --- a/TouchBarBar/WindowController.swift +++ b/TouchBarBar/WindowController.swift @@ -1,6 +1,6 @@ // // WindowController.swift -// TouchFart +// TouchBarBar // // Created by Guidouil on 10/29/16. // Copyright © 2016 Guidouil. All rights reserved. @@ -23,7 +23,6 @@ fileprivate extension NSTouchBarItemIdentifier { } - class WindowController: NSWindowController, NSTouchBarDelegate { override func windowDidLoad() { @@ -83,6 +82,4 @@ class WindowController: NSWindowController, NSTouchBarDelegate { } } - - }