diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard
index d45176bb7..bfc4acddb 100644
--- a/Mac/Base.lproj/MainWindow.storyboard
+++ b/Mac/Base.lproj/MainWindow.storyboard
@@ -50,7 +50,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -274,7 +260,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -404,17 +390,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -456,7 +432,7 @@
-
+
diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 9056bab06..6fd80d368 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -62,17 +62,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
sharingServicePickerDelegate = SharingServicePickerDelegate(self.window)
if #available(macOS 10.16, *) {
- DispatchQueue.main.async {
- if self.window?.toolbar?.existingItem(withIdentifier: .newSidebarItemMenu) == nil {
- self.window?.toolbar?.insertItem(withItemIdentifier: .newSidebarItemMenu, at: 1)
- }
- if self.window?.toolbar?.existingItem(withIdentifier: .sidebarTrackingSeparator) == nil {
- self.window?.toolbar?.insertItem(withItemIdentifier: .sidebarTrackingSeparator, at: 2)
- }
- if self.window?.toolbar?.existingItem(withIdentifier: .trackingSeparator) == nil {
- self.window?.toolbar?.insertItem(withItemIdentifier: .trackingSeparator, at: 5)
- }
- }
} else {
if !AppDefaults.shared.showTitleOnMainWindow {
window?.titleVisibility = .hidden
@@ -698,10 +687,19 @@ extension MainWindowController : ScriptingMainWindowController {
// MARK: - NSToolbarDelegate
extension NSToolbarItem.Identifier {
+ static let newFeed = NSToolbarItem.Identifier("newFeed")
+ static let newFolder = NSToolbarItem.Identifier("newFolder")
+ static let refresh = NSToolbarItem.Identifier("refresh")
static let newSidebarItemMenu = NSToolbarItem.Identifier("newSidebarItemMenu")
- static let trackingSeparator = NSToolbarItem.Identifier("trackingSeparator")
- static let share = NSToolbarItem.Identifier("share")
+ static let timelineTrackingSeparator = NSToolbarItem.Identifier("timelineTrackingSeparator")
static let search = NSToolbarItem.Identifier("search")
+ static let markAllAsRead = NSToolbarItem.Identifier("markAllAsRead")
+ static let nextUnread = NSToolbarItem.Identifier("nextUnread")
+ static let markRead = NSToolbarItem.Identifier("markRead")
+ static let markStar = NSToolbarItem.Identifier("markStar")
+ static let readerView = NSToolbarItem.Identifier("readerView")
+ static let openInBrowser = NSToolbarItem.Identifier("openInBrowser")
+ static let share = NSToolbarItem.Identifier("share")
}
extension MainWindowController: NSToolbarDelegate {
@@ -714,13 +712,48 @@ extension MainWindowController: NSToolbarDelegate {
return menuToolbarItem
}
- if #available(macOS 10.16, *), itemIdentifier == .trackingSeparator {
- return NSTrackingSeparatorToolbarItem(identifier: .trackingSeparator, splitView: splitViewController!.splitView, dividerIndex: 1)
+ if #available(macOS 10.16, *), itemIdentifier == .timelineTrackingSeparator {
+ return NSTrackingSeparatorToolbarItem(identifier: .timelineTrackingSeparator, splitView: splitViewController!.splitView, dividerIndex: 1)
}
return nil
}
+ func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
+ if #available(macOS 10.16, *) {
+ return [
+ .refresh,
+ .newSidebarItemMenu,
+ .sidebarTrackingSeparator,
+ .search,
+ .markAllAsRead,
+ .timelineTrackingSeparator,
+ .flexibleSpace,
+ .nextUnread,
+ .markRead,
+ .markStar,
+ .openInBrowser,
+ .share
+ ]
+ } else {
+ return [
+ .newFeed,
+ .newFolder,
+ .refresh,
+ .flexibleSpace,
+ .markAllAsRead,
+ .search,
+ .flexibleSpace,
+ .nextUnread,
+ .markStar,
+ .markRead,
+ .readerView,
+ .openInBrowser,
+ .share
+ ]
+ }
+ }
+
func toolbarWillAddItem(_ notification: Notification) {
guard let item = notification.userInfo?["item"] as? NSToolbarItem else {
return