From 8d798273466bc29904d351aea03a2044b07176b9 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Thu, 14 Feb 2019 21:58:45 -0800 Subject: [PATCH] Start TimelineContainerViewController. --- NetNewsWire.xcodeproj/project.pbxproj | 16 ++++++++-------- NetNewsWire/Base.lproj/MainWindow.storyboard | 2 +- ...ift => TimelineContainerViewController.swift} | 4 ++-- .../MainWindow/Timeline/TimelineTableView.xib | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) rename NetNewsWire/MainWindow/Timeline/{TimelineTableViewController.swift => TimelineContainerViewController.swift} (71%) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 2ebebe241..42e0457dc 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -20,10 +20,10 @@ 8405DD9A22153B6B008CE1BF /* TimelineContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DD9822153B6B008CE1BF /* TimelineContainerView.swift */; }; 8405DD9C22153BD7008CE1BF /* NSView-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DD9B22153BD7008CE1BF /* NSView-Extensions.swift */; }; 8405DD9D22153BD7008CE1BF /* NSView-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DD9B22153BD7008CE1BF /* NSView-Extensions.swift */; }; - 8405DD9F22168671008CE1BF /* TimelineTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DD9E22168671008CE1BF /* TimelineTableViewController.swift */; }; - 8405DDA022168671008CE1BF /* TimelineTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DD9E22168671008CE1BF /* TimelineTableViewController.swift */; }; 8405DDA222168920008CE1BF /* TimelineTableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8405DDA122168920008CE1BF /* TimelineTableView.xib */; }; 8405DDA322168920008CE1BF /* TimelineTableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8405DDA122168920008CE1BF /* TimelineTableView.xib */; }; + 8405DDA522168C62008CE1BF /* TimelineContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DDA422168C62008CE1BF /* TimelineContainerViewController.swift */; }; + 8405DDA622168C62008CE1BF /* TimelineContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8405DDA422168C62008CE1BF /* TimelineContainerViewController.swift */; }; 840958632201629A002C1579 /* Subscribe to Feed.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 840BEE4121D70E64009BBAFA /* CrashReportWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840BEE4021D70E64009BBAFA /* CrashReportWindowController.swift */; }; 840D617F2029031C009BC708 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840D617E2029031C009BC708 /* AppDelegate.swift */; }; @@ -746,8 +746,8 @@ 8405DD892213E0E3008CE1BF /* DetailContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailContainerView.swift; sourceTree = ""; }; 8405DD9822153B6B008CE1BF /* TimelineContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineContainerView.swift; sourceTree = ""; }; 8405DD9B22153BD7008CE1BF /* NSView-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSView-Extensions.swift"; sourceTree = ""; }; - 8405DD9E22168671008CE1BF /* TimelineTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineTableViewController.swift; sourceTree = ""; }; 8405DDA122168920008CE1BF /* TimelineTableView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TimelineTableView.xib; sourceTree = ""; }; + 8405DDA422168C62008CE1BF /* TimelineContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineContainerViewController.swift; sourceTree = ""; }; 840BEE4021D70E64009BBAFA /* CrashReportWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportWindowController.swift; sourceTree = ""; }; 840D617C2029031C009BC708 /* NetNewsWire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetNewsWire.app; sourceTree = BUILT_PRODUCTS_DIR; }; 840D617E2029031C009BC708 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -1303,11 +1303,11 @@ 849A97681ED9EBC8007D329B /* Timeline */ = { isa = PBXGroup; children = ( - 849A976B1ED9EBC8007D329B /* TimelineViewController.swift */, + 8405DDA422168C62008CE1BF /* TimelineContainerViewController.swift */, 8405DD9822153B6B008CE1BF /* TimelineContainerView.swift */, - 84E8E0DA202EC49300562D8F /* TimelineViewController+ContextualMenus.swift */, 8405DDA122168920008CE1BF /* TimelineTableView.xib */, - 8405DD9E22168671008CE1BF /* TimelineTableViewController.swift */, + 849A976B1ED9EBC8007D329B /* TimelineViewController.swift */, + 84E8E0DA202EC49300562D8F /* TimelineViewController+ContextualMenus.swift */, 84F204DF1FAACBB30076E152 /* ArticleArray.swift */, 849A97691ED9EBC8007D329B /* TimelineTableRowView.swift */, 849A976A1ED9EBC8007D329B /* TimelineTableView.swift */, @@ -2363,6 +2363,7 @@ buildActionMask = 2147483647; files = ( 840F7C1E21BDA4B40057E851 /* ArticleArray.swift in Sources */, + 8405DDA622168C62008CE1BF /* TimelineContainerViewController.swift in Sources */, 840F7C1F21BDA4B40057E851 /* AppDelegate.swift in Sources */, 840F7C2021BDA4B40057E851 /* InspectorWindowController.swift in Sources */, 840F7C2121BDA4B40057E851 /* AppDefaults.swift in Sources */, @@ -2372,7 +2373,6 @@ 8405DD8B2213E0E3008CE1BF /* DetailContainerView.swift in Sources */, 840F7C2621BDA4B40057E851 /* TimelineKeyboardDelegate.swift in Sources */, 84216D0422128B9D0049B9B9 /* DetailWebViewController.swift in Sources */, - 8405DDA022168671008CE1BF /* TimelineTableViewController.swift in Sources */, 840F7C2821BDA4B40057E851 /* Browser.swift in Sources */, 840F7C2921BDA4B40057E851 /* KeyboardDelegateProtocol.swift in Sources */, 840F7C2A21BDA4B40057E851 /* AppleEventUtils.swift in Sources */, @@ -2502,7 +2502,6 @@ 8444C8F21FED81840051386C /* OPMLExporter.swift in Sources */, 849A975E1ED9EB72007D329B /* MainWindowController.swift in Sources */, 84F2D53A1FC2308B00998D64 /* UnreadFeed.swift in Sources */, - 8405DD9F22168671008CE1BF /* TimelineTableViewController.swift in Sources */, 84595CA221E9C880003E15A4 /* AdvancedPreferencesViewController.swift in Sources */, 845A29221FC9251E007B49E3 /* SidebarCellLayout.swift in Sources */, 84AD1EBA2031649C00BC20B7 /* SmartFeedPasteboardWriter.swift in Sources */, @@ -2560,6 +2559,7 @@ 841ABA5E20145E9200980E11 /* FolderInspectorViewController.swift in Sources */, 845213231FCA5B11003B6E93 /* ImageDownloader.swift in Sources */, 849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */, + 8405DDA522168C62008CE1BF /* TimelineContainerViewController.swift in Sources */, 844B5B671FEA18E300C7C76A /* MainWIndowKeyboardHandler.swift in Sources */, 848D578E21543519005FFAD5 /* PasteboardFeed.swift in Sources */, 849A97921ED9EF65007D329B /* IndeterminateProgressWindowController.swift in Sources */, diff --git a/NetNewsWire/Base.lproj/MainWindow.storyboard b/NetNewsWire/Base.lproj/MainWindow.storyboard index 7793edb1a..ba79833cd 100644 --- a/NetNewsWire/Base.lproj/MainWindow.storyboard +++ b/NetNewsWire/Base.lproj/MainWindow.storyboard @@ -416,7 +416,7 @@ - + diff --git a/NetNewsWire/MainWindow/Timeline/TimelineTableViewController.swift b/NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift similarity index 71% rename from NetNewsWire/MainWindow/Timeline/TimelineTableViewController.swift rename to NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift index 6c9712785..6033945de 100644 --- a/NetNewsWire/MainWindow/Timeline/TimelineTableViewController.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift @@ -1,5 +1,5 @@ // -// TimelineTableViewController.swift +// TimelineContainerViewController.swift // NetNewsWire // // Created by Brent Simmons on 2/14/19. @@ -8,7 +8,7 @@ import Cocoa -class TimelineTableViewController: NSViewController { +class TimelineContainerViewController: NSViewController { override func viewDidLoad() { super.viewDidLoad() diff --git a/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib b/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib index 373337c8f..0f3920593 100644 --- a/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib +++ b/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib @@ -7,6 +7,7 @@ +