Removed all awakeFromNib() overrides (#859)

dirkwhoffmann · Jan 18, 2025 · cf5ed2d · cf5ed2d
1 parent 57018d9
commit cf5ed2d
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 43 deletions.
diff --git a/GUI/Dialogs/Captures/ScreenshotDialog.swift b/GUI/Dialogs/Captures/ScreenshotDialog.swift
@@ -68,6 +68,7 @@ class ScreenshotDialog: DialogController {
     override func dialogDidShow() {
 
         super.dialogDidShow()
+
         now = Date()
         updateLabels()
 

diff --git a/GUI/Dialogs/Captures/SnapshotDialog.swift b/GUI/Dialogs/Captures/SnapshotDialog.swift
@@ -34,10 +34,6 @@ class SnapshotDialog: DialogController {
 
     // Remembers the auto-snapshot setting
     var takeSnapshots = false
-
-    override func windowWillLoad() {
-
-    }
 
     override func dialogDidShow() {
 

diff --git a/GUI/Dialogs/Configuration/ConfigurationController.swift b/GUI/Dialogs/Configuration/ConfigurationController.swift
@@ -344,25 +344,14 @@ class ConfigurationController: DialogController {
         firstTab = tab
         showAsSheet()
     }
-
-    override func awakeFromNib() {
-
-        debug(.lifetime)
-
-        super.awakeFromNib()
-        awakeVideoPrefsFromNib()
-        refreshRomSelector()
-    }
-
-    override func windowDidLoad() {
-
-        debug(.lifetime)
-        super.windowDidLoad()
-    }
 
     override func dialogWillShow() {
 
         super.dialogWillShow()
+
+        initVideoTab()
+        refreshRomSelector()
+
         if firstTab != "" { prefTabView?.selectTabViewItem(withIdentifier: firstTab) }
         refresh()
     }

diff --git a/GUI/Dialogs/Configuration/RomDropView.swift b/GUI/Dialogs/Configuration/RomDropView.swift
@@ -26,11 +26,14 @@ class DropView: NSImageView {
 
     var oldImage: NSImage?
 
-    override func awakeFromNib() {
+    override init(frame frameRect: NSRect) { super.init(frame: frameRect); commonInit() }
+    required init?(coder: NSCoder) { super.init(coder: coder); commonInit() }
+
+    func commonInit() {
 
         registerForDraggedTypes([NSPasteboard.PasteboardType.fileURL])
     }
-
+    
     func acceptDragSource(url: URL) -> Bool { return false }
 
     override func draggingEntered(_ sender: NSDraggingInfo) -> NSDragOperation {

diff --git a/GUI/Dialogs/Configuration/VideoConf.swift b/GUI/Dialogs/Configuration/VideoConf.swift
@@ -9,7 +9,7 @@
 
 extension ConfigurationController {
 
-    func awakeVideoPrefsFromNib() {
+    func initVideoTab() {
 
         // Check for available enhancers
         let enhancers = parent.renderer.ressourceManager.enhancerGallery

diff --git a/GUI/Dialogs/Inspector/EventTableView.swift b/GUI/Dialogs/Inspector/EventTableView.swift
@@ -10,21 +10,22 @@
 class EventTableView: NSTableView {
 
     @IBOutlet weak var inspector: Inspector!
-    var amiga: EmulatorProxy!
 
     var slotInfo = [EventSlotInfo?](repeating: nil, count: EventSlot.COUNT.rawValue)
 
-    override func awakeFromNib() {
+    override init(frame frameRect: NSRect) { super.init(frame: frameRect); commonInit() }
+    required init?(coder: NSCoder) { super.init(coder: coder); commonInit() }
+
+    func commonInit() {
 
-        amiga = inspector.emu
         delegate = self
         dataSource = self
         target = self
     }
-
+    
     private func cache() {
         for row in 0 ..< EventSlot.COUNT.rawValue {
-            slotInfo[row] = amiga.agnus.cachedSlotInfo(row)
+            slotInfo[row] = inspector.emu.agnus.cachedSlotInfo(row)
         }
     }
 

diff --git a/GUI/Dialogs/Inspector/Inspector.swift b/GUI/Dialogs/Inspector/Inspector.swift
@@ -670,6 +670,8 @@ class Inspector: DialogController {
 
     override func dialogWillShow() {
 
+        super.dialogWillShow()
+
         // Hide the panel selector
         panel.tabPosition = .none
 
@@ -694,6 +696,7 @@ class Inspector: DialogController {
 
     override func dialogDidShow() {
 
+        super.dialogDidShow()
         refresh(full: true)
     }
 

diff --git a/GUI/Dialogs/Media/DiskExporter.swift b/GUI/Dialogs/Media/DiskExporter.swift
@@ -144,17 +144,14 @@ class DiskExporter: DialogController {
         if vol != nil { addItem("Folder", tag: Format.vol) }
     }
 
-    override public func awakeFromNib() {
+    override func dialogWillShow() {
 
-        super.awakeFromNib()
+        super.dialogWillShow()
+
         updatePartitionPopup()
         updateFormatPopup()
         update()
     }
-
-    override func windowDidLoad() {
-
-    }
 
     func update() {
 

diff --git a/GUI/Dialogs/Media/FloppyCreator.swift b/GUI/Dialogs/Media/FloppyCreator.swift
@@ -41,9 +41,9 @@ class FloppyCreator: DialogController {
         super.showAsSheet()
     }
 
-    override public func awakeFromNib() {
+    override func dialogWillShow() {
 
-        super.awakeFromNib()
+        super.dialogWillShow()
 
         let type = emu.get(.DRIVE_TYPE, drive: nr)
         switch FloppyDriveType(rawValue: type) {

diff --git a/GUI/Dialogs/Media/HardDiskConfigurator.swift b/GUI/Dialogs/Media/HardDiskConfigurator.swift
@@ -95,9 +95,9 @@ class HardDiskConfigurator: DialogController {
         super.showAsSheet()
     }
 
-    override public func awakeFromNib() {
+    override func dialogWillShow() {
 
-        super.awakeFromNib()
+        super.dialogWillShow()
 
         cylinderStepper.maxValue = .greatestFiniteMagnitude
         headStepper.maxValue = .greatestFiniteMagnitude

diff --git a/GUI/Dialogs/Media/HardDiskCreator.swift b/GUI/Dialogs/Media/HardDiskCreator.swift
@@ -77,9 +77,9 @@ class HardDiskCreator: DialogController {
         super.showAsSheet()
     }
 
-    override public func awakeFromNib() {
+    override func dialogWillShow() {
 
-        super.awakeFromNib()
+        super.dialogWillShow()
 
         // Configure elements
         cylinderStepper.maxValue = .greatestFiniteMagnitude

diff --git a/GUI/Dialogs/Media/PartitionSelector.swift b/GUI/Dialogs/Media/PartitionSelector.swift
@@ -30,9 +30,9 @@ class PartitionSelector: DialogController {
         super.showAsSheet(completionHandler: completionHandler)
     }
 
-    override public func awakeFromNib() {
+    override func dialogWillShow() {
 
-        super.awakeFromNib()
+        super.dialogWillShow()
 
         partitionPopup.removeAllItems()
 

diff --git a/GUI/Dialogs/Preferences/PreferencesController.swift b/GUI/Dialogs/Preferences/PreferencesController.swift
@@ -131,9 +131,9 @@ class PreferencesController: DialogController {
         showAsSheet()
     }
 
-    override func awakeFromNib() {
+    override func dialogWillShow() {
 
-        super.awakeFromNib()
+        super.dialogWillShow()
 
         if let id = firstTab { tabView?.selectTabViewItem(withIdentifier: id) }
         refresh()