From 0e5b400a0c73dec915bd0567e63d87496507f196 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 15 Nov 2017 22:40:49 -0800 Subject: [PATCH] Show Error Log window from Window menu. --- Evergreen/AppDelegate.swift | 10 ++++++++++ Evergreen/Base.lproj/Main.storyboard | 6 ++++++ .../RSCore/RSCore/AppKit/LogWindowController.swift | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift index 669bda6db..4eef8689c 100644 --- a/Evergreen/AppDelegate.swift +++ b/Evergreen/AppDelegate.swift @@ -32,6 +32,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { var addFolderWindowController: AddFolderWindowController? var keyboardShortcutsWindowController: WebViewWindowController? var inspectorWindowController: InspectorWindowController? + var logWindowController: LogWindowController? let log = Log() let themeLoader = VSThemeLoader() private let appNewsURLString = "https://ranchero.com/evergreen/feed.json" @@ -263,6 +264,15 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { } } + @IBAction func showLogWindow(_ sender: Any?) { + + if logWindowController == nil { + logWindowController = LogWindowController(title: "Errors", log: log) + } + + logWindowController!.showWindow(self) + } + @IBAction func importOPMLFromFile(_ sender: AnyObject) { let panel = NSOpenPanel() diff --git a/Evergreen/Base.lproj/Main.storyboard b/Evergreen/Base.lproj/Main.storyboard index 657d259e8..cc27e2a4f 100644 --- a/Evergreen/Base.lproj/Main.storyboard +++ b/Evergreen/Base.lproj/Main.storyboard @@ -468,6 +468,12 @@ + + + + + + diff --git a/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift b/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift index 654e5e3b6..0dcfee270 100644 --- a/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift +++ b/Frameworks/RSCore/RSCore/AppKit/LogWindowController.swift @@ -8,7 +8,7 @@ import Cocoa -class LogWindowController: NSWindowController { +public class LogWindowController: NSWindowController { @IBOutlet private var textView: NSTextView! private var title: String! @@ -24,7 +24,7 @@ class LogWindowController: NSWindowController { NotificationCenter.default.addObserver(self, selector: #selector(logDidAddItem(_:)), name: .LogDidAddItem, object: log) } - override func windowDidLoad() { + public override func windowDidLoad() { window!.title = title addExistingLogItems()