renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Continue removing Reddit references.

Browse Source
This commit is contained in:
Brent Simmons
2023-06-30 21:20:11 -07:00
parent 36d8bcea40
commit a673e6bba7
6 changed files with 6 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Mac/AppDelegate.swift
View File

@@ -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!)

13
Mac/Base.lproj/Main.storyboard
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
</dependencies>
<scenes>
<!--Application-->
@@ -69,17 +68,11 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="File" id="bib-Uj-vzu">
<items>
<menuItem title="New Web Feed…" keyEquivalent="n" id="Was-JA-tGl">
<menuItem title="New Feed…" keyEquivalent="n" id="Was-JA-tGl">
<connections>
<action selector="showAddWebFeedWindow:" target="Ady-hI-5gd" id="LkT-kx-aCR"/>
</connections>
</menuItem>
<menuItem title="New Reddit Feed…" id="n6h-Bp-CIc">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="showAddRedditFeedWindow:" target="Ady-hI-5gd" id="Irh-Rw-mFK"/>
</connections>
</menuItem>
<menuItem title="New Folder…" keyEquivalent="N" id="wkh-LX-Xp1">
<connections>
<action selector="showAddFolderWindow:" target="Ady-hI-5gd" id="GIi-wc-uYk"/>

7
Mac/MainWindow/MainWindowController.swift
View File

@@ -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:"))

3
Mac/en-GB.lproj/Main.strings
View File

@@ -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…";

3
Mac/zh-Hans.lproj/Main.strings
View File

@@ -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" = "搜素文章...";

23
Technotes/Dependencies.markdown
View File

@@ -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.