diff --git a/Modules/Clock/main.swift b/Modules/Clock/main.swift index 75530211..b7cc1c9d 100644 --- a/Modules/Clock/main.swift +++ b/Modules/Clock/main.swift @@ -61,7 +61,7 @@ public class Clock: Module { private var reader: ClockReader? static var list: [Clock_t] { - if let objects = Store.shared.data(key: "\(ModuleType.clock.rawValue)_list") { + if let objects = Store.shared.data(key: "\(ModuleType.clock.stringValue)_list") { let decoder = JSONDecoder() if let objectsDecoded = try? decoder.decode(Array.self, from: objects) as [Clock_t] { return objectsDecoded diff --git a/Modules/Disk/main.swift b/Modules/Disk/main.swift index 2744a644..37d3513b 100644 --- a/Modules/Disk/main.swift +++ b/Modules/Disk/main.swift @@ -156,7 +156,7 @@ public class Disks: Codable { public struct Disk_process: Process_p, Codable { public var base: DataSizeBase { - DataSizeBase(rawValue: Store.shared.string(key: "\(ModuleType.disk.rawValue)_base", defaultValue: "byte")) ?? .byte + DataSizeBase(rawValue: Store.shared.string(key: "\(ModuleType.disk.stringValue)_base", defaultValue: "byte")) ?? .byte } public var pid: Int @@ -223,7 +223,7 @@ public class Disk: Module { } } - self.selectedDisk = Store.shared.string(key: "\(ModuleType.disk.rawValue)_disk", defaultValue: self.selectedDisk) + self.selectedDisk = Store.shared.string(key: "\(ModuleType.disk.stringValue)_disk", defaultValue: self.selectedDisk) self.settingsView.selectedDiskHandler = { [weak self] value in self?.selectedDisk = value diff --git a/Modules/Disk/popup.swift b/Modules/Disk/popup.swift index 8258262c..b0122676 100644 --- a/Modules/Disk/popup.swift +++ b/Modules/Disk/popup.swift @@ -287,10 +287,10 @@ internal class DiskView: NSStackView { } private var readColor: NSColor { - SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor + SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor } private var writeColor: NSColor { - SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor + SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor } init(width: CGFloat, uuid: String = "", name: String = "", size: Int64 = 1, free: Int64 = 1, path: URL? = nil, smart: smart_t? = nil, resize: @escaping () -> Void) { @@ -411,10 +411,10 @@ internal class NameView: NSStackView { private var writeState: NSView? = nil private var readColor: NSColor { - SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor + SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor } private var writeColor: NSColor { - SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor + SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor } public init(width: CGFloat, name: String, size: Int64, free: Int64, path: URL?) { @@ -518,13 +518,13 @@ internal class ChartView: NSStackView { private var ready: Bool = false private var readColor: NSColor { - SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor + SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_readColor", defaultValue: SColor.secondBlue.key)).additional as! NSColor } private var writeColor: NSColor { - SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.rawValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor + SColor.fromString(Store.shared.string(key: "\(ModuleType.disk.stringValue)_writeColor", defaultValue: SColor.secondRed.key)).additional as! NSColor } private var reverseOrder: Bool { - Store.shared.bool(key: "\(ModuleType.disk.rawValue)_reverseOrder", defaultValue: false) + Store.shared.bool(key: "\(ModuleType.disk.stringValue)_reverseOrder", defaultValue: false) } public init(width: CGFloat) { diff --git a/Modules/Disk/readers.swift b/Modules/Disk/readers.swift index 286318fc..e8aee46a 100644 --- a/Modules/Disk/readers.swift +++ b/Modules/Disk/readers.swift @@ -36,7 +36,7 @@ internal class CapacityReader: Reader { internal var list: Disks = Disks() private var SMART: Bool { - Store.shared.bool(key: "\(ModuleType.disk.rawValue)_SMART", defaultValue: true) + Store.shared.bool(key: "\(ModuleType.disk.stringValue)_SMART", defaultValue: true) } public override func read() { @@ -381,7 +381,7 @@ public class ProcessReader: Reader<[Disk_process]> { } private var numberOfProcesses: Int { - Store.shared.int(key: "\(ModuleType.disk.rawValue)_processes", defaultValue: 5) + Store.shared.int(key: "\(ModuleType.disk.stringValue)_processes", defaultValue: 5) } public override func setup() { diff --git a/Modules/Sensors/main.swift b/Modules/Sensors/main.swift index d81959cb..068d3efb 100644 --- a/Modules/Sensors/main.swift +++ b/Modules/Sensors/main.swift @@ -30,7 +30,7 @@ public class Sensors: Module { self.popupView = Popup() self.portalView = Portal(.sensors) self.notificationsView = Notifications(.sensors) - self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.rawValue)_sensor", defaultValue: "Average System Total") + self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.stringValue)_sensor", defaultValue: "Average System Total") super.init( moduleType: .sensors, @@ -78,7 +78,7 @@ public class Sensors: Module { } } } - self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.rawValue)_sensor", defaultValue: self.selectedSensor) + self.selectedSensor = Store.shared.string(key: "\(ModuleType.sensors.stringValue)_sensor", defaultValue: self.selectedSensor) self.settingsView.selectedHandler = { [weak self] value in self?.selectedSensor = value self?.sensorsReader?.read() diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj index c006450a..7d82a84f 100644 --- a/Stats.xcodeproj/project.pbxproj +++ b/Stats.xcodeproj/project.pbxproj @@ -2861,7 +2861,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.11.27; + MARKETING_VERSION = 2.11.28; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2898,7 +2898,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 2.11.27; + MARKETING_VERSION = 2.11.28; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Stats/Supporting Files/Info.plist b/Stats/Supporting Files/Info.plist index 23b02d4c..8c302f2a 100755 --- a/Stats/Supporting Files/Info.plist +++ b/Stats/Supporting Files/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 668 + 669 Description Simple macOS system monitor in your menu bar LSApplicationCategoryType diff --git a/Widgets/Supporting Files/Info.plist b/Widgets/Supporting Files/Info.plist index aa019b1b..f051e215 100644 --- a/Widgets/Supporting Files/Info.plist +++ b/Widgets/Supporting Files/Info.plist @@ -11,9 +11,9 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleShortVersionString - 2.11.27 + 2.11.28 CFBundleVersion - 668 + 669 NSExtension NSExtensionPointIdentifier