From a673e6bba7137d06fc261d922bc9b1ebb350e8eb Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 30 Jun 2023 21:20:11 -0700 Subject: [PATCH] Continue removing Reddit references. --- Mac/AppDelegate.swift | 13 ------------- Mac/Base.lproj/Main.storyboard | 13 +++---------- Mac/MainWindow/MainWindowController.swift | 7 +------ Mac/en-GB.lproj/Main.strings | 3 --- Mac/zh-Hans.lproj/Main.strings | 3 --- Technotes/Dependencies.markdown | 23 ++--------------------- 6 files changed, 6 insertions(+), 56 deletions(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 6cde701c4..c7bba32b0 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -515,13 +515,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, return !isDisplayingSheet && !AccountManager.shared.activeAccounts.isEmpty } - if item.action == #selector(showAddRedditFeedWindow(_:)) { - guard !isDisplayingSheet && isSpecialAccountAvailable && ExtensionPointManager.shared.isRedditEnabled else { - return false - } - return ExtensionPointManager.shared.isRedditEnabled - } - #if !MAC_APP_STORE if item.action == #selector(toggleWebInspectorEnabled(_:)) { (item as! NSMenuItem).state = AppDefaults.shared.webInspectorEnabled ? .on : .off @@ -595,12 +588,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, addWebFeed(nil) } - @MainActor @IBAction func showAddRedditFeedWindow(_ sender: Any?) { - createAndShowMainWindowIfNecessary() - addFeedController = AddFeedController(hostWindow: mainWindowController!.window!) - addFeedController?.showAddFeedSheet(.redditFeed) - } - @MainActor @IBAction func showAddFolderWindow(_ sender: Any?) { createAndShowMainWindowIfNecessary() showAddFolderSheetOnWindow(mainWindowController!.window!) diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard index 50342563a..6a0c2cc8e 100644 --- a/Mac/Base.lproj/Main.storyboard +++ b/Mac/Base.lproj/Main.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -69,17 +68,11 @@ - + - - - - - - diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift index d3e5aab90..4d6169d36 100644 --- a/Mac/MainWindow/MainWindowController.swift +++ b/Mac/MainWindow/MainWindowController.swift @@ -1445,15 +1445,10 @@ private extension MainWindowController { let menu = NSMenu() let newWebFeedItem = NSMenuItem() - newWebFeedItem.title = NSLocalizedString("button.title.new-web-feed", comment: "New Web Feed...") + newWebFeedItem.title = NSLocalizedString("button.title.new-web-feed", comment: "New Feed...") newWebFeedItem.action = Selector(("showAddWebFeedWindow:")) menu.addItem(newWebFeedItem) - let newRedditFeedItem = NSMenuItem() - newRedditFeedItem.title = NSLocalizedString("button.title.new-reddit-feed", comment: "New Reddit Feed...") - newRedditFeedItem.action = Selector(("showAddRedditFeedWindow:")) - menu.addItem(newRedditFeedItem) - let newFolderFeedItem = NSMenuItem() newFolderFeedItem.title = NSLocalizedString("button.title.open-new-folder", comment: "New Folder...") newFolderFeedItem.action = Selector(("showAddFolderWindow:")) diff --git a/Mac/en-GB.lproj/Main.strings b/Mac/en-GB.lproj/Main.strings index 80b790d52..3edf94104 100644 --- a/Mac/en-GB.lproj/Main.strings +++ b/Mac/en-GB.lproj/Main.strings @@ -208,9 +208,6 @@ /* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "mK6-2p-4JG"; */ "mK6-2p-4JG.title" = "Check Grammar With Spelling"; -/* Class = "NSMenuItem"; title = "New Reddit Feed…"; ObjectID = "n6h-Bp-CIc"; */ -"n6h-Bp-CIc.title" = "New Reddit Feed…"; - /* Class = "NSMenuItem"; title = "Article Search…"; ObjectID = "nB2-mv-2i5"; */ "nB2-mv-2i5.title" = "Article Search…"; diff --git a/Mac/zh-Hans.lproj/Main.strings b/Mac/zh-Hans.lproj/Main.strings index 7a6165c29..e4c866d33 100644 --- a/Mac/zh-Hans.lproj/Main.strings +++ b/Mac/zh-Hans.lproj/Main.strings @@ -205,9 +205,6 @@ /* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "mK6-2p-4JG"; */ "mK6-2p-4JG.title" = "检查拼写和语法"; -/* Class = "NSMenuItem"; title = "New Reddit Feed…"; ObjectID = "n6h-Bp-CIc"; */ -"n6h-Bp-CIc.title" = "添加 Reddit 订阅..."; - /* Class = "NSMenuItem"; title = "Article Search…"; ObjectID = "nB2-mv-2i5"; */ "nB2-mv-2i5.title" = "搜素文章..."; diff --git a/Technotes/Dependencies.markdown b/Technotes/Dependencies.markdown index 480e97958..05e763d0e 100644 --- a/Technotes/Dependencies.markdown +++ b/Technotes/Dependencies.markdown @@ -4,30 +4,11 @@ In addition to our own frameworks (RSCore, RSDatabase, RSParser, RSTree, and RSW Thank you to the authors of these! -## [BrightFutures](https://github.com/Thomvis/BrightFutures) -Required by OAuthSwift (through Erik) as a testing dependency. Not shipped in NNW. - -## [Erik](https://github.com/phimage/Erik) -Required by OAuthSwift as a testing dependency. Not shipped in NNW. - -## [FileKit](https://github.com/nvzqz/FileKit) -Required by OAuthSwift (through Erik) as a testing dependency. Not shipped in NNW. - ## [FMDB](https://github.com/ccgus/fmdb) RSDatabase uses FMDB for SQLite persistence. -## [Kanna](https://github.com/tid-kijyun/Kanna) -Required by OAuthSwift as a testing dependency. Not shipped in NNW. - -## [OAuthSwift](https://github.com/OAuthSwift/OAuthSwift) -Our Reddit integration uses the OAuth framework to authenticate with the services -and then service requests to them. - ## [PLCrashReporter](https://github.com/microsoft/plcrashreporter) -Used to collect crash reports and send them to Brent. Mac only. +Used to collect crash reports and send them to Brent. Mac only. ## [Sparkle](https://github.com/sparkle-project/Sparkle) -Used to provide application updates to users. Mac only. - -## [Swifter](https://github.com/httpswift/swifter) -Required by OAuthSwift as a testing dependency. Not shipped in NNW. +Used to provide application updates to users. Mac only.