Renamed PopoverViewController to ContentViewController

This commit is contained in:
Lukas Kubanek
2014-10-25 20:14:09 +02:00
parent 0edb5a2a51
commit 03b82ccf7e
4 changed files with 16 additions and 16 deletions
+8 -8
View File
@@ -7,23 +7,23 @@
objects = {
/* Begin PBXBuildFile section */
8044041819FC1606002FE65E /* PopoverViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8044041719FC1606002FE65E /* PopoverViewController.xib */; };
8044041819FC1606002FE65E /* ContentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8044041719FC1606002FE65E /* ContentViewController.xib */; };
80989B9019FBF0A70066AF71 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80989B8F19FBF0A70066AF71 /* AppDelegate.swift */; };
80989B9419FBF0A70066AF71 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 80989B9319FBF0A70066AF71 /* Images.xcassets */; };
80989BB119FBF6A70066AF71 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 80989BAF19FBF6A70066AF71 /* Main.storyboard */; };
80989BB319FBFCA80066AF71 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80989BB219FBFCA80066AF71 /* MainViewController.swift */; };
80989BB519FBFCC80066AF71 /* PopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80989BB419FBFCC80066AF71 /* PopoverViewController.swift */; };
80989BB519FBFCC80066AF71 /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80989BB419FBFCC80066AF71 /* ContentViewController.swift */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
8044041719FC1606002FE65E /* PopoverViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PopoverViewController.xib; sourceTree = "<group>"; };
8044041719FC1606002FE65E /* ContentViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContentViewController.xib; sourceTree = "<group>"; };
80989B8A19FBF0A70066AF71 /* DetachablePopover.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DetachablePopover.app; sourceTree = BUILT_PRODUCTS_DIR; };
80989B8E19FBF0A70066AF71 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
80989B8F19FBF0A70066AF71 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
80989B9319FBF0A70066AF71 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
80989BB019FBF6A70066AF71 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
80989BB219FBFCA80066AF71 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
80989BB419FBFCC80066AF71 /* PopoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopoverViewController.swift; sourceTree = "<group>"; };
80989BB419FBFCC80066AF71 /* ContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -60,7 +60,7 @@
children = (
80989B8F19FBF0A70066AF71 /* AppDelegate.swift */,
80989BB219FBFCA80066AF71 /* MainViewController.swift */,
80989BB419FBFCC80066AF71 /* PopoverViewController.swift */,
80989BB419FBFCC80066AF71 /* ContentViewController.swift */,
);
path = Sources;
sourceTree = "<group>";
@@ -69,7 +69,7 @@
isa = PBXGroup;
children = (
80989BAF19FBF6A70066AF71 /* Main.storyboard */,
8044041719FC1606002FE65E /* PopoverViewController.xib */,
8044041719FC1606002FE65E /* ContentViewController.xib */,
80989B9319FBF0A70066AF71 /* Images.xcassets */,
);
path = Resources;
@@ -142,7 +142,7 @@
files = (
80989B9419FBF0A70066AF71 /* Images.xcassets in Resources */,
80989BB119FBF6A70066AF71 /* Main.storyboard in Resources */,
8044041819FC1606002FE65E /* PopoverViewController.xib in Resources */,
8044041819FC1606002FE65E /* ContentViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -154,7 +154,7 @@
buildActionMask = 2147483647;
files = (
80989B9019FBF0A70066AF71 /* AppDelegate.swift in Sources */,
80989BB519FBFCC80066AF71 /* PopoverViewController.swift in Sources */,
80989BB519FBFCC80066AF71 /* ContentViewController.swift in Sources */,
80989BB319FBFCA80066AF71 /* MainViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -4,7 +4,7 @@
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PopoverViewController" customModule="DetachablePopover" customModuleProvider="target">
<customObject id="-2" userLabel="File's Owner" customClass="ContentViewController" customModule="DetachablePopover" customModuleProvider="target">
<connections>
<outlet property="view" destination="JnG-cl-jqe" id="xc3-HG-H8z"/>
</connections>
@@ -16,8 +16,8 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MMP-vd-MCc">
<rect key="frame" x="46" y="114" width="109" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Popover Content" id="ZdQ-kv-ekm">
<rect key="frame" x="73" y="114" width="54" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Content" id="ZdQ-kv-ekm">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -1,5 +1,5 @@
//
// PopoverViewController.swift
// ContentViewController.swift
// DetachablePopover
//
// Created by Lukas Kubanek on 25.10.2014.
@@ -8,6 +8,6 @@
import AppKit
class PopoverViewController: NSViewController {
class ContentViewController: NSViewController {
}
+3 -3
View File
@@ -21,8 +21,8 @@ class MainViewController: NSViewController, NSPopoverDelegate {
return popover
}()
lazy var popoverViewController: PopoverViewController = {
return PopoverViewController(nibName: "PopoverView", bundle: nil)!
lazy var contentViewController: ContentViewController = {
return ContentViewController(nibName: "ContentViewController", bundle: nil)!
}()
// MARK: - Interface Builder Actions
@@ -32,7 +32,7 @@ class MainViewController: NSViewController, NSPopoverDelegate {
popover.performClose(sender)
} else {
popover.appearance = appearanceForSelectedRadioButton(appearanceSelection.selectedRow)
popover.contentViewController = popoverViewController
popover.contentViewController = contentViewController
let positioningView = sender
let positioningRect = NSZeroRect