import Cocoa
-
-fileprivate extension Selector {
-
- static let reloadContent = #selector(BroserWindowController.reloadContent(_:))
- static let deleteCacheAndReload = #selector(BroserWindowController.deleteCacheAndReload(_:))
- static let clearQuestList = #selector(BroserWindowController.clearQuestList(_:))
- static let selectView = #selector(BroserWindowController.selectView(_:))
- static let changeMainTab = #selector(BroserWindowController.changeMainTab(_:))
- static let screenShot = #selector(BroserWindowController.screenShot(_:))
- static let toggleAnchorageSize = #selector(BroserWindowController.toggleAnchorageSize(_:))
- static let showHideCombinedView = #selector(BroserWindowController.showHideCombinedView(_:))
- static let fleetListAbove = #selector(BroserWindowController.fleetListAbove(_:))
- static let fleetListBelow = #selector(BroserWindowController.fleetListBelow(_:))
- static let fleetListDivide = #selector(BroserWindowController.fleetListDivide(_:))
- static let fleetListSimple = #selector(BroserWindowController.fleetListSimple(_:))
- static let reorderToDoubleLine = #selector(BroserWindowController.reorderToDoubleLine(_:))
- static let reorderToLeftToRight = #selector(BroserWindowController.reorderToLeftToRight(_:))
- static let selectNextFleet = #selector(BroserWindowController.selectNextFleet(_:))
- static let selectPreviousFleet = #selector(BroserWindowController.selectPreviousFleet(_:))
- static let changeSakutekiCalculator = #selector(BroserWindowController.changeSakutekiCalculator(_:))
-}
-
final class BroserWindowController: NSWindowController {
enum FleetViewPosition: Int {
case oldStyle = 0xffffffff
}
- class func keyPathsForValuesAffectingFlagShipName() -> Set<String> {
+ @objc override class func keyPathsForValuesAffectingValue(forKey key: String) -> Set<String> {
- return [#keyPath(flagShipID)]
+ switch key {
+
+ case #keyPath(flagShipName): return [#keyPath(flagShipID)]
+
+ default: return []
+ }
}
- let managedObjectContext = ServerDataStore.default.context
+ @objc let managedObjectContext = ServerDataStore.default.context
deinit {
@IBOutlet weak var placeholder: NSView!
@IBOutlet weak var combinedViewPlaceholder: NSView!
@IBOutlet weak var deckPlaceholder: NSView!
+ @IBOutlet weak var stokerContainer: NSView!
@IBOutlet weak var resourcePlaceholder: NSView!
@IBOutlet weak var ancherageRepariTimerPlaceholder: NSView!
@IBOutlet weak var informations: NSTabView!
@IBOutlet var deckContoller: NSArrayController!
- override var windowNibName: String! {
+ override var windowNibName: NSNib.Name {
- return "BroserWindowController"
+ return .nibName(instanceOf: self)
}
- var flagShipID: Int = 0
- var flagShipName: String? {
+ @objc var flagShipID: Int = 0
+ @objc var flagShipName: String? {
return ServerDataStore.default.ship(by: flagShipID)?.name
}
var changeMainTabHandler: ((Int) -> Void)?
- dynamic var selectedMainTabIndex: Int = 0 {
+ @objc dynamic var selectedMainTabIndex: Int = 0 {
didSet {
changeMainTabHandler?(selectedMainTabIndex)
}
}
- fileprivate var gameViewController: GameViewController!
- fileprivate var fleetViewController: FleetViewController!
- fileprivate var tabViewItemViewControllers: [MainTabVIewItemViewController] = []
- fileprivate var ancherageRepariTimerViewController: AncherageRepairTimerViewController!
+ private var gameViewController: GameViewController!
+ private var fleetViewController: FleetViewController!
+ private var tabViewItemViewControllers: [MainTabVIewItemViewController] = []
+ private var ancherageRepariTimerViewController: AncherageRepairTimerViewController!
private var resourceViewController: ResourceViewController!
private var docksViewController: DocksViewController!
private var shipViewController: ShipViewController!
private var repairListViewController: RepairListViewController!
private var combinedViewController: CombileViewController!
- fileprivate var fleetViewPosition: FleetViewPosition = .above
- fileprivate var isCombinedMode = false
+ private var fleetViewPosition: FleetViewPosition = .above
+ private var isCombinedMode = false
+ private var isExtShpMode = false
// MARK: - Function
override func windowDidLoad() {
ancherageRepariTimerViewController = AncherageRepairTimerViewController()
replace(ancherageRepariTimerPlaceholder, with: ancherageRepariTimerViewController)
- if UserDefaults.standard.screenshotButtonSize == .small { toggleAnchorageSize(nil) }
+ if UserDefaults.standard[.screenshotButtonSize] == .small { toggleAnchorageSize(nil) }
tabViewItemViewControllers = [
DocksViewController(),
]
tabViewItemViewControllers.enumerated().forEach {
- let _ = $0.element.view
+ _ = $0.element.view
let item = informations.tabViewItem(at: $0.offset)
item.viewController = $0.element
}
fleetViewController = FleetViewController(viewType: .detailViewType)
replace(deckPlaceholder, with: fleetViewController)
- setFleetView(position: UserDefaults.standard.fleetViewPosition, animate: false)
+ setFleetView(position: UserDefaults.standard[.fleetViewPosition], animate: false)
fleetViewController.enableAnimation = false
- fleetViewController.shipOrder = UserDefaults.standard.fleetViewShipOrder
+ fleetViewController.shipOrder = UserDefaults.standard[.fleetViewShipOrder]
fleetViewController.enableAnimation = true
+ fleetViewController.delegate = self
- bind(#keyPath(flagShipID), to: deckContoller, withKeyPath: "selection.ship_0", options: nil)
+ bind(NSBindingName(rawValue: #keyPath(flagShipID)), to: deckContoller, withKeyPath: "selection.ship_0", options: nil)
NotificationCenter.default
.addObserver(forName: .CombinedDidCange, object: nil, queue: nil) {
- guard UserDefaults.standard.autoCombinedView,
- let type = $0.userInfo?[CombinedCommand.userInfoKey] as? CombineType
- else { return }
+ guard UserDefaults.standard[.autoCombinedView] else { return }
+ guard let type = $0.userInfo?[CombinedCommand.userInfoKey] as? CombineType else { return }
if !Thread.isMainThread { Thread.sleep(forTimeInterval: 0.1) }
}
}
- if UserDefaults.standard.lastHasCombinedView { showCombinedView() }
+ if UserDefaults.standard[.lastHasCombinedView] { showCombinedView() }
}
override func swipe(with event: NSEvent) {
- guard UserDefaults.standard.useSwipeChangeCombinedView else { return }
+ guard UserDefaults.standard[.useSwipeChangeCombinedView] else { return }
if event.deltaX > 0 {
showCombinedView()
-
}
if event.deltaX < 0 {
hideCombinedView()
-
}
}
- func windowWillClose(_ notification: Notification) {
+ @objc func windowWillClose(_ notification: Notification) {
- UserDefaults.standard.lastHasCombinedView = isCombinedMode
+ UserDefaults.standard[.lastHasCombinedView] = isCombinedMode
}
- fileprivate func replace(_ view: NSView, with viewController: NSViewController) {
+ private func replace(_ view: NSView, with viewController: NSViewController) {
viewController.view.frame = view.frame
viewController.view.autoresizingMask = view.autoresizingMask
- self.window?.contentView?.replaceSubview(view, with: viewController.view)
+ view.superview?.replaceSubview(view, with: viewController.view)
}
- fileprivate func showCombinedView() {
+ private func showCombinedView() {
if isCombinedMode { return }
window?.setFrame(winFrame, display: true, animate: true)
}
- fileprivate func hideCombinedView() {
+ private func hideCombinedView() {
if !isCombinedMode { return }
@IBAction func clearQuestList(_ sender: AnyObject?) {
let store = ServerDataStore.oneTimeEditor()
- store.quests().forEach { store.delete($0) }
+ store.quests().forEach(store.delete)
}
@IBAction func selectView(_ sender: AnyObject?) {
let current = ancherageRepariTimerViewController.controlSize
var diff = AncherageRepairTimerViewController.regularHeight - AncherageRepairTimerViewController.smallHeight
- let newSize: NSControlSize = {
+ let newSize: NSControl.ControlSize = {
if current == .regular {
frame.origin.y += diff
informations.frame = frame
- UserDefaults.standard.screenshotButtonSize = newSize
+ UserDefaults.standard[.screenshotButtonSize] = newSize
}
@IBAction func showHideCombinedView(_ sender: AnyObject?) {
@IBAction func reorderToDoubleLine(_ sender: AnyObject?) {
fleetViewController.shipOrder = .doubleLine
- UserDefaults.standard.fleetViewShipOrder = .doubleLine
+ UserDefaults.standard[.fleetViewShipOrder] = .doubleLine
}
@IBAction func reorderToLeftToRight(_ sender: AnyObject?) {
fleetViewController.shipOrder = .leftToRight
- UserDefaults.standard.fleetViewShipOrder = .leftToRight
+ UserDefaults.standard[.fleetViewShipOrder] = .leftToRight
}
@IBAction func selectNextFleet(_ sender: AnyObject?) {
guard let action: Selector = menuItem.action else { return false }
switch action {
- case Selector.reloadContent, Selector.screenShot, Selector.deleteCacheAndReload:
+
+ case #selector(BroserWindowController.reloadContent(_:)),
+ #selector(BroserWindowController.screenShot(_:)),
+ #selector(BroserWindowController.deleteCacheAndReload(_:)):
+
return gameViewController.validateMenuItem(menuItem)
- case Selector.selectView, Selector.selectNextFleet, Selector.selectPreviousFleet:
+ case #selector(BroserWindowController.selectView(_:)),
+ #selector(BroserWindowController.selectNextFleet(_:)),
+ #selector(BroserWindowController.selectPreviousFleet(_:)):
+
return true
- case Selector.fleetListAbove:
- menuItem.state = fleetViewPosition == .above ? NSOnState : NSOffState
+ case #selector(BroserWindowController.fleetListAbove(_:)):
+ menuItem.state = (fleetViewPosition == .above ? .on : .off)
return true
- case Selector.fleetListBelow:
- menuItem.state = fleetViewPosition == .below ? NSOnState : NSOffState
+ case #selector(BroserWindowController.fleetListBelow(_:)):
+ menuItem.state = (fleetViewPosition == .below ? .on : .off)
return true
- case Selector.fleetListDivide:
- menuItem.state = fleetViewPosition == .divided ? NSOnState : NSOffState
+ case #selector(BroserWindowController.fleetListDivide(_:)):
+ menuItem.state = (fleetViewPosition == .divided ? .on : .off)
return true
- case Selector.fleetListSimple:
- menuItem.state = fleetViewPosition == .oldStyle ? NSOnState : NSOffState
+ case #selector(BroserWindowController.fleetListSimple(_:)):
+ menuItem.state = (fleetViewPosition == .oldStyle ? .on : .off)
return true
- case Selector.reorderToDoubleLine:
- menuItem.state = fleetViewController.shipOrder == .doubleLine ? NSOnState : NSOffState
+ case #selector(BroserWindowController.reorderToDoubleLine(_:)):
+ menuItem.state = (fleetViewController.shipOrder == .doubleLine ? .on : .off)
return true
- case Selector.reorderToLeftToRight:
- menuItem.state = fleetViewController.shipOrder == .leftToRight ? NSOnState: NSOffState
+ case #selector(BroserWindowController.reorderToLeftToRight(_:)):
+ menuItem.state = (fleetViewController.shipOrder == .leftToRight ? .on: .off)
return true
- case Selector.clearQuestList:
+ case #selector(BroserWindowController.clearQuestList(_:)):
return true
- case Selector.showHideCombinedView:
+ case #selector(BroserWindowController.showHideCombinedView(_:)):
if isCombinedMode {
- menuItem.title = NSLocalizedString("Hide Combined View", comment: "View menu, hide combined view")
+ menuItem.title = LocalizedStrings.hideCombinedView.string
} else {
- menuItem.title = NSLocalizedString("Show Combined View", comment: "View menu, show combined view")
+ menuItem.title = LocalizedStrings.showCombinedView.string
}
if fleetViewPosition == .oldStyle { return false }
return true
- case Selector.toggleAnchorageSize:
+ case #selector(BroserWindowController.toggleAnchorageSize(_:)):
return true
- case Selector.changeSakutekiCalculator:
+ case #selector(BroserWindowController.changeSakutekiCalculator(_:)):
return fleetViewController.validateMenuItem(menuItem)
default:
let type: FleetViewType = (newPosition == .oldStyle) ? .minimumViewType : .detailViewType
- guard let newController = FleetViewController(viewType: type)
- else { return }
+ guard let newController = FleetViewController(viewType: type) else { return }
newController.enableAnimation = true
newController.shipOrder = fleetViewController.shipOrder
replace(fleetViewController.view, with: newController)
fleetViewController = newController
+ fleetViewController.delegate = self
}
private func windowHeightForFleetViewPosition(position newPosition: FleetViewPosition) -> CGFloat {
- guard var contentHeight = window!.contentView?.frame.size.height
- else { return 0.0 }
+ guard var contentHeight = window!.contentView?.frame.size.height else { return 0.0 }
if fleetViewPosition == newPosition { return contentHeight }
if fleetViewPosition == .oldStyle {
return fleetListRect
}
- fileprivate func setFleetView(position newPosition: FleetViewPosition, animate: Bool) {
+ private func setFleetView(position newPosition: FleetViewPosition, animate: Bool) {
guard let window = window else { return }
let fleetListRect = fleetViewFrameForFleetViewPosition(position: newPosition)
fleetViewPosition = newPosition
- UserDefaults.standard.fleetViewPosition = newPosition
+ UserDefaults.standard[.fleetViewPosition] = newPosition
if animate {
- let winAnime: [String: Any] = [ NSViewAnimationTargetKey: window,
- NSViewAnimationEndFrameKey: NSValue(rect: winFrame) ]
- let flashAnime: [String: Any] = [ NSViewAnimationTargetKey: gameViewController.view,
- NSViewAnimationEndFrameKey: NSValue(rect: flashRect) ]
- let fleetAnime: [String: Any] = [ NSViewAnimationTargetKey: fleetViewController.view,
- NSViewAnimationEndFrameKey: NSValue(rect: fleetListRect) ]
+ let winAnime: [NSViewAnimation.Key: Any] = [.target: window,
+ .endFrame: NSValue(rect: winFrame) ]
+ let flashAnime: [NSViewAnimation.Key: Any] = [.target: gameViewController.view,
+ .endFrame: NSValue(rect: flashRect) ]
+ let fleetAnime: [NSViewAnimation.Key: Any] = [.target: fleetViewController.view,
+ .endFrame: NSValue(rect: fleetListRect) ]
let anime = NSViewAnimation(viewAnimations: [winAnime, flashAnime, fleetAnime])
}
+extension BroserWindowController: FleetViewControllerDelegate {
+
+ func changeShowsExtShip(_ fleetViewController: FleetViewController, showsExtShip: Bool) {
+
+ guard self.fleetViewController == fleetViewController else { return }
+
+ if isExtShpMode && !showsExtShip {
+
+ // hide
+ let diffHeight = fleetViewController.shipViewSize.height
+
+ var iFrame = informations.frame
+ iFrame.origin.y -= diffHeight
+ iFrame.size.height += diffHeight
+ informations.animator().frame = iFrame
+
+ var sFrame = stokerContainer.frame
+ sFrame.origin.y -= diffHeight
+ stokerContainer.animator().frame = sFrame
+
+ isExtShpMode = false
+
+ } else if !isExtShpMode && showsExtShip {
+
+ //show
+ let diffHeight = fleetViewController.shipViewSize.height
+
+ var iFrame = informations.frame
+ iFrame.origin.y += diffHeight
+ iFrame.size.height -= diffHeight
+ informations.animator().frame = iFrame
+
+ var sFrame = stokerContainer.frame
+ sFrame.origin.y += diffHeight
+ stokerContainer.animator().frame = sFrame
+
+ isExtShpMode = true
+ }
+ }
+}
+
@available(OSX 10.12.2, *)
-fileprivate var mainTouchBars: [Int: NSTouchBar] = [:]
+private var mainTouchBars: [Int: NSTouchBar] = [:]
@available(OSX 10.12.2, *)
-fileprivate var shipTypeButtons: [Int: NSPopoverTouchBarItem] = [:]
+private var shipTypeButtons: [Int: NSPopoverTouchBarItem] = [:]
@available(OSX 10.12.2, *)
-fileprivate var shipTypeSegments: [Int: NSSegmentedControl] = [:]
+private var shipTypeSegments: [Int: NSSegmentedControl] = [:]
@available(OSX 10.12.2, *)
extension BroserWindowController {
if let mainTouchBar = mainTouchBar { return mainTouchBar }
- var array: NSArray = []
- Bundle.main.loadNibNamed("BroswerTouchBar", owner: self, topLevelObjects: &array)
+ Bundle.main.loadNibNamed(NSNib.Name("BroswerTouchBar"), owner: self, topLevelObjects: nil)
- shipTypeSegment.bind(NSSelectedIndexBinding,
+ shipTypeSegment.bind(.selectedIndex,
to: tabViewItemViewControllers[0],
withKeyPath: #keyPath(MainTabVIewItemViewController.selectedShipType),
options: nil)
guard let `self` = self else { return }
self.shipTypeButton.dismissPopover(nil)
- self.shipTypeSegment.unbind(NSSelectedIndexBinding)
+ self.shipTypeSegment.unbind(.selectedIndex)
- guard let button = self.shipTypeButton.view as? NSButton
- else { return }
+ guard let button = self.shipTypeButton.view as? NSButton else { return }
let vc = self.tabViewItemViewControllers[$0]
button.isHidden = !vc.hasShipTypeSelector
- self.shipTypeSegment.bind(NSSelectedIndexBinding,
+ self.shipTypeSegment.bind(.selectedIndex,
to: vc,
withKeyPath: #keyPath(MainTabVIewItemViewController.selectedShipType),
options: nil)