From d637f65851c25a379e961f015ea201c2e0461578 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 28 Feb 2022 12:06:08 -0400 Subject: [PATCH] Separate accessory view init into it's own function --- SilicaViewer/AppDelegate.swift | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/SilicaViewer/AppDelegate.swift b/SilicaViewer/AppDelegate.swift index e9eb0bb..078b405 100644 --- a/SilicaViewer/AppDelegate.swift +++ b/SilicaViewer/AppDelegate.swift @@ -23,6 +23,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { return true } + func addAccessoryView(_ savePanel : NSSavePanel) { + let accessoryView = (ExportAccessoryView.fromNib()! as ExportAccessoryView) + accessoryView.setSavePanel(savePanel) + + savePanel.accessoryView = accessoryView as NSView + } + @IBAction func exportAction(_ sender: Any) { let document = NSApplication.shared.keyWindow?.windowController?.document as? Document; @@ -31,10 +38,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { savePanel.allowedFileTypes = ["tiff"] savePanel.nameFieldStringValue = (document?.getIdealFilename())! - let accessoryView = (ExportAccessoryView.fromNib()! as ExportAccessoryView) - accessoryView.setSavePanel(savePanel) - - savePanel.accessoryView = accessoryView as NSView + addAccessoryView(savePanel) savePanel.begin { (result) in if result.rawValue == NSApplication.ModalResponse.OK.rawValue { @@ -193,10 +197,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { savePanel.allowedFileTypes = ["public.png"] savePanel.nameFieldStringValue = (document?.getIdealFilename())! - let accessoryView = (ExportAccessoryView.fromNib()! as ExportAccessoryView) - accessoryView.setSavePanel(savePanel) - - savePanel.accessoryView = accessoryView as NSView + addAccessoryView(savePanel) savePanel.begin { (result) in if result.rawValue == NSApplication.ModalResponse.OK.rawValue { @@ -221,7 +222,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { savePanel.title = "Save Timelapse" savePanel.allowedFileTypes = ["public.mpeg-4"] savePanel.nameFieldStringValue = (document?.getIdealFilename())! - + savePanel.begin { (result) in if result.rawValue == NSApplication.ModalResponse.OK.rawValue { guard let archive = Archive(data: (document?.data)!, accessMode: Archive.AccessMode.read) else {