diff --git a/MTMR.xcodeproj/project.pbxproj b/MTMR.xcodeproj/project.pbxproj index 8a0f4f0..e3a5a77 100644 --- a/MTMR.xcodeproj/project.pbxproj +++ b/MTMR.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ B082B270205C7D8000BC04DC /* MTMRUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MTMRUITests.swift; sourceTree = ""; }; B082B272205C7D8000BC04DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPress.swift; sourceTree = ""; }; - B0C1CFC9205C97D30021C862 /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WindowController.swift; path = ../WindowController.swift; sourceTree = ""; }; + B0C1CFC9205C97D30021C862 /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -118,7 +118,6 @@ B082B251205C7D8000BC04DC /* MTMR */ = { isa = PBXGroup; children = ( - B0C1CFC9205C97D30021C862 /* WindowController.swift */, B059D629205E13E5006E6B86 /* TouchBarPrivateApi.h */, B059D62A205F0E7D006E6B86 /* TouchBarPrivateApi-Bridging.h */, B082B252205C7D8000BC04DC /* AppDelegate.swift */, @@ -127,6 +126,7 @@ B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */, B059D623205E04F3006E6B86 /* TouchBarItems.swift */, B059D621205E03F5006E6B86 /* TouchBarController.swift */, + B0C1CFC9205C97D30021C862 /* WindowController.swift */, B082B258205C7D8000BC04DC /* Main.storyboard */, B082B25B205C7D8000BC04DC /* Info.plist */, B082B25C205C7D8000BC04DC /* MTMR.entitlements */, diff --git a/MTMR/WindowController.swift b/MTMR/WindowController.swift index 7d992b2..baaf6f1 100644 --- a/MTMR/WindowController.swift +++ b/MTMR/WindowController.swift @@ -2,25 +2,16 @@ // WindowController.swift // MTMR // -// Created by Anton Palgunov on 16/03/2018. +// Created by Anton Palgunov on 17/03/2018. // Copyright © 2018 Anton Palgunov. All rights reserved. // import Cocoa -fileprivate extension NSTouchBar.CustomizationIdentifier { - static let touchBar = NSTouchBar.CustomizationIdentifier("com.MTMR.touchBar") +class WindowController: NSWindowController { + + override func windowDidLoad() { + super.windowDidLoad() + + } } - -fileprivate extension NSTouchBarItem.Identifier { - static let popover = NSTouchBarItem.Identifier("com.MTMR.TouchBarItem.popover") - static let fontStyle = NSTouchBarItem.Identifier("com.MTMR.TouchBarItem.fontStyle") - static let popoverSlider = NSTouchBarItem.Identifier("com.MTMR.popoverBar.slider") -} - -class WindowController: NSWindowController, NSToolbarDelegate { - let FontSizeToolbarItemID = "FontSize" - let FontStyleToolbarItemID = "FontStyle" - let DefaultFontSize : Int = 18 -} - diff --git a/WindowController.swift b/WindowController.swift deleted file mode 100644 index baaf6f1..0000000 --- a/WindowController.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// WindowController.swift -// MTMR -// -// Created by Anton Palgunov on 17/03/2018. -// Copyright © 2018 Anton Palgunov. All rights reserved. -// - -import Cocoa - -class WindowController: NSWindowController { - - override func windowDidLoad() { - super.windowDidLoad() - - } -}