From 1ec63d8aee972dc7dc300bf5a19d59410afbb499 Mon Sep 17 00:00:00 2001 From: macmade Date: Fri, 20 Nov 2020 06:31:45 +0100 Subject: [PATCH] About winndow... --- Notarize/Classes/AboutWindowController.swift | 28 +++-- Notarize/Info.plist | 2 +- .../Notarize.AboutWindowController.xib | 113 +++++++++--------- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/Notarize/Classes/AboutWindowController.swift b/Notarize/Classes/AboutWindowController.swift index ee69fc4..e086a0b 100644 --- a/Notarize/Classes/AboutWindowController.swift +++ b/Notarize/Classes/AboutWindowController.swift @@ -1,7 +1,7 @@ /******************************************************************************* * The MIT License (MIT) * - * Copyright (c) 2018 Jean-David Gadina - www.xs-labs.com + * Copyright (c) 2020 Jean-David Gadina - www.xs-labs.com * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,31 +24,33 @@ import Cocoa -@objc class AboutWindowController: NSWindowController +public class AboutWindowController: NSWindowController { @objc private dynamic var name: String? @objc private dynamic var version: String? @objc private dynamic var copyright: String? - override var windowNibName: NSNib.Name? + public override var windowNibName: NSNib.Name? { - return NSNib.Name( NSStringFromClass( type( of: self ) ) ) + return NSStringFromClass( type( of: self ) ) } - override func windowDidLoad() + override public func windowDidLoad() { super.windowDidLoad() - self.window?.titlebarAppearsTransparent = true - self.window?.titleVisibility = .hidden + let version = Bundle.main.object( forInfoDictionaryKey: "CFBundleShortVersionString" ) as? String ?? "0.0.0" - self.name = Bundle.main.object( forInfoDictionaryKey: "CFBundleName" ) as? String - self.version = Bundle.main.object( forInfoDictionaryKey: "CFBundleShortVersionString" ) as? String - self.copyright = Bundle.main.object( forInfoDictionaryKey: "NSHumanReadableCopyright" ) as? String - - if let rev = Bundle.main.object( forInfoDictionaryKey: "CFBundleVersion" ) as? String + if let build = Bundle.main.object( forInfoDictionaryKey: "CFBundleVersion" ) as? String { - self.version?.append( " (" + rev + ")" ) + self.version = "\(version) (\(build))" } + else + { + self.version = version + } + + self.name = Bundle.main.object( forInfoDictionaryKey: "CFBundleName" ) as? String + self.copyright = Bundle.main.object( forInfoDictionaryKey: "NSHumanReadableCopyright" ) as? String } } diff --git a/Notarize/Info.plist b/Notarize/Info.plist index 6eec830..535134e 100644 --- a/Notarize/Info.plist +++ b/Notarize/Info.plist @@ -25,7 +25,7 @@ LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright - Copyright © 2018 XS-Labs. All rights reserved. + Copyright © 2020 XS-Labs. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/Notarize/UI/Base.lproj/Notarize.AboutWindowController.xib b/Notarize/UI/Base.lproj/Notarize.AboutWindowController.xib index a350987..e673dc7 100644 --- a/Notarize/UI/Base.lproj/Notarize.AboutWindowController.xib +++ b/Notarize/UI/Base.lproj/Notarize.AboutWindowController.xib @@ -1,95 +1,96 @@ + - + - + - + - + - + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - +