From fed8fbce98f9d14f5d97349e6a1bf926706c2527 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 7 Apr 2020 08:06:47 -0500 Subject: [PATCH] Tweak the new preference pane. --- Mac/AppAssets.swift | 6 +++++ .../PreferencesWindowController.swift | 24 ++++++++++++------ .../Contents.json | 12 --------- .../feedProviderToolbar.imageset/globe.pdf | Bin 7542 -> 0 bytes 4 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/Contents.json delete mode 100644 Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/globe.pdf diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 4ef1c1cc5..101174152 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -77,6 +77,12 @@ struct AppAssets { return RSImage(named: "articleExtractorProgress4") }() + static var bookmarkImage: RSImage? = { + let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BookmarkIcon.icns" + let image = RSImage(contentsOfFile: path) + return image + }() + static var faviconTemplateImage: RSImage = { return RSImage(named: "faviconTemplateImage")! }() diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift index b13adbfd4..e6d225914 100644 --- a/Mac/Preferences/PreferencesWindowController.swift +++ b/Mac/Preferences/PreferencesWindowController.swift @@ -12,12 +12,12 @@ private struct PreferencesToolbarItemSpec { let identifier: NSToolbarItem.Identifier let name: String - let imageName: NSImage.Name + let image: NSImage? - init(identifierRawValue: String, name: String, imageName: NSImage.Name) { + init(identifierRawValue: String, name: String, image: NSImage?) { self.identifier = NSToolbarItem.Identifier(identifierRawValue) self.name = name - self.imageName = imageName + self.image = image } } @@ -34,16 +34,24 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { private var viewControllers = [String: NSViewController]() private let toolbarItemSpecs: [PreferencesToolbarItemSpec] = { var specs = [PreferencesToolbarItemSpec]() - specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.General, name: NSLocalizedString("General", comment: "Preferences"), imageName: NSImage.preferencesGeneralName)] - specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Accounts, name: NSLocalizedString("Accounts", comment: "Preferences"), imageName: NSImage.userAccountsName)] - specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.FeedProvider, name: NSLocalizedString("Providers", comment: "Preferences"), imageName: "feedProviderToolbar")] + specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.General, + name: NSLocalizedString("General", comment: "Preferences"), + image: NSImage(named: NSImage.preferencesGeneralName))] + specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Accounts, + name: NSLocalizedString("Accounts", comment: "Preferences"), + image: NSImage(named: NSImage.userAccountsName))] + specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.FeedProvider, + name: NSLocalizedString("Integrations", comment: "Preferences"), + image: AppAssets.bookmarkImage)] // Omit the Advanced Preferences for now because the Software Update related functionality is // forbidden/non-applicable, and we can rely upon Apple to some extent for crash reports. We // can add back the Crash Reporter preferences when we're ready to dynamically shuffle the rest // of the content in this tab. #if !MAC_APP_STORE - specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Advanced, name: NSLocalizedString("Advanced", comment: "Preferences"), imageName: NSImage.advancedName)] + specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Advanced, + name: NSLocalizedString("Advanced", comment: "Preferences"), + image: NSImage(named: NSImage.advancedName))] #endif return specs }() @@ -86,7 +94,7 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { toolbarItem.target = self toolbarItem.label = toolbarItemSpec.name toolbarItem.paletteLabel = toolbarItem.label - toolbarItem.image = NSImage(named: toolbarItemSpec.imageName) + toolbarItem.image = toolbarItemSpec.image return toolbarItem } diff --git a/Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/Contents.json b/Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/Contents.json deleted file mode 100644 index 79f849e65..000000000 --- a/Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "globe.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/globe.pdf b/Mac/Resources/Assets.xcassets/feedProviderToolbar.imageset/globe.pdf deleted file mode 100644 index 2e2ffbf186cd7c33e0dce23a6d31f4a66dc463a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7542 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 Nc`#{d#pNY1{|CIlI9LDx