FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename templateImage to just image since we don't use template images anymore

Browse Source
This commit is contained in:
Maurice Parker 2020-10-30 15:42:45 -05:00
parent d4dbc5a8b2
commit 198a5c29bf
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mac/Preferences/ExtensionPoints/EnableExtensionPointView.swift
View File

@ -92,7 +92,7 @@ struct EnableExtensionPointView: View {
ForEach(extensionPointTypeNames, id: \.self, content: { extensionPointTypeName in ForEach(extensionPointTypeNames, id: \.self, content: { extensionPointTypeName in
let extensionPointType = typeFromName(extensionPointTypeName) let extensionPointType = typeFromName(extensionPointTypeName)
HStack(alignment: .center) { HStack(alignment: .center) {
Image(nsImage: extensionPointType.templateImage) Image(nsImage: extensionPointType.image)
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(width: 25, height: 25, alignment: .center) .frame(width: 25, height: 25, alignment: .center)
@ -129,7 +129,7 @@ struct EnableExtensionPointView: View {
ForEach(extensionPointTypeNames, id: \.self, content: { extensionPointTypeName in ForEach(extensionPointTypeNames, id: \.self, content: { extensionPointTypeName in
let extensionPointType = typeFromName(extensionPointTypeName) let extensionPointType = typeFromName(extensionPointTypeName)
HStack(alignment: .center) { HStack(alignment: .center) {
Image(nsImage: extensionPointType.templateImage) Image(nsImage: extensionPointType.image)
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(width: 25, height: 25, alignment: .center) .frame(width: 25, height: 25, alignment: .center)

2
Mac/Preferences/ExtensionPoints/ExtensionPointDetailViewController.swift
View File

@ -29,7 +29,7 @@ class ExtensionPointDetailViewController: NSViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
guard let extensionPoint = extensionPoint else { return } guard let extensionPoint = extensionPoint else { return }
imageView.image = extensionPoint.templateImage imageView.image = extensionPoint.image
titleLabel.stringValue = extensionPoint.title titleLabel.stringValue = extensionPoint.title
descriptionLabel.attributedStringValue = extensionPoint.description descriptionLabel.attributedStringValue = extensionPoint.description
} }

2
Mac/Preferences/ExtensionPoints/ExtensionPointEnableWindowController.swift
View File

@ -33,7 +33,7 @@ class ExtensionPointEnableWindowController: NSWindowController {
super.windowDidLoad() super.windowDidLoad()
guard let extensionPointType = extensionPointType else { return } guard let extensionPointType = extensionPointType else { return }
imageView.image = extensionPointType.templateImage imageView.image = extensionPointType.image
titleLabel.stringValue = extensionPointType.title titleLabel.stringValue = extensionPointType.title
descriptionLabel.attributedStringValue = extensionPointType.description descriptionLabel.attributedStringValue = extensionPointType.description
} }

2
Mac/Preferences/ExtensionPoints/ExtensionPointPreferencesViewController.swift
View File

@ -87,7 +87,7 @@ extension ExtensionPointPreferencesViewController: NSTableViewDelegate {
if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? NSTableCellView { if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? NSTableCellView {
let extensionPoint = activeExtensionPoints[row] let extensionPoint = activeExtensionPoints[row]
cell.textField?.stringValue = extensionPoint.title cell.textField?.stringValue = extensionPoint.title
cell.imageView?.image = extensionPoint.templateImage cell.imageView?.image = extensionPoint.image
return cell return cell
} }
return nil return nil

6
Shared/ExtensionPoints/ExtensionPoint.swift
View File

@ -18,7 +18,7 @@ protocol ExtensionPoint {
static var isSinglton: Bool { get } static var isSinglton: Bool { get }
static var isDeveloperBuildRestricted: Bool { get } static var isDeveloperBuildRestricted: Bool { get }
static var title: String { get } static var title: String { get }
static var templateImage: RSImage { get } static var image: RSImage { get }
static var description: NSAttributedString { get } static var description: NSAttributedString { get }
var title: String { get } var title: String { get }
@ -28,8 +28,8 @@ protocol ExtensionPoint {
extension ExtensionPoint { extension ExtensionPoint {
var templateImage: RSImage { var image: RSImage {
return extensionPointID.extensionPointType.templateImage return extensionPointID.extensionPointType.image
} }
var description: NSAttributedString { var description: NSAttributedString {

2
Shared/ExtensionPoints/RedditFeedProvider-Extensions.swift
View File

@ -14,7 +14,7 @@ extension RedditFeedProvider: ExtensionPoint {
static var isSinglton = false static var isSinglton = false
static var isDeveloperBuildRestricted = true static var isDeveloperBuildRestricted = true
static var title = NSLocalizedString("Reddit", comment: "Reddit") static var title = NSLocalizedString("Reddit", comment: "Reddit")
static var templateImage = AppAssets.extensionPointReddit static var image = AppAssets.extensionPointReddit
static var description: NSAttributedString = { static var description: NSAttributedString = {
return RedditFeedProvider.makeAttrString("This extension enables you to subscribe to Reddit URL's as if they were RSS feeds. It only works with \(Account.defaultLocalAccountName) or iCloud accounts.") return RedditFeedProvider.makeAttrString("This extension enables you to subscribe to Reddit URL's as if they were RSS feeds. It only works with \(Account.defaultLocalAccountName) or iCloud accounts.")
}() }()

2
Shared/ExtensionPoints/SendToMarsEditCommand.swift
View File

@ -15,7 +15,7 @@ final class SendToMarsEditCommand: ExtensionPoint, SendToCommand {
static var isSinglton = true static var isSinglton = true
static var isDeveloperBuildRestricted = false static var isDeveloperBuildRestricted = false
static var title = NSLocalizedString("MarsEdit", comment: "MarsEdit") static var title = NSLocalizedString("MarsEdit", comment: "MarsEdit")
static var templateImage = AppAssets.extensionPointMarsEdit static var image = AppAssets.extensionPointMarsEdit
static var description: NSAttributedString = { static var description: NSAttributedString = {
let attrString = SendToMarsEditCommand.makeAttrString("This extension enables share menu functionality to send selected article text to MarsEdit. You need the MarsEdit application for this to work.") let attrString = SendToMarsEditCommand.makeAttrString("This extension enables share menu functionality to send selected article text to MarsEdit. You need the MarsEdit application for this to work.")
let range = NSRange(location: 81, length: 8) let range = NSRange(location: 81, length: 8)

2
Shared/ExtensionPoints/SendToMicroBlogCommand.swift
View File

@ -17,7 +17,7 @@ final class SendToMicroBlogCommand: ExtensionPoint, SendToCommand {
static var isSinglton = true static var isSinglton = true
static var isDeveloperBuildRestricted = false static var isDeveloperBuildRestricted = false
static var title: String = NSLocalizedString("Micro.blog", comment: "Micro.blog") static var title: String = NSLocalizedString("Micro.blog", comment: "Micro.blog")
static var templateImage = AppAssets.extensionPointMicroblog static var image = AppAssets.extensionPointMicroblog
static var description: NSAttributedString = { static var description: NSAttributedString = {
let attrString = SendToMicroBlogCommand.makeAttrString("This extension enables share menu functionality to send selected article text to Micro.blog. You need the Micro.blog application for this to work.") let attrString = SendToMicroBlogCommand.makeAttrString("This extension enables share menu functionality to send selected article text to Micro.blog. You need the Micro.blog application for this to work.")
let range = NSRange(location: 81, length: 10) let range = NSRange(location: 81, length: 10)

2
Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift
View File

@ -14,7 +14,7 @@ extension TwitterFeedProvider: ExtensionPoint {
static var isSinglton = false static var isSinglton = false
static var isDeveloperBuildRestricted = true static var isDeveloperBuildRestricted = true
static var title = NSLocalizedString("Twitter", comment: "Twitter") static var title = NSLocalizedString("Twitter", comment: "Twitter")
static var templateImage = AppAssets.extensionPointTwitter static var image = AppAssets.extensionPointTwitter
static var description: NSAttributedString = { static var description: NSAttributedString = {
return TwitterFeedProvider.makeAttrString("This extension enables you to subscribe to Twitter URL's as if they were RSS feeds. It only works with \(Account.defaultLocalAccountName) or iCloud accounts.") return TwitterFeedProvider.makeAttrString("This extension enables you to subscribe to Twitter URL's as if they were RSS feeds. It only works with \(Account.defaultLocalAccountName) or iCloud accounts.")
}() }()