Permalink
Browse files

🚧 No more xibs for the main window

  • Loading branch information...
1 parent dc7d59c commit 3d1ba34d24c46dc70129d0a2697551663f5a3385 @andreyvit andreyvit committed Jun 6, 2016
@@ -31,12 +31,10 @@
438DF5AA1CBCB8D10019154B /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5A91CBCB8D10019154B /* MainWindowController.swift */; };
438DF5AC1CBCB99E0019154B /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5AB1CBCB99E0019154B /* MainWindow.swift */; };
438DF5AE1CBCBA690019154B /* TreePaneViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5AD1CBCBA690019154B /* TreePaneViewController.swift */; };
- 438DF5B01CBCBAF70019154B /* MainWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 438DF5AF1CBCBAF70019154B /* MainWindow.storyboard */; };
438DF5B21CBCBDD90019154B /* ContentPaneViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5B11CBCBDD90019154B /* ContentPaneViewController.swift */; };
438DF5B51CBCBF160019154B /* TreeItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5B41CBCBF160019154B /* TreeItems.swift */; };
438DF5B71CBCC3700019154B /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5B61CBCC3700019154B /* App.swift */; };
438DF5B91CBCC82C0019154B /* AppController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438DF5B81CBCC82C0019154B /* AppController.swift */; };
- 43A705FE1CE08B2400DDA594 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43A705FD1CE08B2400DDA594 /* Main.storyboard */; };
43D6A8D11BB2A5AB00296B03 /* ExpressiveCasting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D6A8D01BB2A5AB00296B03 /* ExpressiveCasting.framework */; };
43D6A8E61BB2A8EB00296B03 /* ExpressiveFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D6A8E51BB2A8EB00296B03 /* ExpressiveFoundation.framework */; };
43D6A91D1BB2AB3D00296B03 /* ExpressiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D6A91C1BB2AB3D00296B03 /* ExpressiveCocoa.framework */; };
@@ -102,13 +100,11 @@
438DF5A91CBCB8D10019154B /* MainWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
438DF5AB1CBCB99E0019154B /* MainWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindow.swift; sourceTree = "<group>"; };
438DF5AD1CBCBA690019154B /* TreePaneViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TreePaneViewController.swift; sourceTree = "<group>"; };
- 438DF5AF1CBCBAF70019154B /* MainWindow.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainWindow.storyboard; sourceTree = "<group>"; };
438DF5B11CBCBDD90019154B /* ContentPaneViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentPaneViewController.swift; sourceTree = "<group>"; };
438DF5B41CBCBF160019154B /* TreeItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TreeItems.swift; sourceTree = "<group>"; };
438DF5B61CBCC3700019154B /* App.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
438DF5B81CBCC82C0019154B /* AppController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppController.swift; sourceTree = "<group>"; };
438DF5BC1CC0D82C0019154B /* LiveReload.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = LiveReload.entitlements; path = ../LiveReload.entitlements; sourceTree = "<group>"; };
- 43A705FD1CE08B2400DDA594 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
43D6A89D1BB218EB00296B03 /* ExpressiveCollections.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ExpressiveCollections.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43D6A8D01BB2A5AB00296B03 /* ExpressiveCasting.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ExpressiveCasting.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43D6A8E51BB2A8EB00296B03 /* ExpressiveFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ExpressiveFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -229,9 +225,7 @@
43D6A9221BB2ACD100296B03 /* Storyboards */ = {
isa = PBXGroup;
children = (
- 43A705FD1CE08B2400DDA594 /* Main.storyboard */,
43D6A9231BB2ACD100296B03 /* MainMenu.xib */,
- 438DF5AF1CBCBAF70019154B /* MainWindow.storyboard */,
);
path = Storyboards;
sourceTree = "<group>";
@@ -399,8 +393,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 43A705FE1CE08B2400DDA594 /* Main.storyboard in Resources */,
- 438DF5B01CBCBAF70019154B /* MainWindow.storyboard in Resources */,
43D6A92C1BB2ACF200296B03 /* Assets.xcassets in Resources */,
43D6A9251BB2ACD100296B03 /* MainMenu.xib in Resources */,
);
@@ -11,10 +11,6 @@ public class AppController {
// MARK: - Main Window
- private lazy var mainStoryboard: NSStoryboard = { [unowned self] in
- NSStoryboard(name: "Main", bundle: nil)
- }()
-
private var isMainWindowControllerLoaded = false
private lazy var mainWindowController: MainWindowController = { [unowned self] in
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
- <dependencies>
- <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
- </dependencies>
- <scenes>
- <!--Window Controller-->
- <scene sceneID="9By-ad-her">
- <objects>
- <windowController storyboardIdentifier="Main" id="Ppy-xI-mZu" customClass="MainWindowController" customModule="LiveReload" customModuleProvider="target" sceneMemberID="viewController">
- <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="rvZ-5F-VcB">
- <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
- <windowCollectionBehavior key="collectionBehavior" canJoinAllSpaces="YES"/>
- <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="359" y="281" width="480" height="270"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
- </window>
- </windowController>
- <customObject id="AEP-o5-9lZ" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="18" y="298"/>
- </scene>
- </scenes>
-</document>
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
- <dependencies>
- <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
- </dependencies>
- <scenes>
- <!--Main Window Content View Controller-->
- <scene sceneID="GRN-2U-oWg">
- <objects>
- <splitViewController id="QOJ-oG-uD1" customClass="MainWindowContentViewController" customModule="LiveReload" customModuleProvider="target" sceneMemberID="viewController">
- <splitView key="splitView" dividerStyle="thin" vertical="YES" id="v0f-Sq-cw0">
- <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
- <autoresizingMask key="autoresizingMask"/>
- </splitView>
- </splitViewController>
- <customObject id="9Eg-wr-pTK" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="39" y="629"/>
- </scene>
- <!--Tree Pane View Controller-->
- <scene sceneID="Ceb-vq-DSJ">
- <objects>
- <viewController storyboardIdentifier="TreePane" id="bsU-nL-rC8" customClass="TreePaneViewController" customModule="LiveReload" customModuleProvider="target" sceneMemberID="viewController">
- <scrollView key="view" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="RQ9-ny-AJD">
- <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <clipView key="contentView" drawsBackground="NO" id="tmS-F7-LbN">
- <rect key="frame" x="1" y="1" width="448" height="298"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="14" outlineTableColumn="32K-Dz-D5W" id="W61-Mh-u2L">
- <rect key="frame" x="0.0" y="0.0" width="448" height="0.0"/>
- <autoresizingMask key="autoresizingMask"/>
- <size key="intercellSpacing" width="3" height="0.0"/>
- <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
- <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
- <tableColumns>
- <tableColumn width="445" minWidth="16" maxWidth="1000" id="32K-Dz-D5W">
- <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
- <font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
- </tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="Prl-Ky-UXX">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
- <prototypeCellViews>
- <tableCellView identifier="HeaderCell" id="7do-Zb-vG0">
- <rect key="frame" x="1" y="0.0" width="445" height="17"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="agF-27-C5c">
- <rect key="frame" x="0.0" y="1" width="145" height="14"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="HEADER CELL" id="pKm-Z6-N1L">
- <font key="font" metaFont="smallSystemBold"/>
- <color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- </subviews>
- <connections>
- <outlet property="textField" destination="agF-27-C5c" id="Tm5-gi-Rrq"/>
- </connections>
- </tableCellView>
- <tableCellView identifier="DataCell" id="zxg-Zs-BB3">
- <rect key="frame" x="1" y="17" width="445" height="17"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZFi-zZ-Mmo">
- <rect key="frame" x="3" y="0.0" width="17" height="17"/>
- <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="NSActionTemplate" id="C7W-2m-Wng"/>
- </imageView>
- <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zTW-Y9-f1h">
- <rect key="frame" x="25" y="0.0" width="120" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ag0-A3-Bob">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- </subviews>
- <connections>
- <outlet property="imageView" destination="ZFi-zZ-Mmo" id="bYI-A3-Xkn"/>
- <outlet property="textField" destination="zTW-Y9-f1h" id="5Oc-54-6mX"/>
- </connections>
- </tableCellView>
- </prototypeCellViews>
- </tableColumn>
- </tableColumns>
- <connections>
- <outlet property="dataSource" destination="bsU-nL-rC8" id="xPH-HD-TEh"/>
- <outlet property="delegate" destination="bsU-nL-rC8" id="r69-7V-q6Q"/>
- </connections>
- </outlineView>
- </subviews>
- <nil key="backgroundColor"/>
- </clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Ha4-Ks-KhI">
- <rect key="frame" x="1" y="283" width="448" height="16"/>
- <autoresizingMask key="autoresizingMask"/>
- </scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="FHu-mD-UYS">
- <rect key="frame" x="224" y="17" width="15" height="102"/>
- <autoresizingMask key="autoresizingMask"/>
- </scroller>
- </scrollView>
- <connections>
- <outlet property="outlineView" destination="W61-Mh-u2L" id="LRf-uU-MtD"/>
- </connections>
- </viewController>
- <customObject id="MI6-XF-QrP" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="639" y="459"/>
- </scene>
- <!--Content Pane View Controller-->
- <scene sceneID="3bk-SW-z8u">
- <objects>
- <viewController storyboardIdentifier="ContentPane" id="GoP-v7-0tN" customClass="ContentPaneViewController" customModule="LiveReload" customModuleProvider="target" sceneMemberID="viewController">
- <view key="view" id="1MN-vi-mr4">
- <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
- <autoresizingMask key="autoresizingMask"/>
- </view>
- </viewController>
- <customObject id="xNP-VZ-hkP" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="639" y="820"/>
- </scene>
- </scenes>
- <resources>
- <image name="NSActionTemplate" width="14" height="14"/>
- </resources>
-</document>
Oops, something went wrong.

0 comments on commit 3d1ba34

Please sign in to comment.