From 03b82ccf7e2de61f3bd80a0bfb6a297aed02ea07 Mon Sep 17 00:00:00 2001 From: Lukas Kubanek Date: Sat, 25 Oct 2014 20:13:59 +0200 Subject: [PATCH] Renamed PopoverViewController to ContentViewController --- DetachablePopover.xcodeproj/project.pbxproj | 16 ++++++++-------- ...wController.xib => ContentViewController.xib} | 6 +++--- ...troller.swift => ContentViewController.swift} | 4 ++-- Sources/MainViewController.swift | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) rename Resources/{PopoverViewController.xib => ContentViewController.xib} (92%) rename Sources/{PopoverViewController.swift => ContentViewController.swift} (66%) diff --git a/DetachablePopover.xcodeproj/project.pbxproj b/DetachablePopover.xcodeproj/project.pbxproj index 428549e..8c33476 100644 --- a/DetachablePopover.xcodeproj/project.pbxproj +++ b/DetachablePopover.xcodeproj/project.pbxproj @@ -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 = ""; }; + 8044041719FC1606002FE65E /* ContentViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContentViewController.xib; sourceTree = ""; }; 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 = ""; }; 80989B8F19FBF0A70066AF71 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 80989B9319FBF0A70066AF71 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 80989BB019FBF6A70066AF71 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 80989BB219FBFCA80066AF71 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; - 80989BB419FBFCC80066AF71 /* PopoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopoverViewController.swift; sourceTree = ""; }; + 80989BB419FBFCC80066AF71 /* ContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = ""; }; /* 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 = ""; @@ -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; diff --git a/Resources/PopoverViewController.xib b/Resources/ContentViewController.xib similarity index 92% rename from Resources/PopoverViewController.xib rename to Resources/ContentViewController.xib index 53a5e35..5afbfd1 100644 --- a/Resources/PopoverViewController.xib +++ b/Resources/ContentViewController.xib @@ -4,7 +4,7 @@ - + @@ -16,8 +16,8 @@ - - + + diff --git a/Sources/PopoverViewController.swift b/Sources/ContentViewController.swift similarity index 66% rename from Sources/PopoverViewController.swift rename to Sources/ContentViewController.swift index 0ec1ae0..4da4337 100644 --- a/Sources/PopoverViewController.swift +++ b/Sources/ContentViewController.swift @@ -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 { } diff --git a/Sources/MainViewController.swift b/Sources/MainViewController.swift index 5bb9c1c..5329101 100644 --- a/Sources/MainViewController.swift +++ b/Sources/MainViewController.swift @@ -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