mirror of
https://github.com/morgan9e/macos-stats
synced 2026-04-14 00:04:15 +09:00
moved to modules; removed global store; preferences and modules savings;
This commit is contained in:
Serhiy Mytrovtsiy
@@ -7,84 +7,30 @@
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
import ServiceManagement
|
||||
import os.log
|
||||
|
||||
extension Notification.Name {
|
||||
static let killLauncher = Notification.Name("killLauncher")
|
||||
}
|
||||
let modules: Observable<[Module]> = Observable([CPU(), Memory(), Disk()])
|
||||
let colors: Observable<Bool> = Observable(true)
|
||||
|
||||
@NSApplicationMain
|
||||
class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
var statusItem = NSStatusBar.system.statusItem(withLength: CGFloat(84))
|
||||
let statusBarView: StatusBarView = StatusBarView.createFromNib()!
|
||||
let defaults = UserDefaults.standard
|
||||
let launcherAppId = "eu.exelban.StatsLauncher"
|
||||
|
||||
var menuBarItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
|
||||
|
||||
func applicationDidFinishLaunching(_ aNotification: Notification) {
|
||||
if NSRunningApplication.runningApplications(withBundleIdentifier: "eu.exelban.StatsLauncher").isEmpty {
|
||||
DistributedNotificationCenter.default().post(name: .killLauncher, object: Bundle.main.bundleIdentifier!)
|
||||
}
|
||||
if defaults.object(forKey: "startOnLogin") != nil {
|
||||
SMLoginItemSetEnabled(launcherAppId as CFString, defaults.bool(forKey: "startOnLogin"))
|
||||
} else {
|
||||
SMLoginItemSetEnabled(launcherAppId as CFString, true)
|
||||
guard let menuBarButton = self.menuBarItem.button else {
|
||||
NSApp.terminate(nil)
|
||||
return
|
||||
}
|
||||
|
||||
self.statusItem.length = CGFloat(28 * store.activeWidgets.value)
|
||||
|
||||
let _ = CpuUsage()
|
||||
let _ = MemoryUsage()
|
||||
let _ = DiskUsage()
|
||||
|
||||
if let button = statusItem.button {
|
||||
button.addSubview(statusBarView)
|
||||
}
|
||||
statusItem.menu = statusBarView.buildMenu()
|
||||
|
||||
store.activeWidgets.subscribe(observer: self) { (newValue, oldValue) in
|
||||
self.statusItem.length = CGFloat(28 * newValue)
|
||||
|
||||
if let button = self.statusItem.button {
|
||||
if newValue == 0 {
|
||||
self.statusItem.length = NSStatusItem.squareLength
|
||||
for view in button.subviews {
|
||||
view.removeFromSuperview()
|
||||
}
|
||||
button.image = NSImage(named:NSImage.Name("tray_icon"))
|
||||
} else {
|
||||
button.image = nil
|
||||
button.addSubview(self.statusBarView)
|
||||
}
|
||||
}
|
||||
}
|
||||
colors << (defaults.object(forKey: "colors") != nil ? defaults.bool(forKey: "colors") : false)
|
||||
_ = MenuBar(menuBarItem, menuBarButton: menuBarButton)
|
||||
}
|
||||
|
||||
func applicationWillTerminate(_ aNotification: Notification) {
|
||||
}
|
||||
|
||||
@objc func toggleStatus(_ sender : NSMenuItem) {
|
||||
let status = sender.state != NSControl.StateValue.on
|
||||
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
|
||||
switch sender.title {
|
||||
case "CPU":
|
||||
store.cpuStatus << status
|
||||
case "Memory":
|
||||
store.memoryStatus << status
|
||||
case "Disk":
|
||||
store.diskStatus << status
|
||||
case "Colors":
|
||||
store.colors << status
|
||||
return
|
||||
default: break
|
||||
if modules.value.count != 0 {
|
||||
for module in modules.value{
|
||||
module.stop()
|
||||
}
|
||||
}
|
||||
|
||||
store.activeWidgets << (status ? store.activeWidgets.value+1 : store.activeWidgets.value-1)
|
||||
}
|
||||
|
||||
@objc func toggleStartOnLogin(_ sender : NSMenuItem) {
|
||||
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
SMLoginItemSetEnabled(launcherAppId as CFString, sender.state == NSControl.StateValue.on)
|
||||
}
|
||||
}
|
||||
|
||||
124
Stats/MenuBar.swift
Normal file
124
Stats/MenuBar.swift
Normal file
@@ -0,0 +1,124 @@
|
||||
//
|
||||
// MenuBar.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 31.05.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
import ServiceManagement
|
||||
|
||||
let MODULE_HEIGHT = CGFloat(NSApplication.shared.mainMenu?.menuBarHeight ?? 22)
|
||||
let MODULE_WIDTH = CGFloat(28)
|
||||
|
||||
class MenuBar {
|
||||
let defaults = UserDefaults.standard
|
||||
let menuBarItem: NSStatusItem
|
||||
lazy var menuBarButton: NSButton = NSButton()
|
||||
|
||||
init(_ menuBarItem: NSStatusItem, menuBarButton: NSButton) {
|
||||
self.menuBarItem = menuBarItem
|
||||
self.menuBarButton = menuBarButton
|
||||
|
||||
generateMenuBar()
|
||||
modules.subscribe(observer: self) { (_, _) in
|
||||
self.generateMenuBar()
|
||||
}
|
||||
}
|
||||
|
||||
func generateMenuBar() {
|
||||
buildModulesView()
|
||||
menuBarItem.menu = buildMenu()
|
||||
|
||||
for module in modules.value {
|
||||
module.active.subscribe(observer: self) { (value, _) in
|
||||
self.buildModulesView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func buildMenu() -> NSMenu {
|
||||
let menu = NSMenu()
|
||||
|
||||
for module in modules.value {
|
||||
menu.addItem(module.menu())
|
||||
}
|
||||
|
||||
menu.addItem(NSMenuItem.separator())
|
||||
|
||||
let preferences = NSMenuItem(title: "Preferences", action: nil, keyEquivalent: "")
|
||||
let preferencesMenu = NSMenu()
|
||||
|
||||
let colorStatus = NSMenuItem(title: "Colors", action: #selector(toggleMenu), keyEquivalent: "")
|
||||
colorStatus.state = defaults.object(forKey: "colors") != nil && !defaults.bool(forKey: "colors") ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
colorStatus.target = self
|
||||
preferencesMenu.addItem(colorStatus)
|
||||
|
||||
let runAtLogin = NSMenuItem(title: "Run at login", action: #selector(toggleMenu), keyEquivalent: "")
|
||||
runAtLogin.state = defaults.object(forKey: "runAtLogin") != nil && !defaults.bool(forKey: "runAtLogin") ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
runAtLogin.target = self
|
||||
preferencesMenu.addItem(runAtLogin)
|
||||
|
||||
preferences.submenu = preferencesMenu
|
||||
menu.addItem(preferences)
|
||||
|
||||
menu.addItem(NSMenuItem.separator())
|
||||
menu.addItem(NSMenuItem(title: "Quit Stats", action: #selector(NSApplication.terminate(_:)), keyEquivalent: ""))
|
||||
|
||||
return menu
|
||||
}
|
||||
|
||||
@objc func toggleMenu(_ sender : NSMenuItem) {
|
||||
let launcherId = "eu.exelban.StatsLauncher"
|
||||
let status = sender.state != NSControl.StateValue.on
|
||||
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
|
||||
switch sender.title {
|
||||
case "Run at login":
|
||||
SMLoginItemSetEnabled(launcherId as CFString, !status)
|
||||
self.defaults.set(status, forKey: "runAtLogin")
|
||||
case "Colors":
|
||||
self.defaults.set(status, forKey: "colors")
|
||||
colors << status
|
||||
return
|
||||
default: break
|
||||
}
|
||||
}
|
||||
|
||||
func buildModulesView() {
|
||||
for subview in self.menuBarButton.subviews {
|
||||
subview.removeFromSuperview()
|
||||
}
|
||||
|
||||
self.menuBarButton.image = NSImage(named:NSImage.Name("tray_icon"))
|
||||
var WIDTH = CGFloat(modules.value.count * 28)
|
||||
|
||||
let view: NSView = NSView(frame: NSMakeRect(0, 0, WIDTH, MODULE_HEIGHT))
|
||||
|
||||
let stack: NSStackView = NSStackView(frame: NSMakeRect(0, 0, WIDTH, MODULE_HEIGHT))
|
||||
stack.orientation = NSUserInterfaceLayoutOrientation.horizontal
|
||||
stack.distribution = NSStackView.Distribution.fillEqually
|
||||
stack.spacing = 0
|
||||
|
||||
WIDTH = 0
|
||||
for module in modules.value {
|
||||
if module.active.value {
|
||||
module.start()
|
||||
WIDTH = WIDTH + module.view.frame.size.width
|
||||
stack.addView(module.view, in: NSStackView.Gravity.center)
|
||||
}
|
||||
}
|
||||
|
||||
if stack.subviews.count != 0 {
|
||||
view.frame.size.width = WIDTH
|
||||
stack.frame.size.width = WIDTH
|
||||
self.menuBarItem.length = WIDTH
|
||||
|
||||
view.addSubview(stack)
|
||||
|
||||
self.menuBarButton.image = nil
|
||||
self.menuBarButton.addSubview(view)
|
||||
}
|
||||
}
|
||||
}
|
||||
72
Stats/Modules/CPU/CPU.swift
Normal file
72
Stats/Modules/CPU/CPU.swift
Normal file
@@ -0,0 +1,72 @@
|
||||
//
|
||||
// CPU.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
|
||||
class CPU: Module {
|
||||
let name: String = "CPU"
|
||||
var view: NSView = NSView()
|
||||
let defaults = UserDefaults.standard
|
||||
|
||||
var active: Observable<Bool>
|
||||
var reader: Reader = CPUReader()
|
||||
|
||||
@IBOutlet weak var value: NSTextField!
|
||||
|
||||
init() {
|
||||
self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
|
||||
self.view = loadViewFromNib()
|
||||
|
||||
// self.view.frame = CGRect(x: 20, y: 0, width: self.view.frame.size.width, height: self.view.frame.size.height )
|
||||
}
|
||||
|
||||
func start() {
|
||||
if !self.reader.usage.value.isNaN {
|
||||
self.value.stringValue = "\(Int(Float(self.reader.usage.value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.value.textColor = self.reader.usage.value.usageColor()
|
||||
}
|
||||
|
||||
self.reader.start()
|
||||
self.reader.usage.subscribe(observer: self) { (value, _) in
|
||||
if !value.isNaN {
|
||||
self.value.stringValue = "\(Int(Float(value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.value.textColor = value.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
colors.subscribe(observer: self) { (value, _) in
|
||||
self.value.textColor = self.reader.usage.value.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
func menu() -> NSMenuItem {
|
||||
let menu = NSMenuItem(title: name, action: #selector(toggle), keyEquivalent: "")
|
||||
if defaults.object(forKey: name) != nil {
|
||||
menu.state = defaults.bool(forKey: name) ? NSControl.StateValue.on : NSControl.StateValue.off
|
||||
} else {
|
||||
menu.state = NSControl.StateValue.on
|
||||
}
|
||||
menu.target = self
|
||||
menu.isEnabled = true
|
||||
return menu
|
||||
}
|
||||
|
||||
@objc func toggle(_ sender: NSMenuItem) {
|
||||
let state = sender.state != NSControl.StateValue.on
|
||||
|
||||
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
self.defaults.set(state, forKey: name)
|
||||
self.active << state
|
||||
|
||||
if !state {
|
||||
self.stop()
|
||||
} else {
|
||||
self.start()
|
||||
}
|
||||
}
|
||||
}
|
||||
57
Stats/Modules/CPU/CPU.xib
Normal file
57
Stats/Modules/CPU/CPU.xib
Normal file
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner">
|
||||
<connections>
|
||||
<outlet property="value" destination="TXn-kg-jq1" id="e0R-gJ-2zT"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<customView identifier="CPU" id="c22-O7-iKe">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="fuk-Yl-Mga">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LO0-sZ-E6r">
|
||||
<rect key="frame" x="-2" y="11" width="24" height="9"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="CPU" id="TrQ-4e-Tib">
|
||||
<font key="font" metaFont="systemLight" size="7"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TXn-kg-jq1">
|
||||
<rect key="frame" x="-2" y="0.0" width="8" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="3Xv-9c-3y5">
|
||||
<font key="font" metaFont="system" size="10"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="LO0-sZ-E6r" firstAttribute="top" secondItem="fuk-Yl-Mga" secondAttribute="top" constant="2" id="0SG-E2-zVZ"/>
|
||||
<constraint firstItem="TXn-kg-jq1" firstAttribute="top" secondItem="fuk-Yl-Mga" secondAttribute="top" constant="9" id="1WZ-E9-iKh"/>
|
||||
<constraint firstAttribute="width" constant="28" id="TeP-YH-zJb"/>
|
||||
<constraint firstItem="LO0-sZ-E6r" firstAttribute="leading" secondItem="fuk-Yl-Mga" secondAttribute="leading" id="qf8-uc-Nqz"/>
|
||||
<constraint firstItem="TXn-kg-jq1" firstAttribute="leading" secondItem="fuk-Yl-Mga" secondAttribute="leading" id="uie-Bo-uLC"/>
|
||||
<constraint firstAttribute="height" constant="22" id="yuY-bI-RAD"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="fuk-Yl-Mga" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="IlM-4E-if4"/>
|
||||
<constraint firstItem="fuk-Yl-Mga" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="n6Y-Dl-WZW"/>
|
||||
</constraints>
|
||||
<point key="canvasLocation" x="-248" y="-5"/>
|
||||
</customView>
|
||||
</objects>
|
||||
</document>
|
||||
28
Stats/Readers/CpuUsage.swift → Stats/Modules/CPU/CPUReader.swift
Executable file → Normal file
28
Stats/Readers/CpuUsage.swift → Stats/Modules/CPU/CPUReader.swift
Executable file → Normal file
@@ -1,14 +1,15 @@
|
||||
//
|
||||
// CpuUsage.swift
|
||||
// Mini Stats
|
||||
// reader.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 29/05/2019.
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
class CpuUsage {
|
||||
class CPUReader: Reader {
|
||||
var usage: Observable<Float>!
|
||||
var cpuInfo: processor_info_array_t!
|
||||
var prevCpuInfo: processor_info_array_t?
|
||||
var numCpuInfo: mach_msg_type_number_t = 0
|
||||
@@ -19,6 +20,7 @@ class CpuUsage {
|
||||
|
||||
init() {
|
||||
let mibKeys: [Int32] = [ CTL_HW, HW_NCPU ]
|
||||
self.usage = Observable(0)
|
||||
mibKeys.withUnsafeBufferPointer() { mib in
|
||||
var sizeOfNumCPUs: size_t = MemoryLayout<uint>.size
|
||||
let status = sysctl(processor_info_array_t(mutating: mib.baseAddress), 2, &numCPUs, &sizeOfNumCPUs, nil, 0)
|
||||
@@ -26,10 +28,24 @@ class CpuUsage {
|
||||
numCPUs = 1
|
||||
}
|
||||
read()
|
||||
updateTimer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(read), userInfo: nil, repeats: true)
|
||||
}
|
||||
}
|
||||
|
||||
func start() {
|
||||
if updateTimer != nil {
|
||||
return
|
||||
}
|
||||
updateTimer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(read), userInfo: nil, repeats: true)
|
||||
}
|
||||
|
||||
func stop() {
|
||||
if updateTimer == nil {
|
||||
return
|
||||
}
|
||||
updateTimer.invalidate()
|
||||
updateTimer = nil
|
||||
}
|
||||
|
||||
@objc func read() {
|
||||
var numCPUsU: natural_t = 0
|
||||
let err: kern_return_t = host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &numCPUsU, &cpuInfo, &numCpuInfo);
|
||||
@@ -60,7 +76,7 @@ class CpuUsage {
|
||||
inUseOnAllCores = inUseOnAllCores + inUse
|
||||
totalOnAllCores = totalOnAllCores + total
|
||||
}
|
||||
store.cpuUsage << (Float(inUseOnAllCores) / Float(totalOnAllCores))
|
||||
self.usage << (Float(inUseOnAllCores) / Float(totalOnAllCores))
|
||||
|
||||
CPUUsageLock.unlock()
|
||||
|
||||
70
Stats/Modules/Disk/Disk.swift
Normal file
70
Stats/Modules/Disk/Disk.swift
Normal file
@@ -0,0 +1,70 @@
|
||||
//
|
||||
// Disk.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
|
||||
class Disk: Module {
|
||||
let name: String = "Disk"
|
||||
var view: NSView = NSView()
|
||||
let defaults = UserDefaults.standard
|
||||
|
||||
var active: Observable<Bool>
|
||||
var reader: Reader = DiskReader()
|
||||
|
||||
@IBOutlet weak var value: NSTextField!
|
||||
|
||||
init() {
|
||||
self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
|
||||
self.view = loadViewFromNib()
|
||||
}
|
||||
|
||||
func start() {
|
||||
if !self.reader.usage.value.isNaN {
|
||||
self.value.stringValue = "\(Int(Float(self.reader.usage.value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.value.textColor = self.reader.usage.value.usageColor()
|
||||
}
|
||||
|
||||
self.reader.start()
|
||||
self.reader.usage.subscribe(observer: self) { (value, _) in
|
||||
if !value.isNaN {
|
||||
self.value.stringValue = "\(Int(Float(value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.value.textColor = value.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
colors.subscribe(observer: self) { (value, _) in
|
||||
self.value.textColor = self.reader.usage.value.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
func menu() -> NSMenuItem {
|
||||
let menu = NSMenuItem(title: name, action: #selector(toggle), keyEquivalent: "")
|
||||
if defaults.object(forKey: name) != nil {
|
||||
menu.state = defaults.bool(forKey: name) ? NSControl.StateValue.on : NSControl.StateValue.off
|
||||
} else {
|
||||
menu.state = NSControl.StateValue.on
|
||||
}
|
||||
menu.target = self
|
||||
menu.isEnabled = true
|
||||
return menu
|
||||
}
|
||||
|
||||
@objc func toggle(_ sender: NSMenuItem) {
|
||||
let state = sender.state != NSControl.StateValue.on
|
||||
|
||||
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
self.defaults.set(state, forKey: name)
|
||||
self.active << state
|
||||
|
||||
if !state {
|
||||
self.stop()
|
||||
} else {
|
||||
self.start()
|
||||
}
|
||||
}
|
||||
}
|
||||
57
Stats/Modules/Disk/Disk.xib
Normal file
57
Stats/Modules/Disk/Disk.xib
Normal file
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner">
|
||||
<connections>
|
||||
<outlet property="value" destination="ynz-6E-8RQ" id="6K4-yo-kWJ"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<customView identifier="CPU" id="L5h-u0-PHQ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="vHb-ac-rqs">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kt4-RP-7O0">
|
||||
<rect key="frame" x="-2" y="11" width="23" height="9"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="SSD" id="qLa-gn-BoV">
|
||||
<font key="font" metaFont="systemLight" size="7"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ynz-6E-8RQ">
|
||||
<rect key="frame" x="-2" y="0.0" width="8" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="foy-v3-uvP">
|
||||
<font key="font" metaFont="system" size="10"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="28" id="8DC-Wm-Hq7"/>
|
||||
<constraint firstItem="ynz-6E-8RQ" firstAttribute="leading" secondItem="vHb-ac-rqs" secondAttribute="leading" id="MDR-Ch-YzB"/>
|
||||
<constraint firstItem="kt4-RP-7O0" firstAttribute="top" secondItem="vHb-ac-rqs" secondAttribute="top" constant="2" id="Nd4-YH-TQD"/>
|
||||
<constraint firstItem="ynz-6E-8RQ" firstAttribute="top" secondItem="vHb-ac-rqs" secondAttribute="top" constant="9" id="Zzv-LQ-LWx"/>
|
||||
<constraint firstAttribute="height" constant="22" id="sZU-qm-ImR"/>
|
||||
<constraint firstItem="kt4-RP-7O0" firstAttribute="leading" secondItem="vHb-ac-rqs" secondAttribute="leading" id="yoF-RQ-AIG"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="vHb-ac-rqs" firstAttribute="leading" secondItem="L5h-u0-PHQ" secondAttribute="leading" id="06R-ZA-Fy9"/>
|
||||
<constraint firstItem="vHb-ac-rqs" firstAttribute="top" secondItem="L5h-u0-PHQ" secondAttribute="top" id="Zt9-77-xk9"/>
|
||||
</constraints>
|
||||
<point key="canvasLocation" x="-106" y="7"/>
|
||||
</customView>
|
||||
</objects>
|
||||
</document>
|
||||
28
Stats/Readers/DiskUsage.swift → Stats/Modules/Disk/DiskReader.swift
Executable file → Normal file
28
Stats/Readers/DiskUsage.swift → Stats/Modules/Disk/DiskReader.swift
Executable file → Normal file
@@ -1,19 +1,35 @@
|
||||
//
|
||||
// DiskUsage.swift
|
||||
// Mini Stats
|
||||
// DiskReader.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 29/05/2019.
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
class DiskUsage {
|
||||
class DiskReader: Reader {
|
||||
var usage: Observable<Float>!
|
||||
var updateTimer: Timer!
|
||||
|
||||
init() {
|
||||
self.usage = Observable(0)
|
||||
read()
|
||||
updateTimer = Timer.scheduledTimer(timeInterval: 30, target: self, selector: #selector(read), userInfo: nil, repeats: true)
|
||||
}
|
||||
|
||||
func start() {
|
||||
if updateTimer != nil {
|
||||
return
|
||||
}
|
||||
updateTimer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(read), userInfo: nil, repeats: true)
|
||||
}
|
||||
|
||||
func stop() {
|
||||
if updateTimer == nil {
|
||||
return
|
||||
}
|
||||
updateTimer.invalidate()
|
||||
updateTimer = nil
|
||||
}
|
||||
|
||||
@objc func read() {
|
||||
@@ -21,7 +37,7 @@ class DiskUsage {
|
||||
let free = freeDiskSpaceInBytes()
|
||||
let usedSpace = total - free
|
||||
|
||||
store.diskUsage << (Float(usedSpace) / Float(total))
|
||||
self.usage << (Float(usedSpace) / Float(total))
|
||||
}
|
||||
|
||||
func totalDiskSpaceInBytes() -> Int64 {
|
||||
70
Stats/Modules/Memory/Memory.swift
Normal file
70
Stats/Modules/Memory/Memory.swift
Normal file
@@ -0,0 +1,70 @@
|
||||
//
|
||||
// Memory.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
|
||||
class Memory: Module {
|
||||
let name: String = "Memory"
|
||||
var view: NSView = NSView()
|
||||
let defaults = UserDefaults.standard
|
||||
|
||||
var active: Observable<Bool>
|
||||
var reader: Reader = MemoryReader()
|
||||
|
||||
@IBOutlet weak var value: NSTextField!
|
||||
|
||||
init() {
|
||||
self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
|
||||
self.view = loadViewFromNib()
|
||||
}
|
||||
|
||||
func start() {
|
||||
if !self.reader.usage.value.isNaN {
|
||||
self.value.stringValue = "\(Int(Float(self.reader.usage.value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.value.textColor = self.reader.usage.value.usageColor()
|
||||
}
|
||||
|
||||
self.reader.start()
|
||||
self.reader.usage.subscribe(observer: self) { (value, _) in
|
||||
if !value.isNaN {
|
||||
self.value.stringValue = "\(Int(Float(value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.value.textColor = value.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
colors.subscribe(observer: self) { (value, _) in
|
||||
self.value.textColor = self.reader.usage.value.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
func menu() -> NSMenuItem {
|
||||
let menu = NSMenuItem(title: name, action: #selector(toggle), keyEquivalent: "")
|
||||
if defaults.object(forKey: name) != nil {
|
||||
menu.state = defaults.bool(forKey: name) ? NSControl.StateValue.on : NSControl.StateValue.off
|
||||
} else {
|
||||
menu.state = NSControl.StateValue.on
|
||||
}
|
||||
menu.target = self
|
||||
menu.isEnabled = true
|
||||
return menu
|
||||
}
|
||||
|
||||
@objc func toggle(_ sender: NSMenuItem) {
|
||||
let state = sender.state != NSControl.StateValue.on
|
||||
|
||||
sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
|
||||
self.defaults.set(state, forKey: name)
|
||||
self.active << state
|
||||
|
||||
if !state {
|
||||
self.stop()
|
||||
} else {
|
||||
self.start()
|
||||
}
|
||||
}
|
||||
}
|
||||
57
Stats/Modules/Memory/Memory.xib
Normal file
57
Stats/Modules/Memory/Memory.xib
Normal file
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner">
|
||||
<connections>
|
||||
<outlet property="value" destination="pcp-bW-A5a" id="05g-TN-E6h"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<customView identifier="CPU" id="zVf-HY-0OA">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="tl1-23-Yde">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dVi-1r-SQt">
|
||||
<rect key="frame" x="-2" y="11" width="25" height="9"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="MEM" id="U2z-9g-lnI">
|
||||
<font key="font" metaFont="systemLight" size="7"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcp-bW-A5a">
|
||||
<rect key="frame" x="-2" y="0.0" width="8" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="0Nx-Gf-K16">
|
||||
<font key="font" metaFont="system" size="10"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="dVi-1r-SQt" firstAttribute="leading" secondItem="tl1-23-Yde" secondAttribute="leading" id="80x-aW-s8H"/>
|
||||
<constraint firstItem="pcp-bW-A5a" firstAttribute="leading" secondItem="tl1-23-Yde" secondAttribute="leading" id="8r6-W0-PTu"/>
|
||||
<constraint firstItem="dVi-1r-SQt" firstAttribute="top" secondItem="tl1-23-Yde" secondAttribute="top" constant="2" id="Oj6-S6-2IB"/>
|
||||
<constraint firstAttribute="height" constant="22" id="euO-l5-Zwz"/>
|
||||
<constraint firstItem="pcp-bW-A5a" firstAttribute="top" secondItem="tl1-23-Yde" secondAttribute="top" constant="9" id="fOM-cd-BF6"/>
|
||||
<constraint firstAttribute="width" constant="28" id="tbx-wa-WQ3"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="tl1-23-Yde" firstAttribute="top" secondItem="zVf-HY-0OA" secondAttribute="top" id="Xwk-Wm-7N3"/>
|
||||
<constraint firstItem="tl1-23-Yde" firstAttribute="leading" secondItem="zVf-HY-0OA" secondAttribute="leading" id="oDv-Kz-VfI"/>
|
||||
</constraints>
|
||||
<point key="canvasLocation" x="-127" y="13"/>
|
||||
</customView>
|
||||
</objects>
|
||||
</document>
|
||||
30
Stats/Readers/MemoryUsage.swift → Stats/Modules/Memory/MemoryReader.swift
Executable file → Normal file
30
Stats/Readers/MemoryUsage.swift → Stats/Modules/Memory/MemoryReader.swift
Executable file → Normal file
@@ -1,18 +1,20 @@
|
||||
//
|
||||
// MemoryUsage.swift
|
||||
// Mini Stats
|
||||
// reader.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 29/05/2019.
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
class MemoryUsage {
|
||||
class MemoryReader: Reader {
|
||||
var usage: Observable<Float>!
|
||||
var updateTimer: Timer!
|
||||
var totalSize: Float
|
||||
|
||||
init() {
|
||||
self.usage = Observable(0)
|
||||
var stats = host_basic_info()
|
||||
var count = UInt32(MemoryLayout<host_basic_info_data_t>.size / MemoryLayout<integer_t>.size)
|
||||
|
||||
@@ -31,9 +33,23 @@ class MemoryUsage {
|
||||
}
|
||||
|
||||
read()
|
||||
}
|
||||
|
||||
func start() {
|
||||
if updateTimer != nil {
|
||||
return
|
||||
}
|
||||
updateTimer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(read), userInfo: nil, repeats: true)
|
||||
}
|
||||
|
||||
func stop() {
|
||||
if updateTimer == nil {
|
||||
return
|
||||
}
|
||||
updateTimer.invalidate()
|
||||
updateTimer = nil
|
||||
}
|
||||
|
||||
@objc func read() {
|
||||
var stats = vm_statistics64()
|
||||
var count = UInt32(MemoryLayout<vm_statistics64_data_t>.size / MemoryLayout<integer_t>.size)
|
||||
@@ -46,12 +62,12 @@ class MemoryUsage {
|
||||
|
||||
if kerr == KERN_SUCCESS {
|
||||
let active = Float(stats.active_count) * Float(PAGE_SIZE)
|
||||
// let inactive = Float(stats.inactive_count) * Float(PAGE_SIZE)
|
||||
// let inactive = Float(stats.inactive_count) * Float(PAGE_SIZE)
|
||||
let wired = Float(stats.wire_count) * Float(PAGE_SIZE)
|
||||
let compressed = Float(stats.compressor_page_count) * Float(PAGE_SIZE)
|
||||
|
||||
|
||||
let free = totalSize - (active + wired + compressed)
|
||||
store.memoryUsage << ((totalSize - free) / totalSize)
|
||||
self.usage << ((totalSize - free) / totalSize)
|
||||
}
|
||||
else {
|
||||
print("Error with host_statistics64(): " + (String(cString: mach_error_string(kerr), encoding: String.Encoding.ascii) ?? "unknown error"))
|
||||
@@ -1,133 +0,0 @@
|
||||
//
|
||||
// StatusBarView.swift
|
||||
// Mini Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 28.05.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
|
||||
class StatusBarView: NSView, NibLoadable {
|
||||
@IBOutlet weak var CPUView: NSView!
|
||||
@IBOutlet weak var CPUTitleLabel: NSTextField!
|
||||
@IBOutlet weak var CPUValueLabel: NSTextField!
|
||||
@IBOutlet weak var MemoryView: NSView!
|
||||
@IBOutlet weak var MemoryTitleLabel: NSTextField!
|
||||
@IBOutlet weak var MemoryValueLabel: NSTextField!
|
||||
@IBOutlet weak var DiskView: NSView!
|
||||
@IBOutlet weak var DiskTitleLabel: NSTextField!
|
||||
@IBOutlet weak var DiskValueLabel: NSTextField!
|
||||
|
||||
let defaults = UserDefaults.standard
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
prepare()
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
super.init(coder: aDecoder)
|
||||
prepare()
|
||||
}
|
||||
|
||||
func prepare() {
|
||||
if store.cpuUsage.value != 0 {
|
||||
self.CPUValueLabel.stringValue = "\(Int(Float(store.cpuUsage.value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.CPUValueLabel.textColor = store.cpuUsage.value.usageColor()
|
||||
}
|
||||
if store.memoryUsage.value != 0 {
|
||||
self.MemoryValueLabel.stringValue = "\(Int(Float(store.memoryUsage.value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.MemoryValueLabel.textColor = store.memoryUsage.value.usageColor()
|
||||
}
|
||||
if store.diskUsage.value != 0 {
|
||||
self.DiskValueLabel.stringValue = "\(Int(Float(store.diskUsage.value.roundTo(decimalPlaces: 2))! * 100))%"
|
||||
self.DiskValueLabel.textColor = store.diskUsage.value.usageColor()
|
||||
}
|
||||
|
||||
store.cpuUsage.subscribe(observer: self) { (newValue, _) in
|
||||
let percentage = Int(Float(newValue.roundTo(decimalPlaces: 2))! * 100)
|
||||
self.CPUValueLabel.stringValue = "\(percentage)%"
|
||||
if store.colors.value {
|
||||
self.CPUValueLabel.textColor = newValue.usageColor()
|
||||
}
|
||||
}
|
||||
store.memoryUsage.subscribe(observer: self) { (newValue, _) in
|
||||
let percentage = Int(Float(newValue.roundTo(decimalPlaces: 2))! * 100)
|
||||
self.MemoryValueLabel.stringValue = "\(percentage)%"
|
||||
if store.colors.value {
|
||||
self.MemoryValueLabel.textColor = newValue.usageColor()
|
||||
}
|
||||
}
|
||||
store.diskUsage.subscribe(observer: self) { (newValue, _) in
|
||||
let percentage = Int(Float(newValue.roundTo(decimalPlaces: 2))! * 100)
|
||||
self.DiskValueLabel.stringValue = "\(percentage)%"
|
||||
if store.colors.value {
|
||||
self.DiskValueLabel.textColor = newValue.usageColor()
|
||||
}
|
||||
}
|
||||
|
||||
store.cpuStatus.subscribe(observer: self) { (newValue, _) in
|
||||
self.CPUView.isHidden = !newValue
|
||||
}
|
||||
store.memoryStatus.subscribe(observer: self) { (newValue, _) in
|
||||
self.MemoryView.isHidden = !newValue
|
||||
}
|
||||
store.diskStatus.subscribe(observer: self) { (newValue, _) in
|
||||
self.DiskView.isHidden = !newValue
|
||||
}
|
||||
|
||||
store.activeWidgets.subscribe(observer: self) { (newValue, _) in
|
||||
self.frame = CGRect(x: 0 , y: 0, width: CGFloat(28 * newValue), height: self.frame.height)
|
||||
}
|
||||
|
||||
store.colors.subscribe(observer: self) { (newValue, _) in
|
||||
if newValue {
|
||||
self.CPUValueLabel.textColor = store.cpuUsage.value.usageColor()
|
||||
self.MemoryValueLabel.textColor = store.memoryUsage.value.usageColor()
|
||||
self.DiskValueLabel.textColor = store.diskUsage.value.usageColor()
|
||||
} else {
|
||||
self.CPUValueLabel.textColor = NSColor.labelColor
|
||||
self.MemoryValueLabel.textColor = NSColor.labelColor
|
||||
self.DiskValueLabel.textColor = NSColor.labelColor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func buildMenu() -> NSMenu {
|
||||
let menu = NSMenu()
|
||||
|
||||
let cpuStatus = NSMenuItem(title: "CPU", action: #selector(AppDelegate.toggleStatus(_:)), keyEquivalent: "")
|
||||
cpuStatus.state = NSControl.StateValue.on
|
||||
cpuStatus.isEnabled = true
|
||||
|
||||
let memoryStatus = NSMenuItem(title: "Memory", action: #selector(AppDelegate.toggleStatus(_:)), keyEquivalent: "")
|
||||
memoryStatus.state = NSControl.StateValue.on
|
||||
|
||||
let diskStatus = NSMenuItem(title: "Disk", action: #selector(AppDelegate.toggleStatus(_:)), keyEquivalent: "")
|
||||
diskStatus.state = NSControl.StateValue.on
|
||||
|
||||
menu.addItem(cpuStatus)
|
||||
menu.addItem(memoryStatus)
|
||||
menu.addItem(diskStatus)
|
||||
|
||||
menu.addItem(NSMenuItem.separator())
|
||||
|
||||
let colorStatus = NSMenuItem(title: "Colors", action: #selector(AppDelegate.toggleStatus(_:)), keyEquivalent: "")
|
||||
colorStatus.state = store.colors.value ? NSControl.StateValue.on : NSControl.StateValue.off
|
||||
menu.addItem(colorStatus)
|
||||
|
||||
let runAtLogin = NSMenuItem(title: "Run at login", action: #selector(AppDelegate.toggleStartOnLogin(_:)), keyEquivalent: "")
|
||||
if defaults.object(forKey: "startOnLogin") != nil {
|
||||
runAtLogin.state = defaults.bool(forKey: "startOnLogin") ? NSControl.StateValue.on : NSControl.StateValue.off
|
||||
} else {
|
||||
runAtLogin.state = NSControl.StateValue.on
|
||||
}
|
||||
menu.addItem(runAtLogin)
|
||||
|
||||
menu.addItem(NSMenuItem.separator())
|
||||
menu.addItem(NSMenuItem(title: "Quit Stats", action: #selector(NSApplication.terminate(_:)), keyEquivalent: ""))
|
||||
|
||||
return menu
|
||||
}
|
||||
}
|
||||
@@ -1,137 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner"/>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<customView identifier="StatusBar" id="c22-O7-iKe" customClass="StatusBarView" customModule="Mini_Stats" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="84" height="22"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||
<subviews>
|
||||
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IJB-x2-29t">
|
||||
<rect key="frame" x="0.0" y="0.0" width="84" height="22"/>
|
||||
<subviews>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="pvL-K9-vax">
|
||||
<rect key="frame" x="0.0" y="0.0" width="28" height="22"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cpe-3W-Ev8">
|
||||
<rect key="frame" x="-2" y="11" width="24" height="9"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="CPU" id="vf2-q9-hVn">
|
||||
<font key="font" metaFont="systemLight" size="7"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rbt-gs-nsS">
|
||||
<rect key="frame" x="-2" y="0.0" width="8" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="2cO-tg-cb4">
|
||||
<font key="font" metaFont="system" size="10"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="22" id="806-dH-PzQ"/>
|
||||
<constraint firstItem="Cpe-3W-Ev8" firstAttribute="leading" secondItem="pvL-K9-vax" secondAttribute="leading" id="XJN-4y-iAA"/>
|
||||
<constraint firstItem="Cpe-3W-Ev8" firstAttribute="top" secondItem="pvL-K9-vax" secondAttribute="top" constant="2" id="aPc-5b-ePA"/>
|
||||
<constraint firstAttribute="width" constant="28" id="bWb-4X-1FV"/>
|
||||
<constraint firstItem="Rbt-gs-nsS" firstAttribute="leading" secondItem="pvL-K9-vax" secondAttribute="leading" id="dyo-HN-gWI"/>
|
||||
<constraint firstItem="Rbt-gs-nsS" firstAttribute="top" secondItem="pvL-K9-vax" secondAttribute="top" constant="9" id="wRK-E2-AF6"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Quj-Mt-k03">
|
||||
<rect key="frame" x="28" y="0.0" width="28" height="22"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b1f-Fv-md0">
|
||||
<rect key="frame" x="-2" y="11" width="25" height="9"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="MEM" id="L85-zv-uE7">
|
||||
<font key="font" metaFont="systemLight" size="7"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dmx-V7-sFE">
|
||||
<rect key="frame" x="-2" y="0.0" width="8" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="v3q-gL-vWD">
|
||||
<font key="font" metaFont="system" size="10"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="dmx-V7-sFE" firstAttribute="leading" secondItem="Quj-Mt-k03" secondAttribute="leading" id="9CP-iG-hdg"/>
|
||||
<constraint firstItem="b1f-Fv-md0" firstAttribute="leading" secondItem="Quj-Mt-k03" secondAttribute="leading" id="KT3-ac-1OM"/>
|
||||
<constraint firstItem="b1f-Fv-md0" firstAttribute="top" secondItem="Quj-Mt-k03" secondAttribute="top" constant="2" id="MT1-yg-Kg8"/>
|
||||
<constraint firstAttribute="height" constant="22" id="PXN-Qg-HVq"/>
|
||||
<constraint firstItem="dmx-V7-sFE" firstAttribute="top" secondItem="Quj-Mt-k03" secondAttribute="top" constant="9" id="Ybn-D9-wVS"/>
|
||||
<constraint firstAttribute="width" constant="28" id="vpV-6P-7Fo"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="1Qe-yN-He3">
|
||||
<rect key="frame" x="56" y="0.0" width="28" height="22"/>
|
||||
<subviews>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uek-Af-zbW">
|
||||
<rect key="frame" x="-2" y="11" width="23" height="9"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="SSD" id="pKO-7I-MaK">
|
||||
<font key="font" metaFont="systemLight" size="7"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9tX-nP-aGF">
|
||||
<rect key="frame" x="-2" y="0.0" width="8" height="13"/>
|
||||
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="KfY-K7-Nzh">
|
||||
<font key="font" metaFont="system" size="10"/>
|
||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="9tX-nP-aGF" firstAttribute="top" secondItem="1Qe-yN-He3" secondAttribute="top" constant="9" id="3kK-VU-aH8"/>
|
||||
<constraint firstItem="9tX-nP-aGF" firstAttribute="leading" secondItem="1Qe-yN-He3" secondAttribute="leading" id="TC0-aW-8TJ"/>
|
||||
<constraint firstAttribute="width" constant="28" id="Xgg-Cz-Dbf"/>
|
||||
<constraint firstItem="uek-Af-zbW" firstAttribute="leading" secondItem="1Qe-yN-He3" secondAttribute="leading" id="h4p-BB-Tl3"/>
|
||||
<constraint firstItem="uek-Af-zbW" firstAttribute="top" secondItem="1Qe-yN-He3" secondAttribute="top" constant="2" id="lcl-mv-FS7"/>
|
||||
<constraint firstAttribute="height" constant="22" id="qCG-s0-5Rn"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
</subviews>
|
||||
<visibilityPriorities>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
</visibilityPriorities>
|
||||
<customSpacing>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
</customSpacing>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="IJB-x2-29t" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="4P1-4h-qqH"/>
|
||||
<constraint firstItem="IJB-x2-29t" firstAttribute="centerX" secondItem="c22-O7-iKe" secondAttribute="centerX" id="MKm-Hm-eCE"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<outlet property="CPUTitleLabel" destination="Cpe-3W-Ev8" id="Rxt-Vc-Wna"/>
|
||||
<outlet property="CPUValueLabel" destination="Rbt-gs-nsS" id="Wkc-ij-zBx"/>
|
||||
<outlet property="CPUView" destination="pvL-K9-vax" id="MBN-nB-hHr"/>
|
||||
<outlet property="DiskTitleLabel" destination="uek-Af-zbW" id="oAx-AD-emj"/>
|
||||
<outlet property="DiskValueLabel" destination="9tX-nP-aGF" id="msY-WQ-mgS"/>
|
||||
<outlet property="DiskView" destination="1Qe-yN-He3" id="XrK-8h-jrV"/>
|
||||
<outlet property="MemoryTitleLabel" destination="b1f-Fv-md0" id="eXU-eb-22H"/>
|
||||
<outlet property="MemoryValueLabel" destination="dmx-V7-sFE" id="1Rt-Rm-JqS"/>
|
||||
<outlet property="MemoryView" destination="Quj-Mt-k03" id="ypU-rj-qUu"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="125" y="124"/>
|
||||
</customView>
|
||||
</objects>
|
||||
</document>
|
||||
@@ -1,68 +0,0 @@
|
||||
//
|
||||
// Store.swift
|
||||
// Mini Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 29/05/2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
class Store {
|
||||
let defaults = UserDefaults.standard
|
||||
|
||||
let cpuUsage: Observable<Float>
|
||||
let memoryUsage: Observable<Float>
|
||||
let diskUsage: Observable<Float>
|
||||
|
||||
let cpuStatus: Observable<Bool>
|
||||
let memoryStatus: Observable<Bool>
|
||||
let diskStatus: Observable<Bool>
|
||||
|
||||
let colors: Observable<Bool>
|
||||
|
||||
let activeWidgets: Observable<Int8>
|
||||
|
||||
init() {
|
||||
cpuUsage = Observable(0)
|
||||
memoryUsage = Observable(0)
|
||||
diskUsage = Observable(0)
|
||||
|
||||
cpuStatus = Observable(true)
|
||||
memoryStatus = Observable(true)
|
||||
diskStatus = Observable(true)
|
||||
|
||||
activeWidgets = Observable(3)
|
||||
|
||||
colors = Observable(false)
|
||||
|
||||
if defaults.object(forKey: "cpuStatus") != nil {
|
||||
cpuStatus << defaults.bool(forKey: "cpuStatus")
|
||||
}
|
||||
if defaults.object(forKey: "memoryStatus") != nil {
|
||||
memoryStatus << defaults.bool(forKey: "memoryStatus")
|
||||
}
|
||||
if defaults.object(forKey: "diskStatus") != nil {
|
||||
diskStatus << defaults.bool(forKey: "diskStatus")
|
||||
}
|
||||
if defaults.object(forKey: "colors") != nil {
|
||||
colors << defaults.bool(forKey: "colors")
|
||||
}
|
||||
|
||||
cpuStatus.subscribe(observer: self) { (newValue, _) in
|
||||
self.defaults.set(newValue, forKey: "cpuStatus")
|
||||
}
|
||||
memoryStatus.subscribe(observer: self) { (newValue, _) in
|
||||
self.defaults.set(newValue, forKey: "memoryStatus")
|
||||
}
|
||||
diskStatus.subscribe(observer: self) { (newValue, _) in
|
||||
self.defaults.set(newValue, forKey: "diskStatus")
|
||||
}
|
||||
|
||||
colors.subscribe(observer: self) { (newValue, _) in
|
||||
self.defaults.set(newValue, forKey: "colors")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var store = Store()
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
@@ -8,672 +9,12 @@
|
||||
<scene sceneID="JPo-4y-FX3">
|
||||
<objects>
|
||||
<application id="hnw-xV-0zn" sceneMemberID="viewController">
|
||||
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
|
||||
<items>
|
||||
<menuItem title="Stats" id="1Xt-HY-uBw">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Stats" systemMenu="apple" id="uQy-DD-JDr">
|
||||
<items>
|
||||
<menuItem title="About Stats" id="5kV-Vb-QxS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
|
||||
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
|
||||
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
|
||||
<menuItem title="Services" id="NMo-om-nkz">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
|
||||
<menuItem title="Hide Stats" keyEquivalent="h" id="Olw-nP-bQN">
|
||||
<connections>
|
||||
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Show All" id="Kd2-mp-pUS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
|
||||
<menuItem title="Quit Stats" keyEquivalent="q" id="4sb-4s-VLi">
|
||||
<connections>
|
||||
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="File" id="dMs-cI-mzQ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="File" id="bib-Uj-vzu">
|
||||
<items>
|
||||
<menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
|
||||
<connections>
|
||||
<action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
|
||||
<connections>
|
||||
<action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Open Recent" id="tXI-mr-wws">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
|
||||
<items>
|
||||
<menuItem title="Clear Menu" id="vNY-rz-j42">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
|
||||
<menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
|
||||
<connections>
|
||||
<action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
|
||||
<connections>
|
||||
<action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
|
||||
<connections>
|
||||
<action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H">
|
||||
<connections>
|
||||
<action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
|
||||
<menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
|
||||
<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
|
||||
<connections>
|
||||
<action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Edit" id="5QF-Oa-p0T">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Edit" id="W48-6f-4Dl">
|
||||
<items>
|
||||
<menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
|
||||
<connections>
|
||||
<action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
|
||||
<connections>
|
||||
<action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
|
||||
<menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
|
||||
<connections>
|
||||
<action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
|
||||
<connections>
|
||||
<action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
|
||||
<connections>
|
||||
<action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Delete" id="pa3-QI-u2k">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
|
||||
<connections>
|
||||
<action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
|
||||
<menuItem title="Find" id="4EN-yA-p0u">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Find" id="1b7-l0-nxx">
|
||||
<items>
|
||||
<menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
|
||||
<connections>
|
||||
<action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
|
||||
<items>
|
||||
<menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
|
||||
<connections>
|
||||
<action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
|
||||
<connections>
|
||||
<action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
|
||||
<menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Substitutions" id="9ic-FL-obx">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
|
||||
<items>
|
||||
<menuItem title="Show Substitutions" id="z6F-FW-3nz">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
|
||||
<menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Quotes" id="hQb-2v-fYv">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Dashes" id="rgM-f4-ycn">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Links" id="cwL-P1-jid">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Data Detectors" id="tRr-pd-1PS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Text Replacement" id="HFQ-gK-NFA">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Transformations" id="2oI-Rn-ZJC">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Transformations" id="c8a-y6-VQd">
|
||||
<items>
|
||||
<menuItem title="Make Upper Case" id="vmV-6d-7jI">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Make Lower Case" id="d9M-CD-aMd">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Capitalize" id="UEZ-Bs-lqG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Speech" id="xrE-MZ-jX0">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Speech" id="3rS-ZA-NoH">
|
||||
<items>
|
||||
<menuItem title="Start Speaking" id="Ynk-f8-cLZ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Stop Speaking" id="Oyz-dy-DGm">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Format" id="jxT-CU-nIS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Format" id="GEO-Iw-cKr">
|
||||
<items>
|
||||
<menuItem title="Font" id="Gi5-1S-RQB">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
|
||||
<items>
|
||||
<menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq">
|
||||
<connections>
|
||||
<action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27">
|
||||
<connections>
|
||||
<action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq">
|
||||
<connections>
|
||||
<action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
|
||||
<connections>
|
||||
<action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
|
||||
<menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL">
|
||||
<connections>
|
||||
<action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST">
|
||||
<connections>
|
||||
<action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
|
||||
<menuItem title="Kern" id="jBQ-r6-VK2">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Kern" id="tlD-Oa-oAM">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="GUa-eO-cwY">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use None" id="cDB-IK-hbR">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Tighten" id="46P-cB-AYj">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Loosen" id="ogc-rX-tC1">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Ligatures" id="o6e-r0-MWq">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="agt-UL-0e3">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use None" id="J7y-lM-qPV">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use All" id="xQD-1f-W4t">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Baseline" id="OaQ-X3-Vso">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Baseline" id="ijk-EB-dga">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="3Om-Ey-2VK">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Superscript" id="Rqc-34-cIF">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Subscript" id="I0S-gh-46l">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Raise" id="2h7-ER-AoG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Lower" id="1tx-W0-xDw">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
|
||||
<menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
|
||||
<connections>
|
||||
<action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
|
||||
<menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Text" id="Fal-I4-PZk">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Text" id="d9c-me-L2H">
|
||||
<items>
|
||||
<menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
|
||||
<connections>
|
||||
<action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
|
||||
<connections>
|
||||
<action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Justify" id="J5U-5w-g23">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
|
||||
<connections>
|
||||
<action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
|
||||
<menuItem title="Writing Direction" id="H1b-Si-o9J">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
|
||||
<items>
|
||||
<menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
</menuItem>
|
||||
<menuItem id="YGs-j5-SAR">
|
||||
<string key="title"> Default</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="Lbh-J2-qVU">
|
||||
<string key="title"> Left to Right</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="jFq-tB-4Kx">
|
||||
<string key="title"> Right to Left</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
|
||||
<menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
</menuItem>
|
||||
<menuItem id="Nop-cj-93Q">
|
||||
<string key="title"> Default</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="BgM-ve-c93">
|
||||
<string key="title"> Left to Right</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="RB4-Sm-HuC">
|
||||
<string key="title"> Right to Left</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
|
||||
<menuItem title="Show Ruler" id="vLm-3I-IUL">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="View" id="H8h-7b-M4v">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="View" id="HyV-fh-RgO">
|
||||
<items>
|
||||
<menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="hB3-LF-h0Y"/>
|
||||
<menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleFullScreen:" target="Ady-hI-5gd" id="dU3-MA-1Rq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Window" id="aUF-d1-5bR">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
|
||||
<items>
|
||||
<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
|
||||
<connections>
|
||||
<action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Zoom" id="R4o-n2-Eq4">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
|
||||
<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Help" id="wpr-3q-Mcd">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
|
||||
<items>
|
||||
<menuItem title="Stats Help" keyEquivalent="?" id="FKE-Sm-Kum">
|
||||
<connections>
|
||||
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6"/>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
|
||||
</connections>
|
||||
</application>
|
||||
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Mini_Stats" customModuleProvider="target"/>
|
||||
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Stats" customModuleProvider="target"/>
|
||||
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
|
||||
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
|
||||
@@ -15,6 +15,10 @@ extension Float {
|
||||
}
|
||||
|
||||
func usageColor() -> NSColor {
|
||||
if !colors.value {
|
||||
return NSColor.textColor
|
||||
}
|
||||
|
||||
switch self {
|
||||
case 0.6...0.8:
|
||||
return NSColor.systemOrange
|
||||
@@ -32,3 +36,4 @@ public enum Unit : Float {
|
||||
case megabyte = 1048576
|
||||
case gigabyte = 1073741824
|
||||
}
|
||||
|
||||
|
||||
42
Stats/libs/Module.swift
Normal file
42
Stats/libs/Module.swift
Normal file
@@ -0,0 +1,42 @@
|
||||
//
|
||||
// Module.swift
|
||||
// Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 01.06.2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
|
||||
protocol Module {
|
||||
var name: String { get }
|
||||
var active: Observable<Bool> { get }
|
||||
var reader: Reader { get }
|
||||
var view: NSView { get }
|
||||
|
||||
func menu() -> NSMenuItem
|
||||
func start()
|
||||
func stop()
|
||||
}
|
||||
|
||||
extension Module where Self: Module {
|
||||
func stop() {
|
||||
self.reader.stop()
|
||||
self.reader.usage.unsubscribe(observer: self as AnyObject)
|
||||
}
|
||||
|
||||
func loadViewFromNib() -> NSView {
|
||||
var topLevelObjects: NSArray?
|
||||
if Bundle.main.loadNibNamed(NSNib.Name(String(describing: Self.self)), owner: self, topLevelObjects: &topLevelObjects) {
|
||||
return (topLevelObjects?.first(where: { $0 is NSView } ) as? NSView)!
|
||||
}
|
||||
return NSView()
|
||||
}
|
||||
}
|
||||
|
||||
protocol Reader {
|
||||
var usage: Observable<Float>! { get }
|
||||
func start()
|
||||
func read()
|
||||
func stop()
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
//
|
||||
// NilLoadable.swift
|
||||
// Mini Stats
|
||||
//
|
||||
// Created by Serhiy Mytrovtsiy on 29/05/2019.
|
||||
// Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
|
||||
//
|
||||
|
||||
import Cocoa
|
||||
|
||||
protocol NibLoadable {
|
||||
static var nibName: String? { get }
|
||||
static func createFromNib(in bundle: Bundle) -> Self?
|
||||
}
|
||||
|
||||
extension NibLoadable where Self: NSView {
|
||||
|
||||
static var nibName: String? {
|
||||
return String(describing: Self.self)
|
||||
}
|
||||
|
||||
static func createFromNib(in bundle: Bundle = Bundle.main) -> Self? {
|
||||
guard let nibName = nibName else { return nil }
|
||||
var topLevelArray: NSArray? = nil
|
||||
bundle.loadNibNamed(NSNib.Name(nibName), owner: self, topLevelObjects: &topLevelArray)
|
||||
guard let results = topLevelArray else { return nil }
|
||||
let views = Array<Any>(results).filter { $0 is Self }
|
||||
return views.last as? Self
|
||||
}
|
||||
}
|
||||
@@ -13,12 +13,15 @@ protocol ObservableProtocol {
|
||||
var value: T { get set }
|
||||
func subscribe(observer: AnyObject, block: @escaping (_ newValue: T, _ oldValue: T) -> ())
|
||||
func unsubscribe(observer: AnyObject)
|
||||
func userDefaults(key: String)
|
||||
}
|
||||
|
||||
public final class Observable<T>: ObservableProtocol {
|
||||
typealias ObserverBlock = (_ newValue: T, _ oldValue: T) -> ()
|
||||
typealias ObserversEntry = (observer: AnyObject, block: ObserverBlock)
|
||||
private var observers: Array<ObserversEntry>
|
||||
private let defaults = UserDefaults.standard
|
||||
private var userDefaultsKey: String = ""
|
||||
|
||||
init(_ value: T) {
|
||||
self.value = value
|
||||
@@ -31,6 +34,7 @@ public final class Observable<T>: ObservableProtocol {
|
||||
let (_, block) = entry
|
||||
block(value, oldValue)
|
||||
}
|
||||
updateUserDefaults()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,6 +51,14 @@ public final class Observable<T>: ObservableProtocol {
|
||||
|
||||
observers = filtered
|
||||
}
|
||||
|
||||
func userDefaults(key: String) {
|
||||
self.userDefaultsKey = key
|
||||
}
|
||||
|
||||
func updateUserDefaults() {
|
||||
self.defaults.set(self.value, forKey: self.userDefaultsKey)
|
||||
}
|
||||
}
|
||||
|
||||
func <<<T>(observable: Observable<T>, value: T) {
|
||||
|
||||
Reference in New Issue
Block a user