Skip to content

Commit

Permalink
Remove MainWindowController nib (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
LarsJK authored and sindresorhus committed Mar 19, 2018
1 parent b1b34e0 commit 1ae9316
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 49 deletions.
4 changes: 0 additions & 4 deletions Gifski.xcodeproj/project.pbxproj
Expand Up @@ -10,7 +10,6 @@
5A1FDC6F203F0B050065E0F5 /* libgifski.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3FD619F201BD29E0087160A /* libgifski.a */; };
C2040B8920435871004EE259 /* GifskiWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2040B8820435871004EE259 /* GifskiWrapper.swift */; };
C2AFA91D204FFEFD00FC5A7F /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2AFA91B204FFEFD00FC5A7F /* MainWindowController.swift */; };
C2AFA91E204FFEFD00FC5A7F /* MainWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C2AFA91C204FFEFD00FC5A7F /* MainWindowController.xib */; };
E317FF132057E24700A80A18 /* CircularProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = E317FF122057E24700A80A18 /* CircularProgress.swift */; };
E317FF1C20583E9800A80A18 /* DockProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = E317FF1B20583E9800A80A18 /* DockProgress.swift */; };
E339F011203820ED003B78FB /* Gifski.swift in Sources */ = {isa = PBXBuildFile; fileRef = E339F010203820ED003B78FB /* Gifski.swift */; };
Expand Down Expand Up @@ -65,7 +64,6 @@
/* Begin PBXFileReference section */
C2040B8820435871004EE259 /* GifskiWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = GifskiWrapper.swift; sourceTree = "<group>"; usesTabs = 1; };
C2AFA91B204FFEFD00FC5A7F /* MainWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = MainWindowController.swift; sourceTree = "<group>"; usesTabs = 1; };
C2AFA91C204FFEFD00FC5A7F /* MainWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindowController.xib; sourceTree = "<group>"; };
E317FF122057E24700A80A18 /* CircularProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgress.swift; sourceTree = "<group>"; };
E317FF1B20583E9800A80A18 /* DockProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DockProgress.swift; sourceTree = "<group>"; };
E339F010203820ED003B78FB /* Gifski.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Gifski.swift; sourceTree = "<group>"; usesTabs = 1; };
Expand Down Expand Up @@ -141,7 +139,6 @@
children = (
E3AE62861E5CD2F300035A2F /* AppDelegate.swift */,
C2AFA91B204FFEFD00FC5A7F /* MainWindowController.swift */,
C2AFA91C204FFEFD00FC5A7F /* MainWindowController.xib */,
E3DF3E86203BD2B900055855 /* SavePanelAccessoryViewController.swift */,
E3DF3E87203BD2B900055855 /* SavePanelAccessoryViewController.xib */,
E3CB1DD61F7E4CBC00D79BFC /* VideoDropView.swift */,
Expand Down Expand Up @@ -271,7 +268,6 @@
E3AE628C1E5CD2F300035A2F /* MainMenu.xib in Resources */,
E3DF3E89203BD2B900055855 /* SavePanelAccessoryViewController.xib in Resources */,
E3C3DB4F203F154300CB8BB9 /* Credits.rtf in Resources */,
C2AFA91E204FFEFD00FC5A7F /* MainWindowController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion Gifski/AppDelegate.swift
Expand Up @@ -6,7 +6,7 @@ extension NSColor {

@NSApplicationMain
final class AppDelegate: NSObject, NSApplicationDelegate {
let mainWindowController = MainWindowController()
lazy var mainWindowController = MainWindowController()
var hasFinishedLaunching = false
var urlsToConvertOnLaunch: URL!

Expand Down
33 changes: 18 additions & 15 deletions Gifski/MainWindowController.swift
@@ -1,9 +1,5 @@
import Cocoa

extension NSNib.Name {
static let mainWindowController = NSNib.Name("MainWindowController")
}

class MainWindowController: NSWindowController {
private var progressObserver: NSKeyValueObservation?

Expand Down Expand Up @@ -37,35 +33,42 @@ class MainWindowController: NSWindowController {
}
}

override func windowDidLoad() {
with(window!) {
convenience init() {
let rect = CGRect(
origin: NSScreen.main?.frame.center ?? .zero,
width: 360,
height: 240
)
let window = NSWindow(
contentRect: rect,
styleMask: [.titled, .closable, .miniaturizable, .fullSizeContentView],
backing: .buffered,
defer: false
)

self.init(window: window)

with(window) {
$0.delegate = self
$0.appearance = .app
$0.titleVisibility = .hidden
$0.tabbingMode = .disallowed
$0.titlebarAppearsTransparent = true
$0.isMovableByWindowBackground = true
$0.styleMask.remove([.resizable, .fullScreen])
$0.styleMask.insert(.fullSizeContentView)
$0.isRestorable = false
$0.setFrame(CGRect(width: 360, height: 240), display: true)
$0.center()
}

let view = window!.contentView!
let view = window.contentView!
view.addSubview(circularProgress)
view.addSubview(videoDropView, positioned: .above, relativeTo: nil)

window!.makeKeyAndOrderFront(nil)
window.makeKeyAndOrderFront(nil)
NSApp.activate(ignoringOtherApps: true)

DockProgress.style = .circle(radius: 55, color: .appTheme)
}

override var windowNibName: NSNib.Name? {
return .mainWindowController
}

func convert(_ inputUrl: URL) {
// We already specify the UTIs we support, so this can only happen on invalid but supported files
guard inputUrl.isVideoDecodable else {
Expand Down
29 changes: 0 additions & 29 deletions Gifski/MainWindowController.xib

This file was deleted.

0 comments on commit 1ae9316

Please sign in to comment.