added new widget Chart with label; initialized widget protocol;

2026-04-14 00:04:15 +09:00 · 2019-06-15 12:16:33 +02:00
parent 102ab549f3
commit bdb8c052cc
10 changed files with 341 additions and 232 deletions
--- a/Stats/MenuBar.swift
+++ b/Stats/MenuBar.swift
@@ -10,7 +10,7 @@ import Cocoa
 import ServiceManagement

 let MODULE_HEIGHT = CGFloat(NSApplication.shared.mainMenu?.menuBarHeight ?? 22)
-let MODULE_WIDTH = CGFloat(28)
+let MODULE_WIDTH = CGFloat(32)

 class MenuBar {
    let defaults = UserDefaults.standard
@@ -34,6 +34,8 @@ class MenuBar {
        for module in modules.value {
            module.active.subscribe(observer: self) { (value, _) in
                self.buildModulesView()
+                self.menuBarItem.menu?.removeAllItems()
+                self.menuBarItem.menu = self.buildMenu()
            }
        }
    }
@@ -42,7 +44,7 @@ class MenuBar {
        let menu = NSMenu()
        
        for module in modules.value {
-            menu.addItem(module.menu())
+            menu.addItem(module.menu)
        }
        
        menu.addItem(NSMenuItem.separator())
--- a/Stats/Modules/CPU/CPU.swift
+++ b/Stats/Modules/CPU/CPU.swift
@@ -10,39 +10,51 @@ import Cocoa

 class CPU: Module {
    let name: String = "CPU"
+    let shortName: String = "CPU"
    var view: NSView = NSView()
-    let defaults = UserDefaults.standard
-    
+    var menu: NSMenuItem = NSMenuItem()
+    var submenu: NSMenu = NSMenu()
    var active: Observable<Bool>
    var reader: Reader = CPUReader()
    
+    let defaults = UserDefaults.standard
+    var widgetType: WidgetType
+    
    init() {
        self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
-        self.view = ChartView(frame: NSMakeRect(0, 0, MODULE_WIDTH + 7, MODULE_HEIGHT))
+        self.widgetType = defaults.object(forKey: "\(name)_widget") != nil ? defaults.float(forKey: "\(name)_widget") : Widgets.Mini
+        initMenu()
+        initWidget()
    }
    
-    func start() {
-        if !self.reader.usage.value.isNaN {
-            (self.view as! ChartView).value(value: self.reader.usage!.value)
-        }
+    func initMenu() {
+        menu = NSMenuItem(title: name, action: #selector(toggle), keyEquivalent: "")
+        submenu = NSMenu()
        
-        self.reader.start()
-        self.reader.usage.subscribe(observer: self) { (value, _) in
-            if !value.isNaN {
-                (self.view as! ChartView).value(value: value)
-            }
-        }
-    }
-    
-    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
-        return menu
+        
+        let mini = NSMenuItem(title: "Mini", action: #selector(toggleWidget), keyEquivalent: "")
+        mini.state = self.widgetType == Widgets.Mini ? NSControl.StateValue.on : NSControl.StateValue.off
+        mini.target = self
+        
+        let chart = NSMenuItem(title: "Chart", action: #selector(toggleWidget), keyEquivalent: "")
+        chart.state = self.widgetType == Widgets.Chart ? NSControl.StateValue.on : NSControl.StateValue.off
+        chart.target = self
+        
+        let chartWithValue = NSMenuItem(title: "Chart with value", action: #selector(toggleWidget), keyEquivalent: "")
+        chartWithValue.state = self.widgetType == Widgets.ChartWithValue ? NSControl.StateValue.on : NSControl.StateValue.off
+        chartWithValue.target = self
+        
+        submenu.addItem(mini)
+        submenu.addItem(chart)
+        submenu.addItem(chartWithValue)
+        
+        menu.submenu = submenu
    }
    
    @objc func toggle(_ sender: NSMenuItem) {
@@ -52,9 +64,41 @@ class CPU: Module {
        self.active << state
        
        if !state {
+            menu.submenu = nil
            self.stop()
        } else {
+            menu.submenu = submenu
            self.start()
        }
    }
+    
+    @objc func toggleWidget(_ sender: NSMenuItem) {
+        var widgetCode: Float = 0.0
+        
+        switch sender.title {
+        case "Mini":
+            widgetCode = Widgets.Mini
+        case "Chart":
+            widgetCode = Widgets.Chart
+        case "Chart with value":
+            widgetCode = Widgets.ChartWithValue
+        default:
+            break
+        }
+        
+        if self.widgetType == widgetCode {
+            return
+        }
+        
+        for item in self.submenu.items {
+            if item.title == "Mini" || item.title == "Chart" || item.title == "Chart with value" {
+                item.state = NSControl.StateValue.off
+            }
+        }
+        
+        sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
+        self.defaults.set(widgetCode, forKey: "\(name)_widget")
+        self.widgetType = widgetCode
+        self.initWidget()
+    }
 }
--- a/Stats/Modules/Disk/Disk.swift
+++ b/Stats/Modules/Disk/Disk.swift
@@ -10,9 +10,11 @@ import Cocoa

 class Disk: Module {
    let name: String = "Disk"
-    var colors: Bool = false
+    let shortName: String = "SSD"
    var view: NSView = NSView()
+    var menu: NSMenuItem = NSMenuItem()
    let defaults = UserDefaults.standard
+    var widgetType: WidgetType
    
    var active: Observable<Bool>
    var reader: Reader = DiskReader()
@@ -21,26 +23,17 @@ class Disk: Module {
    
    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.widgetType = defaults.object(forKey: "\(name)_widget") != nil ? defaults.float(forKey: "\(name)_widget") : Widgets.Mini
        
-        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()
-            }
-        }
+        self.initMenu()
+        
+        let widget = Mini(frame: NSMakeRect(0, 0, MODULE_WIDTH, MODULE_HEIGHT))
+        widget.label = self.shortName
+        self.view = widget
    }
    
-    func menu() -> NSMenuItem {
-        let menu = NSMenuItem(title: name, action: #selector(toggle), keyEquivalent: "")
+    func initMenu() {
+        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 {
@@ -48,7 +41,6 @@ class Disk: Module {
        }
        menu.target = self
        menu.isEnabled = true
-        return menu
    }
    
    @objc func toggle(_ sender: NSMenuItem) {
--- a/Stats/Modules/Disk/Disk.xib
+++ b/Stats/Modules/Disk/Disk.xib
@@ -1,57 +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">
-            <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>
--- a/Stats/Modules/Memory/Memory.swift
+++ b/Stats/Modules/Memory/Memory.swift
@@ -10,45 +10,53 @@ import Cocoa

 class Memory: Module {
    let name: String = "Memory"
-    var colors: Bool = false
+    let shortName: String = "MEM"
    var view: NSView = NSView()
-    let defaults = UserDefaults.standard
-    
+    var menu: NSMenuItem = NSMenuItem()
+    var submenu: NSMenu = NSMenu()
    var active: Observable<Bool>
    var reader: Reader = MemoryReader()
+    var widgetType: WidgetType
+    
+    let defaults = UserDefaults.standard
    
    @IBOutlet weak var value: NSTextField!
    
    init() {
        self.active = Observable(defaults.object(forKey: name) != nil ? defaults.bool(forKey: name) : true)
-        self.view = loadViewFromNib()
+        self.widgetType = defaults.object(forKey: "\(name)_widget") != nil ? defaults.float(forKey: "\(name)_widget") : Widgets.Mini
+        initMenu()
+        initWidget()
    }
    
-    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()
-        }
+    func initMenu() {
+        menu = NSMenuItem(title: name, action: #selector(toggle), keyEquivalent: "")
+        submenu = NSMenu()
        
-        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()
-            }
-        }
-    }
-    
-    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
+        
+        let mini = NSMenuItem(title: "Mini", action: #selector(toggleWidget), keyEquivalent: "")
+        mini.state = self.widgetType == Widgets.Mini ? NSControl.StateValue.on : NSControl.StateValue.off
+        mini.target = self
+        
+        let chart = NSMenuItem(title: "Chart", action: #selector(toggleWidget), keyEquivalent: "")
+        chart.state = self.widgetType == Widgets.Chart ? NSControl.StateValue.on : NSControl.StateValue.off
+        chart.target = self
+        
+        let chartWithValue = NSMenuItem(title: "Chart with value", action: #selector(toggleWidget), keyEquivalent: "")
+        chartWithValue.state = self.widgetType == Widgets.ChartWithValue ? NSControl.StateValue.on : NSControl.StateValue.off
+        chartWithValue.target = self
+        
+        submenu.addItem(mini)
+        submenu.addItem(chart)
+        submenu.addItem(chartWithValue)
+        
+        menu.submenu = submenu
    }
    
    @objc func toggle(_ sender: NSMenuItem) {
@@ -64,4 +72,34 @@ class Memory: Module {
            self.start()
        }
    }
+    
+    @objc func toggleWidget(_ sender: NSMenuItem) {
+        var widgetCode: Float = 0.0
+        
+        switch sender.title {
+        case "Mini":
+            widgetCode = Widgets.Mini
+        case "Chart":
+            widgetCode = Widgets.Chart
+        case "Chart with value":
+            widgetCode = Widgets.ChartWithValue
+        default:
+            break
+        }
+        
+        if self.widgetType == widgetCode {
+            return
+        }
+        
+        for item in self.submenu.items {
+            if item.title == "Mini" || item.title == "Chart" || item.title == "Chart with value" {
+                item.state = NSControl.StateValue.off
+            }
+        }
+        
+        sender.state = sender.state == NSControl.StateValue.on ? NSControl.StateValue.off : NSControl.StateValue.on
+        self.defaults.set(widgetCode, forKey: "\(name)_widget")
+        self.widgetType = widgetCode
+        self.initWidget()
+    }
 }
--- a/Stats/Modules/Memory/Memory.xib
+++ b/Stats/Modules/Memory/Memory.xib
@@ -1,57 +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">
-            <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>
--- a/Stats/Modules/CPU/CPUView.swift
+++ b/Stats/Modules/CPU/CPUView.swift
@@ -8,10 +8,8 @@

 import Cocoa

-class ChartView: NSView {
-    var valueLabel: NSTextField = NSTextField()
-    
-    var label: Bool = true
+class Chart: NSView, Widget {
+    var height: CGFloat = 0.0
    var points: [Float] {
        didSet {
            self.needsDisplay = true
@@ -22,29 +20,8 @@ class ChartView: NSView {
    override init(frame: NSRect) {
        self.points = Array(repeating: 0.0, count: 50)
        super.init(frame: frame)
-        
        self.wantsLayer = true
-        
-        if self.label {
-            let valueLabel = NSTextField(frame: NSMakeRect(2, MODULE_HEIGHT - 11, self.frame.size.width, 10))
-            valueLabel.textColor = NSColor.red
-            valueLabel.isEditable = false
-            valueLabel.isSelectable = false
-            valueLabel.isBezeled = false
-            valueLabel.wantsLayer = true
-            valueLabel.textColor = .labelColor
-            valueLabel.backgroundColor = .controlColor
-            valueLabel.canDrawSubviewsIntoLayer = true
-            valueLabel.alignment = .natural
-            valueLabel.font = NSFont.systemFont(ofSize: 8, weight: .ultraLight)
-            valueLabel.stringValue = ""
-            valueLabel.addSubview(NSView())
-            
-            self.valueLabel = valueLabel
-            self.addSubview(self.valueLabel)
-        } else {
-            self.addSubview(NSView())
-        }
+        self.addSubview(NSView())
    }
    
    required init?(coder decoder: NSCoder) {
@@ -60,9 +37,8 @@ class ChartView: NSView {
        let context = NSGraphicsContext.current!.cgContext
        let xOffset: CGFloat = 4.0
        let yOffset: CGFloat = 3.0
-        var height: CGFloat = self.frame.size.height - CGFloat((yOffset * 2))
-        if self.label {
-            height = 7.0
+        if height == 0 {
+            height = self.frame.size.height - CGFloat((yOffset * 2))
        }
        let xRatio = Double(self.frame.size.width - (xOffset * 2)) / (Double(self.points.count) - 1)
        
@@ -70,7 +46,7 @@ class ChartView: NSView {
            return CGFloat((Double(point) * xRatio)) + xOffset
        }
        let columnYPoint = { (point: Int) -> CGFloat in
-            return CGFloat((CGFloat(truncating: self.points[point] as NSNumber) * height)) + yOffset
+            return CGFloat((CGFloat(truncating: self.points[point] as NSNumber) * self.height)) + yOffset
        }
        
        let graphPath = NSBezierPath()
@@ -99,16 +75,60 @@ class ChartView: NSView {
        
        context.restoreGState()
        
-        graphPath.lineWidth = 1.0
+        graphPath.lineWidth = 0.5
        graphPath.stroke()
    }
    
    func value(value: Float) {
-        if self.label {
-            self.valueLabel.stringValue = "\(Int(Float(Float(value).roundTo(decimalPlaces: 2))! * 100))%"
-            self.valueLabel.textColor = Float(value).usageColor()
+        if self.points.count < 50 {
+            self.points.append(value)
+            return
        }
        
+        for (i, _) in self.points.enumerated() {
+            if i+1 < self.points.count {
+                self.points[i] = self.points[i+1]
+            } else {
+                self.points[i] = value
+            }
+        }
+    }
+}
+
+class ChartWithValue: Chart {
+    var valueLabel: NSTextField = NSTextField()
+    
+    override init(frame: NSRect) {
+        super.init(frame: frame)
+        
+        self.wantsLayer = true
+        
+        valueLabel = NSTextField(frame: NSMakeRect(2, MODULE_HEIGHT - 11, self.frame.size.width, 10))
+        valueLabel.textColor = NSColor.red
+        valueLabel.isEditable = false
+        valueLabel.isSelectable = false
+        valueLabel.isBezeled = false
+        valueLabel.wantsLayer = true
+        valueLabel.textColor = .labelColor
+        valueLabel.backgroundColor = .controlColor
+        valueLabel.canDrawSubviewsIntoLayer = true
+        valueLabel.alignment = .natural
+        valueLabel.font = NSFont.systemFont(ofSize: 8, weight: .ultraLight)
+        valueLabel.stringValue = ""
+        valueLabel.addSubview(NSView())
+        
+        self.height = 7.0
+        self.addSubview(valueLabel)
+    }
+    
+    required init?(coder decoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func value(value: Float) {
+        self.valueLabel.stringValue = "\(Int(Float(Float(value).roundTo(decimalPlaces: 2))! * 100))%"
+        self.valueLabel.textColor = Float(value).usageColor()
+        
        if self.points.count < 50 {
            self.points.append(value)
            return
--- a/Stats/Widgets/Mini.swift
+++ b/Stats/Widgets/Mini.swift
@@ -0,0 +1,76 @@
+//
+//  Mini.swift
+//  Stats
+//
+//  Created by Serhiy Mytrovtsiy on 14.06.2019.
+//  Copyright © 2019 Serhiy Mytrovtsiy. All rights reserved.
+//
+
+import Cocoa
+
+class Mini: NSView, Widget {
+    var valueView: NSTextField = NSTextField()
+    var labelView: NSTextField = NSTextField()
+    
+    var value: Float = 0
+    var label: String = "" {
+        didSet {
+            self.labelView.stringValue = label
+        }
+    }
+    
+    override init(frame: NSRect) {
+        super.init(frame: frame)
+        
+        self.wantsLayer = true
+        
+        let xOffset: CGFloat = 1.0
+        
+        let labelView = NSTextField(frame: NSMakeRect(xOffset, 13, self.frame.size.width, 7))
+        labelView.textColor = NSColor.red
+        labelView.isEditable = false
+        labelView.isSelectable = false
+        labelView.isBezeled = false
+        labelView.wantsLayer = true
+        labelView.textColor = .labelColor
+        labelView.backgroundColor = .controlColor
+        labelView.canDrawSubviewsIntoLayer = true
+        labelView.alignment = .natural
+        labelView.font = NSFont.systemFont(ofSize: 7, weight: .ultraLight)
+        labelView.stringValue = self.label
+        labelView.addSubview(NSView())
+        
+        let valueView = NSTextField(frame: NSMakeRect(xOffset, 3, self.frame.size.width, 10))
+        valueView.textColor = NSColor.red
+        valueView.isEditable = false
+        valueView.isSelectable = false
+        valueView.isBezeled = false
+        valueView.wantsLayer = true
+        valueView.textColor = .labelColor
+        valueView.backgroundColor = .controlColor
+        valueView.canDrawSubviewsIntoLayer = true
+        valueView.alignment = .natural
+        valueView.font = NSFont.systemFont(ofSize: 10, weight: .regular)
+        valueView.stringValue = ""
+        valueView.addSubview(NSView())
+        
+        self.labelView = labelView
+        self.valueView = valueView
+        
+        self.addSubview(self.labelView)
+        self.addSubview(self.valueView)
+    }
+    
+    required init?(coder decoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func value(value: Float) {
+        if self.value != value {
+            self.value = value
+            
+            self.valueView.stringValue = "\(Int(Float(Float(value).roundTo(decimalPlaces: 2))! * 100))%"
+            self.valueView.textColor = Float(value).usageColor()
+        }
+    }
+}
--- a/Stats/libs/Module.swift
+++ b/Stats/libs/Module.swift
@@ -8,30 +8,65 @@

 import Cocoa

-protocol Module {
+protocol Module: class {
    var name: String { get }
-    var view: NSView { get }
+    var shortName: String { get }
+    var view: NSView { get set }
+    var menu: NSMenuItem { get }
    var active: Observable<Bool> { get }
    var reader: Reader { get }
+    var widgetType: WidgetType { get }
    
-    func menu() -> NSMenuItem
    func start()
    func stop()
 }

 extension Module {
+    func initWidget() {
+        self.active << false
+        switch self.widgetType {
+        case Widgets.Mini:
+            let widget = Mini(frame: NSMakeRect(0, 0, MODULE_WIDTH, MODULE_HEIGHT))
+            widget.label = self.shortName
+            self.view = widget
+            break
+        case Widgets.Chart:
+            self.view = Chart(frame: NSMakeRect(0, 0, MODULE_WIDTH + 7, MODULE_HEIGHT))
+            break
+        case Widgets.ChartWithValue:
+            self.view = ChartWithValue(frame: NSMakeRect(0, 0, MODULE_WIDTH + 7, MODULE_HEIGHT))
+            break
+        default:
+            let widget = Mini(frame: NSMakeRect(0, 0, MODULE_WIDTH, MODULE_HEIGHT))
+            widget.label = self.shortName
+            self.view = widget
+        }
+        self.active << true
+    }
+    
+    func start() {
+        if !self.reader.usage.value.isNaN {
+            guard let widget = self.view as? Widget else {
+                return
+            }
+            widget.value(value: self.reader.usage.value)
+        }
+        
+        self.reader.start()
+        self.reader.usage.subscribe(observer: self as AnyObject) { (value, _) in
+            if !value.isNaN {
+                guard let widget = self.view as? Widget else {
+                    return
+                }
+                widget.value(value: value)
+            }
+        }
+    }
+    
    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 {
@@ -40,3 +75,15 @@ protocol Reader {
    func read()
    func stop()
 }
+
+protocol Widget {
+    func value(value: Float)
+}
+
+typealias WidgetType = Float
+
+struct Widgets {
+    static let Mini: WidgetType = 0.0
+    static let Chart: WidgetType = 1.0
+    static let ChartWithValue: WidgetType = 1.1
+}