From dd506616b339ee57ec6dc734a28caca4f3579a68 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Sat, 15 Nov 2014 23:47:46 +0100 Subject: [PATCH] Initial layout of project window --- AVRsack.xcodeproj/project.pbxproj | 131 ++++++++++++++++-- .../xcschemes/AVRsack.xcscheme | 114 +++++++++++++++ .../xcschemes/xcschememanagement.plist | 27 ++++ ...{AppDelegate.swift => ASApplication.swift} | 2 +- AVRsack/{Document.swift => ASProjDoc.swift} | 14 +- AVRsack/AVRsack-Bridging-Header.h | 4 + AVRsack/Base.lproj/ASProjDoc.xib | 129 +++++++++++++++++ AVRsack/Base.lproj/Document.xib | 43 ------ AVRsack/Base.lproj/MainMenu.xib | 10 +- AVRsack/Info.plist | 4 +- 10 files changed, 410 insertions(+), 68 deletions(-) create mode 100644 AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/AVRsack.xcscheme create mode 100644 AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/xcschememanagement.plist rename AVRsack/{AppDelegate.swift => ASApplication.swift} (89%) rename AVRsack/{Document.swift => ASProjDoc.swift} (86%) create mode 100644 AVRsack/AVRsack-Bridging-Header.h create mode 100644 AVRsack/Base.lproj/ASProjDoc.xib delete mode 100644 AVRsack/Base.lproj/Document.xib diff --git a/AVRsack.xcodeproj/project.pbxproj b/AVRsack.xcodeproj/project.pbxproj index 7caefde..c35248f 100644 --- a/AVRsack.xcodeproj/project.pbxproj +++ b/AVRsack.xcodeproj/project.pbxproj @@ -7,12 +7,14 @@ objects = { /* Begin PBXBuildFile section */ - 9501D8021A17025C0034C530 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501D8011A17025C0034C530 /* AppDelegate.swift */; }; - 9501D8041A17025C0034C530 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501D8031A17025C0034C530 /* Document.swift */; }; - 9501D8071A17025C0034C530 /* Document.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9501D8051A17025C0034C530 /* Document.xib */; }; + 9501D8021A17025C0034C530 /* ASApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501D8011A17025C0034C530 /* ASApplication.swift */; }; + 9501D8041A17025C0034C530 /* ASProjDoc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501D8031A17025C0034C530 /* ASProjDoc.swift */; }; + 9501D8071A17025C0034C530 /* ASProjDoc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9501D8051A17025C0034C530 /* ASProjDoc.xib */; }; 9501D8091A17025C0034C530 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9501D8081A17025C0034C530 /* Images.xcassets */; }; 9501D80C1A17025C0034C530 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9501D80A1A17025C0034C530 /* MainMenu.xib */; }; 9501D8181A17025C0034C530 /* AVRsackTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501D8171A17025C0034C530 /* AVRsackTests.swift */; }; + 95EA32621A17B90600F66EB0 /* ACEView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95EA325B1A17B8DA00F66EB0 /* ACEView.framework */; }; + 95EA32651A17BA8C00F66EB0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95EA32631A17BA8C00F66EB0 /* Cocoa.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -23,19 +25,51 @@ remoteGlobalIDString = 9501D7FB1A17025C0034C530; remoteInfo = AVRsack; }; + 95EA325A1A17B8DA00F66EB0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 7C8A728C15EA0769007E5EB8; + remoteInfo = ACEView; + }; + 95EA325C1A17B8DA00F66EB0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 7C8A72E015EA0F0E007E5EB8; + remoteInfo = ACEVIewExample; + }; + 95EA325E1A17B8DA00F66EB0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 36F169E216B9346C00E8965C; + remoteInfo = ACEViewTests; + }; + 95EA32601A17B8E900F66EB0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 7C8A728B15EA0769007E5EB8; + remoteInfo = ACEView; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 9501D7FC1A17025C0034C530 /* AVRsack.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AVRsack.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9501D8001A17025C0034C530 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9501D8011A17025C0034C530 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 9501D8031A17025C0034C530 /* Document.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = ""; }; - 9501D8061A17025C0034C530 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Document.xib; sourceTree = ""; }; + 9501D8011A17025C0034C530 /* ASApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASApplication.swift; sourceTree = ""; }; + 9501D8031A17025C0034C530 /* ASProjDoc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASProjDoc.swift; sourceTree = ""; }; + 9501D8061A17025C0034C530 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ASProjDoc.xib; sourceTree = ""; }; 9501D8081A17025C0034C530 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 9501D80B1A17025C0034C530 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 9501D8111A17025C0034C530 /* AVRsackTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AVRsackTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 9501D8161A17025C0034C530 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9501D8171A17025C0034C530 /* AVRsackTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVRsackTests.swift; sourceTree = ""; }; + 958D76811A17DA1C00917D96 /* AVRsack-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AVRsack-Bridging-Header.h"; sourceTree = ""; }; + 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ACEView.xcodeproj; path = ../ACEView/ACEView.xcodeproj; sourceTree = ""; }; + 95EA32631A17BA8C00F66EB0 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 95EA32641A17BA8C00F66EB0 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -43,6 +77,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 95EA32651A17BA8C00F66EB0 /* Cocoa.framework in Frameworks */, + 95EA32621A17B90600F66EB0 /* ACEView.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -59,6 +95,7 @@ 9501D7F31A17025C0034C530 = { isa = PBXGroup; children = ( + 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */, 9501D7FE1A17025C0034C530 /* AVRsack */, 9501D8141A17025C0034C530 /* AVRsackTests */, 9501D7FD1A17025C0034C530 /* Products */, @@ -77,12 +114,14 @@ 9501D7FE1A17025C0034C530 /* AVRsack */ = { isa = PBXGroup; children = ( - 9501D8011A17025C0034C530 /* AppDelegate.swift */, - 9501D8031A17025C0034C530 /* Document.swift */, - 9501D8051A17025C0034C530 /* Document.xib */, + 958D76811A17DA1C00917D96 /* AVRsack-Bridging-Header.h */, + 9501D8011A17025C0034C530 /* ASApplication.swift */, + 9501D8031A17025C0034C530 /* ASProjDoc.swift */, + 9501D8051A17025C0034C530 /* ASProjDoc.xib */, 9501D8081A17025C0034C530 /* Images.xcassets */, 9501D80A1A17025C0034C530 /* MainMenu.xib */, 9501D7FF1A17025C0034C530 /* Supporting Files */, + 95EA32671A17BAA600F66EB0 /* Frameworks */, ); path = AVRsack; sourceTree = ""; @@ -112,6 +151,25 @@ name = "Supporting Files"; sourceTree = ""; }; + 95EA32551A17B8DA00F66EB0 /* Products */ = { + isa = PBXGroup; + children = ( + 95EA325B1A17B8DA00F66EB0 /* ACEView.framework */, + 95EA325D1A17B8DA00F66EB0 /* ACEVIewExample.app */, + 95EA325F1A17B8DA00F66EB0 /* ACEViewTests.octest */, + ); + name = Products; + sourceTree = ""; + }; + 95EA32671A17BAA600F66EB0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 95EA32631A17BA8C00F66EB0 /* Cocoa.framework */, + 95EA32641A17BA8C00F66EB0 /* WebKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -126,6 +184,7 @@ buildRules = ( ); dependencies = ( + 95EA32611A17B8E900F66EB0 /* PBXTargetDependency */, ); name = AVRsack; productName = AVRsack; @@ -179,6 +238,12 @@ mainGroup = 9501D7F31A17025C0034C530; productRefGroup = 9501D7FD1A17025C0034C530 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 95EA32551A17B8DA00F66EB0 /* Products */; + ProjectRef = 95EA32541A17B8DA00F66EB0 /* ACEView.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 9501D7FB1A17025C0034C530 /* AVRsack */, @@ -187,12 +252,36 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 95EA325B1A17B8DA00F66EB0 /* ACEView.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ACEView.framework; + remoteRef = 95EA325A1A17B8DA00F66EB0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 95EA325D1A17B8DA00F66EB0 /* ACEVIewExample.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = ACEVIewExample.app; + remoteRef = 95EA325C1A17B8DA00F66EB0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 95EA325F1A17B8DA00F66EB0 /* ACEViewTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = ACEViewTests.octest; + remoteRef = 95EA325E1A17B8DA00F66EB0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 9501D7FA1A17025C0034C530 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9501D8071A17025C0034C530 /* Document.xib in Resources */, + 9501D8071A17025C0034C530 /* ASProjDoc.xib in Resources */, 9501D8091A17025C0034C530 /* Images.xcassets in Resources */, 9501D80C1A17025C0034C530 /* MainMenu.xib in Resources */, ); @@ -212,8 +301,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9501D8041A17025C0034C530 /* Document.swift in Sources */, - 9501D8021A17025C0034C530 /* AppDelegate.swift in Sources */, + 9501D8041A17025C0034C530 /* ASProjDoc.swift in Sources */, + 9501D8021A17025C0034C530 /* ASApplication.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -233,15 +322,20 @@ target = 9501D7FB1A17025C0034C530 /* AVRsack */; targetProxy = 9501D8121A17025C0034C530 /* PBXContainerItemProxy */; }; + 95EA32611A17B8E900F66EB0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = ACEView; + targetProxy = 95EA32601A17B8E900F66EB0 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 9501D8051A17025C0034C530 /* Document.xib */ = { + 9501D8051A17025C0034C530 /* ASProjDoc.xib */ = { isa = PBXVariantGroup; children = ( 9501D8061A17025C0034C530 /* Base */, ); - name = Document.xib; + name = ASProjDoc.xib; sourceTree = ""; }; 9501D80A1A17025C0034C530 /* MainMenu.xib */ = { @@ -336,10 +430,14 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; INFOPLIST_FILE = AVRsack/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "AVRsack/AVRsack-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; @@ -347,10 +445,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; INFOPLIST_FILE = AVRsack/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "AVRsack/AVRsack-Bridging-Header.h"; }; name = Release; }; @@ -409,6 +510,7 @@ 9501D81D1A17025C0034C530 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 9501D81E1A17025C0034C530 /* Build configuration list for PBXNativeTarget "AVRsackTests" */ = { isa = XCConfigurationList; @@ -417,6 +519,7 @@ 9501D8201A17025C0034C530 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/AVRsack.xcscheme b/AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/AVRsack.xcscheme new file mode 100644 index 0000000..1e90279 --- /dev/null +++ b/AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/AVRsack.xcscheme @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/xcschememanagement.plist b/AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..d99ed4e --- /dev/null +++ b/AVRsack.xcodeproj/xcuserdata/neeri.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + AVRsack.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 9501D7FB1A17025C0034C530 + + primary + + + 9501D8101A17025C0034C530 + + primary + + + + + diff --git a/AVRsack/AppDelegate.swift b/AVRsack/ASApplication.swift similarity index 89% rename from AVRsack/AppDelegate.swift rename to AVRsack/ASApplication.swift index 85365a2..536da2a 100644 --- a/AVRsack/AppDelegate.swift +++ b/AVRsack/ASApplication.swift @@ -9,7 +9,7 @@ import Cocoa @NSApplicationMain -class AppDelegate: NSObject, NSApplicationDelegate { +class ASApplication: NSObject, NSApplicationDelegate { diff --git a/AVRsack/Document.swift b/AVRsack/ASProjDoc.swift similarity index 86% rename from AVRsack/Document.swift rename to AVRsack/ASProjDoc.swift index 4ee6685..71806d1 100644 --- a/AVRsack/Document.swift +++ b/AVRsack/ASProjDoc.swift @@ -1,5 +1,5 @@ // -// Document.swift +// ASProjDoc.swift // AVRsack // // Created by Matthias Neeracher on 11/15/14. @@ -8,8 +8,10 @@ import Cocoa -class Document: NSDocument { - +class ASProjDoc: NSDocument { + @IBOutlet weak var editor : ACEView! + @IBOutlet weak var outline: NSOutlineView! + override init() { super.init() // Add your subclass-specific initialization here. @@ -17,7 +19,9 @@ class Document: NSDocument { override func windowControllerDidLoadNib(aController: NSWindowController) { super.windowControllerDidLoadNib(aController) - // Add any code here that needs to be executed once the windowController has loaded the document's window. + editor.setString("Here we go!") + editor.setMode(UInt(ACEModeASCIIDoc)) + editor.setTheme(UInt(ACEThemeXcode)) } override class func autosavesInPlace() -> Bool { @@ -27,7 +31,7 @@ class Document: NSDocument { override var windowNibName: String? { // Returns the nib file name of the document // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this property and override -makeWindowControllers instead. - return "Document" + return "ASProjDoc" } override func dataOfType(typeName: String, error outError: NSErrorPointer) -> NSData? { diff --git a/AVRsack/AVRsack-Bridging-Header.h b/AVRsack/AVRsack-Bridging-Header.h new file mode 100644 index 0000000..6fefd4a --- /dev/null +++ b/AVRsack/AVRsack-Bridging-Header.h @@ -0,0 +1,4 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// +#import diff --git a/AVRsack/Base.lproj/ASProjDoc.xib b/AVRsack/Base.lproj/ASProjDoc.xib new file mode 100644 index 0000000..70af9bd --- /dev/null +++ b/AVRsack/Base.lproj/ASProjDoc.xib @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AVRsack/Base.lproj/Document.xib b/AVRsack/Base.lproj/Document.xib deleted file mode 100644 index 08a18c7..0000000 --- a/AVRsack/Base.lproj/Document.xib +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AVRsack/Base.lproj/MainMenu.xib b/AVRsack/Base.lproj/MainMenu.xib index 6db088a..103f46b 100644 --- a/AVRsack/Base.lproj/MainMenu.xib +++ b/AVRsack/Base.lproj/MainMenu.xib @@ -1,7 +1,7 @@ - + - + @@ -11,7 +11,7 @@ - + @@ -662,5 +662,9 @@ + + + + diff --git a/AVRsack/Info.plist b/AVRsack/Info.plist index 165a82e..f31c317 100644 --- a/AVRsack/Info.plist +++ b/AVRsack/Info.plist @@ -14,7 +14,7 @@ CFBundleTypeIconFile CFBundleTypeName - DocumentType + Project CFBundleTypeOSTypes ???? @@ -22,7 +22,7 @@ CFBundleTypeRole Editor NSDocumentClass - $(PRODUCT_MODULE_NAME).Document + AVRsack.ASProjDoc CFBundleExecutable