diff --git a/AppleEvents/AppleEventUtils.swift b/AppleEvents/AppleEventUtils.swift index 80825c5b2..0bd5b514a 100644 --- a/AppleEvents/AppleEventUtils.swift +++ b/AppleEvents/AppleEventUtils.swift @@ -1,6 +1,6 @@ // // AppleEventUtils.swift -// EvergreenTests +// NetNewsWireTests // // Created by Olof Hellman on 1/7/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/AppleEvents/NSAppleEventDescriptor+UserRecordFields.swift b/AppleEvents/NSAppleEventDescriptor+UserRecordFields.swift index 0a34a1091..e1e273478 100644 --- a/AppleEvents/NSAppleEventDescriptor+UserRecordFields.swift +++ b/AppleEvents/NSAppleEventDescriptor+UserRecordFields.swift @@ -1,6 +1,6 @@ // // NSAppleEventDescriptor+UserRecordFields.swift -// EvergreenTests +// NetNewsWireTests // // Created by Olof Hellman on 1/7/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Commands/DeleteFromSidebarCommand.swift b/Commands/DeleteFromSidebarCommand.swift index 5c7e465bf..ea6eb1f82 100644 --- a/Commands/DeleteFromSidebarCommand.swift +++ b/Commands/DeleteFromSidebarCommand.swift @@ -1,6 +1,6 @@ // // DeleteFromSidebarCommand.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/4/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Commands/MarkCommandValidationStatus.swift b/Commands/MarkCommandValidationStatus.swift index 510f55f77..05264bdb5 100644 --- a/Commands/MarkCommandValidationStatus.swift +++ b/Commands/MarkCommandValidationStatus.swift @@ -1,6 +1,6 @@ // // MarkCommandValidationStatus.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/17/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Commands/MarkStatusCommand.swift b/Commands/MarkStatusCommand.swift index abd7cda05..5d78d664a 100644 --- a/Commands/MarkStatusCommand.swift +++ b/Commands/MarkStatusCommand.swift @@ -1,6 +1,6 @@ // // MarkStatusCommand.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 10/26/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Commands/SendToCommand.swift b/Commands/SendToCommand.swift index 7b67b3883..795c57698 100644 --- a/Commands/SendToCommand.swift +++ b/Commands/SendToCommand.swift @@ -1,6 +1,6 @@ // // SendToCommand.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/8/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Commands/SendToMarsEditCommand.swift b/Commands/SendToMarsEditCommand.swift index bdad71d87..3a9fd33b2 100644 --- a/Commands/SendToMarsEditCommand.swift +++ b/Commands/SendToMarsEditCommand.swift @@ -1,6 +1,6 @@ // // SendToMarsEditCommand.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/8/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Commands/SendToMicroBlogCommand.swift b/Commands/SendToMicroBlogCommand.swift index fd0c8870a..59fc34987 100644 --- a/Commands/SendToMicroBlogCommand.swift +++ b/Commands/SendToMicroBlogCommand.swift @@ -1,6 +1,6 @@ // // SendToMicroBlogCommand.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/8/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/EvergreenTests/ScriptingTests/scripts/uiScriptingTestSetup.applescript b/EvergreenTests/ScriptingTests/scripts/uiScriptingTestSetup.applescript deleted file mode 100644 index cd2019379..000000000 --- a/EvergreenTests/ScriptingTests/scripts/uiScriptingTestSetup.applescript +++ /dev/null @@ -1,18 +0,0 @@ --- this script sets up Evergreen so it is ready to be tested --- to get a current article - -to activateEvergreen() - tell application "Evergreen" - activate - end tell -end activateEvergreen - -tell application "System Events" - set isFrontmost to frontmost of process "Evergreen" - repeat while isFrontmost is false - my activateEvergreen() - set isFrontmost to frontmost of process "Evergreen" - end repeat -end tell - -return {test_result:true, script_result:"finished"} diff --git a/Exporters/OPMLExporter.swift b/Exporters/OPMLExporter.swift index dde3d18a0..c177431ef 100644 --- a/Exporters/OPMLExporter.swift +++ b/Exporters/OPMLExporter.swift @@ -1,6 +1,6 @@ // // OPMLExporter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/22/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -18,7 +18,7 @@ struct OPMLExporter { let openingText = """ - + \(escapedTitle) diff --git a/Frameworks/Account/AccountManager.swift b/Frameworks/Account/AccountManager.swift index 48388a157..7fd66d1db 100644 --- a/Frameworks/Account/AccountManager.swift +++ b/Frameworks/Account/AccountManager.swift @@ -1,6 +1,6 @@ // // AccountManager.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/18/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Frameworks/Account/Container.swift b/Frameworks/Account/Container.swift index 68307dca3..5063690ed 100644 --- a/Frameworks/Account/Container.swift +++ b/Frameworks/Account/Container.swift @@ -1,7 +1,7 @@ // // Container.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 4/17/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Frameworks/Account/UnreadCountProvider.swift b/Frameworks/Account/UnreadCountProvider.swift index 8decf754e..10983a57e 100644 --- a/Frameworks/Account/UnreadCountProvider.swift +++ b/Frameworks/Account/UnreadCountProvider.swift @@ -1,6 +1,6 @@ // // UnreadCountProtocol.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 4/8/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Frameworks/Account/xcconfig/Account_project.xcconfig b/Frameworks/Account/xcconfig/Account_project.xcconfig index 01aba393d..148ea9b25 100644 --- a/Frameworks/Account/xcconfig/Account_project.xcconfig +++ b/Frameworks/Account/xcconfig/Account_project.xcconfig @@ -2,7 +2,7 @@ CODE_SIGN_IDENTITY = Mac Developer CODE_SIGN_STYLE = Automatic DEVELOPMENT_TEAM = M8L2WTLA8W -// See the notes in Evergreen_target.xcconfig on why the +// See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here #include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" diff --git a/Frameworks/Articles/xcconfig/Articles_project.xcconfig b/Frameworks/Articles/xcconfig/Articles_project.xcconfig index 01aba393d..148ea9b25 100644 --- a/Frameworks/Articles/xcconfig/Articles_project.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_project.xcconfig @@ -2,7 +2,7 @@ CODE_SIGN_IDENTITY = Mac Developer CODE_SIGN_STYLE = Automatic DEVELOPMENT_TEAM = M8L2WTLA8W -// See the notes in Evergreen_target.xcconfig on why the +// See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here #include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.swift b/Frameworks/ArticlesDatabase/ArticlesDatabase.swift index 9d35fb56b..bffd9f08e 100644 --- a/Frameworks/ArticlesDatabase/ArticlesDatabase.swift +++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.swift @@ -1,6 +1,6 @@ // // ArticlesDatabase.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/20/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Frameworks/ArticlesDatabase/ArticlesTable.swift b/Frameworks/ArticlesDatabase/ArticlesTable.swift index ea403b884..ab165190e 100644 --- a/Frameworks/ArticlesDatabase/ArticlesTable.swift +++ b/Frameworks/ArticlesDatabase/ArticlesTable.swift @@ -1,6 +1,6 @@ // // ArticlesTable.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 5/9/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Frameworks/ArticlesDatabase/StatusesTable.swift b/Frameworks/ArticlesDatabase/StatusesTable.swift index 8f5318a18..3935f92ca 100644 --- a/Frameworks/ArticlesDatabase/StatusesTable.swift +++ b/Frameworks/ArticlesDatabase/StatusesTable.swift @@ -1,6 +1,6 @@ // // StatusesTable.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 5/8/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig index 63ecf06f8..3a66a49c9 100644 --- a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig +++ b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig @@ -2,7 +2,7 @@ CODE_SIGN_IDENTITY = Mac Developer CODE_SIGN_STYLE = Automatic DEVELOPMENT_TEAM = 9C84TZ7Q6Z -// See the notes in Evergreen_target.xcconfig on why the +// See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here #include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" diff --git a/Importers/DefaultFeeds.plist b/Importers/DefaultFeeds.plist index a3a0d5ec2..40655b136 100644 --- a/Importers/DefaultFeeds.plist +++ b/Importers/DefaultFeeds.plist @@ -4,7 +4,7 @@ note - By Brent Simmons, Evergreen developer + By Brent Simmons, NetNewsWire developer editedName Inessential homePageURL @@ -96,11 +96,11 @@ homePageURL - https://ranchero.com/evergreen/ + https://ranchero.com/netnewswire/ editedName - Evergreen News + NetNewsWire News url - https://ranchero.com/evergreen/feed.json + https://ranchero.com/netnewswire/feed.json homePageURL diff --git a/Importers/DefaultFeedsImporter.swift b/Importers/DefaultFeedsImporter.swift index d1ba7404e..b25c96d5d 100644 --- a/Importers/DefaultFeedsImporter.swift +++ b/Importers/DefaultFeedsImporter.swift @@ -1,6 +1,6 @@ // // DefaultFeedsImporter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/13/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Importers/OPMLImporter.swift b/Importers/OPMLImporter.swift index aa88931b9..85c12dcb4 100644 --- a/Importers/OPMLImporter.swift +++ b/Importers/OPMLImporter.swift @@ -1,6 +1,6 @@ // // OPMLImporter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 10/5/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen-iOS/AppDelegate.swift b/NetNewsWire-iOS/AppDelegate.swift similarity index 99% rename from Evergreen-iOS/AppDelegate.swift rename to NetNewsWire-iOS/AppDelegate.swift index 1eb49e75e..0561c1b90 100644 --- a/Evergreen-iOS/AppDelegate.swift +++ b/NetNewsWire-iOS/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// Evergreen-iOS +// NetNewsWire-iOS // // Created by Brent Simmons on 2/5/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/NetNewsWire-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Evergreen-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to NetNewsWire-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Evergreen-iOS/Assets.xcassets/Contents.json b/NetNewsWire-iOS/Assets.xcassets/Contents.json similarity index 100% rename from Evergreen-iOS/Assets.xcassets/Contents.json rename to NetNewsWire-iOS/Assets.xcassets/Contents.json diff --git a/Evergreen-iOS/Base.lproj/LaunchScreen.storyboard b/NetNewsWire-iOS/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Evergreen-iOS/Base.lproj/LaunchScreen.storyboard rename to NetNewsWire-iOS/Base.lproj/LaunchScreen.storyboard diff --git a/Evergreen-iOS/Base.lproj/Main.storyboard b/NetNewsWire-iOS/Base.lproj/Main.storyboard similarity index 100% rename from Evergreen-iOS/Base.lproj/Main.storyboard rename to NetNewsWire-iOS/Base.lproj/Main.storyboard diff --git a/Evergreen-iOS/DetailViewController.swift b/NetNewsWire-iOS/DetailViewController.swift similarity index 97% rename from Evergreen-iOS/DetailViewController.swift rename to NetNewsWire-iOS/DetailViewController.swift index ff7d668b0..3aeeb95d6 100644 --- a/Evergreen-iOS/DetailViewController.swift +++ b/NetNewsWire-iOS/DetailViewController.swift @@ -1,6 +1,6 @@ // // DetailViewController.swift -// Evergreen-iOS +// NetNewsWire-iOS // // Created by Brent Simmons on 2/5/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen-iOS/Info.plist b/NetNewsWire-iOS/Info.plist similarity index 100% rename from Evergreen-iOS/Info.plist rename to NetNewsWire-iOS/Info.plist diff --git a/Evergreen-iOS/MasterViewController.swift b/NetNewsWire-iOS/MasterViewController.swift similarity index 99% rename from Evergreen-iOS/MasterViewController.swift rename to NetNewsWire-iOS/MasterViewController.swift index eccbba797..a1469359b 100644 --- a/Evergreen-iOS/MasterViewController.swift +++ b/NetNewsWire-iOS/MasterViewController.swift @@ -1,6 +1,6 @@ // // MasterViewController.swift -// Evergreen-iOS +// NetNewsWire-iOS // // Created by Brent Simmons on 2/5/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen-iOSTests/Info.plist b/NetNewsWire-iOSTests/Info.plist similarity index 100% rename from Evergreen-iOSTests/Info.plist rename to NetNewsWire-iOSTests/Info.plist diff --git a/Evergreen-iOSTests/Evergreen_iOSTests.swift b/NetNewsWire-iOSTests/NetNewsWire_iOSTests.swift similarity index 87% rename from Evergreen-iOSTests/Evergreen_iOSTests.swift rename to NetNewsWire-iOSTests/NetNewsWire_iOSTests.swift index 0cbcccfe8..f5881881d 100644 --- a/Evergreen-iOSTests/Evergreen_iOSTests.swift +++ b/NetNewsWire-iOSTests/NetNewsWire_iOSTests.swift @@ -1,15 +1,15 @@ // -// Evergreen_iOSTests.swift -// Evergreen-iOSTests +// NetNewsWire_iOSTests.swift +// NetNewsWire-iOSTests // // Created by Brent Simmons on 2/5/18. // Copyright © 2018 Ranchero Software. All rights reserved. // import XCTest -@testable import Evergreen_iOS +@testable import NetNewsWire_iOS -class Evergreen_iOSTests: XCTestCase { +class NetNewsWire_iOSTests: XCTestCase { override func setUp() { super.setUp() diff --git a/Evergreen-iOSUITests/Info.plist b/NetNewsWire-iOSUITests/Info.plist similarity index 100% rename from Evergreen-iOSUITests/Info.plist rename to NetNewsWire-iOSUITests/Info.plist diff --git a/Evergreen-iOSUITests/Evergreen_iOSUITests.swift b/NetNewsWire-iOSUITests/NetNewsWire_iOSUITests.swift similarity index 91% rename from Evergreen-iOSUITests/Evergreen_iOSUITests.swift rename to NetNewsWire-iOSUITests/NetNewsWire_iOSUITests.swift index 66023b2c1..5f9221760 100644 --- a/Evergreen-iOSUITests/Evergreen_iOSUITests.swift +++ b/NetNewsWire-iOSUITests/NetNewsWire_iOSUITests.swift @@ -1,6 +1,6 @@ // -// Evergreen_iOSUITests.swift -// Evergreen-iOSUITests +// NetNewsWire_iOSUITests.swift +// NetNewsWire-iOSUITests // // Created by Brent Simmons on 2/5/18. // Copyright © 2018 Ranchero Software. All rights reserved. @@ -8,7 +8,7 @@ import XCTest -class Evergreen_iOSUITests: XCTestCase { +class NetNewsWire_iOSUITests: XCTestCase { override func setUp() { super.setUp() diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 0fce94d93..e10744d25 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 6581C73820CED60100F4AD34 /* SafariExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73720CED60100F4AD34 /* SafariExtensionHandler.swift */; }; 6581C73A20CED60100F4AD34 /* SafariExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */; }; 6581C73D20CED60100F4AD34 /* SafariExtensionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6581C73B20CED60100F4AD34 /* SafariExtensionViewController.xib */; }; - 6581C74020CED60100F4AD34 /* evergreen-subscribe-to-feed.js in Resources */ = {isa = PBXBuildFile; fileRef = 6581C73F20CED60100F4AD34 /* evergreen-subscribe-to-feed.js */; }; + 6581C74020CED60100F4AD34 /* netnewswire-subscribe-to-feed.js in Resources */ = {isa = PBXBuildFile; fileRef = 6581C73F20CED60100F4AD34 /* netnewswire-subscribe-to-feed.js */; }; 6581C74220CED60100F4AD34 /* ToolbarItemIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */; }; 6581C74620CED60100F4AD34 /* Subscribe to Feed.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 840D617F2029031C009BC708 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840D617E2029031C009BC708 /* AppDelegate.swift */; }; @@ -19,8 +19,8 @@ 840D61862029031C009BC708 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 840D61842029031C009BC708 /* Main.storyboard */; }; 840D61882029031D009BC708 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 840D61872029031D009BC708 /* Assets.xcassets */; }; 840D618B2029031D009BC708 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 840D61892029031D009BC708 /* LaunchScreen.storyboard */; }; - 840D61962029031D009BC708 /* Evergreen_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840D61952029031D009BC708 /* Evergreen_iOSTests.swift */; }; - 840D61A12029031E009BC708 /* Evergreen_iOSUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840D61A02029031E009BC708 /* Evergreen_iOSUITests.swift */; }; + 840D61962029031D009BC708 /* NetNewsWire_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840D61952029031D009BC708 /* NetNewsWire_iOSTests.swift */; }; + 840D61A12029031E009BC708 /* NetNewsWire_iOSUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840D61A02029031E009BC708 /* NetNewsWire_iOSUITests.swift */; }; 84162A152038C12C00035290 /* MarkCommandValidationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84162A142038C12C00035290 /* MarkCommandValidationStatus.swift */; }; 84162A252038C1E000035290 /* TimelineDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84162A242038C1E000035290 /* TimelineDataSource.swift */; }; 841ABA4E20145E7300980E11 /* NothingInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841ABA4D20145E7300980E11 /* NothingInspectorViewController.swift */; }; @@ -103,7 +103,6 @@ 849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849C64631ED37A5D003D8FC0 /* AppDelegate.swift */; }; 849C64681ED37A5D003D8FC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 849C64671ED37A5D003D8FC0 /* Assets.xcassets */; }; 849C646B1ED37A5D003D8FC0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849C64691ED37A5D003D8FC0 /* Main.storyboard */; }; - 849C64761ED37A5D003D8FC0 /* EvergreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849C64751ED37A5D003D8FC0 /* EvergreenTests.swift */; }; 849EE70F203919360082A1EA /* AppImages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849EE70E203919360082A1EA /* AppImages.swift */; }; 849EE71F20391DF20082A1EA /* MainWindowToolbarDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849EE71E20391DF20082A1EA /* MainWindowToolbarDelegate.swift */; }; 849EE72120391F560082A1EA /* MainWindowSharingServicePickerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849EE72020391F560082A1EA /* MainWindowSharingServicePickerDelegate.swift */; }; @@ -161,54 +160,43 @@ 84F3EE1920DEC97E003FADEB /* FeedSpecifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F3EE0720DEC97E003FADEB /* FeedSpecifier.swift */; }; 84F3EE1A20DEC97E003FADEB /* HTMLFeedFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F3EE0820DEC97E003FADEB /* HTMLFeedFinder.swift */; }; 84F3EE1B20DEC97E003FADEB /* HTMLFeedFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F3EE0820DEC97E003FADEB /* HTMLFeedFinder.swift */; }; + 84F9EAE5213660A100CF2DE4 /* AppleScriptXCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD1213660A100CF2DE4 /* AppleScriptXCTestCase.swift */; }; + 84F9EAE6213660A100CF2DE4 /* ScriptingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD2213660A100CF2DE4 /* ScriptingTests.swift */; }; + 84F9EAE7213660A100CF2DE4 /* testNameOfAuthors.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD4213660A100CF2DE4 /* testNameOfAuthors.applescript */; }; + 84F9EAE8213660A100CF2DE4 /* testGetURL.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD5213660A100CF2DE4 /* testGetURL.applescript */; }; + 84F9EAE9213660A100CF2DE4 /* testNameAndUrlOfEveryFeed.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD6213660A100CF2DE4 /* testNameAndUrlOfEveryFeed.applescript */; }; + 84F9EAEA213660A100CF2DE4 /* testFeedExists.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD7213660A100CF2DE4 /* testFeedExists.applescript */; }; + 84F9EAEB213660A100CF2DE4 /* testIterativeCreateAndDeleteFeed.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD8213660A100CF2DE4 /* testIterativeCreateAndDeleteFeed.applescript */; }; + 84F9EAEC213660A100CF2DE4 /* selectAFeed.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAD9213660A100CF2DE4 /* selectAFeed.applescript */; }; + 84F9EAED213660A100CF2DE4 /* uiScriptingTestSetup.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EADA213660A100CF2DE4 /* uiScriptingTestSetup.applescript */; }; + 84F9EAEE213660A100CF2DE4 /* testURLsOfCurrentArticle.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EADB213660A100CF2DE4 /* testURLsOfCurrentArticle.applescript */; }; + 84F9EAEF213660A100CF2DE4 /* testNameOfEveryFolder.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EADC213660A100CF2DE4 /* testNameOfEveryFolder.applescript */; }; + 84F9EAF0213660A100CF2DE4 /* testFeedOPML.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EADD213660A100CF2DE4 /* testFeedOPML.applescript */; }; + 84F9EAF1213660A100CF2DE4 /* selectAnArticle.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EADE213660A100CF2DE4 /* selectAnArticle.applescript */; }; + 84F9EAF2213660A100CF2DE4 /* testTitleOfArticlesWhose.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EADF213660A100CF2DE4 /* testTitleOfArticlesWhose.applescript */; }; + 84F9EAF3213660A100CF2DE4 /* testCurrentArticleIsNil.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAE0213660A100CF2DE4 /* testCurrentArticleIsNil.applescript */; }; + 84F9EAF4213660A100CF2DE4 /* testGenericScript.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAE1213660A100CF2DE4 /* testGenericScript.applescript */; }; + 84F9EAF5213660A100CF2DE4 /* establishMainWindowStartingState.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAE2213660A100CF2DE4 /* establishMainWindowStartingState.applescript */; }; + 84F9EAF6213660A100CF2DE4 /* NetNewsWireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F9EAE3213660A100CF2DE4 /* NetNewsWireTests.swift */; }; + 84F9EAF7213660A100CF2DE4 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 84F9EAE4213660A100CF2DE4 /* Info.plist */; }; 84FB9A2F1EDCD6C4003D53B9 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; }; 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84FF69B11FC3793300DC198E /* FaviconURLFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FF69B01FC3793300DC198E /* FaviconURLFinder.swift */; }; D553738B20186C20006D8857 /* Article+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553737C20186C1F006D8857 /* Article+Scriptability.swift */; }; - D55373AF2018797C006D8857 /* testTitleOfArticlesWhose.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */; }; - D55373B020187A05006D8857 /* testTitleOfArticlesWhose.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */; }; - D5558FD32002245C0066386B /* ScriptingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD22002245C0066386B /* ScriptingTests.swift */; }; D5558FD5200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD4200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift */; }; D5558FD9200228D30066386B /* AppleEventUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD7200228B80066386B /* AppleEventUtils.swift */; }; - D57BE6E0204CD35F00D11AAC /* NSScriptCommand+Evergreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57BE6DF204CD35F00D11AAC /* NSScriptCommand+Evergreen.swift */; }; - D57BE7642051025E00D11AAC /* testFeedExists.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D57BE7562051025E00D11AAC /* testFeedExists.applescript */; }; - D57BE7652051027D00D11AAC /* testFeedExists.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D57BE7562051025E00D11AAC /* testFeedExists.applescript */; }; - D5907CA0200232A1005947E5 /* testGenericScript.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5907C9D20023249005947E5 /* testGenericScript.applescript */; }; - D5907CA1200232A1005947E5 /* testGetURL.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD1200223F60066386B /* testGetURL.applescript */; }; - D5907CA2200232AD005947E5 /* testGenericScript.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5907C9D20023249005947E5 /* testGenericScript.applescript */; }; - D5907CA3200232AF005947E5 /* testGetURL.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5558FD1200223F60066386B /* testGetURL.applescript */; }; + D57BE6E0204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57BE6DF204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift */; }; D5907D7F2004AC00005947E5 /* NSApplication+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5907D7E2004AC00005947E5 /* NSApplication+Scriptability.swift */; }; D5907D972004B7EB005947E5 /* Account+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5907D962004B7EB005947E5 /* Account+Scriptability.swift */; }; D5907DB22004BB37005947E5 /* ScriptingObjectContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5907DB12004BB37005947E5 /* ScriptingObjectContainer.swift */; }; D5907DB32005F45D005947E5 /* AppleEventUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5558FD7200228B80066386B /* AppleEventUtils.swift */; }; D5A2678C20130ECF00A8D3C0 /* Author+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A2678B20130ECF00A8D3C0 /* Author+Scriptability.swift */; }; - D5A2679C201312F900A8D3C0 /* testNameOfAuthors.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5A2679B201312F900A8D3C0 /* testNameOfAuthors.applescript */; }; - D5A2679D201313A200A8D3C0 /* testNameOfAuthors.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5A2679B201312F900A8D3C0 /* testNameOfAuthors.applescript */; }; - D5A267C120131B8300A8D3C0 /* testFeedOPML.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5A267B220131B8300A8D3C0 /* testFeedOPML.applescript */; }; - D5A267C220131BA000A8D3C0 /* testFeedOPML.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5A267B220131B8300A8D3C0 /* testFeedOPML.applescript */; }; - D5D07B18204B42050093F739 /* testIterativeCreateAndDeleteFeed.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5D07B09204B42050093F739 /* testIterativeCreateAndDeleteFeed.applescript */; }; - D5D07B19204B423C0093F739 /* testIterativeCreateAndDeleteFeed.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5D07B09204B42050093F739 /* testIterativeCreateAndDeleteFeed.applescript */; }; D5D1751220020B980047B29D /* NetNewsWire.sdef in Resources */ = {isa = PBXBuildFile; fileRef = D5D175012002039D0047B29D /* NetNewsWire.sdef */; }; D5E4CC54202C1361009B4FFC /* AppDelegate+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CC53202C1361009B4FFC /* AppDelegate+Scriptability.swift */; }; D5E4CC64202C1AC1009B4FFC /* MainWindowController+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CC63202C1AC1009B4FFC /* MainWindowController+Scriptability.swift */; }; - D5E4CCB320300024009B4FFC /* uiScriptingTestSetup.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CCB220300024009B4FFC /* uiScriptingTestSetup.applescript */; }; - D5E4CCB420300033009B4FFC /* uiScriptingTestSetup.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5E4CCB220300024009B4FFC /* uiScriptingTestSetup.applescript */; }; - D5E4CCC520300537009B4FFC /* AppleScriptXCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CCC3203004EA009B4FFC /* AppleScriptXCTestCase.swift */; }; - D5E4CCD720303823009B4FFC /* selectAnArticle.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CCD520303823009B4FFC /* selectAnArticle.applescript */; }; - D5E4CCD820303823009B4FFC /* selectAFeed.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CCD620303823009B4FFC /* selectAFeed.applescript */; }; - D5E4CCDA2030382A009B4FFC /* establishMainWindowStartingState.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5E4CCD92030382A009B4FFC /* establishMainWindowStartingState.applescript */; }; - D5E4CCDB20303A52009B4FFC /* selectAFeed.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5E4CCD620303823009B4FFC /* selectAFeed.applescript */; }; - D5E4CCDC20303A52009B4FFC /* selectAnArticle.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5E4CCD520303823009B4FFC /* selectAnArticle.applescript */; }; - D5E4CCDD20303A59009B4FFC /* establishMainWindowStartingState.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5E4CCD92030382A009B4FFC /* establishMainWindowStartingState.applescript */; }; - D5E4CCDE20303A66009B4FFC /* testCurrentArticleIsNil.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5E4CCD12030260E009B4FFC /* testCurrentArticleIsNil.applescript */; }; - D5E4CCDF20303A66009B4FFC /* testURLsOfCurrentArticle.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5E4CCCF203025FF009B4FFC /* testURLsOfCurrentArticle.applescript */; }; D5F4EDB5200744A700B9E363 /* ScriptingObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDB4200744A700B9E363 /* ScriptingObject.swift */; }; D5F4EDB720074D6500B9E363 /* Feed+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDB620074D6500B9E363 /* Feed+Scriptability.swift */; }; D5F4EDB920074D7C00B9E363 /* Folder+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDB820074D7C00B9E363 /* Folder+Scriptability.swift */; }; - D5F4EDE620075C1300B9E363 /* testNameOfEveryFolder.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDD720075C1300B9E363 /* testNameOfEveryFolder.applescript */; }; - D5F4EDE820075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDE720075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript */; }; - D5F4EDE920075C6700B9E363 /* testNameAndUrlOfEveryFeed.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5F4EDE720075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript */; }; - D5F4EDEA20075C6700B9E363 /* testNameOfEveryFolder.applescript in CopyFiles */ = {isa = PBXBuildFile; fileRef = D5F4EDD720075C1300B9E363 /* testNameOfEveryFolder.applescript */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -217,14 +205,14 @@ containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; proxyType = 1; remoteGlobalIDString = 840D617B2029031C009BC708; - remoteInfo = "Evergreen-iOS"; + remoteInfo = "NetNewsWire-iOS"; }; 840D619D2029031E009BC708 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; proxyType = 1; remoteGlobalIDString = 840D617B2029031C009BC708; - remoteInfo = "Evergreen-iOS"; + remoteInfo = "NetNewsWire-iOS"; }; 841D4D5A2106B3D600DD04E6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -294,7 +282,7 @@ containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; proxyType = 1; remoteGlobalIDString = 849C645F1ED37A5D003D8FC0; - remoteInfo = Evergreen; + remoteInfo = NetNewsWire; }; 84C37F2720DD8CCE00CA8CF5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -483,21 +471,6 @@ dstPath = TestScripts; dstSubfolderSpec = 7; files = ( - D57BE7652051027D00D11AAC /* testFeedExists.applescript in CopyFiles */, - D5D07B19204B423C0093F739 /* testIterativeCreateAndDeleteFeed.applescript in CopyFiles */, - D5E4CCDE20303A66009B4FFC /* testCurrentArticleIsNil.applescript in CopyFiles */, - D5E4CCDF20303A66009B4FFC /* testURLsOfCurrentArticle.applescript in CopyFiles */, - D5E4CCDD20303A59009B4FFC /* establishMainWindowStartingState.applescript in CopyFiles */, - D5E4CCDB20303A52009B4FFC /* selectAFeed.applescript in CopyFiles */, - D5E4CCDC20303A52009B4FFC /* selectAnArticle.applescript in CopyFiles */, - D5E4CCB420300033009B4FFC /* uiScriptingTestSetup.applescript in CopyFiles */, - D5A267C220131BA000A8D3C0 /* testFeedOPML.applescript in CopyFiles */, - D5A2679D201313A200A8D3C0 /* testNameOfAuthors.applescript in CopyFiles */, - D5F4EDE920075C6700B9E363 /* testNameAndUrlOfEveryFeed.applescript in CopyFiles */, - D5F4EDEA20075C6700B9E363 /* testNameOfEveryFolder.applescript in CopyFiles */, - D55373B020187A05006D8857 /* testTitleOfArticlesWhose.applescript in CopyFiles */, - D5907CA2200232AD005947E5 /* testGenericScript.applescript in CopyFiles */, - D5907CA3200232AF005947E5 /* testGetURL.applescript in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -510,7 +483,7 @@ 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariExtensionViewController.swift; sourceTree = ""; }; 6581C73C20CED60100F4AD34 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SafariExtensionViewController.xib; sourceTree = ""; }; 6581C73E20CED60100F4AD34 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 6581C73F20CED60100F4AD34 /* evergreen-subscribe-to-feed.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "evergreen-subscribe-to-feed.js"; sourceTree = ""; }; + 6581C73F20CED60100F4AD34 /* netnewswire-subscribe-to-feed.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "netnewswire-subscribe-to-feed.js"; sourceTree = ""; }; 6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = ToolbarItemIcon.pdf; sourceTree = ""; }; 6581C74320CED60100F4AD34 /* Subscribe_to_Feed.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Subscribe_to_Feed.entitlements; sourceTree = ""; }; 8403E75A201C4A79007F7246 /* FeedListKeyboardDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListKeyboardDelegate.swift; sourceTree = ""; }; @@ -523,10 +496,10 @@ 840D618A2029031D009BC708 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 840D618C2029031D009BC708 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 840D61912029031D009BC708 /* NetNewsWire-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "NetNewsWire-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 840D61952029031D009BC708 /* Evergreen_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Evergreen_iOSTests.swift; sourceTree = ""; }; + 840D61952029031D009BC708 /* NetNewsWire_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetNewsWire_iOSTests.swift; sourceTree = ""; }; 840D61972029031D009BC708 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 840D619C2029031D009BC708 /* NetNewsWire-iOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "NetNewsWire-iOSUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 840D61A02029031E009BC708 /* Evergreen_iOSUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Evergreen_iOSUITests.swift; sourceTree = ""; }; + 840D61A02029031E009BC708 /* NetNewsWire_iOSUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetNewsWire_iOSUITests.swift; sourceTree = ""; }; 840D61A22029031E009BC708 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84162A142038C12C00035290 /* MarkCommandValidationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkCommandValidationStatus.swift; sourceTree = ""; }; 84162A242038C1E000035290 /* TimelineDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineDataSource.swift; sourceTree = ""; }; @@ -539,11 +512,11 @@ 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 = ""; }; 842611A11FCB769D0086A189 /* RSHTMLMetadata+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RSHTMLMetadata+Extension.swift"; sourceTree = ""; }; - 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppNotifications.swift; path = Evergreen/AppNotifications.swift; sourceTree = ""; }; - 842E45DC1ED8C54B000A8B52 /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Browser.swift; path = Evergreen/Browser.swift; sourceTree = ""; }; + 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppNotifications.swift; path = NetNewsWire/AppNotifications.swift; sourceTree = ""; }; + 842E45DC1ED8C54B000A8B52 /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Browser.swift; path = NetNewsWire/Browser.swift; sourceTree = ""; }; 842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardDelegateProtocol.swift; sourceTree = ""; }; 842E45E41ED8C6B7000A8B52 /* MainWindowSplitView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowSplitView.swift; sourceTree = ""; }; - 842E45E61ED8C747000A8B52 /* DB5.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DB5.plist; path = Evergreen/Resources/DB5.plist; sourceTree = ""; }; + 842E45E61ED8C747000A8B52 /* DB5.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DB5.plist; path = NetNewsWire/Resources/DB5.plist; sourceTree = ""; }; 843A3B5520311E7700BF76EC /* FeedListOutlineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListOutlineView.swift; sourceTree = ""; }; 84411E701FE5FBFA004B527F /* SmallIconProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallIconProvider.swift; sourceTree = ""; }; 8444C8F11FED81840051386C /* OPMLExporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLExporter.swift; sourceTree = ""; }; @@ -590,39 +563,37 @@ 849A977D1ED9EC42007D329B /* ArticleRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleRenderer.swift; sourceTree = ""; }; 849A977E1ED9EC42007D329B /* DetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = ""; }; 849A97821ED9EC63007D329B /* SidebarStatusBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SidebarStatusBarView.swift; sourceTree = ""; }; - 849A97841ED9ECCD007D329B /* PreferencesWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PreferencesWindowController.swift; path = Evergreen/Preferences/PreferencesWindowController.swift; sourceTree = ""; }; + 849A97841ED9ECCD007D329B /* PreferencesWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PreferencesWindowController.swift; path = NetNewsWire/Preferences/PreferencesWindowController.swift; sourceTree = ""; }; 849A97871ED9ECEF007D329B /* ArticleStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleStyle.swift; sourceTree = ""; }; 849A97881ED9ECEF007D329B /* ArticleStylesManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleStylesManager.swift; sourceTree = ""; }; 849A978C1ED9EE4D007D329B /* FeedListWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedListWindowController.swift; sourceTree = ""; }; 849A978E1ED9EE72007D329B /* DefaultFeeds.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DefaultFeeds.plist; path = Importers/DefaultFeeds.plist; sourceTree = SOURCE_ROOT; }; 849A97911ED9EF65007D329B /* IndeterminateProgressWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndeterminateProgressWindowController.swift; sourceTree = ""; }; - 849A97941ED9EF7A007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Evergreen/Base.lproj/IndeterminateProgressWindow.xib; sourceTree = SOURCE_ROOT; }; + 849A97941ED9EF7A007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = NetNewsWire/Base.lproj/IndeterminateProgressWindow.xib; sourceTree = SOURCE_ROOT; }; 849A97971ED9EFAA007D329B /* Node-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Node-Extensions.swift"; sourceTree = ""; }; - 849A979A1ED9EFEB007D329B /* styleSheet.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = styleSheet.css; path = Evergreen/MainWindow/Detail/styleSheet.css; sourceTree = SOURCE_ROOT; }; - 849A979B1ED9EFEB007D329B /* template.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = template.html; path = Evergreen/MainWindow/Detail/template.html; sourceTree = SOURCE_ROOT; }; + 849A979A1ED9EFEB007D329B /* styleSheet.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = styleSheet.css; path = NetNewsWire/MainWindow/Detail/styleSheet.css; sourceTree = SOURCE_ROOT; }; + 849A979B1ED9EFEB007D329B /* template.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = template.html; path = NetNewsWire/MainWindow/Detail/template.html; sourceTree = SOURCE_ROOT; }; 849A979E1ED9F130007D329B /* SidebarCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SidebarCell.swift; sourceTree = ""; }; 849A97A01ED9F180007D329B /* InitialFeedDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = InitialFeedDownloader.swift; path = AddFeed/InitialFeedDownloader.swift; sourceTree = ""; }; 849A97A11ED9F180007D329B /* FolderTreeControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FolderTreeControllerDelegate.swift; path = AddFeed/FolderTreeControllerDelegate.swift; sourceTree = ""; }; - 849A97A51ED9F94D007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Evergreen/Base.lproj/Preferences.storyboard; sourceTree = ""; }; - 849A97A81ED9F9AA007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Evergreen/Base.lproj/AddFeedSheet.xib; sourceTree = SOURCE_ROOT; }; - 849A97AB1ED9F9BC007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Evergreen/Base.lproj/AddFolderSheet.xib; sourceTree = SOURCE_ROOT; }; - 849A97B11ED9FA69007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Evergreen/Base.lproj/MainWindow.storyboard; sourceTree = SOURCE_ROOT; }; + 849A97A51ED9F94D007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = NetNewsWire/Base.lproj/Preferences.storyboard; sourceTree = ""; }; + 849A97A81ED9F9AA007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = NetNewsWire/Base.lproj/AddFeedSheet.xib; sourceTree = SOURCE_ROOT; }; + 849A97AB1ED9F9BC007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = NetNewsWire/Base.lproj/AddFolderSheet.xib; sourceTree = SOURCE_ROOT; }; + 849A97B11ED9FA69007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = NetNewsWire/Base.lproj/MainWindow.storyboard; sourceTree = SOURCE_ROOT; }; 849C64601ED37A5D003D8FC0 /* NetNewsWire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetNewsWire.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 849C64631ED37A5D003D8FC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Evergreen/AppDelegate.swift; sourceTree = ""; }; - 849C64671ED37A5D003D8FC0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Evergreen/Assets.xcassets; sourceTree = ""; }; + 849C64631ED37A5D003D8FC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = NetNewsWire/AppDelegate.swift; sourceTree = ""; }; + 849C64671ED37A5D003D8FC0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = NetNewsWire/Assets.xcassets; sourceTree = ""; }; 849C646A1ED37A5D003D8FC0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 849C646C1ED37A5D003D8FC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../Info.plist; sourceTree = ""; }; 849C64711ED37A5D003D8FC0 /* NetNewsWireTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NetNewsWireTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 849C64751ED37A5D003D8FC0 /* EvergreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvergreenTests.swift; sourceTree = ""; }; - 849C64771ED37A5D003D8FC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 849EE70E203919360082A1EA /* AppImages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppImages.swift; path = Evergreen/AppImages.swift; sourceTree = ""; }; + 849EE70E203919360082A1EA /* AppImages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppImages.swift; path = NetNewsWire/AppImages.swift; sourceTree = ""; }; 849EE71E20391DF20082A1EA /* MainWindowToolbarDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowToolbarDelegate.swift; sourceTree = ""; }; 849EE72020391F560082A1EA /* MainWindowSharingServicePickerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowSharingServicePickerDelegate.swift; sourceTree = ""; }; 84A14FF220048CA70046AD9A /* SendToMicroBlogCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToMicroBlogCommand.swift; sourceTree = ""; }; 84A1500220048D660046AD9A /* SendToCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToCommand.swift; sourceTree = ""; }; 84A1500420048DDF0046AD9A /* SendToMarsEditCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToMarsEditCommand.swift; sourceTree = ""; }; 84A37CB4201ECD610087C5AF /* RenameWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RenameWindowController.swift; sourceTree = ""; }; - 84A37CBA201ECE590087C5AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Evergreen/Base.lproj/RenameSheet.xib; sourceTree = SOURCE_ROOT; }; + 84A37CBA201ECE590087C5AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = NetNewsWire/Base.lproj/RenameSheet.xib; sourceTree = SOURCE_ROOT; }; 84A6B6931FB8D43C006754AC /* DinosaursWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DinosaursWindow.xib; sourceTree = ""; }; 84A6B6951FB8DBD2006754AC /* DinosaursWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DinosaursWindowController.swift; sourceTree = ""; }; 84AAF2BE202CF684004A0BC4 /* TimelineContextualMenuDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineContextualMenuDelegate.swift; sourceTree = ""; }; @@ -649,10 +620,10 @@ 84D52E941FE588BB00D14F5B /* DetailStatusBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailStatusBarView.swift; sourceTree = ""; }; 84D5BA1F201E8FB6009092BD /* SidebarGearMenuDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarGearMenuDelegate.swift; sourceTree = ""; }; 84DAEE2F1F86CAFE0058304B /* OPMLImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLImporter.swift; sourceTree = ""; }; - 84DAEE311F870B390058304B /* DockBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DockBadge.swift; path = Evergreen/DockBadge.swift; sourceTree = ""; }; + 84DAEE311F870B390058304B /* DockBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DockBadge.swift; path = NetNewsWire/DockBadge.swift; sourceTree = ""; }; 84E185B2203B74E500F69BFA /* SingleLineTextFieldSizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleLineTextFieldSizer.swift; sourceTree = ""; }; 84E185C2203BB12600F69BFA /* MultilineTextFieldSizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineTextFieldSizer.swift; sourceTree = ""; }; - 84E46C7C1F75EF7B005ECFB3 /* AppDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDefaults.swift; path = Evergreen/AppDefaults.swift; sourceTree = ""; }; + 84E46C7C1F75EF7B005ECFB3 /* AppDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDefaults.swift; path = NetNewsWire/AppDefaults.swift; sourceTree = ""; }; 84E850851FCB60CE0072EA88 /* AuthorAvatarDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorAvatarDownloader.swift; sourceTree = ""; }; 84E8E0DA202EC49300562D8F /* TimelineViewController+ContextualMenus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TimelineViewController+ContextualMenus.swift"; sourceTree = ""; }; 84E8E0EA202F693600562D8F /* DetailWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailWebView.swift; sourceTree = ""; }; @@ -667,44 +638,46 @@ 84F3EE0620DEC97E003FADEB /* FeedFinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedFinder.swift; sourceTree = ""; }; 84F3EE0720DEC97E003FADEB /* FeedSpecifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedSpecifier.swift; sourceTree = ""; }; 84F3EE0820DEC97E003FADEB /* HTMLFeedFinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLFeedFinder.swift; sourceTree = ""; }; + 84F9EAD1213660A100CF2DE4 /* AppleScriptXCTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppleScriptXCTestCase.swift; sourceTree = ""; }; + 84F9EAD2213660A100CF2DE4 /* ScriptingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScriptingTests.swift; sourceTree = ""; }; + 84F9EAD4213660A100CF2DE4 /* testNameOfAuthors.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testNameOfAuthors.applescript; sourceTree = ""; }; + 84F9EAD5213660A100CF2DE4 /* testGetURL.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testGetURL.applescript; sourceTree = ""; }; + 84F9EAD6213660A100CF2DE4 /* testNameAndUrlOfEveryFeed.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testNameAndUrlOfEveryFeed.applescript; sourceTree = ""; }; + 84F9EAD7213660A100CF2DE4 /* testFeedExists.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testFeedExists.applescript; sourceTree = ""; }; + 84F9EAD8213660A100CF2DE4 /* testIterativeCreateAndDeleteFeed.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testIterativeCreateAndDeleteFeed.applescript; sourceTree = ""; }; + 84F9EAD9213660A100CF2DE4 /* selectAFeed.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = selectAFeed.applescript; sourceTree = ""; }; + 84F9EADA213660A100CF2DE4 /* uiScriptingTestSetup.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = uiScriptingTestSetup.applescript; sourceTree = ""; }; + 84F9EADB213660A100CF2DE4 /* testURLsOfCurrentArticle.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testURLsOfCurrentArticle.applescript; sourceTree = ""; }; + 84F9EADC213660A100CF2DE4 /* testNameOfEveryFolder.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testNameOfEveryFolder.applescript; sourceTree = ""; }; + 84F9EADD213660A100CF2DE4 /* testFeedOPML.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testFeedOPML.applescript; sourceTree = ""; }; + 84F9EADE213660A100CF2DE4 /* selectAnArticle.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = selectAnArticle.applescript; sourceTree = ""; }; + 84F9EADF213660A100CF2DE4 /* testTitleOfArticlesWhose.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testTitleOfArticlesWhose.applescript; sourceTree = ""; }; + 84F9EAE0213660A100CF2DE4 /* testCurrentArticleIsNil.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testCurrentArticleIsNil.applescript; sourceTree = ""; }; + 84F9EAE1213660A100CF2DE4 /* testGenericScript.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testGenericScript.applescript; sourceTree = ""; }; + 84F9EAE2213660A100CF2DE4 /* establishMainWindowStartingState.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = establishMainWindowStartingState.applescript; sourceTree = ""; }; + 84F9EAE3213660A100CF2DE4 /* NetNewsWireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetNewsWireTests.swift; sourceTree = ""; }; + 84F9EAE4213660A100CF2DE4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Vendor/Sparkle.framework; sourceTree = SOURCE_ROOT; }; 84FF69B01FC3793300DC198E /* FaviconURLFinder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconURLFinder.swift; sourceTree = ""; }; D553737C20186C1F006D8857 /* Article+Scriptability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Article+Scriptability.swift"; sourceTree = ""; }; - D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testTitleOfArticlesWhose.applescript; sourceTree = ""; }; - D5558FD1200223F60066386B /* testGetURL.applescript */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.applescript; path = testGetURL.applescript; sourceTree = ""; }; - D5558FD22002245C0066386B /* ScriptingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ScriptingTests.swift; path = EvergreenTests/ScriptingTests/ScriptingTests.swift; sourceTree = SOURCE_ROOT; }; D5558FD4200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "NSAppleEventDescriptor+UserRecordFields.swift"; path = "AppleEvents/NSAppleEventDescriptor+UserRecordFields.swift"; sourceTree = SOURCE_ROOT; }; D5558FD7200228B80066386B /* AppleEventUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppleEventUtils.swift; sourceTree = ""; }; - D57BE6DF204CD35F00D11AAC /* NSScriptCommand+Evergreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSScriptCommand+Evergreen.swift"; sourceTree = ""; }; - D57BE7562051025E00D11AAC /* testFeedExists.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testFeedExists.applescript; sourceTree = ""; }; - D5907C9D20023249005947E5 /* testGenericScript.applescript */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.applescript; path = testGenericScript.applescript; sourceTree = ""; }; - D5907CDC2002F0BE005947E5 /* Evergreen_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Evergreen_project_release.xcconfig; sourceTree = ""; }; - D5907CDD2002F0BE005947E5 /* Evergreen_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Evergreen_project_debug.xcconfig; sourceTree = ""; }; - D5907CDE2002F0BE005947E5 /* Evergreen_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Evergreen_project.xcconfig; sourceTree = ""; }; - D5907CDF2002F0F9005947E5 /* EvergreenTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = EvergreenTests_target.xcconfig; sourceTree = ""; }; - D5907CE02002F0FA005947E5 /* Evergreen_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Evergreen_target.xcconfig; sourceTree = ""; }; + D57BE6DF204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSScriptCommand+NetNewsWire.swift"; sourceTree = ""; }; + D5907CDC2002F0BE005947E5 /* NetNewsWire_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_project_release.xcconfig; sourceTree = ""; }; + D5907CDD2002F0BE005947E5 /* NetNewsWire_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_project_debug.xcconfig; sourceTree = ""; }; + D5907CDE2002F0BE005947E5 /* NetNewsWire_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_project.xcconfig; sourceTree = ""; }; + D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWireTests_target.xcconfig; sourceTree = ""; }; + D5907CE02002F0FA005947E5 /* NetNewsWire_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_target.xcconfig; sourceTree = ""; }; D5907D7E2004AC00005947E5 /* NSApplication+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSApplication+Scriptability.swift"; sourceTree = ""; }; D5907D962004B7EB005947E5 /* Account+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account+Scriptability.swift"; sourceTree = ""; }; D5907DB12004BB37005947E5 /* ScriptingObjectContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptingObjectContainer.swift; sourceTree = ""; }; D5A2678B20130ECF00A8D3C0 /* Author+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Author+Scriptability.swift"; sourceTree = ""; }; - D5A2679B201312F900A8D3C0 /* testNameOfAuthors.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testNameOfAuthors.applescript; sourceTree = ""; }; - D5A267B220131B8300A8D3C0 /* testFeedOPML.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testFeedOPML.applescript; sourceTree = ""; }; - D5D07B09204B42050093F739 /* testIterativeCreateAndDeleteFeed.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testIterativeCreateAndDeleteFeed.applescript; sourceTree = ""; }; D5D175012002039D0047B29D /* NetNewsWire.sdef */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = NetNewsWire.sdef; path = ../Resources/NetNewsWire.sdef; sourceTree = ""; }; D5E4CC53202C1361009B4FFC /* AppDelegate+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Scriptability.swift"; sourceTree = ""; }; D5E4CC63202C1AC1009B4FFC /* MainWindowController+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainWindowController+Scriptability.swift"; sourceTree = ""; }; - D5E4CCB220300024009B4FFC /* uiScriptingTestSetup.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = uiScriptingTestSetup.applescript; sourceTree = ""; }; - D5E4CCC3203004EA009B4FFC /* AppleScriptXCTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppleScriptXCTestCase.swift; path = EvergreenTests/ScriptingTests/AppleScriptXCTestCase.swift; sourceTree = SOURCE_ROOT; }; - D5E4CCCF203025FF009B4FFC /* testURLsOfCurrentArticle.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testURLsOfCurrentArticle.applescript; sourceTree = ""; }; - D5E4CCD12030260E009B4FFC /* testCurrentArticleIsNil.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testCurrentArticleIsNil.applescript; sourceTree = ""; }; - D5E4CCD520303823009B4FFC /* selectAnArticle.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = selectAnArticle.applescript; sourceTree = ""; }; - D5E4CCD620303823009B4FFC /* selectAFeed.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = selectAFeed.applescript; sourceTree = ""; }; - D5E4CCD92030382A009B4FFC /* establishMainWindowStartingState.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = establishMainWindowStartingState.applescript; sourceTree = ""; }; D5F4EDB4200744A700B9E363 /* ScriptingObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptingObject.swift; sourceTree = ""; }; D5F4EDB620074D6500B9E363 /* Feed+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Feed+Scriptability.swift"; sourceTree = ""; }; D5F4EDB820074D7C00B9E363 /* Folder+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Folder+Scriptability.swift"; sourceTree = ""; }; - D5F4EDD720075C1300B9E363 /* testNameOfEveryFolder.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testNameOfEveryFolder.applescript; sourceTree = ""; }; - D5F4EDE720075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testNameAndUrlOfEveryFeed.applescript; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -770,14 +743,14 @@ 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */, 6581C73B20CED60100F4AD34 /* SafariExtensionViewController.xib */, 6581C73E20CED60100F4AD34 /* Info.plist */, - 6581C73F20CED60100F4AD34 /* evergreen-subscribe-to-feed.js */, + 6581C73F20CED60100F4AD34 /* netnewswire-subscribe-to-feed.js */, 6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */, 6581C74320CED60100F4AD34 /* Subscribe_to_Feed.entitlements */, ); path = "Safari Extension"; sourceTree = ""; }; - 840D617D2029031C009BC708 /* Evergreen-iOS */ = { + 840D617D2029031C009BC708 /* NetNewsWire-iOS */ = { isa = PBXGroup; children = ( 840D617E2029031C009BC708 /* AppDelegate.swift */, @@ -788,25 +761,25 @@ 840D61892029031D009BC708 /* LaunchScreen.storyboard */, 840D618C2029031D009BC708 /* Info.plist */, ); - path = "Evergreen-iOS"; + path = "NetNewsWire-iOS"; sourceTree = ""; }; - 840D61942029031D009BC708 /* Evergreen-iOSTests */ = { + 840D61942029031D009BC708 /* NetNewsWire-iOSTests */ = { isa = PBXGroup; children = ( - 840D61952029031D009BC708 /* Evergreen_iOSTests.swift */, + 840D61952029031D009BC708 /* NetNewsWire_iOSTests.swift */, 840D61972029031D009BC708 /* Info.plist */, ); - path = "Evergreen-iOSTests"; + path = "NetNewsWire-iOSTests"; sourceTree = ""; }; - 840D619F2029031E009BC708 /* Evergreen-iOSUITests */ = { + 840D619F2029031E009BC708 /* NetNewsWire-iOSUITests */ = { isa = PBXGroup; children = ( - 840D61A02029031E009BC708 /* Evergreen_iOSUITests.swift */, + 840D61A02029031E009BC708 /* NetNewsWire_iOSUITests.swift */, 840D61A22029031E009BC708 /* Info.plist */, ); - path = "Evergreen-iOSUITests"; + path = "NetNewsWire-iOSUITests"; sourceTree = ""; }; 841D4D552106B3D500DD04E6 /* Products */ = { @@ -833,7 +806,7 @@ 8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */, ); name = HTMLMetadata; - path = Evergreen/HTMLMetadata; + path = NetNewsWire/HTMLMetadata; sourceTree = ""; }; 842E45E01ED8C587000A8B52 /* Preferences */ = { @@ -862,7 +835,7 @@ 849A97411ED9EAA9007D329B /* Add Folder */, ); name = MainWindow; - path = Evergreen/MainWindow; + path = NetNewsWire/MainWindow; sourceTree = ""; }; 8444C9011FED81880051386C /* Exporters */ = { @@ -910,7 +883,7 @@ 842611A11FCB769D0086A189 /* RSHTMLMetadata+Extension.swift */, ); name = Images; - path = Evergreen/Images; + path = NetNewsWire/Images; sourceTree = ""; }; 845A29251FC928C7007B49E3 /* Cell */ = { @@ -953,7 +926,7 @@ 84FF69B01FC3793300DC198E /* FaviconURLFinder.swift */, ); name = Favicons; - path = Evergreen/Favicons; + path = NetNewsWire/Favicons; sourceTree = ""; }; 849A97411ED9EAA9007D329B /* Add Folder */ = { @@ -985,7 +958,7 @@ 84411E701FE5FBFA004B527F /* SmallIconProvider.swift */, ); name = Data; - path = Evergreen/Data; + path = NetNewsWire/Data; sourceTree = ""; }; 849A975F1ED9EB95007D329B /* Sidebar */ = { @@ -1061,7 +1034,7 @@ 849A97881ED9ECEF007D329B /* ArticleStylesManager.swift */, ); name = "Article Styles"; - path = Evergreen/ArticleStyles; + path = NetNewsWire/ArticleStyles; sourceTree = SOURCE_ROOT; }; 849A978B1ED9EE4D007D329B /* Feed List */ = { @@ -1078,7 +1051,7 @@ 84DC413A20310AEE00198AD4 /* UnusedIn1.0 */, ); name = "Feed List"; - path = Evergreen/FeedList; + path = NetNewsWire/FeedList; sourceTree = ""; }; 849A97901ED9EF65007D329B /* Progress Window */ = { @@ -1088,7 +1061,7 @@ 849A97911ED9EF65007D329B /* IndeterminateProgressWindowController.swift */, ); name = "Progress Window"; - path = Evergreen/ProgressWindow; + path = NetNewsWire/ProgressWindow; sourceTree = ""; }; 849A97961ED9EFAA007D329B /* Extensions */ = { @@ -1097,7 +1070,7 @@ 849A97971ED9EFAA007D329B /* Node-Extensions.swift */, ); name = Extensions; - path = Evergreen/Extensions; + path = NetNewsWire/Extensions; sourceTree = ""; }; 849A97991ED9EFB6007D329B /* Resources */ = { @@ -1108,7 +1081,7 @@ 84EB380F1FBA8B9F000D2111 /* KeyboardShortcuts */, ); name = Resources; - path = Evergreen/Extensions; + path = NetNewsWire/Extensions; sourceTree = ""; }; 849C64571ED37A5D003D8FC0 = { @@ -1145,12 +1118,12 @@ D5907D6F2004AB67005947E5 /* Scriptability */, D5558FD6200227E60066386B /* AppleEvents */, 849A97991ED9EFB6007D329B /* Resources */, - 840D617D2029031C009BC708 /* Evergreen-iOS */, - 840D61942029031D009BC708 /* Evergreen-iOSTests */, - 840D619F2029031E009BC708 /* Evergreen-iOSUITests */, + 84F9EACF213660A100CF2DE4 /* NetNewsWireTests */, + 840D617D2029031C009BC708 /* NetNewsWire-iOS */, + 840D61942029031D009BC708 /* NetNewsWire-iOSTests */, + 840D619F2029031E009BC708 /* NetNewsWire-iOSUITests */, 6581C73620CED60100F4AD34 /* Safari Extension */, 84FB9A2C1EDCD6A4003D53B9 /* Frameworks */, - 849C64741ED37A5D003D8FC0 /* EvergreenTests */, D5907CDA2002F084005947E5 /* xcconfig */, 849C64611ED37A5D003D8FC0 /* Products */, 846E77301F6EF5D600A165E2 /* Account.xcodeproj */, @@ -1178,16 +1151,6 @@ name = Products; sourceTree = ""; }; - 849C64741ED37A5D003D8FC0 /* EvergreenTests */ = { - isa = PBXGroup; - children = ( - D5558FC020021C290066386B /* ScriptingTests */, - 849C64751ED37A5D003D8FC0 /* EvergreenTests.swift */, - 849C64771ED37A5D003D8FC0 /* Info.plist */, - ); - path = EvergreenTests; - sourceTree = ""; - }; 84A37CB3201ECD610087C5AF /* Renaming */ = { isa = PBXGroup; children = ( @@ -1204,7 +1167,7 @@ 84A6B6951FB8DBD2006754AC /* DinosaursWindowController.swift */, ); name = Dinosaurs; - path = Evergreen/Dinosaurs; + path = NetNewsWire/Dinosaurs; sourceTree = ""; }; 84BBB12A20142A4700F054F5 /* Inspector */ = { @@ -1218,7 +1181,7 @@ 841ABA4D20145E7300980E11 /* NothingInspectorViewController.swift */, ); name = Inspector; - path = Evergreen/Inspector; + path = NetNewsWire/Inspector; sourceTree = ""; }; 84C37F2320DD8CCD00CA8CF5 /* Products */ = { @@ -1304,7 +1267,7 @@ 84EB38101FBA8B9F000D2111 /* KeyboardShortcuts.html */, ); name = KeyboardShortcuts; - path = Evergreen/Resources/KeyboardShortcuts; + path = NetNewsWire/Resources/KeyboardShortcuts; sourceTree = SOURCE_ROOT; }; 84F2D5341FC22FCB00998D64 /* SmartFeeds */ = { @@ -1319,7 +1282,7 @@ 84AD1EB92031649C00BC20B7 /* SmartFeedPasteboardWriter.swift */, ); name = SmartFeeds; - path = Evergreen/SmartFeeds; + path = NetNewsWire/SmartFeeds; sourceTree = ""; }; 84F3EE0420DEC97E003FADEB /* FeedFinder */ = { @@ -1330,7 +1293,49 @@ 84F3EE0820DEC97E003FADEB /* HTMLFeedFinder.swift */, ); name = FeedFinder; - path = Evergreen/FeedFinder; + path = NetNewsWire/FeedFinder; + sourceTree = ""; + }; + 84F9EACF213660A100CF2DE4 /* NetNewsWireTests */ = { + isa = PBXGroup; + children = ( + 84F9EAD0213660A100CF2DE4 /* ScriptingTests */, + 84F9EAE3213660A100CF2DE4 /* NetNewsWireTests.swift */, + 84F9EAE4213660A100CF2DE4 /* Info.plist */, + ); + path = NetNewsWireTests; + sourceTree = ""; + }; + 84F9EAD0213660A100CF2DE4 /* ScriptingTests */ = { + isa = PBXGroup; + children = ( + 84F9EAD1213660A100CF2DE4 /* AppleScriptXCTestCase.swift */, + 84F9EAD2213660A100CF2DE4 /* ScriptingTests.swift */, + 84F9EAD3213660A100CF2DE4 /* scripts */, + ); + path = ScriptingTests; + sourceTree = ""; + }; + 84F9EAD3213660A100CF2DE4 /* scripts */ = { + isa = PBXGroup; + children = ( + 84F9EAD4213660A100CF2DE4 /* testNameOfAuthors.applescript */, + 84F9EAD5213660A100CF2DE4 /* testGetURL.applescript */, + 84F9EAD6213660A100CF2DE4 /* testNameAndUrlOfEveryFeed.applescript */, + 84F9EAD7213660A100CF2DE4 /* testFeedExists.applescript */, + 84F9EAD8213660A100CF2DE4 /* testIterativeCreateAndDeleteFeed.applescript */, + 84F9EAD9213660A100CF2DE4 /* selectAFeed.applescript */, + 84F9EADA213660A100CF2DE4 /* uiScriptingTestSetup.applescript */, + 84F9EADB213660A100CF2DE4 /* testURLsOfCurrentArticle.applescript */, + 84F9EADC213660A100CF2DE4 /* testNameOfEveryFolder.applescript */, + 84F9EADD213660A100CF2DE4 /* testFeedOPML.applescript */, + 84F9EADE213660A100CF2DE4 /* selectAnArticle.applescript */, + 84F9EADF213660A100CF2DE4 /* testTitleOfArticlesWhose.applescript */, + 84F9EAE0213660A100CF2DE4 /* testCurrentArticleIsNil.applescript */, + 84F9EAE1213660A100CF2DE4 /* testGenericScript.applescript */, + 84F9EAE2213660A100CF2DE4 /* establishMainWindowStartingState.applescript */, + ); + path = scripts; sourceTree = ""; }; 84FB9A2C1EDCD6A4003D53B9 /* Frameworks */ = { @@ -1341,39 +1346,7 @@ 6581C73420CED60100F4AD34 /* Cocoa.framework */, ); name = Frameworks; - path = Evergreen/Extensions; - sourceTree = ""; - }; - D5558FC020021C290066386B /* ScriptingTests */ = { - isa = PBXGroup; - children = ( - D5558FCF20021C590066386B /* scripts */, - D5558FD22002245C0066386B /* ScriptingTests.swift */, - D5E4CCC3203004EA009B4FFC /* AppleScriptXCTestCase.swift */, - ); - path = ScriptingTests; - sourceTree = ""; - }; - D5558FCF20021C590066386B /* scripts */ = { - isa = PBXGroup; - children = ( - D5E4CCD92030382A009B4FFC /* establishMainWindowStartingState.applescript */, - D5E4CCD620303823009B4FFC /* selectAFeed.applescript */, - D5E4CCD520303823009B4FFC /* selectAnArticle.applescript */, - D5907C9D20023249005947E5 /* testGenericScript.applescript */, - D57BE7562051025E00D11AAC /* testFeedExists.applescript */, - D5A267B220131B8300A8D3C0 /* testFeedOPML.applescript */, - D5558FD1200223F60066386B /* testGetURL.applescript */, - D5F4EDE720075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript */, - D5A2679B201312F900A8D3C0 /* testNameOfAuthors.applescript */, - D5F4EDD720075C1300B9E363 /* testNameOfEveryFolder.applescript */, - D55373A02018797B006D8857 /* testTitleOfArticlesWhose.applescript */, - D5D07B09204B42050093F739 /* testIterativeCreateAndDeleteFeed.applescript */, - D5E4CCD12030260E009B4FFC /* testCurrentArticleIsNil.applescript */, - D5E4CCCF203025FF009B4FFC /* testURLsOfCurrentArticle.applescript */, - D5E4CCB220300024009B4FFC /* uiScriptingTestSetup.applescript */, - ); - path = scripts; + path = NetNewsWire/Extensions; sourceTree = ""; }; D5558FD6200227E60066386B /* AppleEvents */ = { @@ -1388,11 +1361,11 @@ D5907CDA2002F084005947E5 /* xcconfig */ = { isa = PBXGroup; children = ( - D5907CDD2002F0BE005947E5 /* Evergreen_project_debug.xcconfig */, - D5907CDC2002F0BE005947E5 /* Evergreen_project_release.xcconfig */, - D5907CDE2002F0BE005947E5 /* Evergreen_project.xcconfig */, - D5907CE02002F0FA005947E5 /* Evergreen_target.xcconfig */, - D5907CDF2002F0F9005947E5 /* EvergreenTests_target.xcconfig */, + D5907CDD2002F0BE005947E5 /* NetNewsWire_project_debug.xcconfig */, + D5907CDC2002F0BE005947E5 /* NetNewsWire_project_release.xcconfig */, + D5907CDE2002F0BE005947E5 /* NetNewsWire_project.xcconfig */, + D5907CE02002F0FA005947E5 /* NetNewsWire_target.xcconfig */, + D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */, ); path = xcconfig; sourceTree = ""; @@ -1410,10 +1383,10 @@ D5907D7E2004AC00005947E5 /* NSApplication+Scriptability.swift */, D5907DB12004BB37005947E5 /* ScriptingObjectContainer.swift */, D5F4EDB4200744A700B9E363 /* ScriptingObject.swift */, - D57BE6DF204CD35F00D11AAC /* NSScriptCommand+Evergreen.swift */, + D57BE6DF204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift */, ); name = Scriptability; - path = Evergreen/Scriptability; + path = NetNewsWire/Scriptability; sourceTree = ""; }; /* End PBXGroup section */ @@ -1449,7 +1422,7 @@ dependencies = ( ); name = "NetNewsWire-iOS"; - productName = "Evergreen-iOS"; + productName = "NetNewsWire-iOS"; productReference = 840D617C2029031C009BC708 /* NetNewsWire.app */; productType = "com.apple.product-type.application"; }; @@ -1467,7 +1440,7 @@ 840D61932029031D009BC708 /* PBXTargetDependency */, ); name = "NetNewsWire-iOSTests"; - productName = "Evergreen-iOSTests"; + productName = "NetNewsWire-iOSTests"; productReference = 840D61912029031D009BC708 /* NetNewsWire-iOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; @@ -1485,7 +1458,7 @@ 840D619E2029031E009BC708 /* PBXTargetDependency */, ); name = "NetNewsWire-iOSUITests"; - productName = "Evergreen-iOSUITests"; + productName = "NetNewsWire-iOSUITests"; productReference = 840D619C2029031D009BC708 /* NetNewsWire-iOSUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; @@ -1514,7 +1487,7 @@ 8440C8B02129F9F5002353D1 /* PBXTargetDependency */, ); name = NetNewsWire; - productName = Evergreen; + productName = NetNewsWire; productReference = 849C64601ED37A5D003D8FC0 /* NetNewsWire.app */; productType = "com.apple.product-type.application"; }; @@ -1533,7 +1506,7 @@ 849C64731ED37A5D003D8FC0 /* PBXTargetDependency */, ); name = NetNewsWireTests; - productName = EvergreenTests; + productName = NetNewsWireTests; productReference = 849C64711ED37A5D003D8FC0 /* NetNewsWireTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; @@ -1799,7 +1772,7 @@ files = ( 6581C74220CED60100F4AD34 /* ToolbarItemIcon.pdf in Resources */, 6581C73D20CED60100F4AD34 /* SafariExtensionViewController.xib in Resources */, - 6581C74020CED60100F4AD34 /* evergreen-subscribe-to-feed.js in Resources */, + 6581C74020CED60100F4AD34 /* netnewswire-subscribe-to-feed.js in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1858,6 +1831,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 84F9EAF7213660A100CF2DE4 /* Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1906,7 +1880,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 840D61962029031D009BC708 /* Evergreen_iOSTests.swift in Sources */, + 840D61962029031D009BC708 /* NetNewsWire_iOSTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1914,7 +1888,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 840D61A12029031E009BC708 /* Evergreen_iOSUITests.swift in Sources */, + 840D61A12029031E009BC708 /* NetNewsWire_iOSUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1947,7 +1921,7 @@ 849A97641ED9EB96007D329B /* SidebarOutlineView.swift in Sources */, D5A2678C20130ECF00A8D3C0 /* Author+Scriptability.swift in Sources */, 84F2D5371FC22FCC00998D64 /* PseudoFeed.swift in Sources */, - D57BE6E0204CD35F00D11AAC /* NSScriptCommand+Evergreen.swift in Sources */, + D57BE6E0204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift in Sources */, D553738B20186C20006D8857 /* Article+Scriptability.swift in Sources */, 845EE7C11FC2488C00854A1F /* SmartFeed.swift in Sources */, 84702AA41FA27AC0006B8943 /* MarkStatusCommand.swift in Sources */, @@ -2042,23 +2016,25 @@ buildActionMask = 2147483647; files = ( D5558FD5200225680066386B /* NSAppleEventDescriptor+UserRecordFields.swift in Sources */, + 84F9EAEB213660A100CF2DE4 /* testIterativeCreateAndDeleteFeed.applescript in Sources */, + 84F9EAF4213660A100CF2DE4 /* testGenericScript.applescript in Sources */, + 84F9EAE6213660A100CF2DE4 /* ScriptingTests.swift in Sources */, + 84F9EAED213660A100CF2DE4 /* uiScriptingTestSetup.applescript in Sources */, + 84F9EAE8213660A100CF2DE4 /* testGetURL.applescript in Sources */, + 84F9EAEA213660A100CF2DE4 /* testFeedExists.applescript in Sources */, + 84F9EAF6213660A100CF2DE4 /* NetNewsWireTests.swift in Sources */, + 84F9EAF1213660A100CF2DE4 /* selectAnArticle.applescript in Sources */, + 84F9EAE9213660A100CF2DE4 /* testNameAndUrlOfEveryFeed.applescript in Sources */, + 84F9EAF3213660A100CF2DE4 /* testCurrentArticleIsNil.applescript in Sources */, + 84F9EAEE213660A100CF2DE4 /* testURLsOfCurrentArticle.applescript in Sources */, D5558FD9200228D30066386B /* AppleEventUtils.swift in Sources */, - D55373AF2018797C006D8857 /* testTitleOfArticlesWhose.applescript in Sources */, - D5907CA1200232A1005947E5 /* testGetURL.applescript in Sources */, - D5D07B18204B42050093F739 /* testIterativeCreateAndDeleteFeed.applescript in Sources */, - D5A267C120131B8300A8D3C0 /* testFeedOPML.applescript in Sources */, - D5A2679C201312F900A8D3C0 /* testNameOfAuthors.applescript in Sources */, - 849C64761ED37A5D003D8FC0 /* EvergreenTests.swift in Sources */, - D5E4CCC520300537009B4FFC /* AppleScriptXCTestCase.swift in Sources */, - D5E4CCB320300024009B4FFC /* uiScriptingTestSetup.applescript in Sources */, - D5558FD32002245C0066386B /* ScriptingTests.swift in Sources */, - D5E4CCDA2030382A009B4FFC /* establishMainWindowStartingState.applescript in Sources */, - D5F4EDE820075C1800B9E363 /* testNameAndUrlOfEveryFeed.applescript in Sources */, - D5907CA0200232A1005947E5 /* testGenericScript.applescript in Sources */, - D5F4EDE620075C1300B9E363 /* testNameOfEveryFolder.applescript in Sources */, - D5E4CCD720303823009B4FFC /* selectAnArticle.applescript in Sources */, - D5E4CCD820303823009B4FFC /* selectAFeed.applescript in Sources */, - D57BE7642051025E00D11AAC /* testFeedExists.applescript in Sources */, + 84F9EAE7213660A100CF2DE4 /* testNameOfAuthors.applescript in Sources */, + 84F9EAEF213660A100CF2DE4 /* testNameOfEveryFolder.applescript in Sources */, + 84F9EAF5213660A100CF2DE4 /* establishMainWindowStartingState.applescript in Sources */, + 84F9EAF0213660A100CF2DE4 /* testFeedOPML.applescript in Sources */, + 84F9EAF2213660A100CF2DE4 /* testTitleOfArticlesWhose.applescript in Sources */, + 84F9EAE5213660A100CF2DE4 /* AppleScriptXCTestCase.swift in Sources */, + 84F9EAEC213660A100CF2DE4 /* selectAFeed.applescript in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2198,7 +2174,7 @@ 849C646A1ED37A5D003D8FC0 /* Base */, ); name = Main.storyboard; - path = Evergreen; + path = NetNewsWire; sourceTree = ""; }; 84A37CB9201ECE590087C5AF /* RenameSheet.xib */ = { @@ -2214,7 +2190,7 @@ /* Begin XCBuildConfiguration section */ 6581C74720CED60100F4AD34 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* Evergreen_target.xcconfig */; + baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_target.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = "Safari Extension/Subscribe_to_Feed.entitlements"; INFOPLIST_FILE = "Safari Extension/Info.plist"; @@ -2226,7 +2202,7 @@ }; 6581C74820CED60100F4AD34 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* Evergreen_target.xcconfig */; + baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_target.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = "Safari Extension/Subscribe_to_Feed.entitlements"; INFOPLIST_FILE = "Safari Extension/Info.plist"; @@ -2290,12 +2266,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "Evergreen-iOS/Info.plist"; + INFOPLIST_FILE = "NetNewsWire-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.iOS"; PRODUCT_NAME = NetNewsWire; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -2353,11 +2329,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "Evergreen-iOS/Info.plist"; + INFOPLIST_FILE = "NetNewsWire-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.iOS"; PRODUCT_NAME = NetNewsWire; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -2422,12 +2398,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "Evergreen-iOSTests/Info.plist"; + INFOPLIST_FILE = "NetNewsWire-iOSTests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.iOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -2487,11 +2463,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "Evergreen-iOSTests/Info.plist"; + INFOPLIST_FILE = "NetNewsWire-iOSTests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.iOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -2556,19 +2532,19 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "Evergreen-iOSUITests/Info.plist"; + INFOPLIST_FILE = "NetNewsWire-iOSUITests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOSUITests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.iOSUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = "Evergreen-iOS"; + TEST_TARGET_NAME = "NetNewsWire-iOS"; }; name = Debug; }; @@ -2620,24 +2596,24 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "Evergreen-iOSUITests/Info.plist"; + INFOPLIST_FILE = "NetNewsWire-iOSUITests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.Evergreen-iOSUITests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire-Evergreen.iOSUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = "Evergreen-iOS"; + TEST_TARGET_NAME = "NetNewsWire-iOS"; VALIDATE_PRODUCT = YES; }; name = Release; }; 849C64781ED37A5D003D8FC0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CDD2002F0BE005947E5 /* Evergreen_project_debug.xcconfig */; + baseConfigurationReference = D5907CDD2002F0BE005947E5 /* NetNewsWire_project_debug.xcconfig */; buildSettings = { DEVELOPMENT_TEAM = M8L2WTLA8W; }; @@ -2645,7 +2621,7 @@ }; 849C64791ED37A5D003D8FC0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CDC2002F0BE005947E5 /* Evergreen_project_release.xcconfig */; + baseConfigurationReference = D5907CDC2002F0BE005947E5 /* NetNewsWire_project_release.xcconfig */; buildSettings = { DEVELOPMENT_TEAM = M8L2WTLA8W; }; @@ -2653,7 +2629,7 @@ }; 849C647B1ED37A5D003D8FC0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* Evergreen_target.xcconfig */; + baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_target.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; @@ -2664,7 +2640,7 @@ }; 849C647C1ED37A5D003D8FC0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* Evergreen_target.xcconfig */; + baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_target.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; @@ -2675,7 +2651,7 @@ }; 849C647E1ED37A5D003D8FC0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CDF2002F0F9005947E5 /* EvergreenTests_target.xcconfig */; + baseConfigurationReference = D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */; buildSettings = { PRODUCT_NAME = NetNewsWireTests; }; @@ -2683,7 +2659,7 @@ }; 849C647F1ED37A5D003D8FC0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D5907CDF2002F0F9005947E5 /* EvergreenTests_target.xcconfig */; + baseConfigurationReference = D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */; buildSettings = { PRODUCT_NAME = NetNewsWireTests; }; diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Evergreen.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Evergreen.xcscheme new file mode 100644 index 000000000..d386a43dc --- /dev/null +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/Evergreen.xcscheme @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme new file mode 100644 index 000000000..00b189403 --- /dev/null +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme new file mode 100644 index 000000000..d386a43dc --- /dev/null +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Evergreen/AppDefaults.swift b/NetNewsWire/AppDefaults.swift similarity index 99% rename from Evergreen/AppDefaults.swift rename to NetNewsWire/AppDefaults.swift index ae137aca4..28a61c9c7 100644 --- a/Evergreen/AppDefaults.swift +++ b/NetNewsWire/AppDefaults.swift @@ -1,6 +1,6 @@ // // AppDefaults.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 9/22/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/AppDelegate.swift b/NetNewsWire/AppDelegate.swift similarity index 95% rename from Evergreen/AppDelegate.swift rename to NetNewsWire/AppDelegate.swift index 29324770c..5203f8a6c 100644 --- a/Evergreen/AppDelegate.swift +++ b/NetNewsWire/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/11/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. @@ -56,7 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, private let log = Log() private let themeLoader = VSThemeLoader() - private let appNewsURLString = "https://ranchero.com/evergreen/feed.json" + private let appNewsURLString = "https://ranchero.com/netnewswire/feed.json" private let dockBadge = DockBadge() override init() { @@ -116,7 +116,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, currentTheme = themeLoader.defaultTheme let tempDirectory = NSTemporaryDirectory() - let cacheFolder = (tempDirectory as NSString).appendingPathComponent("com.ranchero.evergreen") + let cacheFolder = (tempDirectory as NSString).appendingPathComponent("com.ranchero.NetNewsWire-Evergreen") let faviconsFolder = (cacheFolder as NSString).appendingPathComponent("Favicons") let faviconsFolderURL = URL(fileURLWithPath: faviconsFolder) @@ -404,32 +404,32 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, if AccountManager.shared.anyAccountHasFeedWithURL(appNewsURLString) { return } - addFeed(appNewsURLString, "Evergreen News") + addFeed(appNewsURLString, "NetNewsWire News") } @IBAction func openWebsite(_ sender: Any?) { - Browser.open("https://ranchero.com/evergreen/", inBackground: false) + Browser.open("https://ranchero.com/netnewswire/", inBackground: false) } @IBAction func openRepository(_ sender: Any?) { - Browser.open("https://github.com/brentsimmons/Evergreen", inBackground: false) + Browser.open("https://github.com/brentsimmons/NetNewsWire", inBackground: false) } @IBAction func openBugTracker(_ sender: Any?) { - Browser.open("https://github.com/brentsimmons/Evergreen/issues", inBackground: false) + Browser.open("https://github.com/brentsimmons/NetNewsWire/issues", inBackground: false) } @IBAction func openTechnotes(_ sender: Any?) { - Browser.open("https://github.com/brentsimmons/Evergreen/tree/master/Technotes", inBackground: false) + Browser.open("https://github.com/brentsimmons/NetNewsWire/tree/master/Technotes", inBackground: false) } @IBAction func showHelp(_ sender: Any?) { - Browser.open("https://ranchero.com/evergreen/help/1.0/", inBackground: false) + Browser.open("https://ranchero.com/netnewswire/help/5.0/", inBackground: false) } @IBAction func donateToAppCampForGirls(_ sender: Any?) { diff --git a/Evergreen/AppImages.swift b/NetNewsWire/AppImages.swift similarity index 97% rename from Evergreen/AppImages.swift rename to NetNewsWire/AppImages.swift index 17c160577..e89ed12d1 100644 --- a/Evergreen/AppImages.swift +++ b/NetNewsWire/AppImages.swift @@ -1,6 +1,6 @@ // // AppImages.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/17/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/AppNotifications.swift b/NetNewsWire/AppNotifications.swift similarity index 98% rename from Evergreen/AppNotifications.swift rename to NetNewsWire/AppNotifications.swift index 3eaaacf70..cb59c1223 100644 --- a/Evergreen/AppNotifications.swift +++ b/NetNewsWire/AppNotifications.swift @@ -1,6 +1,6 @@ // // AppNotifications.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/30/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/ArticleStyles/ArticleStyle.swift b/NetNewsWire/ArticleStyles/ArticleStyle.swift similarity index 99% rename from Evergreen/ArticleStyles/ArticleStyle.swift rename to NetNewsWire/ArticleStyles/ArticleStyle.swift index a9a82548e..3f6898ff5 100644 --- a/Evergreen/ArticleStyles/ArticleStyle.swift +++ b/NetNewsWire/ArticleStyles/ArticleStyle.swift @@ -1,6 +1,6 @@ // // ArticleStyle.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 9/26/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/ArticleStyles/ArticleStylesManager.swift b/NetNewsWire/ArticleStyles/ArticleStylesManager.swift similarity index 98% rename from Evergreen/ArticleStyles/ArticleStylesManager.swift rename to NetNewsWire/ArticleStyles/ArticleStylesManager.swift index 87eac91ac..7d809008f 100644 --- a/Evergreen/ArticleStyles/ArticleStylesManager.swift +++ b/NetNewsWire/ArticleStyles/ArticleStylesManager.swift @@ -1,6 +1,6 @@ // // ArticleStylesManager.sqift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 9/26/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. @@ -16,7 +16,7 @@ private let styleKey = "style" private let defaultStyleName = "Default" private let stylesFolderName = "Styles" private let stylesInResourcesFolderName = "Styles" -private let styleSuffix = ".evergreenstyle" +private let styleSuffix = ".netnewswirestyle" private let nnwStyleSuffix = ".nnwstyle" private let cssStyleSuffix = ".css" private let styleSuffixes = [styleSuffix, nnwStyleSuffix, cssStyleSuffix]; diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/Contents.json b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/Contents.json rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/Contents.json diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_128x128.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_128x128.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_128x128.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_128x128.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_128x128@2x.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_128x128@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_128x128@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_128x128@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_16x16.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_16x16.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_16x16.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_16x16.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_16x16@2x.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_16x16@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_16x16@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_16x16@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_256x256.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_256x256.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_256x256.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_256x256.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_256x256@2x.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_256x256@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_256x256@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_256x256@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_32x32.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_32x32.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_32x32.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_32x32.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_32x32@2x.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_32x32@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_32x32@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_32x32@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_512x512.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_512x512.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_512x512.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_512x512.png diff --git a/Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_512x512@2x.png b/NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_512x512@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon-December.appiconset/icon_512x512@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon-December.appiconset/icon_512x512@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/Contents.json b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/Contents.json rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_128x128.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_128x128.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_128x128.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_16x16.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_16x16.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_16x16.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_256x256.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_256x256.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_256x256.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_32x32.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_32x32.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_32x32.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_512x512.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_512x512.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_512x512.png diff --git a/Evergreen/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png rename to NetNewsWire/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png diff --git a/Evergreen/Assets.xcassets/Contents.json b/NetNewsWire/Assets.xcassets/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/Contents.json rename to NetNewsWire/Assets.xcassets/Contents.json diff --git a/Evergreen/Assets.xcassets/action.imageset/Contents.json b/NetNewsWire/Assets.xcassets/action.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/action.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/action.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/action.imageset/action.png b/NetNewsWire/Assets.xcassets/action.imageset/action.png similarity index 100% rename from Evergreen/Assets.xcassets/action.imageset/action.png rename to NetNewsWire/Assets.xcassets/action.imageset/action.png diff --git a/Evergreen/Assets.xcassets/action.imageset/action@2x.png b/NetNewsWire/Assets.xcassets/action.imageset/action@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/action.imageset/action@2x.png rename to NetNewsWire/Assets.xcassets/action.imageset/action@2x.png diff --git a/Evergreen/Assets.xcassets/markAllRead.imageset/Contents.json b/NetNewsWire/Assets.xcassets/markAllRead.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/markAllRead.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/markAllRead.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/markAllRead.imageset/markAllRead.png b/NetNewsWire/Assets.xcassets/markAllRead.imageset/markAllRead.png similarity index 100% rename from Evergreen/Assets.xcassets/markAllRead.imageset/markAllRead.png rename to NetNewsWire/Assets.xcassets/markAllRead.imageset/markAllRead.png diff --git a/Evergreen/Assets.xcassets/markAllRead.imageset/markAllRead@2x.png b/NetNewsWire/Assets.xcassets/markAllRead.imageset/markAllRead@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/markAllRead.imageset/markAllRead@2x.png rename to NetNewsWire/Assets.xcassets/markAllRead.imageset/markAllRead@2x.png diff --git a/Evergreen/Assets.xcassets/markRead.imageset/Contents.json b/NetNewsWire/Assets.xcassets/markRead.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/markRead.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/markRead.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/markRead.imageset/markRead.png b/NetNewsWire/Assets.xcassets/markRead.imageset/markRead.png similarity index 100% rename from Evergreen/Assets.xcassets/markRead.imageset/markRead.png rename to NetNewsWire/Assets.xcassets/markRead.imageset/markRead.png diff --git a/Evergreen/Assets.xcassets/markRead.imageset/markRead@2x.png b/NetNewsWire/Assets.xcassets/markRead.imageset/markRead@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/markRead.imageset/markRead@2x.png rename to NetNewsWire/Assets.xcassets/markRead.imageset/markRead@2x.png diff --git a/Evergreen/Assets.xcassets/markUnread.imageset/Contents.json b/NetNewsWire/Assets.xcassets/markUnread.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/markUnread.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/markUnread.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/markUnread.imageset/markUnread.png b/NetNewsWire/Assets.xcassets/markUnread.imageset/markUnread.png similarity index 100% rename from Evergreen/Assets.xcassets/markUnread.imageset/markUnread.png rename to NetNewsWire/Assets.xcassets/markUnread.imageset/markUnread.png diff --git a/Evergreen/Assets.xcassets/markUnread.imageset/markUnread@2x.png b/NetNewsWire/Assets.xcassets/markUnread.imageset/markUnread@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/markUnread.imageset/markUnread@2x.png rename to NetNewsWire/Assets.xcassets/markUnread.imageset/markUnread@2x.png diff --git a/Evergreen/Assets.xcassets/newFolder.imageset/Contents.json b/NetNewsWire/Assets.xcassets/newFolder.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/newFolder.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/newFolder.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/newFolder.imageset/newFolder.png b/NetNewsWire/Assets.xcassets/newFolder.imageset/newFolder.png similarity index 100% rename from Evergreen/Assets.xcassets/newFolder.imageset/newFolder.png rename to NetNewsWire/Assets.xcassets/newFolder.imageset/newFolder.png diff --git a/Evergreen/Assets.xcassets/newFolder.imageset/newFolder@2x.png b/NetNewsWire/Assets.xcassets/newFolder.imageset/newFolder@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/newFolder.imageset/newFolder@2x.png rename to NetNewsWire/Assets.xcassets/newFolder.imageset/newFolder@2x.png diff --git a/Evergreen/Assets.xcassets/nextUnread.imageset/Contents.json b/NetNewsWire/Assets.xcassets/nextUnread.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/nextUnread.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/nextUnread.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/nextUnread.imageset/nextUnread.png b/NetNewsWire/Assets.xcassets/nextUnread.imageset/nextUnread.png similarity index 100% rename from Evergreen/Assets.xcassets/nextUnread.imageset/nextUnread.png rename to NetNewsWire/Assets.xcassets/nextUnread.imageset/nextUnread.png diff --git a/Evergreen/Assets.xcassets/nextUnread.imageset/nextUnread@2x.png b/NetNewsWire/Assets.xcassets/nextUnread.imageset/nextUnread@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/nextUnread.imageset/nextUnread@2x.png rename to NetNewsWire/Assets.xcassets/nextUnread.imageset/nextUnread@2x.png diff --git a/Evergreen/Assets.xcassets/openInBrowser.imageset/Contents.json b/NetNewsWire/Assets.xcassets/openInBrowser.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/openInBrowser.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/openInBrowser.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/openInBrowser.imageset/openInBrowser.png b/NetNewsWire/Assets.xcassets/openInBrowser.imageset/openInBrowser.png similarity index 100% rename from Evergreen/Assets.xcassets/openInBrowser.imageset/openInBrowser.png rename to NetNewsWire/Assets.xcassets/openInBrowser.imageset/openInBrowser.png diff --git a/Evergreen/Assets.xcassets/openInBrowser.imageset/openInBrowser@2x.png b/NetNewsWire/Assets.xcassets/openInBrowser.imageset/openInBrowser@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/openInBrowser.imageset/openInBrowser@2x.png rename to NetNewsWire/Assets.xcassets/openInBrowser.imageset/openInBrowser@2x.png diff --git a/Evergreen/Assets.xcassets/star.imageset/Contents.json b/NetNewsWire/Assets.xcassets/star.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/star.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/star.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/star.imageset/star.png b/NetNewsWire/Assets.xcassets/star.imageset/star.png similarity index 100% rename from Evergreen/Assets.xcassets/star.imageset/star.png rename to NetNewsWire/Assets.xcassets/star.imageset/star.png diff --git a/Evergreen/Assets.xcassets/star.imageset/star@2x.png b/NetNewsWire/Assets.xcassets/star.imageset/star@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/star.imageset/star@2x.png rename to NetNewsWire/Assets.xcassets/star.imageset/star@2x.png diff --git a/Evergreen/Assets.xcassets/timelineStar.imageset/Contents.json b/NetNewsWire/Assets.xcassets/timelineStar.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/timelineStar.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/timelineStar.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/timelineStar.imageset/timelineStar.png b/NetNewsWire/Assets.xcassets/timelineStar.imageset/timelineStar.png similarity index 100% rename from Evergreen/Assets.xcassets/timelineStar.imageset/timelineStar.png rename to NetNewsWire/Assets.xcassets/timelineStar.imageset/timelineStar.png diff --git a/Evergreen/Assets.xcassets/timelineStar.imageset/timelineStar@2x.png b/NetNewsWire/Assets.xcassets/timelineStar.imageset/timelineStar@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/timelineStar.imageset/timelineStar@2x.png rename to NetNewsWire/Assets.xcassets/timelineStar.imageset/timelineStar@2x.png diff --git a/Evergreen/Assets.xcassets/unstar.imageset/Contents.json b/NetNewsWire/Assets.xcassets/unstar.imageset/Contents.json similarity index 100% rename from Evergreen/Assets.xcassets/unstar.imageset/Contents.json rename to NetNewsWire/Assets.xcassets/unstar.imageset/Contents.json diff --git a/Evergreen/Assets.xcassets/unstar.imageset/unstar.png b/NetNewsWire/Assets.xcassets/unstar.imageset/unstar.png similarity index 100% rename from Evergreen/Assets.xcassets/unstar.imageset/unstar.png rename to NetNewsWire/Assets.xcassets/unstar.imageset/unstar.png diff --git a/Evergreen/Assets.xcassets/unstar.imageset/unstar@2x.png b/NetNewsWire/Assets.xcassets/unstar.imageset/unstar@2x.png similarity index 100% rename from Evergreen/Assets.xcassets/unstar.imageset/unstar@2x.png rename to NetNewsWire/Assets.xcassets/unstar.imageset/unstar@2x.png diff --git a/Evergreen/Base.lproj/AddFeedSheet.xib b/NetNewsWire/Base.lproj/AddFeedSheet.xib similarity index 100% rename from Evergreen/Base.lproj/AddFeedSheet.xib rename to NetNewsWire/Base.lproj/AddFeedSheet.xib diff --git a/Evergreen/Base.lproj/AddFolderSheet.xib b/NetNewsWire/Base.lproj/AddFolderSheet.xib similarity index 100% rename from Evergreen/Base.lproj/AddFolderSheet.xib rename to NetNewsWire/Base.lproj/AddFolderSheet.xib diff --git a/Evergreen/Base.lproj/IndeterminateProgressWindow.xib b/NetNewsWire/Base.lproj/IndeterminateProgressWindow.xib similarity index 100% rename from Evergreen/Base.lproj/IndeterminateProgressWindow.xib rename to NetNewsWire/Base.lproj/IndeterminateProgressWindow.xib diff --git a/Evergreen/Base.lproj/Main.storyboard b/NetNewsWire/Base.lproj/Main.storyboard similarity index 100% rename from Evergreen/Base.lproj/Main.storyboard rename to NetNewsWire/Base.lproj/Main.storyboard diff --git a/Evergreen/Base.lproj/MainWindow.storyboard b/NetNewsWire/Base.lproj/MainWindow.storyboard similarity index 97% rename from Evergreen/Base.lproj/MainWindow.storyboard rename to NetNewsWire/Base.lproj/MainWindow.storyboard index a2768ae68..31f5f022d 100644 --- a/Evergreen/Base.lproj/MainWindow.storyboard +++ b/NetNewsWire/Base.lproj/MainWindow.storyboard @@ -9,8 +9,8 @@ - - + + @@ -197,7 +197,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -341,6 +341,7 @@ + @@ -354,7 +355,7 @@ - + @@ -441,17 +442,17 @@ - + - + - + @@ -462,7 +463,7 @@ - + @@ -473,7 +474,7 @@ - + @@ -492,11 +493,11 @@ - + - + @@ -553,32 +554,32 @@ - + - + - + - + - + - - + diff --git a/Evergreen/Base.lproj/Preferences.storyboard b/NetNewsWire/Base.lproj/Preferences.storyboard similarity index 100% rename from Evergreen/Base.lproj/Preferences.storyboard rename to NetNewsWire/Base.lproj/Preferences.storyboard diff --git a/Evergreen/Base.lproj/RenameSheet.xib b/NetNewsWire/Base.lproj/RenameSheet.xib similarity index 100% rename from Evergreen/Base.lproj/RenameSheet.xib rename to NetNewsWire/Base.lproj/RenameSheet.xib diff --git a/Evergreen/Browser.swift b/NetNewsWire/Browser.swift similarity index 100% rename from Evergreen/Browser.swift rename to NetNewsWire/Browser.swift diff --git a/Evergreen/Data/ArticleUtilities.swift b/NetNewsWire/Data/ArticleUtilities.swift similarity index 98% rename from Evergreen/Data/ArticleUtilities.swift rename to NetNewsWire/Data/ArticleUtilities.swift index 4277d22a9..be7bc3df8 100644 --- a/Evergreen/Data/ArticleUtilities.swift +++ b/NetNewsWire/Data/ArticleUtilities.swift @@ -1,6 +1,6 @@ // // ArticleUtilities.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/25/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/Data/SmallIconProvider.swift b/NetNewsWire/Data/SmallIconProvider.swift similarity index 97% rename from Evergreen/Data/SmallIconProvider.swift rename to NetNewsWire/Data/SmallIconProvider.swift index 4878290f9..46b2a7d85 100644 --- a/Evergreen/Data/SmallIconProvider.swift +++ b/NetNewsWire/Data/SmallIconProvider.swift @@ -1,6 +1,6 @@ // // SmallIconProvider.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/16/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Dinosaurs/DinosaursWindow.xib b/NetNewsWire/Dinosaurs/DinosaursWindow.xib similarity index 100% rename from Evergreen/Dinosaurs/DinosaursWindow.xib rename to NetNewsWire/Dinosaurs/DinosaursWindow.xib diff --git a/Evergreen/Dinosaurs/DinosaursWindowController.swift b/NetNewsWire/Dinosaurs/DinosaursWindowController.swift similarity index 97% rename from Evergreen/Dinosaurs/DinosaursWindowController.swift rename to NetNewsWire/Dinosaurs/DinosaursWindowController.swift index ffc09e849..4ecd4ca24 100644 --- a/Evergreen/Dinosaurs/DinosaursWindowController.swift +++ b/NetNewsWire/Dinosaurs/DinosaursWindowController.swift @@ -1,6 +1,6 @@ // // DinosaursWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/12/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/DockBadge.swift b/NetNewsWire/DockBadge.swift similarity index 96% rename from Evergreen/DockBadge.swift rename to NetNewsWire/DockBadge.swift index c90ea6825..ec9414730 100644 --- a/Evergreen/DockBadge.swift +++ b/NetNewsWire/DockBadge.swift @@ -1,6 +1,6 @@ // // DockBadge.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 10/5/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Extensions/Node-Extensions.swift b/NetNewsWire/Extensions/Node-Extensions.swift similarity index 100% rename from Evergreen/Extensions/Node-Extensions.swift rename to NetNewsWire/Extensions/Node-Extensions.swift diff --git a/Evergreen/Favicons/FaviconDownloader.swift b/NetNewsWire/Favicons/FaviconDownloader.swift similarity index 99% rename from Evergreen/Favicons/FaviconDownloader.swift rename to NetNewsWire/Favicons/FaviconDownloader.swift index c15232502..3a820003a 100644 --- a/Evergreen/Favicons/FaviconDownloader.swift +++ b/NetNewsWire/Favicons/FaviconDownloader.swift @@ -1,6 +1,6 @@ // // FaviconDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Favicons/FaviconURLFinder.swift b/NetNewsWire/Favicons/FaviconURLFinder.swift similarity index 97% rename from Evergreen/Favicons/FaviconURLFinder.swift rename to NetNewsWire/Favicons/FaviconURLFinder.swift index c29b938aa..e91787ee9 100644 --- a/Evergreen/Favicons/FaviconURLFinder.swift +++ b/NetNewsWire/Favicons/FaviconURLFinder.swift @@ -1,6 +1,6 @@ // // FaviconURLFinder.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/20/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Favicons/SingleFaviconDownloader.swift b/NetNewsWire/Favicons/SingleFaviconDownloader.swift similarity index 99% rename from Evergreen/Favicons/SingleFaviconDownloader.swift rename to NetNewsWire/Favicons/SingleFaviconDownloader.swift index cac633ae4..be7ffed08 100644 --- a/Evergreen/Favicons/SingleFaviconDownloader.swift +++ b/NetNewsWire/Favicons/SingleFaviconDownloader.swift @@ -1,6 +1,6 @@ // // SingleFaviconDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/23/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedFinder/FeedFinder.swift b/NetNewsWire/FeedFinder/FeedFinder.swift similarity index 100% rename from Evergreen/FeedFinder/FeedFinder.swift rename to NetNewsWire/FeedFinder/FeedFinder.swift diff --git a/Evergreen/FeedFinder/FeedSpecifier.swift b/NetNewsWire/FeedFinder/FeedSpecifier.swift similarity index 100% rename from Evergreen/FeedFinder/FeedSpecifier.swift rename to NetNewsWire/FeedFinder/FeedSpecifier.swift diff --git a/Evergreen/FeedFinder/HTMLFeedFinder.swift b/NetNewsWire/FeedFinder/HTMLFeedFinder.swift similarity index 100% rename from Evergreen/FeedFinder/HTMLFeedFinder.swift rename to NetNewsWire/FeedFinder/HTMLFeedFinder.swift diff --git a/Evergreen/FeedList/FeedList.plist b/NetNewsWire/FeedList/FeedList.plist similarity index 100% rename from Evergreen/FeedList/FeedList.plist rename to NetNewsWire/FeedList/FeedList.plist diff --git a/Evergreen/FeedList/FeedList.storyboard b/NetNewsWire/FeedList/FeedList.storyboard similarity index 100% rename from Evergreen/FeedList/FeedList.storyboard rename to NetNewsWire/FeedList/FeedList.storyboard diff --git a/Evergreen/FeedList/FeedListFeed.swift b/NetNewsWire/FeedList/FeedListFeed.swift similarity index 99% rename from Evergreen/FeedList/FeedListFeed.swift rename to NetNewsWire/FeedList/FeedListFeed.swift index 5032a0a5a..76c692a8f 100644 --- a/Evergreen/FeedList/FeedListFeed.swift +++ b/NetNewsWire/FeedList/FeedListFeed.swift @@ -1,6 +1,6 @@ // // FeedListFeed.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/4/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedList/FeedListFolder.swift b/NetNewsWire/FeedList/FeedListFolder.swift similarity index 97% rename from Evergreen/FeedList/FeedListFolder.swift rename to NetNewsWire/FeedList/FeedListFolder.swift index 668292104..5cf3fe922 100644 --- a/Evergreen/FeedList/FeedListFolder.swift +++ b/NetNewsWire/FeedList/FeedListFolder.swift @@ -1,6 +1,6 @@ // // FeedListFolder.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/4/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedList/FeedListOutlineView.swift b/NetNewsWire/FeedList/FeedListOutlineView.swift similarity index 97% rename from Evergreen/FeedList/FeedListOutlineView.swift rename to NetNewsWire/FeedList/FeedListOutlineView.swift index 7e6966bc0..066e641e6 100644 --- a/Evergreen/FeedList/FeedListOutlineView.swift +++ b/NetNewsWire/FeedList/FeedListOutlineView.swift @@ -1,6 +1,6 @@ // // FeedListOutlineView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/11/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedList/FeedListTreeControllerDelegate.swift b/NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift similarity index 93% rename from Evergreen/FeedList/FeedListTreeControllerDelegate.swift rename to NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift index aa9907509..04730fe60 100644 --- a/Evergreen/FeedList/FeedListTreeControllerDelegate.swift +++ b/NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift @@ -1,6 +1,6 @@ // // FeedListTreeControllerDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/4/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -24,8 +24,8 @@ final class FeedListTreeControllerDelegate: TreeControllerDelegate { init() { -// let evergreenNewsFeed = FeedListFeed(name: "Evergreen News", url: "https://ranchero.com/evergreen/feed.json", homePageURL: "https://ranchero.com/evergreen/blog/") - self.topLevelFeeds = Set() //Set([evergreenNewsFeed]) +// let netnewswireNewsFeed = FeedListFeed(name: "NetNewsWire News", url: "https://ranchero.com/netnewswire/feed.json", homePageURL: "https://ranchero.com/netnewswire/blog/") + self.topLevelFeeds = Set() //Set([netnewswireNewsFeedNewsFeed]) let defaultFeeds = FeedListReader.defaultFeeds() let defaultFeedsFolder = FeedListFolder(name: NSLocalizedString("Default Feeds (for new users)", comment: "Feed Directory"), feeds: defaultFeeds) diff --git a/Evergreen/FeedList/FeedListViewController.swift b/NetNewsWire/FeedList/FeedListViewController.swift similarity index 99% rename from Evergreen/FeedList/FeedListViewController.swift rename to NetNewsWire/FeedList/FeedListViewController.swift index 9cc83a96b..6d7ca1790 100644 --- a/Evergreen/FeedList/FeedListViewController.swift +++ b/NetNewsWire/FeedList/FeedListViewController.swift @@ -1,6 +1,6 @@ // // FeedListViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/1/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedList/FeedListWindowController.swift b/NetNewsWire/FeedList/FeedListWindowController.swift similarity index 96% rename from Evergreen/FeedList/FeedListWindowController.swift rename to NetNewsWire/FeedList/FeedListWindowController.swift index c1a09c961..457f41517 100644 --- a/Evergreen/FeedList/FeedListWindowController.swift +++ b/NetNewsWire/FeedList/FeedListWindowController.swift @@ -1,6 +1,6 @@ // // FeedListWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/1/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/FeedList/UnusedIn1.0/FeedListControlsView.swift b/NetNewsWire/FeedList/UnusedIn1.0/FeedListControlsView.swift similarity index 93% rename from Evergreen/FeedList/UnusedIn1.0/FeedListControlsView.swift rename to NetNewsWire/FeedList/UnusedIn1.0/FeedListControlsView.swift index dcbdf7d6d..674994c57 100644 --- a/Evergreen/FeedList/UnusedIn1.0/FeedListControlsView.swift +++ b/NetNewsWire/FeedList/UnusedIn1.0/FeedListControlsView.swift @@ -1,6 +1,6 @@ // // FeedListControlsView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/1/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedList/UnusedIn1.0/FeedListKeyboardDelegate.swift b/NetNewsWire/FeedList/UnusedIn1.0/FeedListKeyboardDelegate.swift similarity index 96% rename from Evergreen/FeedList/UnusedIn1.0/FeedListKeyboardDelegate.swift rename to NetNewsWire/FeedList/UnusedIn1.0/FeedListKeyboardDelegate.swift index 7e58e8f20..bfd7ae083 100644 --- a/Evergreen/FeedList/UnusedIn1.0/FeedListKeyboardDelegate.swift +++ b/NetNewsWire/FeedList/UnusedIn1.0/FeedListKeyboardDelegate.swift @@ -1,6 +1,6 @@ // // FeedListKeyboardDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/26/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/FeedList/UnusedIn1.0/FeedListSplitViewController.swift b/NetNewsWire/FeedList/UnusedIn1.0/FeedListSplitViewController.swift similarity index 97% rename from Evergreen/FeedList/UnusedIn1.0/FeedListSplitViewController.swift rename to NetNewsWire/FeedList/UnusedIn1.0/FeedListSplitViewController.swift index 9a82f1f40..93e55b086 100644 --- a/Evergreen/FeedList/UnusedIn1.0/FeedListSplitViewController.swift +++ b/NetNewsWire/FeedList/UnusedIn1.0/FeedListSplitViewController.swift @@ -1,6 +1,6 @@ // // FeedListSplitViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/28/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/HTMLMetadata/HTMLMetadataDownloader.swift b/NetNewsWire/HTMLMetadata/HTMLMetadataDownloader.swift similarity index 99% rename from Evergreen/HTMLMetadata/HTMLMetadataDownloader.swift rename to NetNewsWire/HTMLMetadata/HTMLMetadataDownloader.swift index 26fa2fa5d..5727bfa47 100644 --- a/Evergreen/HTMLMetadata/HTMLMetadataDownloader.swift +++ b/NetNewsWire/HTMLMetadata/HTMLMetadataDownloader.swift @@ -1,6 +1,6 @@ // // HTMLMetadataDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/26/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Images/AuthorAvatarDownloader.swift b/NetNewsWire/Images/AuthorAvatarDownloader.swift similarity index 99% rename from Evergreen/Images/AuthorAvatarDownloader.swift rename to NetNewsWire/Images/AuthorAvatarDownloader.swift index c739becd2..009c75a95 100644 --- a/Evergreen/Images/AuthorAvatarDownloader.swift +++ b/NetNewsWire/Images/AuthorAvatarDownloader.swift @@ -1,6 +1,6 @@ // // AuthorAvatarDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/26/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Images/FeaturedImageDownloader.swift b/NetNewsWire/Images/FeaturedImageDownloader.swift similarity index 99% rename from Evergreen/Images/FeaturedImageDownloader.swift rename to NetNewsWire/Images/FeaturedImageDownloader.swift index db32e940a..e67361ac3 100644 --- a/Evergreen/Images/FeaturedImageDownloader.swift +++ b/NetNewsWire/Images/FeaturedImageDownloader.swift @@ -1,6 +1,6 @@ // // FeaturedImageDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/26/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Images/FeedIconDownloader.swift b/NetNewsWire/Images/FeedIconDownloader.swift similarity index 99% rename from Evergreen/Images/FeedIconDownloader.swift rename to NetNewsWire/Images/FeedIconDownloader.swift index 2707c985b..13f2c2ea0 100644 --- a/Evergreen/Images/FeedIconDownloader.swift +++ b/NetNewsWire/Images/FeedIconDownloader.swift @@ -1,6 +1,6 @@ // // FeedIconDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/26/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Images/ImageDownloader.swift b/NetNewsWire/Images/ImageDownloader.swift similarity index 99% rename from Evergreen/Images/ImageDownloader.swift rename to NetNewsWire/Images/ImageDownloader.swift index e6d2ae87f..f5fd3ef5a 100644 --- a/Evergreen/Images/ImageDownloader.swift +++ b/NetNewsWire/Images/ImageDownloader.swift @@ -1,6 +1,6 @@ // // ImageDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/25/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Images/RSHTMLMetadata+Extension.swift b/NetNewsWire/Images/RSHTMLMetadata+Extension.swift similarity index 99% rename from Evergreen/Images/RSHTMLMetadata+Extension.swift rename to NetNewsWire/Images/RSHTMLMetadata+Extension.swift index 8d54b84d6..a9b57438e 100644 --- a/Evergreen/Images/RSHTMLMetadata+Extension.swift +++ b/NetNewsWire/Images/RSHTMLMetadata+Extension.swift @@ -1,6 +1,6 @@ // // RSHTMLMetadata+Extension.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/26/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/Info.plist b/NetNewsWire/Info.plist similarity index 91% rename from Evergreen/Info.plist rename to NetNewsWire/Info.plist index 3f1ac400a..56f439685 100644 --- a/Evergreen/Info.plist +++ b/NetNewsWire/Info.plist @@ -53,8 +53,8 @@ OSAScriptingDefinition NetNewsWire.sdef SUFeedURL - https://ranchero.com/downloads/evergreen-beta.xml + https://ranchero.com/downloads/netnewswire-beta.xml UserAgent - Evergreen (macOS; RSS Reader; https://ranchero.com/evergreen/) + NetNewsWire (macOS; RSS Reader; https://ranchero.com/netnewswire/) diff --git a/Evergreen/Inspector/BuiltinSmartFeedInspectorViewController.swift b/NetNewsWire/Inspector/BuiltinSmartFeedInspectorViewController.swift similarity index 98% rename from Evergreen/Inspector/BuiltinSmartFeedInspectorViewController.swift rename to NetNewsWire/Inspector/BuiltinSmartFeedInspectorViewController.swift index 68f7d4773..da31cc523 100644 --- a/Evergreen/Inspector/BuiltinSmartFeedInspectorViewController.swift +++ b/NetNewsWire/Inspector/BuiltinSmartFeedInspectorViewController.swift @@ -1,6 +1,6 @@ // // BuiltinSmartFeedInspectorViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/20/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/Inspector/FeedInspectorViewController.swift b/NetNewsWire/Inspector/FeedInspectorViewController.swift similarity index 99% rename from Evergreen/Inspector/FeedInspectorViewController.swift rename to NetNewsWire/Inspector/FeedInspectorViewController.swift index 5ca6c7ea2..29515d59e 100644 --- a/Evergreen/Inspector/FeedInspectorViewController.swift +++ b/NetNewsWire/Inspector/FeedInspectorViewController.swift @@ -1,6 +1,6 @@ // // FeedInspectorViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/20/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/Inspector/FolderInspectorViewController.swift b/NetNewsWire/Inspector/FolderInspectorViewController.swift similarity index 99% rename from Evergreen/Inspector/FolderInspectorViewController.swift rename to NetNewsWire/Inspector/FolderInspectorViewController.swift index 4df9961d2..15e0b7d40 100644 --- a/Evergreen/Inspector/FolderInspectorViewController.swift +++ b/NetNewsWire/Inspector/FolderInspectorViewController.swift @@ -1,6 +1,6 @@ // // FolderInspectorViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/20/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/Inspector/Inspector.storyboard b/NetNewsWire/Inspector/Inspector.storyboard similarity index 100% rename from Evergreen/Inspector/Inspector.storyboard rename to NetNewsWire/Inspector/Inspector.storyboard diff --git a/Evergreen/Inspector/InspectorWindowController.swift b/NetNewsWire/Inspector/InspectorWindowController.swift similarity index 99% rename from Evergreen/Inspector/InspectorWindowController.swift rename to NetNewsWire/Inspector/InspectorWindowController.swift index c350b6b18..a77ce578a 100644 --- a/Evergreen/Inspector/InspectorWindowController.swift +++ b/NetNewsWire/Inspector/InspectorWindowController.swift @@ -1,6 +1,6 @@ // // InspectorWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/20/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/Inspector/NothingInspectorViewController.swift b/NetNewsWire/Inspector/NothingInspectorViewController.swift similarity index 98% rename from Evergreen/Inspector/NothingInspectorViewController.swift rename to NetNewsWire/Inspector/NothingInspectorViewController.swift index 6885d00a0..f6ffb97f3 100644 --- a/Evergreen/Inspector/NothingInspectorViewController.swift +++ b/NetNewsWire/Inspector/NothingInspectorViewController.swift @@ -1,6 +1,6 @@ // // NothingInspectorViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/20/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/AddFeed/AddFeedController.swift b/NetNewsWire/MainWindow/AddFeed/AddFeedController.swift similarity index 99% rename from Evergreen/MainWindow/AddFeed/AddFeedController.swift rename to NetNewsWire/MainWindow/AddFeed/AddFeedController.swift index aef73a9c0..0b8d9e975 100644 --- a/Evergreen/MainWindow/AddFeed/AddFeedController.swift +++ b/NetNewsWire/MainWindow/AddFeed/AddFeedController.swift @@ -1,6 +1,6 @@ // // AddFeedController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/28/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift b/NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift similarity index 99% rename from Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift rename to NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift index e67616878..78e3f92b0 100644 --- a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift +++ b/NetNewsWire/MainWindow/AddFeed/AddFeedWindowController.swift @@ -1,6 +1,6 @@ // // AddFeedWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/1/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift b/NetNewsWire/MainWindow/AddFeed/FolderTreeControllerDelegate.swift similarity index 98% rename from Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift rename to NetNewsWire/MainWindow/AddFeed/FolderTreeControllerDelegate.swift index 20c00e245..33316954c 100644 --- a/Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift +++ b/NetNewsWire/MainWindow/AddFeed/FolderTreeControllerDelegate.swift @@ -1,6 +1,6 @@ // // FolderTreeControllerDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/10/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/AddFeed/InitialFeedDownloader.swift b/NetNewsWire/MainWindow/AddFeed/InitialFeedDownloader.swift similarity index 97% rename from Evergreen/MainWindow/AddFeed/InitialFeedDownloader.swift rename to NetNewsWire/MainWindow/AddFeed/InitialFeedDownloader.swift index 7261200e4..41f6c6ca5 100644 --- a/Evergreen/MainWindow/AddFeed/InitialFeedDownloader.swift +++ b/NetNewsWire/MainWindow/AddFeed/InitialFeedDownloader.swift @@ -1,6 +1,6 @@ // // InitialFeedDownloader.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 9/3/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift b/NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift similarity index 99% rename from Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift rename to NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift index e529b0431..5f90de909 100644 --- a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift +++ b/NetNewsWire/MainWindow/AddFolder/AddFolderWindowController.swift @@ -1,6 +1,6 @@ // // AddFolderWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/1/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Detail/ArticleRenderer.swift b/NetNewsWire/MainWindow/Detail/ArticleRenderer.swift similarity index 99% rename from Evergreen/MainWindow/Detail/ArticleRenderer.swift rename to NetNewsWire/MainWindow/Detail/ArticleRenderer.swift index 5a32d887c..aa1d27d54 100644 --- a/Evergreen/MainWindow/Detail/ArticleRenderer.swift +++ b/NetNewsWire/MainWindow/Detail/ArticleRenderer.swift @@ -1,6 +1,6 @@ // // ArticleRenderer.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 9/8/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift b/NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift similarity index 99% rename from Evergreen/MainWindow/Detail/DetailStatusBarView.swift rename to NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift index 96514ed9b..b0f85397b 100644 --- a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift +++ b/NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift @@ -1,6 +1,6 @@ // // DetailStatusBarView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/16/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Detail/DetailViewController.swift b/NetNewsWire/MainWindow/Detail/DetailViewController.swift similarity index 99% rename from Evergreen/MainWindow/Detail/DetailViewController.swift rename to NetNewsWire/MainWindow/Detail/DetailViewController.swift index ffcb21be7..1db0a4c1f 100644 --- a/Evergreen/MainWindow/Detail/DetailViewController.swift +++ b/NetNewsWire/MainWindow/Detail/DetailViewController.swift @@ -1,6 +1,6 @@ // // DetailViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/26/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Detail/DetailWebView.swift b/NetNewsWire/MainWindow/Detail/DetailWebView.swift similarity index 99% rename from Evergreen/MainWindow/Detail/DetailWebView.swift rename to NetNewsWire/MainWindow/Detail/DetailWebView.swift index 2492622d8..82b560d01 100644 --- a/Evergreen/MainWindow/Detail/DetailWebView.swift +++ b/NetNewsWire/MainWindow/Detail/DetailWebView.swift @@ -1,6 +1,6 @@ // // DetailWebView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/10/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Detail/styleSheet.css b/NetNewsWire/MainWindow/Detail/styleSheet.css similarity index 100% rename from Evergreen/MainWindow/Detail/styleSheet.css rename to NetNewsWire/MainWindow/Detail/styleSheet.css diff --git a/Evergreen/MainWindow/Detail/template.html b/NetNewsWire/MainWindow/Detail/template.html similarity index 100% rename from Evergreen/MainWindow/Detail/template.html rename to NetNewsWire/MainWindow/Detail/template.html diff --git a/Evergreen/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist b/NetNewsWire/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist similarity index 100% rename from Evergreen/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist rename to NetNewsWire/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist diff --git a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift b/NetNewsWire/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift similarity index 98% rename from Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift rename to NetNewsWire/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift index f2f0cd038..04483edca 100644 --- a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift +++ b/NetNewsWire/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift @@ -1,6 +1,6 @@ // // MainWIndowKeyboardHandler.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/KeyboardDelegateProtocol.swift b/NetNewsWire/MainWindow/KeyboardDelegateProtocol.swift similarity index 95% rename from Evergreen/MainWindow/KeyboardDelegateProtocol.swift rename to NetNewsWire/MainWindow/KeyboardDelegateProtocol.swift index b0cfcc54a..9c7c084b6 100644 --- a/Evergreen/MainWindow/KeyboardDelegateProtocol.swift +++ b/NetNewsWire/MainWindow/KeyboardDelegateProtocol.swift @@ -1,6 +1,6 @@ // // KeyboardDelegateProtocol.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 10/11/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/MainWindowController.swift b/NetNewsWire/MainWindow/MainWindowController.swift similarity index 99% rename from Evergreen/MainWindow/MainWindowController.swift rename to NetNewsWire/MainWindow/MainWindowController.swift index 3a517eb17..45bbab85d 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/NetNewsWire/MainWindow/MainWindowController.swift @@ -1,6 +1,6 @@ // // MainWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/1/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/MainWindowSharingServicePickerDelegate.swift b/NetNewsWire/MainWindow/MainWindowSharingServicePickerDelegate.swift similarity index 98% rename from Evergreen/MainWindow/MainWindowSharingServicePickerDelegate.swift rename to NetNewsWire/MainWindow/MainWindowSharingServicePickerDelegate.swift index d598126a3..614559646 100644 --- a/Evergreen/MainWindow/MainWindowSharingServicePickerDelegate.swift +++ b/NetNewsWire/MainWindow/MainWindowSharingServicePickerDelegate.swift @@ -1,6 +1,6 @@ // // MainWindowSharingServicePickerDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/17/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/MainWindowSplitView.swift b/NetNewsWire/MainWindow/MainWindowSplitView.swift similarity index 95% rename from Evergreen/MainWindow/MainWindowSplitView.swift rename to NetNewsWire/MainWindow/MainWindowSplitView.swift index aac3c3c70..e9068d480 100644 --- a/Evergreen/MainWindow/MainWindowSplitView.swift +++ b/NetNewsWire/MainWindow/MainWindowSplitView.swift @@ -1,6 +1,6 @@ // // MainWindowSplitView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/5/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/MainWindowToolbarDelegate.swift b/NetNewsWire/MainWindow/MainWindowToolbarDelegate.swift similarity index 97% rename from Evergreen/MainWindow/MainWindowToolbarDelegate.swift rename to NetNewsWire/MainWindow/MainWindowToolbarDelegate.swift index 208969094..2002a5976 100644 --- a/Evergreen/MainWindow/MainWindowToolbarDelegate.swift +++ b/NetNewsWire/MainWindow/MainWindowToolbarDelegate.swift @@ -1,6 +1,6 @@ // // MainWindowToolbarDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/17/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift rename to NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift index 07b15d5f5..8b8be824a 100644 --- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift +++ b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift @@ -1,6 +1,6 @@ // // SidebarCell.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/1/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift similarity index 98% rename from Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift rename to NetNewsWire/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift index d68e1204b..27cd15006 100644 --- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift +++ b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCellAppearance.swift @@ -1,6 +1,6 @@ // // SidebarCellAppearance.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/24/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCellLayout.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift rename to NetNewsWire/MainWindow/Sidebar/Cell/SidebarCellLayout.swift index 77141bd18..eec1e04eb 100644 --- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCellLayout.swift +++ b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCellLayout.swift @@ -1,6 +1,6 @@ // // SidebarLayout.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/24/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift b/NetNewsWire/MainWindow/Sidebar/FeedPasteboardWriter.swift similarity index 95% rename from Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift rename to NetNewsWire/MainWindow/Sidebar/FeedPasteboardWriter.swift index 03a945b29..201878201 100644 --- a/Evergreen/MainWindow/Sidebar/FeedPasteboardWriter.swift +++ b/NetNewsWire/MainWindow/Sidebar/FeedPasteboardWriter.swift @@ -1,6 +1,6 @@ // // FeedPasteboardWriter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/7/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -23,7 +23,7 @@ extension Feed: PasteboardWriterOwner { private let feed: Feed static let feedUTI = "com.ranchero.feed" static let feedUTIType = NSPasteboard.PasteboardType(rawValue: feedUTI) - static let feedUTIInternal = "com.ranchero.evergreen.internal.feed" + static let feedUTIInternal = "com.ranchero.NetNewsWire-Evergreen.internal.feed" static let feedUTIInternalType = NSPasteboard.PasteboardType(rawValue: feedUTIInternal) init(feed: Feed) { diff --git a/Evergreen/MainWindow/Sidebar/FolderPasteboardWriter.swift b/NetNewsWire/MainWindow/Sidebar/FolderPasteboardWriter.swift similarity index 93% rename from Evergreen/MainWindow/Sidebar/FolderPasteboardWriter.swift rename to NetNewsWire/MainWindow/Sidebar/FolderPasteboardWriter.swift index 0b12bb676..b87ade020 100644 --- a/Evergreen/MainWindow/Sidebar/FolderPasteboardWriter.swift +++ b/NetNewsWire/MainWindow/Sidebar/FolderPasteboardWriter.swift @@ -1,6 +1,6 @@ // // FolderPasteboardWriter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/11/18. // Copyright © 2018 Ranchero Software. All rights reserved. @@ -20,7 +20,7 @@ extension Folder: PasteboardWriterOwner { @objc final class FolderPasteboardWriter: NSObject, NSPasteboardWriting { private let folder: Folder - static let folderUTIInternal = "com.ranchero.evergreen.internal.folder" + static let folderUTIInternal = "com.ranchero.NetNewsWire-Evergreen.internal.folder" static let folderUTIInternalType = NSPasteboard.PasteboardType(rawValue: folderUTIInternal) init(folder: Folder) { diff --git a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift b/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift similarity index 98% rename from Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift rename to NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift index 1f1f6986b..26d5a299d 100644 --- a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift +++ b/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift @@ -1,6 +1,6 @@ // // SidebarKeyboardDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist b/NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist similarity index 100% rename from Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist rename to NetNewsWire/MainWindow/Sidebar/Keyboard/SidebarKeyboardShortcuts.plist diff --git a/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift b/NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift rename to NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift index 12ac8cd98..15ce9ad6d 100644 --- a/Evergreen/MainWindow/Sidebar/Renaming/RenameWindowController.swift +++ b/NetNewsWire/MainWindow/Sidebar/Renaming/RenameWindowController.swift @@ -1,6 +1,6 @@ // // RenameWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/28/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarContextualMenuDelegate.swift b/NetNewsWire/MainWindow/Sidebar/SidebarContextualMenuDelegate.swift similarity index 97% rename from Evergreen/MainWindow/Sidebar/SidebarContextualMenuDelegate.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarContextualMenuDelegate.swift index de1dd5e8f..f107e7fc5 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarContextualMenuDelegate.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarContextualMenuDelegate.swift @@ -1,6 +1,6 @@ // // SidebarContextualMenuDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/7/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarGearMenuDelegate.swift b/NetNewsWire/MainWindow/Sidebar/SidebarGearMenuDelegate.swift similarity index 98% rename from Evergreen/MainWindow/Sidebar/SidebarGearMenuDelegate.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarGearMenuDelegate.swift index a363f1804..d777c3105 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarGearMenuDelegate.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarGearMenuDelegate.swift @@ -1,6 +1,6 @@ // // SidebarGearMenuDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/28/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift similarity index 98% rename from Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift index 6748b65ef..74055ae33 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift @@ -1,6 +1,6 @@ // // SidebarOutlineDataSource.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/12/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarOutlineView.swift b/NetNewsWire/MainWindow/Sidebar/SidebarOutlineView.swift similarity index 98% rename from Evergreen/MainWindow/Sidebar/SidebarOutlineView.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarOutlineView.swift index 81b37380e..2be34e87c 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarOutlineView.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarOutlineView.swift @@ -1,6 +1,6 @@ // // SidebarOutlineView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/17/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift b/NetNewsWire/MainWindow/Sidebar/SidebarStatusBarView.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarStatusBarView.swift index efda7544a..9d9972903 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarStatusBarView.swift @@ -1,6 +1,6 @@ // // SidebarStatusBarView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 9/17/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift b/NetNewsWire/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift index e183bcc0e..bbde3c627 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift @@ -1,6 +1,6 @@ // // SidebarTreeControllerDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/24/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift b/NetNewsWire/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift index 46761bb34..3729b0419 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift @@ -1,6 +1,6 @@ // // SidebarViewController+ContextualMenus.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 1/28/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift b/NetNewsWire/MainWindow/Sidebar/SidebarViewController.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/SidebarViewController.swift rename to NetNewsWire/MainWindow/Sidebar/SidebarViewController.swift index 876c57478..4818f3ba0 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift +++ b/NetNewsWire/MainWindow/Sidebar/SidebarViewController.swift @@ -1,6 +1,6 @@ // // SidebarViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/26/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Sidebar/UnreadCountView.swift b/NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift similarity index 99% rename from Evergreen/MainWindow/Sidebar/UnreadCountView.swift rename to NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift index e479bf3d3..96f394cd1 100644 --- a/Evergreen/MainWindow/Sidebar/UnreadCountView.swift +++ b/NetNewsWire/MainWindow/Sidebar/UnreadCountView.swift @@ -1,6 +1,6 @@ // // UnreadCountView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/22/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/ArticleArray.swift b/NetNewsWire/MainWindow/Timeline/ArticleArray.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/ArticleArray.swift rename to NetNewsWire/MainWindow/Timeline/ArticleArray.swift index dabf18e55..b9b7b4076 100644 --- a/Evergreen/MainWindow/Timeline/ArticleArray.swift +++ b/NetNewsWire/MainWindow/Timeline/ArticleArray.swift @@ -1,6 +1,6 @@ // // ArticleArray.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/1/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift b/NetNewsWire/MainWindow/Timeline/ArticlePasteboardWriter.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift rename to NetNewsWire/MainWindow/Timeline/ArticlePasteboardWriter.swift index 3f8ee88b1..502e7b5fa 100644 --- a/Evergreen/MainWindow/Timeline/ArticlePasteboardWriter.swift +++ b/NetNewsWire/MainWindow/Timeline/ArticlePasteboardWriter.swift @@ -1,6 +1,6 @@ // // ArticlePasteboardWriter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/6/17. // Copyright © 2017 Ranchero Software. All rights reserved. @@ -22,7 +22,7 @@ extension Article: PasteboardWriterOwner { let article: Article static let articleUTI = "com.ranchero.article" static let articleUTIType = NSPasteboard.PasteboardType(rawValue: articleUTI) - static let articleUTIInternal = "com.ranchero.evergreen.internal.article" + static let articleUTIInternal = "com.ranchero.NetNewsWire-Evergreen.internal.article" static let articleUTIInternalType = NSPasteboard.PasteboardType(rawValue: articleUTIInternal) private lazy var renderedHTML: String = { diff --git a/Evergreen/MainWindow/Timeline/Cell/MultilineTextFieldSizer.swift b/NetNewsWire/MainWindow/Timeline/Cell/MultilineTextFieldSizer.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/Cell/MultilineTextFieldSizer.swift rename to NetNewsWire/MainWindow/Timeline/Cell/MultilineTextFieldSizer.swift index 8cacaeb85..d5b979d25 100644 --- a/Evergreen/MainWindow/Timeline/Cell/MultilineTextFieldSizer.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/MultilineTextFieldSizer.swift @@ -1,6 +1,6 @@ // // MultilineTextFieldSizer.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/19/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift b/NetNewsWire/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift rename to NetNewsWire/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift index da8029130..607d00bb7 100644 --- a/Evergreen/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/SingleLineTextFieldSizer.swift @@ -1,6 +1,6 @@ // // SingleLineTextFieldSizer.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/19/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift rename to NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift index ea1c1d3a9..f1a08f39b 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift @@ -1,6 +1,6 @@ // // TimelineCellAppearance.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/6/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellData.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift rename to NetNewsWire/MainWindow/Timeline/Cell/TimelineCellData.swift index 7fcada1da..14ca34d94 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellData.swift @@ -1,6 +1,6 @@ // // TimelineCellData.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/6/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift rename to NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift index edc6d522a..d8aed54db 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift @@ -1,6 +1,6 @@ // // TimelineCellLayout.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/6/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineStringUtilities.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift rename to NetNewsWire/MainWindow/Timeline/Cell/TimelineStringUtilities.swift index aab2b723f..c164e8963 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineStringUtilities.swift @@ -1,6 +1,6 @@ // // TimelineStringUtilities.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/31/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineTableCellView.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift rename to NetNewsWire/MainWindow/Timeline/Cell/TimelineTableCellView.swift index 7112c0158..7584c1237 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineTableCellView.swift @@ -1,6 +1,6 @@ // // TimelineTableCellView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/31/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift b/NetNewsWire/MainWindow/Timeline/Cell/UnreadIndicatorView.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift rename to NetNewsWire/MainWindow/Timeline/Cell/UnreadIndicatorView.swift index 990324b7d..99cd00253 100644 --- a/Evergreen/MainWindow/Timeline/Cell/UnreadIndicatorView.swift +++ b/NetNewsWire/MainWindow/Timeline/Cell/UnreadIndicatorView.swift @@ -1,6 +1,6 @@ // // UnreadIndicatorView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/16/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift b/NetNewsWire/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift rename to NetNewsWire/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift index 3a4a0242f..fb228538b 100644 --- a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift +++ b/NetNewsWire/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift @@ -1,6 +1,6 @@ // // TimelineKeyboardDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardShortcuts.plist b/NetNewsWire/MainWindow/Timeline/Keyboard/TimelineKeyboardShortcuts.plist similarity index 100% rename from Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardShortcuts.plist rename to NetNewsWire/MainWindow/Timeline/Keyboard/TimelineKeyboardShortcuts.plist diff --git a/Evergreen/MainWindow/Timeline/TimelineContextualMenuDelegate.swift b/NetNewsWire/MainWindow/Timeline/TimelineContextualMenuDelegate.swift similarity index 97% rename from Evergreen/MainWindow/Timeline/TimelineContextualMenuDelegate.swift rename to NetNewsWire/MainWindow/Timeline/TimelineContextualMenuDelegate.swift index 2510f5d77..83d053a91 100644 --- a/Evergreen/MainWindow/Timeline/TimelineContextualMenuDelegate.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineContextualMenuDelegate.swift @@ -1,6 +1,6 @@ // // TimelineContextualMenuDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/8/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/TimelineDataSource.swift b/NetNewsWire/MainWindow/Timeline/TimelineDataSource.swift similarity index 97% rename from Evergreen/MainWindow/Timeline/TimelineDataSource.swift rename to NetNewsWire/MainWindow/Timeline/TimelineDataSource.swift index 620c457fe..dc9c7d1e0 100644 --- a/Evergreen/MainWindow/Timeline/TimelineDataSource.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineDataSource.swift @@ -1,6 +1,6 @@ // // TimelineDataSource.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/17/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift b/NetNewsWire/MainWindow/Timeline/TimelineTableRowView.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/TimelineTableRowView.swift rename to NetNewsWire/MainWindow/Timeline/TimelineTableRowView.swift index 06f76089b..41cea1ba4 100644 --- a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineTableRowView.swift @@ -1,6 +1,6 @@ // // TimelineTableRowView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/31/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/TimelineTableView.swift b/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift similarity index 98% rename from Evergreen/MainWindow/Timeline/TimelineTableView.swift rename to NetNewsWire/MainWindow/Timeline/TimelineTableView.swift index 03fa75fd2..6a463377e 100644 --- a/Evergreen/MainWindow/Timeline/TimelineTableView.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineTableView.swift @@ -1,6 +1,6 @@ // // TimelineTableView.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 10/11/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift b/NetNewsWire/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift rename to NetNewsWire/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift index 08fe3aa6a..56b6f0be4 100644 --- a/Evergreen/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift @@ -1,6 +1,6 @@ // // TimelineViewController+ContextualMenus.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/9/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/MainWindow/Timeline/TimelineViewController.swift b/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift similarity index 99% rename from Evergreen/MainWindow/Timeline/TimelineViewController.swift rename to NetNewsWire/MainWindow/Timeline/TimelineViewController.swift index 5dd1049f5..7371b0991 100644 --- a/Evergreen/MainWindow/Timeline/TimelineViewController.swift +++ b/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift @@ -1,6 +1,6 @@ // // TimelineViewController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 7/26/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/Notes/HelpMenu.markdown b/NetNewsWire/Notes/HelpMenu.markdown similarity index 100% rename from Evergreen/Notes/HelpMenu.markdown rename to NetNewsWire/Notes/HelpMenu.markdown diff --git a/Evergreen/Preferences/PreferencesWindowController.swift b/NetNewsWire/Preferences/PreferencesWindowController.swift similarity index 99% rename from Evergreen/Preferences/PreferencesWindowController.swift rename to NetNewsWire/Preferences/PreferencesWindowController.swift index 423808f41..e3b4bdb35 100644 --- a/Evergreen/Preferences/PreferencesWindowController.swift +++ b/NetNewsWire/Preferences/PreferencesWindowController.swift @@ -1,6 +1,6 @@ // // PreferencesWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/1/15. // Copyright © 2015 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift b/NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift similarity index 99% rename from Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift rename to NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift index 40d0cef57..cb5e85526 100644 --- a/Evergreen/ProgressWindow/IndeterminateProgressWindowController.swift +++ b/NetNewsWire/ProgressWindow/IndeterminateProgressWindowController.swift @@ -1,6 +1,6 @@ // // IndeterminateProgressWindowController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 8/28/16. // Copyright © 2016 Ranchero Software, LLC. All rights reserved. diff --git a/Evergreen/Resources/DB5.plist b/NetNewsWire/Resources/DB5.plist similarity index 100% rename from Evergreen/Resources/DB5.plist rename to NetNewsWire/Resources/DB5.plist diff --git a/Evergreen/Resources/EvergreenLarge.png b/NetNewsWire/Resources/EvergreenLarge.png similarity index 100% rename from Evergreen/Resources/EvergreenLarge.png rename to NetNewsWire/Resources/EvergreenLarge.png diff --git a/Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html b/NetNewsWire/Resources/KeyboardShortcuts/KeyboardShortcuts.html similarity index 96% rename from Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html rename to NetNewsWire/Resources/KeyboardShortcuts/KeyboardShortcuts.html index 009e2d6de..fbe0122f5 100644 --- a/Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html +++ b/NetNewsWire/Resources/KeyboardShortcuts/KeyboardShortcuts.html @@ -40,7 +40,7 @@

Keyboard Shortcuts

-

Evergreen has a number of keyboard shortcuts that aren’t listed in the menubar.

+

NetNewsWire has a number of keyboard shortcuts that aren’t listed in the menubar.

The key to reading your news while holding your coffee is the space bar. The space bar scrolls the current article — and, when it’s scrolled all the way, it goes to the next unread article.

diff --git a/Evergreen/Resources/NetNewsWire.sdef b/NetNewsWire/Resources/NetNewsWire.sdef similarity index 94% rename from Evergreen/Resources/NetNewsWire.sdef rename to NetNewsWire/Resources/NetNewsWire.sdef index 968ee7594..56feb0dcf 100644 --- a/Evergreen/Resources/NetNewsWire.sdef +++ b/NetNewsWire/Resources/NetNewsWire.sdef @@ -6,20 +6,20 @@ - + - + - + - + @@ -42,10 +42,10 @@ - - + + + description="NetNewsWire Application" inherits="application"> @@ -196,7 +196,7 @@ - + @@ -222,7 +222,7 @@ - + diff --git a/Evergreen/Scriptability/Account+Scriptability.swift b/NetNewsWire/Scriptability/Account+Scriptability.swift similarity index 99% rename from Evergreen/Scriptability/Account+Scriptability.swift rename to NetNewsWire/Scriptability/Account+Scriptability.swift index 479cb481a..f836a3839 100644 --- a/Evergreen/Scriptability/Account+Scriptability.swift +++ b/NetNewsWire/Scriptability/Account+Scriptability.swift @@ -1,6 +1,6 @@ // // Account+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/9/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/AppDelegate+Scriptability.swift b/NetNewsWire/Scriptability/AppDelegate+Scriptability.swift similarity index 97% rename from Evergreen/Scriptability/AppDelegate+Scriptability.swift rename to NetNewsWire/Scriptability/AppDelegate+Scriptability.swift index 1d865eb9e..13e1e5e31 100644 --- a/Evergreen/Scriptability/AppDelegate+Scriptability.swift +++ b/NetNewsWire/Scriptability/AppDelegate+Scriptability.swift @@ -1,6 +1,6 @@ // // AppDelegate+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 2/7/18. // Copyright © 2018 Olof Hellman. All rights reserved. @@ -56,7 +56,7 @@ extension AppDelegate : AppDelegateAppleEvents { } } -class EvergreenCreateElementCommand : NSCreateCommand { +class NetNewsWireCreateElementCommand : NSCreateCommand { override func performDefaultImplementation() -> Any? { let classDescription = self.createClassDescription if (classDescription.className == "feed") { @@ -76,7 +76,7 @@ class EvergreenCreateElementCommand : NSCreateCommand { is ambiguity about whether specifiers are lists or single objects, the code switches based on which it is. */ -class EvergreenDeleteCommand : NSDeleteCommand { +class NetNewsWireDeleteCommand : NSDeleteCommand { /* delete(objectToDelete:, from container:) @@ -131,7 +131,7 @@ class EvergreenDeleteCommand : NSDeleteCommand { } } -class EvergreenExistsCommand : NSExistsCommand { +class NetNewsWireExistsCommand : NSExistsCommand { // cocoa default behavior doesn't work here, because of cases where we define an object's property // to be another object type. e.g., 'permalink of the current article' parses as diff --git a/Evergreen/Scriptability/Article+Scriptability.swift b/NetNewsWire/Scriptability/Article+Scriptability.swift similarity index 97% rename from Evergreen/Scriptability/Article+Scriptability.swift rename to NetNewsWire/Scriptability/Article+Scriptability.swift index 42f025943..75b2d7d61 100644 --- a/Evergreen/Scriptability/Article+Scriptability.swift +++ b/NetNewsWire/Scriptability/Article+Scriptability.swift @@ -1,6 +1,6 @@ // // Article+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/23/18. // Copyright © 2018 Olof Hellman. All rights reserved. @@ -35,7 +35,7 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectConta // MARK: --- UniqueIdScriptingObject protocol --- - // articles have id in the Evergreen database and id in the feed + // articles have id in the NetNewsWire database and id in the feed // article.uniqueID here is the feed unique id @objc(uniqueId) diff --git a/Evergreen/Scriptability/Author+Scriptability.swift b/NetNewsWire/Scriptability/Author+Scriptability.swift similarity index 98% rename from Evergreen/Scriptability/Author+Scriptability.swift rename to NetNewsWire/Scriptability/Author+Scriptability.swift index 3c60f2c9a..d4156144e 100644 --- a/Evergreen/Scriptability/Author+Scriptability.swift +++ b/NetNewsWire/Scriptability/Author+Scriptability.swift @@ -1,6 +1,6 @@ // // Author+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/19/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/Feed+Scriptability.swift b/NetNewsWire/Scriptability/Feed+Scriptability.swift similarity index 99% rename from Evergreen/Scriptability/Feed+Scriptability.swift rename to NetNewsWire/Scriptability/Feed+Scriptability.swift index d493b85e7..e2fedad4f 100644 --- a/Evergreen/Scriptability/Feed+Scriptability.swift +++ b/NetNewsWire/Scriptability/Feed+Scriptability.swift @@ -1,6 +1,6 @@ // // Feed+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/10/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/Folder+Scriptability.swift b/NetNewsWire/Scriptability/Folder+Scriptability.swift similarity index 99% rename from Evergreen/Scriptability/Folder+Scriptability.swift rename to NetNewsWire/Scriptability/Folder+Scriptability.swift index 454e4901e..d7c8b5a8b 100644 --- a/Evergreen/Scriptability/Folder+Scriptability.swift +++ b/NetNewsWire/Scriptability/Folder+Scriptability.swift @@ -1,6 +1,6 @@ // // Folder+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/10/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/MainWindowController+Scriptability.swift b/NetNewsWire/Scriptability/MainWindowController+Scriptability.swift similarity index 95% rename from Evergreen/Scriptability/MainWindowController+Scriptability.swift rename to NetNewsWire/Scriptability/MainWindowController+Scriptability.swift index baf392228..e83a29711 100644 --- a/Evergreen/Scriptability/MainWindowController+Scriptability.swift +++ b/NetNewsWire/Scriptability/MainWindowController+Scriptability.swift @@ -1,6 +1,6 @@ // // MainWindowController+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 2/7/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/NSApplication+Scriptability.swift b/NetNewsWire/Scriptability/NSApplication+Scriptability.swift similarity index 99% rename from Evergreen/Scriptability/NSApplication+Scriptability.swift rename to NetNewsWire/Scriptability/NSApplication+Scriptability.swift index d339cb557..5564f2723 100644 --- a/Evergreen/Scriptability/NSApplication+Scriptability.swift +++ b/NetNewsWire/Scriptability/NSApplication+Scriptability.swift @@ -1,6 +1,6 @@ // // NSApplication+Scriptability.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/8/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/NSScriptCommand+Evergreen.swift b/NetNewsWire/Scriptability/NSScriptCommand+NetNewsWire.swift similarity index 98% rename from Evergreen/Scriptability/NSScriptCommand+Evergreen.swift rename to NetNewsWire/Scriptability/NSScriptCommand+NetNewsWire.swift index 19ab580a1..fc9a598db 100644 --- a/Evergreen/Scriptability/NSScriptCommand+Evergreen.swift +++ b/NetNewsWire/Scriptability/NSScriptCommand+NetNewsWire.swift @@ -1,6 +1,6 @@ // -// NSScriptCommand+Evergreen.swift -// Evergreen +// NSScriptCommand+NetNewsWire.swift +// NetNewsWire // // Created by Olof Hellman on 3/4/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/ScriptingObject.swift b/NetNewsWire/Scriptability/ScriptingObject.swift similarity index 96% rename from Evergreen/Scriptability/ScriptingObject.swift rename to NetNewsWire/Scriptability/ScriptingObject.swift index 5ffba4279..64187b6dc 100644 --- a/Evergreen/Scriptability/ScriptingObject.swift +++ b/NetNewsWire/Scriptability/ScriptingObject.swift @@ -1,6 +1,6 @@ // // ScriptingObject.swift -// Evergreen +// NetNewsWire // // Created by Olof Hellman on 1/10/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/Evergreen/Scriptability/ScriptingObjectContainer.swift b/NetNewsWire/Scriptability/ScriptingObjectContainer.swift similarity index 100% rename from Evergreen/Scriptability/ScriptingObjectContainer.swift rename to NetNewsWire/Scriptability/ScriptingObjectContainer.swift diff --git a/Evergreen/SmartFeeds/PseudoFeed.swift b/NetNewsWire/SmartFeeds/PseudoFeed.swift similarity index 96% rename from Evergreen/SmartFeeds/PseudoFeed.swift rename to NetNewsWire/SmartFeeds/PseudoFeed.swift index c5b781bc8..37e5c7652 100644 --- a/Evergreen/SmartFeeds/PseudoFeed.swift +++ b/NetNewsWire/SmartFeeds/PseudoFeed.swift @@ -1,6 +1,6 @@ // // PseudoFeed.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/SmartFeeds/SmartFeed.swift b/NetNewsWire/SmartFeeds/SmartFeed.swift similarity index 99% rename from Evergreen/SmartFeeds/SmartFeed.swift rename to NetNewsWire/SmartFeeds/SmartFeed.swift index fd5b9d0ab..76287a829 100644 --- a/Evergreen/SmartFeeds/SmartFeed.swift +++ b/NetNewsWire/SmartFeeds/SmartFeed.swift @@ -1,6 +1,6 @@ // // SmartFeed.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/SmartFeeds/SmartFeedPasteboardWriter.swift b/NetNewsWire/SmartFeeds/SmartFeedPasteboardWriter.swift similarity index 97% rename from Evergreen/SmartFeeds/SmartFeedPasteboardWriter.swift rename to NetNewsWire/SmartFeeds/SmartFeedPasteboardWriter.swift index 0d716c9f5..139f120d9 100644 --- a/Evergreen/SmartFeeds/SmartFeedPasteboardWriter.swift +++ b/NetNewsWire/SmartFeeds/SmartFeedPasteboardWriter.swift @@ -1,6 +1,6 @@ // // SmartFeedPasteboardWriter.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 2/11/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/Evergreen/SmartFeeds/SmartFeedsController.swift b/NetNewsWire/SmartFeeds/SmartFeedsController.swift similarity index 97% rename from Evergreen/SmartFeeds/SmartFeedsController.swift rename to NetNewsWire/SmartFeeds/SmartFeedsController.swift index f773b1dae..ad67c1120 100644 --- a/Evergreen/SmartFeeds/SmartFeedsController.swift +++ b/NetNewsWire/SmartFeeds/SmartFeedsController.swift @@ -1,6 +1,6 @@ // // SmartFeedsController.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 12/16/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/SmartFeeds/StarredFeedDelegate.swift b/NetNewsWire/SmartFeeds/StarredFeedDelegate.swift similarity index 98% rename from Evergreen/SmartFeeds/StarredFeedDelegate.swift rename to NetNewsWire/SmartFeeds/StarredFeedDelegate.swift index c0dd37fa9..81a93a92d 100644 --- a/Evergreen/SmartFeeds/StarredFeedDelegate.swift +++ b/NetNewsWire/SmartFeeds/StarredFeedDelegate.swift @@ -1,6 +1,6 @@ // // StarredFeedDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/SmartFeeds/TodayFeedDelegate.swift b/NetNewsWire/SmartFeeds/TodayFeedDelegate.swift similarity index 97% rename from Evergreen/SmartFeeds/TodayFeedDelegate.swift rename to NetNewsWire/SmartFeeds/TodayFeedDelegate.swift index ba5c1e5e8..b23341b63 100644 --- a/Evergreen/SmartFeeds/TodayFeedDelegate.swift +++ b/NetNewsWire/SmartFeeds/TodayFeedDelegate.swift @@ -1,6 +1,6 @@ // // TodayFeedDelegate.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/Evergreen/SmartFeeds/UnreadFeed.swift b/NetNewsWire/SmartFeeds/UnreadFeed.swift similarity index 98% rename from Evergreen/SmartFeeds/UnreadFeed.swift rename to NetNewsWire/SmartFeeds/UnreadFeed.swift index 707c4ae40..d9bb6fe4f 100644 --- a/Evergreen/SmartFeeds/UnreadFeed.swift +++ b/NetNewsWire/SmartFeeds/UnreadFeed.swift @@ -1,6 +1,6 @@ // // UnreadFeed.swift -// Evergreen +// NetNewsWire // // Created by Brent Simmons on 11/19/17. // Copyright © 2017 Ranchero Software. All rights reserved. diff --git a/EvergreenTests/Info.plist b/NetNewsWireTests/Info.plist similarity index 100% rename from EvergreenTests/Info.plist rename to NetNewsWireTests/Info.plist diff --git a/EvergreenTests/EvergreenTests.swift b/NetNewsWireTests/NetNewsWireTests.swift similarity index 88% rename from EvergreenTests/EvergreenTests.swift rename to NetNewsWireTests/NetNewsWireTests.swift index 2be4f4215..fdccd545e 100644 --- a/EvergreenTests/EvergreenTests.swift +++ b/NetNewsWireTests/NetNewsWireTests.swift @@ -1,15 +1,15 @@ // -// EvergreenTests.swift -// EvergreenTests +// NetNewsWireTests.swift +// NetNewsWireTests // // Created by Brent Simmons on 5/22/17. // Copyright © 2017 Ranchero Software, LLC. All rights reserved. // import XCTest -@testable import Evergreen +@testable import NetNewsWire -class EvergreenTests: XCTestCase { +class NetNewsWireTests: XCTestCase { override func setUp() { super.setUp() diff --git a/EvergreenTests/ScriptingTests/AppleScriptXCTestCase.swift b/NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift similarity index 99% rename from EvergreenTests/ScriptingTests/AppleScriptXCTestCase.swift rename to NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift index 9d870c8bd..24f0ff330 100644 --- a/EvergreenTests/ScriptingTests/AppleScriptXCTestCase.swift +++ b/NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift @@ -1,6 +1,6 @@ // // AppleScriptXCTestCase.swift -// EvergreenUITests +// NetNewsWireUITests // // Created by Olof Hellman on 2/10/18. // Copyright © 2018 Ranchero Software. All rights reserved. diff --git a/EvergreenTests/ScriptingTests/ScriptingTests.swift b/NetNewsWireTests/ScriptingTests/ScriptingTests.swift similarity index 99% rename from EvergreenTests/ScriptingTests/ScriptingTests.swift rename to NetNewsWireTests/ScriptingTests/ScriptingTests.swift index 409d9ecd0..663e9b101 100644 --- a/EvergreenTests/ScriptingTests/ScriptingTests.swift +++ b/NetNewsWireTests/ScriptingTests/ScriptingTests.swift @@ -1,6 +1,6 @@ // // ScriptingTests.swift -// EvergreenTests +// NetNewsWireTests // // Created by Olof Hellman on 1/7/18. // Copyright © 2018 Olof Hellman. All rights reserved. diff --git a/EvergreenTests/ScriptingTests/scripts/establishMainWindowStartingState.applescript b/NetNewsWireTests/ScriptingTests/scripts/establishMainWindowStartingState.applescript similarity index 85% rename from EvergreenTests/ScriptingTests/scripts/establishMainWindowStartingState.applescript rename to NetNewsWireTests/ScriptingTests/scripts/establishMainWindowStartingState.applescript index 2de9e16a8..2855b1696 100644 --- a/EvergreenTests/ScriptingTests/scripts/establishMainWindowStartingState.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/establishMainWindowStartingState.applescript @@ -3,15 +3,15 @@ property downarrowKeyCode : 125 property rightarrowKeyCode : 124 property leftarrowKeyCode : 123 -to activateEvergreen() - tell application "Evergreen" +to activateNetNewsWire() + tell application "NetNewsWire" activate end tell -end activateEvergreen +end activateNetNewsWire to multipleKeyCodes(keycode, numberOfKeys) tell application "System Events" - tell process "Evergreen" + tell process "NetNewsWire" repeat numberOfKeys times key code keycode end repeat @@ -20,7 +20,7 @@ to multipleKeyCodes(keycode, numberOfKeys) end multipleKeyCodes to establishMainWindowStartingState() - activateEvergreen() + activateNetNewsWire() multipleKeyCodes(downarrowKeyCode, 2) multipleKeyCodes(rightarrowKeyCode, 2) multipleKeyCodes(leftarrowKeyCode, 2) diff --git a/EvergreenTests/ScriptingTests/scripts/selectAFeed.applescript b/NetNewsWireTests/ScriptingTests/scripts/selectAFeed.applescript similarity index 80% rename from EvergreenTests/ScriptingTests/scripts/selectAFeed.applescript rename to NetNewsWireTests/ScriptingTests/scripts/selectAFeed.applescript index d1cf2010e..5ee4f0850 100644 --- a/EvergreenTests/ScriptingTests/scripts/selectAFeed.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/selectAFeed.applescript @@ -5,15 +5,15 @@ property downarrowKeyCode : 125 property rightarrowKeyCode : 124 property leftarrowKeyCode : 123 -to activateEvergreen() - tell application "Evergreen" +to activateNetNewsWire() + tell application "NetNewsWire" activate end tell -end activateEvergreen +end activateNetNewsWire to multipleKeyCodes(keycode, numberOfKeys) tell application "System Events" - tell process "Evergreen" + tell process "NetNewsWire" repeat numberOfKeys times key code keycode end repeat @@ -22,7 +22,7 @@ to multipleKeyCodes(keycode, numberOfKeys) end multipleKeyCodes try - activateEvergreen() + activateNetNewsWire() multipleKeyCodes(downarrowKeyCode, 9) multipleKeyCodes(uparrowKeyCode, 1) on error message diff --git a/EvergreenTests/ScriptingTests/scripts/selectAnArticle.applescript b/NetNewsWireTests/ScriptingTests/scripts/selectAnArticle.applescript similarity index 79% rename from EvergreenTests/ScriptingTests/scripts/selectAnArticle.applescript rename to NetNewsWireTests/ScriptingTests/scripts/selectAnArticle.applescript index de6cc58a3..9e87cbbff 100644 --- a/EvergreenTests/ScriptingTests/scripts/selectAnArticle.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/selectAnArticle.applescript @@ -5,15 +5,15 @@ property downarrowKeyCode : 125 property rightarrowKeyCode : 124 property leftarrowKeyCode : 123 -to activateEvergreen() - tell application "Evergreen" +to activateNetNewsWire() + tell application "NetNewsWire" activate end tell -end activateEvergreen +end activateNetNewsWire to multipleKeyCodes(keycode, numberOfKeys) tell application "System Events" - tell process "Evergreen" + tell process "NetNewsWire" repeat numberOfKeys times key code keycode end repeat @@ -22,7 +22,7 @@ to multipleKeyCodes(keycode, numberOfKeys) end multipleKeyCodes try - activateEvergreen() + activateNetNewsWire() multipleKeyCodes(rightarrowKeyCode, 1) on error message return {test_result:false, script_result:message} diff --git a/EvergreenTests/ScriptingTests/scripts/testCurrentArticleIsNil.applescript b/NetNewsWireTests/ScriptingTests/scripts/testCurrentArticleIsNil.applescript similarity index 95% rename from EvergreenTests/ScriptingTests/scripts/testCurrentArticleIsNil.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testCurrentArticleIsNil.applescript index ff462c678..baa7afecd 100644 --- a/EvergreenTests/ScriptingTests/scripts/testCurrentArticleIsNil.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testCurrentArticleIsNil.applescript @@ -4,7 +4,7 @@ -- Privacy and security pane try - tell application "Evergreen" + tell application "NetNewsWire" set shouldBeMissingValue to current article end tell diff --git a/EvergreenTests/ScriptingTests/scripts/testFeedExists.applescript b/NetNewsWireTests/ScriptingTests/scripts/testFeedExists.applescript similarity index 87% rename from EvergreenTests/ScriptingTests/scripts/testFeedExists.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testFeedExists.applescript index 620d11905..098c1ff61 100644 --- a/EvergreenTests/ScriptingTests/scripts/testFeedExists.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testFeedExists.applescript @@ -1,6 +1,6 @@ -- this script just tests that no error was generated from the script try - tell application "Evergreen" + tell application "NetNewsWire" exists feed 1 of account 1 end tell on error message diff --git a/EvergreenTests/ScriptingTests/scripts/testFeedOPML.applescript b/NetNewsWireTests/ScriptingTests/scripts/testFeedOPML.applescript similarity index 87% rename from EvergreenTests/ScriptingTests/scripts/testFeedOPML.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testFeedOPML.applescript index 4362499cf..5d28a8604 100644 --- a/EvergreenTests/ScriptingTests/scripts/testFeedOPML.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testFeedOPML.applescript @@ -1,6 +1,6 @@ -- this script just tests that no error was generated from the script try - tell application "Evergreen" + tell application "NetNewsWire" opml representation of feed 1 of account 1 end tell on error message diff --git a/EvergreenTests/ScriptingTests/scripts/testGenericScript.applescript b/NetNewsWireTests/ScriptingTests/scripts/testGenericScript.applescript similarity index 84% rename from EvergreenTests/ScriptingTests/scripts/testGenericScript.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testGenericScript.applescript index 2092312ba..888d60247 100644 --- a/EvergreenTests/ScriptingTests/scripts/testGenericScript.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testGenericScript.applescript @@ -1,5 +1,5 @@ --- Evergreen scripting unit tests expect a dictionary to be returned from a script +-- NetNewsWire scripting unit tests expect a dictionary to be returned from a script -- containing either -- {test_result:true} -- to indicate success or diff --git a/EvergreenTests/ScriptingTests/scripts/testGetURL.applescript b/NetNewsWireTests/ScriptingTests/scripts/testGetURL.applescript similarity index 92% rename from EvergreenTests/ScriptingTests/scripts/testGetURL.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testGetURL.applescript index b0f0fe9ef..18b90e1d4 100644 --- a/EvergreenTests/ScriptingTests/scripts/testGetURL.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testGetURL.applescript @@ -1,5 +1,5 @@ try - tell application "Evergreen" + tell application "NetNewsWire" open location "http://scripting.com/rss" end tell on error message diff --git a/EvergreenTests/ScriptingTests/scripts/testIterativeCreateAndDeleteFeed.applescript b/NetNewsWireTests/ScriptingTests/scripts/testIterativeCreateAndDeleteFeed.applescript similarity index 95% rename from EvergreenTests/ScriptingTests/scripts/testIterativeCreateAndDeleteFeed.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testIterativeCreateAndDeleteFeed.applescript index 6ebb35eec..277d298d8 100644 --- a/EvergreenTests/ScriptingTests/scripts/testIterativeCreateAndDeleteFeed.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testIterativeCreateAndDeleteFeed.applescript @@ -1,6 +1,6 @@ try - tell application "Evergreen" + tell application "NetNewsWire" tell account id "OnMyMac" repeat 3 times set newFeed to make new feed with data "https://boingboing.net/feed" diff --git a/EvergreenTests/ScriptingTests/scripts/testNameAndUrlOfEveryFeed.applescript b/NetNewsWireTests/ScriptingTests/scripts/testNameAndUrlOfEveryFeed.applescript similarity index 87% rename from EvergreenTests/ScriptingTests/scripts/testNameAndUrlOfEveryFeed.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testNameAndUrlOfEveryFeed.applescript index c501cf8de..86268914b 100644 --- a/EvergreenTests/ScriptingTests/scripts/testNameAndUrlOfEveryFeed.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testNameAndUrlOfEveryFeed.applescript @@ -1,6 +1,6 @@ -- this script just tests that no error was generated from the script try - tell application "Evergreen" + tell application "NetNewsWire" {name, url} of every feed of every account end tell on error message diff --git a/EvergreenTests/ScriptingTests/scripts/testNameOfAuthors.applescript b/NetNewsWireTests/ScriptingTests/scripts/testNameOfAuthors.applescript similarity index 92% rename from EvergreenTests/ScriptingTests/scripts/testNameOfAuthors.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testNameOfAuthors.applescript index 70cf352e9..db15bab30 100644 --- a/EvergreenTests/ScriptingTests/scripts/testNameOfAuthors.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testNameOfAuthors.applescript @@ -1,7 +1,7 @@ -- this script just tests that no error was generated from the script -- and that the returned list is greater than 0 try - tell application "Evergreen" + tell application "NetNewsWire" set namesResult to name of every author of every feed of every account end tell set test_result to ((count items of namesResult) > 0) diff --git a/EvergreenTests/ScriptingTests/scripts/testNameOfEveryFolder.applescript b/NetNewsWireTests/ScriptingTests/scripts/testNameOfEveryFolder.applescript similarity index 87% rename from EvergreenTests/ScriptingTests/scripts/testNameOfEveryFolder.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testNameOfEveryFolder.applescript index 1112d8494..a1abe5e7c 100644 --- a/EvergreenTests/ScriptingTests/scripts/testNameOfEveryFolder.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testNameOfEveryFolder.applescript @@ -1,7 +1,7 @@ -- this script just tests that no error was generated from the script try - tell application "Evergreen" + tell application "NetNewsWire" name of every folder of every account end tell on error message diff --git a/EvergreenTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript b/NetNewsWireTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript similarity index 88% rename from EvergreenTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript index 3ad5cca94..256e20c08 100644 --- a/EvergreenTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testTitleOfArticlesWhose.applescript @@ -1,6 +1,6 @@ -- this script just tests that no error was generated from the script try - tell application "Evergreen" + tell application "NetNewsWire" title of every article of feed "Six Colors" where read is true end tell on error message diff --git a/EvergreenTests/ScriptingTests/scripts/testURLsOfCurrentArticle.applescript b/NetNewsWireTests/ScriptingTests/scripts/testURLsOfCurrentArticle.applescript similarity index 93% rename from EvergreenTests/ScriptingTests/scripts/testURLsOfCurrentArticle.applescript rename to NetNewsWireTests/ScriptingTests/scripts/testURLsOfCurrentArticle.applescript index 048bc528d..7c4fc292d 100644 --- a/EvergreenTests/ScriptingTests/scripts/testURLsOfCurrentArticle.applescript +++ b/NetNewsWireTests/ScriptingTests/scripts/testURLsOfCurrentArticle.applescript @@ -4,7 +4,7 @@ -- Privacy and security pane try - tell application "Evergreen" + tell application "NetNewsWire" {url, permalink, external url} of current article end tell on error message diff --git a/NetNewsWireTests/ScriptingTests/scripts/uiScriptingTestSetup.applescript b/NetNewsWireTests/ScriptingTests/scripts/uiScriptingTestSetup.applescript new file mode 100644 index 000000000..8e6ea48c3 --- /dev/null +++ b/NetNewsWireTests/ScriptingTests/scripts/uiScriptingTestSetup.applescript @@ -0,0 +1,18 @@ +-- this script sets up NetNewsWire so it is ready to be tested +-- to get a current article + +to activateNetNewsWire() + tell application "NetNewsWire" + activate + end tell +end activateNetNewsWire + +tell application "System Events" + set isFrontmost to frontmost of process "NetNewsWire" + repeat while isFrontmost is false + my activateNetNewsWire() + set isFrontmost to frontmost of process "NetNewsWire" + end repeat +end tell + +return {test_result:true, script_result:"finished"} diff --git a/README.md b/README.md index d64e45f2c..c7b52d343 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ It’s a free and open source feed reader for macOS. It supports [RSS](http://cyber.harvard.edu/rss/rss.html), [Atom](https://tools.ietf.org/html/rfc4287), [JSON Feed](https://jsonfeed.org/), and [RSS-in-JSON](https://github.com/scripting/Scripting-News/blob/master/rss-in-json/README.md) formats. -It’s barely usable at this point. Barely. Probably not even. A whole bunch of things haven’t been done yet. (See the [bug tracker](https://github.com/brentsimmons/Evergreen/milestone/1)). +It’s barely usable at this point. Barely. Probably not even. A whole bunch of things haven’t been done yet. (See the [bug tracker](https://github.com/brentsimmons/NetNewsWire/milestone/1)). More info: [https://ranchero.com/netnewswire/](https://ranchero.com/netnewswire/) diff --git a/Safari Extension/Info.plist b/Safari Extension/Info.plist index 4d68d1dd6..fbbb3a265 100644 --- a/Safari Extension/Info.plist +++ b/Safari Extension/Info.plist @@ -32,7 +32,7 @@ Script - evergreen-subscribe-to-feed.js + netnewswire-subscribe-to-feed.js SFSafariToolbarItem diff --git a/Safari Extension/SafariExtensionHandler.swift b/Safari Extension/SafariExtensionHandler.swift index f545ad188..44c560bf7 100644 --- a/Safari Extension/SafariExtensionHandler.swift +++ b/Safari Extension/SafariExtensionHandler.swift @@ -44,7 +44,7 @@ class SafariExtensionHandler: SFSafariExtensionHandler { if (messageName == "subscribeToFeed") { if let feedURLString = userInfo?["url"] as? String { if let feedURL = URL(string: feedURLString) { - // We could do something more Evergreen-specific like invoke an app-specific scheme + // We could do something more NetNewsWire-specific like invoke an app-specific scheme // to subscribe in the app. For starters we just let NSWorkspace open the URL in the // default "feed:" URL scheme handler. NSWorkspace.shared.open(feedURL) diff --git a/Safari Extension/evergreen-subscribe-to-feed.js b/Safari Extension/netnewswire-subscribe-to-feed.js similarity index 100% rename from Safari Extension/evergreen-subscribe-to-feed.js rename to Safari Extension/netnewswire-subscribe-to-feed.js diff --git a/Technotes/CodingGuidelines.md b/Technotes/CodingGuidelines.md index 49683103a..9c3665f6b 100644 --- a/Technotes/CodingGuidelines.md +++ b/Technotes/CodingGuidelines.md @@ -1,6 +1,6 @@ # Coding Guidelines -Evergreen’s coding values are, in order: +NetNewsWire’s coding values are, in order: * No data loss * No crashes @@ -58,7 +58,7 @@ Use `// MARK:` as appropriate. Subclassing is inevitable — there’s no way out of subclassing things like `NSView` and `NSViewController`, because that’s how AppKit works. -But in all the rest of Evergreen, frameworks included, you’d have a hard time finding a class that was designed to be subclassed. It’s rare enough that one would have to look pretty hard to find an example, if there is one at all. +But in all the rest of NetNewsWire, frameworks included, you’d have a hard time finding a class that was designed to be subclassed. It’s rare enough that one would have to look pretty hard to find an example, if there is one at all. Consider this a hard rule: all Swift classes must be marked as `final`, and all Objective-C classes must be treated as if they were so marked. @@ -96,7 +96,7 @@ Don’t fight the built-in frameworks and don’t try to hide them. Let’s not #### Ours -Evergreen is layered into frameworks. There’s an app level and a bunch of frameworks below that. Each framework has its own reason for being. Dependencies between frameworks should be as minimal as possible, but those dependencies do exist. +NetNewsWire is layered into frameworks. There’s an app level and a bunch of frameworks below that. Each framework has its own reason for being. Dependencies between frameworks should be as minimal as possible, but those dependencies do exist. Some frameworks are not permitted to add dependencies, and should be treated as at the bottom of the cake: RSCore, RSWeb, RSDatabase, RSParser, RSTree, and DB5. This simplifies things for us, and makes it easier for us and other people to use these frameworks in other apps. @@ -134,7 +134,7 @@ Well, no, not exactly. *Almost* everything happens on the main thread. The exceptions are things that can be perfectly isolated, such as parsing an RSS feed or fetching from the database. We use `DispatchQueue` to run those in the background, often on a serial queue. -Those things must run without locks — locks are almost completely unused in Evergreen. +Those things must run without locks — locks are almost completely unused in NetNewsWire. Any time a background task with a callback is finished, it must call back on the main queue (except for completely private cases, and then it must be noted in the code). diff --git a/Technotes/DevelopmentAlphaBeta.md b/Technotes/DevelopmentAlphaBeta.md index d2298f53c..22a22ec9b 100644 --- a/Technotes/DevelopmentAlphaBeta.md +++ b/Technotes/DevelopmentAlphaBeta.md @@ -1,4 +1,4 @@ -# What Development, Alpha, Beta, and Final Mean for Evergreen +# What Development, Alpha, Beta, and Final Mean for NetNewsWire #### Development version @@ -25,4 +25,4 @@ The code is considered frozen except for bug fixes, and any bug fixes are done w The app reaches final when the developers are confident that it’s ready to ship. It works as designed, has no known bugs, doesn’t crash, and is fast. -(Note: “no known bugs” is meant extremely seriously. That said, sometimes there are ambiguous weird cases that can’t be reproduced, and so there are exceptions to this rule. But we pretend most strenuously that that isn’t true. In fact, pretend you never read this paragraph, and we’ll pretend we never wrote it.) \ No newline at end of file +(Note: “no known bugs” is meant extremely seriously. That said, sometimes there are ambiguous weird cases that can’t be reproduced, and so there are exceptions to this rule. But we pretend most strenuously that that isn’t true. In fact, pretend you never read this paragraph, and we’ll pretend we never wrote it.) diff --git a/Technotes/QuestionsAnswered.md b/Technotes/QuestionsAnswered.md index 19b94e34b..3a9b22a14 100644 --- a/Technotes/QuestionsAnswered.md +++ b/Technotes/QuestionsAnswered.md @@ -6,9 +6,9 @@ Select it in the sidebar, then hit the Delete key. Or choose Edit > Delete from Note: you can delete multiple feeds, and you can delete folders. You can also undo if you change your mind. -#### Why does Evergreen require the latest macOS? +#### Why does NetNewsWire require the latest macOS? -Since Evergreen is a nights-and-weekends project, we don’t have enough time to run and test on older versions of macOS. Most of the time it will require the most recent macOS. +Since NetNewsWire is a nights-and-weekends project, we don’t have enough time to run and test on older versions of macOS. Most of the time it will require the most recent macOS. #### Why is FeedBin syncing planned for 1.0 but _____ isn’t planned until 2.0? diff --git a/Technotes/README.md b/Technotes/README.md index f90fd0522..a6af274ce 100644 --- a/Technotes/README.md +++ b/Technotes/README.md @@ -8,7 +8,7 @@ ## Notes -[What Development, Alpha, Beta, and Final Mean for Evergreen](DevelopmentAlphaBeta.md) +[What Development, Alpha, Beta, and Final Mean for NetNewsWire](DevelopmentAlphaBeta.md) [Hidden Preferences](HiddenPrefs.md) diff --git a/Technotes/RestoreToFactory.md b/Technotes/RestoreToFactory.md index 70e63a9cf..07d976b23 100644 --- a/Technotes/RestoreToFactory.md +++ b/Technotes/RestoreToFactory.md @@ -2,13 +2,13 @@ Here’s how to start over with untouched preferences and default feeds: -1. Quit Evergreen if it’s running. +1. Quit NetNewsWire if it’s running. -2. Delete the application support folder. On the command line, do: `rm -rf ~/Library/Application\ Support/Evergreen/` +2. Delete the application support folder. On the command line, do: `rm -rf ~/Library/Application\ Support/NetNewsWire/` -3. Delete the preferences. Just deleting the file won’t do the trick — it’s necessary to use the command line. Do: `defaults delete com.ranchero.Evergreen` and then `killall cfprefsd` +3. Delete the preferences. Just deleting the file won’t do the trick — it’s necessary to use the command line. Do: `defaults delete com.ranchero.NetNewsWire` and then `killall cfprefsd` -Launch Evergreen. You should have the default feeds, and all preferences should be reset to their default settings. +Launch NetNewsWire. You should have the default feeds, and all preferences should be reset to their default settings. #### Alternate version diff --git a/Technotes/Roadmap.md b/Technotes/Roadmap.md index 3242e76f3..37e135a01 100644 --- a/Technotes/Roadmap.md +++ b/Technotes/Roadmap.md @@ -4,7 +4,7 @@ This roadmap reflects thinking at the time of the last update. Anything can change at any time. -## Evergreen 1.0 for macOS +## NetNewsWire 1.0 for macOS Features: @@ -25,11 +25,11 @@ Features: Milestones: -[Evergreen 1.0 alpha](https://github.com/brentsimmons/Evergreen/milestone/1)
-[Evergreen 1.0 beta](https://github.com/brentsimmons/Evergreen/milestone/2)
-[Evergreen 1.0](https://github.com/brentsimmons/Evergreen/milestone/3) +[NetNewsWire 1.0 alpha](https://github.com/brentsimmons/NetNewsWire/milestone/1)
+[NetNewsWire 1.0 beta](https://github.com/brentsimmons/NetNewsWire/milestone/2)
+[NetNewsWire 1.0](https://github.com/brentsimmons/NetNewsWire/milestone/3) -(See [What Development, Alpha, Beta, and Final Mean for Evergreen](DevelopmentAlphaBeta.md) for definitions.) +(See [What Development, Alpha, Beta, and Final Mean for NetNewsWire](DevelopmentAlphaBeta.md) for definitions.) ## Future @@ -50,9 +50,9 @@ Features: * Deleting articles * Dinosaurs * Dock menu items -* [Article themes](https://github.com/brentsimmons/Evergreen/issues/257) +* [Article themes](https://github.com/brentsimmons/NetNewsWire/issues/257) * Back/forward commands -* [Article view zooming](https://github.com/brentsimmons/Evergreen/issues/38) -* [Import OPML from URL](https://github.com/brentsimmons/Evergreen/issues/136) -* [Traditional vertical layout](https://github.com/brentsimmons/Evergreen/issues/102) +* [Article view zooming](https://github.com/brentsimmons/NetNewsWire/issues/38) +* [Import OPML from URL](https://github.com/brentsimmons/NetNewsWire/issues/136) +* [Traditional vertical layout](https://github.com/brentsimmons/NetNewsWire/issues/102) diff --git a/Technotes/SubmoduleCheatSheet.md b/Technotes/SubmoduleCheatSheet.md index 95dacaa6d..fbbe4aec8 100644 --- a/Technotes/SubmoduleCheatSheet.md +++ b/Technotes/SubmoduleCheatSheet.md @@ -1,6 +1,6 @@ # Git Submodules -Evergreen uses [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to include shared frameworks. At this writing (June 2018) they are DB5, RSCore, RSDatabase, RSWeb, RSTree, and RSParser. +NetNewsWire uses [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to include shared frameworks. At this writing (June 2018) they are DB5, RSCore, RSDatabase, RSWeb, RSTree, and RSParser. After your first checkout: diff --git a/buildEvergreen b/buildEvergreen deleted file mode 100755 index f7f5b232d..000000000 --- a/buildEvergreen +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -rm -rf ~/.build -mkdir ~/.build - -rm ~/Desktop/Evergreen$1.zip -rm -rf ~/Desktop/Evergreen.app - -xcodebuild -workspace Evergreen.xcworkspace -scheme "Evergreen" -derivedDataPath ~/.build -configuration Release - -ditto /Users/brent/.build/Build/Products/Release/Evergreen.app ~/Desktop/Evergreen.app -open ~/Desktop - -pushd ~/Desktop - -zip --symlinks -r "Evergreen$1.zip" "Evergreen.app/" -zip --symlinks -r "Evergreen-latest.zip" "Evergreen.app/" -ditto Evergreen$1.zip ~/Archive/Releases/ - -popd diff --git a/buildNetNewsWire b/buildNetNewsWire new file mode 100755 index 000000000..11b5d202e --- /dev/null +++ b/buildNetNewsWire @@ -0,0 +1,20 @@ +#!/bin/sh + +rm -rf ~/.build +mkdir ~/.build + +rm ~/Desktop/NetNewsWire$1.zip +rm -rf ~/Desktop/NetNewsWire.app + +xcodebuild -workspace NetNewsWire.xcworkspace -scheme "NetNewsWire" -derivedDataPath ~/.build -configuration Release + +ditto /Users/brent/.build/Build/Products/Release/NetNewsWire.app ~/Desktop/NetNewsWire.app +open ~/Desktop + +pushd ~/Desktop + +zip --symlinks -r "NetNewsWire$1.zip" "NetNewsWire.app/" +zip --symlinks -r "NetNewsWire-latest.zip" "NetNewsWire.app/" +ditto NetNewsWire$1.zip ~/Archive/Releases/ + +popd diff --git a/xcconfig/EvergreenTests_target.xcconfig b/xcconfig/NetNewsWireTests_target.xcconfig similarity index 62% rename from xcconfig/EvergreenTests_target.xcconfig rename to xcconfig/NetNewsWireTests_target.xcconfig index d218c329f..39aefa57a 100644 --- a/xcconfig/EvergreenTests_target.xcconfig +++ b/xcconfig/NetNewsWireTests_target.xcconfig @@ -1,7 +1,7 @@ DEVELOPMENT_TEAM = 9C84TZ7Q6Z CODE_SIGN_STYLE = Automatic -// See the notes in Evergreen_target.xcconfig on why the +// See the notes in NetNewsWire_target.xcconfig on why the // DeveloperSettings.xcconfig is #included here #include "../../SharedXcodeSettings/DeveloperSettings.xcconfig" @@ -10,7 +10,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES COMBINE_HIDPI_IMAGES = YES BUNDLE_LOADER = $(TEST_HOST) LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks -INFOPLIST_FILE = EvergreenTests/Info.plist -PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests +INFOPLIST_FILE = NetNewsWireTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWireTests PRODUCT_NAME = $(TARGET_NAME) -TEST_HOST = $(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen +TEST_HOST = $(BUILT_PRODUCTS_DIR)/NetNewsWire.app/Contents/MacOS/NetNewsWire diff --git a/xcconfig/Evergreen_project.xcconfig b/xcconfig/NetNewsWire_project.xcconfig similarity index 100% rename from xcconfig/Evergreen_project.xcconfig rename to xcconfig/NetNewsWire_project.xcconfig diff --git a/xcconfig/Evergreen_project_debug.xcconfig b/xcconfig/NetNewsWire_project_debug.xcconfig similarity index 88% rename from xcconfig/Evergreen_project_debug.xcconfig rename to xcconfig/NetNewsWire_project_debug.xcconfig index 52c790f32..f1adf871d 100644 --- a/xcconfig/Evergreen_project_debug.xcconfig +++ b/xcconfig/NetNewsWire_project_debug.xcconfig @@ -1,4 +1,4 @@ -#include "./Evergreen_project.xcconfig" +#include "./NetNewsWire_project.xcconfig" ONLY_ACTIVE_ARCH = YES DEBUG_INFORMATION_FORMAT = dwarf diff --git a/xcconfig/Evergreen_project_release.xcconfig b/xcconfig/NetNewsWire_project_release.xcconfig similarity index 80% rename from xcconfig/Evergreen_project_release.xcconfig rename to xcconfig/NetNewsWire_project_release.xcconfig index 958363ef2..3923eb781 100644 --- a/xcconfig/Evergreen_project_release.xcconfig +++ b/xcconfig/NetNewsWire_project_release.xcconfig @@ -1,4 +1,4 @@ -#include "./Evergreen_project.xcconfig" +#include "./NetNewsWire_project.xcconfig" DEBUG_INFORMATION_FORMAT = dwarf-with-dsym ENABLE_NS_ASSERTIONS = NO diff --git a/xcconfig/Evergreen_target.xcconfig b/xcconfig/NetNewsWire_target.xcconfig similarity index 84% rename from xcconfig/Evergreen_target.xcconfig rename to xcconfig/NetNewsWire_target.xcconfig index 3ecba4950..ba5cf39c7 100644 --- a/xcconfig/Evergreen_target.xcconfig +++ b/xcconfig/NetNewsWire_target.xcconfig @@ -18,10 +18,10 @@ PROVISIONING_PROFILE_SPECIFIER = // PROVISIONING_PROFILE_SPECIFIER = // // And you should be able to build without code signing errors and without modifying -// the Evergreen Xcode project. +// the NetNewsWire Xcode project. // -// Example: if your Evergreen Xcode project file is at -// /Users/Shared/git/Evergreen/Evergreen.xcodeproj +// Example: if your NetNewsWire Xcode project file is at +// /Users/Shared/git/NetNewsWire/NetNewsWire.xcodeproj // create your DeveloperSettings.xcconfig file at // /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig // @@ -31,8 +31,8 @@ PROVISIONING_PROFILE_SPECIFIER = ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES COMBINE_HIDPI_IMAGES = YES LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks -INFOPLIST_FILE = Evergreen/Info.plist -PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen +INFOPLIST_FILE = NetNewsWire/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen PRODUCT_NAME = $(TARGET_NAME) FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Frameworks/Vendor ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon