From ce5b60cfe8955f17eb4d12df8f3dca8d78bc0e79 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 17 Feb 2018 10:32:32 -0800 Subject: [PATCH] Update mark-as-starred toolbar item tooltip during validation. --- Evergreen/MainWindow/MainWindowController.swift | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index da44085c6..f26a1133e 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -190,23 +190,26 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations { private func validateToggleStarred(_ item: NSValidatedUserInterfaceItem) -> Bool { let validationStatus = timelineViewController?.markStarredCommandStatus() ?? .canDoNothing - let showStar: Bool + let starring: Bool let result: Bool switch validationStatus { case .canMark: - showStar = true + starring = true result = true case .canUnmark: - showStar = false + starring = false result = true case .canDoNothing: - showStar = true + starring = true result = false } - if let button = (item as? NSToolbarItem)?.view as? NSButton { - button.image = NSImage(named: showStar ? .star : .unstar) + if let toolbarItem = item as? NSToolbarItem { + toolbarItem.toolTip = starring ? NSLocalizedString("Mark as Starred", comment: "Command") : NSLocalizedString("Mark as Unstarred", comment: "Command") + if let button = toolbarItem.view as? NSButton { + button.image = NSImage(named: starring ? .star : .unstar) + } } return result