diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index 530c8ec2e..1ec685d84 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -8,6 +8,9 @@ /* Begin PBXBuildFile section */ 8414AD251FCF5A1E00955102 /* TimelineHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8414AD241FCF5A1E00955102 /* TimelineHeaderView.swift */; }; + 841ABA4E20145E7300980E11 /* NothingInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841ABA4D20145E7300980E11 /* NothingInspectorViewController.swift */; }; + 841ABA5E20145E9200980E11 /* FolderInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841ABA5D20145E9200980E11 /* FolderInspectorViewController.swift */; }; + 841ABA6020145EC100980E11 /* BuiltinSmartFeedInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841ABA5F20145EC100980E11 /* BuiltinSmartFeedInspectorViewController.swift */; }; 8426118A1FCB67AA0086A189 /* FeedIconDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842611891FCB67AA0086A189 /* FeedIconDownloader.swift */; }; 8426119E1FCB6ED40086A189 /* HTMLMetadataDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */; }; 842611A01FCB72600086A189 /* FeaturedImageDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8426119F1FCB72600086A189 /* FeaturedImageDownloader.swift */; }; @@ -460,6 +463,9 @@ /* Begin PBXFileReference section */ 8414AD241FCF5A1E00955102 /* TimelineHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineHeaderView.swift; sourceTree = ""; }; + 841ABA4D20145E7300980E11 /* NothingInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NothingInspectorViewController.swift; sourceTree = ""; }; + 841ABA5D20145E9200980E11 /* FolderInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderInspectorViewController.swift; sourceTree = ""; }; + 841ABA5F20145EC100980E11 /* BuiltinSmartFeedInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuiltinSmartFeedInspectorViewController.swift; sourceTree = ""; }; 842611891FCB67AA0086A189 /* FeedIconDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedIconDownloader.swift; sourceTree = ""; }; 8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLMetadataDownloader.swift; sourceTree = ""; }; 8426119F1FCB72600086A189 /* FeaturedImageDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturedImageDownloader.swift; sourceTree = ""; }; @@ -1082,6 +1088,9 @@ 84BBB12B20142A4700F054F5 /* Inspector.storyboard */, 84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */, 8472058020142E8900AD578B /* FeedInspectorViewController.swift */, + 841ABA5D20145E9200980E11 /* FolderInspectorViewController.swift */, + 841ABA5F20145EC100980E11 /* BuiltinSmartFeedInspectorViewController.swift */, + 841ABA4D20145E7300980E11 /* NothingInspectorViewController.swift */, ); name = Inspector; path = Evergreen/Inspector; @@ -1569,6 +1578,7 @@ 84BBB12E20142A4700F054F5 /* InspectorWindowController.swift in Sources */, 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */, D5907D972004B7EB005947E5 /* Account+Scriptability.swift in Sources */, + 841ABA4E20145E7300980E11 /* NothingInspectorViewController.swift in Sources */, 842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */, 844B5B5B1FEA00FB00C7C76A /* TimelineKeyboardDelegate.swift in Sources */, 84DAEE321F870B390058304B /* DockBadge.swift in Sources */, @@ -1614,6 +1624,7 @@ 849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */, 849A97831ED9EC63007D329B /* SidebarStatusBarView.swift in Sources */, 84F2D5381FC22FCC00998D64 /* TodayFeedDelegate.swift in Sources */, + 841ABA5E20145E9200980E11 /* FolderInspectorViewController.swift in Sources */, 845213231FCA5B11003B6E93 /* ImageDownloader.swift in Sources */, 849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */, 844B5B671FEA18E300C7C76A /* MainWIndowKeyboardHandler.swift in Sources */, @@ -1624,6 +1635,7 @@ 849A978D1ED9EE4D007D329B /* FeedListWindowController.swift in Sources */, 849A97771ED9EC04007D329B /* TimelineCellData.swift in Sources */, 84B99C6B1FAE370B00ECDEDB /* FeedListFeed.swift in Sources */, + 841ABA6020145EC100980E11 /* BuiltinSmartFeedInspectorViewController.swift in Sources */, D5F4EDB5200744A700B9E363 /* ScriptingObject.swift in Sources */, D5F4EDB920074D7C00B9E363 /* Folder+Scriptability.swift in Sources */, 842611A01FCB72600086A189 /* FeaturedImageDownloader.swift in Sources */, diff --git a/Evergreen/Inspector/BuiltinSmartFeedInspectorViewController.swift b/Evergreen/Inspector/BuiltinSmartFeedInspectorViewController.swift new file mode 100644 index 000000000..7d850251a --- /dev/null +++ b/Evergreen/Inspector/BuiltinSmartFeedInspectorViewController.swift @@ -0,0 +1,14 @@ +// +// BuiltinSmartFeedInspectorViewController.swift +// Evergreen +// +// Created by Brent Simmons on 1/20/18. +// Copyright © 2018 Ranchero Software. All rights reserved. +// + +import AppKit + +final class BuiltinSmartFeedInspectorViewController: NSViewController { + + +} diff --git a/Evergreen/Inspector/FolderInspectorViewController.swift b/Evergreen/Inspector/FolderInspectorViewController.swift new file mode 100644 index 000000000..886afe6fa --- /dev/null +++ b/Evergreen/Inspector/FolderInspectorViewController.swift @@ -0,0 +1,14 @@ +// +// FolderInspectorViewController.swift +// Evergreen +// +// Created by Brent Simmons on 1/20/18. +// Copyright © 2018 Ranchero Software. All rights reserved. +// + +import AppKit + +final class FolderInspectorViewController: NSViewController { + + +} diff --git a/Evergreen/Inspector/Inspector.storyboard b/Evergreen/Inspector/Inspector.storyboard index 866f564a0..e146aea9a 100644 --- a/Evergreen/Inspector/Inspector.storyboard +++ b/Evergreen/Inspector/Inspector.storyboard @@ -31,7 +31,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -165,7 +165,7 @@ Field - + @@ -207,10 +207,10 @@ Field - + - + @@ -249,7 +249,7 @@ Field - + diff --git a/Evergreen/Inspector/InspectorWindowController.swift b/Evergreen/Inspector/InspectorWindowController.swift index fe11a74a2..7ed82a899 100644 --- a/Evergreen/Inspector/InspectorWindowController.swift +++ b/Evergreen/Inspector/InspectorWindowController.swift @@ -8,6 +8,13 @@ import AppKit +protocol Inspector { + + var objects: [Any] { get set } + + func isInspectorFor(_ objects: [Any]) -> Bool +} + final class InspectorWindowController: NSWindowController { public var isOpen: Bool { @@ -16,4 +23,8 @@ final class InspectorWindowController: NSWindowController { } } + func inspector(for objects: [Any]) -> Inspector { + + + } } diff --git a/Evergreen/Inspector/NothingInspectorViewController.swift b/Evergreen/Inspector/NothingInspectorViewController.swift new file mode 100644 index 000000000..ac1cf4d00 --- /dev/null +++ b/Evergreen/Inspector/NothingInspectorViewController.swift @@ -0,0 +1,14 @@ +// +// NothingInspectorViewController.swift +// Evergreen +// +// Created by Brent Simmons on 1/20/18. +// Copyright © 2018 Ranchero Software. All rights reserved. +// + +import AppKit + +final class NothingInspectorViewController: NSViewController { + + +}