github-starred/MonitorControl
2
0
Fork 0
mirror of https://github.com/MonitorControl/MonitorControl.git synced 2026-05-21 06:46:18 -06:00
Code Issues 21 Projects Packages Wiki Activity Actions

Remove unnecessary semicolons

Browse source
This commit is contained in:
Asger Hautop Drewsen 2017-01-12 06:20:45 +01:00
parent a6422c017a
commit 2963e2587b
1 changed files with 98 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

196
MonitorControl.OSX/AppDelegate.swift
View file

@ -23,7 +23,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
@IBOutlet weak var statusMenu: NSMenu! @IBOutlet weak var statusMenu: NSMenu!
@IBOutlet weak var window: NSWindow! @IBOutlet weak var window: NSWindow!
let prefs = UserDefaults.standard; let prefs = UserDefaults.standard
let statusItem = NSStatusBar.system().statusItem(withLength: NSVariableStatusItemLength) let statusItem = NSStatusBar.system().statusItem(withLength: NSVariableStatusItemLength)
@ -33,43 +33,43 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var displays : [Display] = [] var displays : [Display] = []
@IBAction func quitClicked(_ sender: AnyObject) { @IBAction func quitClicked(_ sender: AnyObject) {
NSApplication.shared().terminate(self); NSApplication.shared().terminate(self)
} }
func setBrightness( slider: NSSlider ){ func setBrightness( slider: NSSlider ){
let command = "-b"; let command = "-b"
let value = slider.integerValue; let value = slider.integerValue
let i = slider.tag; let i = slider.tag
let d = displays[i] let d = displays[i]
ddcctl(monitor: d.id, command: command, value: value); ddcctl(monitor: d.id, command: command, value: value)
prefs.setValue(value, forKey: "\(command)-\(d.serial)"); prefs.setValue(value, forKey: "\(command)-\(d.serial)")
prefs.synchronize(); prefs.synchronize()
} }
func setVolume(slider: NSSlider ){ func setVolume(slider: NSSlider ){
let command = "-v"; let command = "-v"
let value = slider.integerValue; let value = slider.integerValue
let i = slider.tag; let i = slider.tag
let d = displays[i] let d = displays[i]
ddcctl(monitor: d.id, command: command, value: value); ddcctl(monitor: d.id, command: command, value: value)
prefs.setValue(value, forKey: "\(command)-\(d.serial)"); prefs.setValue(value, forKey: "\(command)-\(d.serial)")
prefs.synchronize(); prefs.synchronize()
} }
func setContrast(slider: NSSlider ){ func setContrast(slider: NSSlider ){
let command = "-c"; let command = "-c"
let value = slider.integerValue; let value = slider.integerValue
let i = slider.tag; let i = slider.tag
let d = displays[i] let d = displays[i]
ddcctl(monitor: d.id, command: command, value: value); ddcctl(monitor: d.id, command: command, value: value)
prefs.setValue(value, forKey: "\(command)-\(d.serial)"); prefs.setValue(value, forKey: "\(command)-\(d.serial)")
prefs.synchronize(); prefs.synchronize()
} }
func applicationDidFinishLaunching(_ aNotification: Notification) { func applicationDidFinishLaunching(_ aNotification: Notification) {
@ -78,7 +78,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
statusItem.title = "♨" statusItem.title = "♨"
statusItem.menu = statusMenu statusItem.menu = statusMenu
acquirePrivileges(); acquirePrivileges()
CGDisplayRegisterReconfigurationCallback({_,_,_ in app.updateDisplays()}, nil) CGDisplayRegisterReconfigurationCallback({_,_,_ in app.updateDisplays()}, nil)
updateDisplays() updateDisplays()
@ -114,83 +114,83 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let i = displays.count - 1 let i = displays.count - 1
let monitorMenuItem = NSMenuItem(); let monitorMenuItem = NSMenuItem()
let monitorSubMenu = NSMenu(); let monitorSubMenu = NSMenu()
let brightnessItem = NSMenuItem(); let brightnessItem = NSMenuItem()
let contrastItem = NSMenuItem(); let contrastItem = NSMenuItem()
let volumeItem = NSMenuItem(); let volumeItem = NSMenuItem()
let defaultMonitorItem = NSMenuItem(); let defaultMonitorItem = NSMenuItem()
let brightnessSlider = NSSlider(frame: NSRect(x: 20, y: 0, width: 200, height: 19)); let brightnessSlider = NSSlider(frame: NSRect(x: 20, y: 0, width: 200, height: 19))
brightnessSlider.target = self; brightnessSlider.target = self
brightnessSlider.minValue = 0; brightnessSlider.minValue = 0
brightnessSlider.maxValue = 100; brightnessSlider.maxValue = 100
brightnessSlider.integerValue = prefs.integer(forKey: "-b-\(serial)") brightnessSlider.integerValue = prefs.integer(forKey: "-b-\(serial)")
brightnessSlider.action = #selector(AppDelegate.setBrightness); brightnessSlider.action = #selector(AppDelegate.setBrightness)
brightnessSlider.tag = i; brightnessSlider.tag = i
let contrastSlider = NSSlider(frame: NSRect(x: 20, y: 0, width: 200, height: 19)); let contrastSlider = NSSlider(frame: NSRect(x: 20, y: 0, width: 200, height: 19))
contrastSlider.target = self; contrastSlider.target = self
contrastSlider.minValue = 0; contrastSlider.minValue = 0
contrastSlider.maxValue = 100; contrastSlider.maxValue = 100
contrastSlider.integerValue = prefs.integer(forKey: "-c-\(serial)") contrastSlider.integerValue = prefs.integer(forKey: "-c-\(serial)")
contrastSlider.action = #selector(AppDelegate.setContrast); contrastSlider.action = #selector(AppDelegate.setContrast)
contrastSlider.tag = i; contrastSlider.tag = i
let volumeSlider = NSSlider(frame: NSRect(x: 20, y: 3, width: 200, height: 19)); let volumeSlider = NSSlider(frame: NSRect(x: 20, y: 3, width: 200, height: 19))
volumeSlider.target = self; volumeSlider.target = self
volumeSlider.minValue = 0; volumeSlider.minValue = 0
volumeSlider.maxValue = 100; volumeSlider.maxValue = 100
volumeSlider.integerValue = prefs.integer(forKey: "-v-\(serial)") volumeSlider.integerValue = prefs.integer(forKey: "-v-\(serial)")
volumeSlider.action = #selector(AppDelegate.setVolume); volumeSlider.action = #selector(AppDelegate.setVolume)
volumeSlider.tag = i; volumeSlider.tag = i
let brightnesSliderView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 40)); let brightnesSliderView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 40))
let contrastSliderView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 40)); let contrastSliderView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 40))
let volumeSliderView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 40)); let volumeSliderView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 40))
let defaultMonitorView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 25)); let defaultMonitorView = NSView(frame: NSRect(x: 0, y: 5, width: 250, height: 25))
let brightnessLabel = NSTextField(frame: NSRect(x: 20, y: 16, width: 130, height: 20)) let brightnessLabel = NSTextField(frame: NSRect(x: 20, y: 16, width: 130, height: 20))
brightnessLabel.stringValue = "Brightness"; brightnessLabel.stringValue = "Brightness"
brightnessLabel.isBordered = false; brightnessLabel.isBordered = false
brightnessLabel.isBezeled = false; brightnessLabel.isBezeled = false
brightnessLabel.isEditable = false brightnessLabel.isEditable = false
brightnessLabel.drawsBackground = false brightnessLabel.drawsBackground = false
let brightnessLabelKeyCode = NSTextField(frame: NSRect(x: 120, y: 16, width: 100, height: 20)) let brightnessLabelKeyCode = NSTextField(frame: NSRect(x: 120, y: 16, width: 100, height: 20))
brightnessLabelKeyCode.stringValue = "⇧⌘- / ⇧⌘+" brightnessLabelKeyCode.stringValue = "⇧⌘- / ⇧⌘+"
brightnessLabelKeyCode.isBordered = false; brightnessLabelKeyCode.isBordered = false
brightnessLabelKeyCode.isBezeled = false; brightnessLabelKeyCode.isBezeled = false
brightnessLabelKeyCode.isEditable = false brightnessLabelKeyCode.isEditable = false
brightnessLabelKeyCode.drawsBackground = false brightnessLabelKeyCode.drawsBackground = false
brightnessLabelKeyCode.isHidden = firstDisplay != nil; brightnessLabelKeyCode.isHidden = firstDisplay != nil
brightnessLabelKeyCode.alignment = NSTextAlignment.right brightnessLabelKeyCode.alignment = NSTextAlignment.right
let constrastLabel = NSTextField(frame: NSRect(x: 20, y: 16, width: 130, height: 20)) let constrastLabel = NSTextField(frame: NSRect(x: 20, y: 16, width: 130, height: 20))
constrastLabel.stringValue = "Contrast" constrastLabel.stringValue = "Contrast"
constrastLabel.isBordered = false; constrastLabel.isBordered = false
constrastLabel.isBezeled = false; constrastLabel.isBezeled = false
constrastLabel.isEditable = false constrastLabel.isEditable = false
constrastLabel.drawsBackground = false constrastLabel.drawsBackground = false
let volumeLabel = NSTextField(frame: NSRect(x: 20, y: 19, width: 130, height: 20)) let volumeLabel = NSTextField(frame: NSRect(x: 20, y: 19, width: 130, height: 20))
volumeLabel.stringValue = "Volume" volumeLabel.stringValue = "Volume"
volumeLabel.isBordered = false; volumeLabel.isBordered = false
volumeLabel.isBezeled = false; volumeLabel.isBezeled = false
volumeLabel.isEditable = false volumeLabel.isEditable = false
volumeLabel.drawsBackground = false volumeLabel.drawsBackground = false
let volumeLabelKeyCode = NSTextField(frame: NSRect(x: 120, y: 19, width: 100, height: 20)) let volumeLabelKeyCode = NSTextField(frame: NSRect(x: 120, y: 19, width: 100, height: 20))
volumeLabelKeyCode.stringValue = "⌥⌘- / ⌥⌘+" volumeLabelKeyCode.stringValue = "⌥⌘- / ⌥⌘+"
volumeLabelKeyCode.isBordered = false; volumeLabelKeyCode.isBordered = false
volumeLabelKeyCode.isBezeled = false; volumeLabelKeyCode.isBezeled = false
volumeLabelKeyCode.isEditable = false; volumeLabelKeyCode.isEditable = false
volumeLabelKeyCode.drawsBackground = false; volumeLabelKeyCode.drawsBackground = false
volumeLabelKeyCode.isHidden = firstDisplay != nil; volumeLabelKeyCode.isHidden = firstDisplay != nil
volumeLabelKeyCode.alignment = NSTextAlignment.right volumeLabelKeyCode.alignment = NSTextAlignment.right
brightnesSliderView.addSubview(brightnessLabel) brightnesSliderView.addSubview(brightnessLabel)
@ -204,30 +204,30 @@ class AppDelegate: NSObject, NSApplicationDelegate {
volumeSliderView.addSubview(volumeLabelKeyCode) volumeSliderView.addSubview(volumeLabelKeyCode)
volumeSliderView.addSubview(volumeSlider) volumeSliderView.addSubview(volumeSlider)
brightnessItem.view = brightnesSliderView; brightnessItem.view = brightnesSliderView
contrastItem.view = contrastSliderView; contrastItem.view = contrastSliderView
volumeItem.view = volumeSliderView; volumeItem.view = volumeSliderView
let defaultMonitorSelectButtom = NSButton(frame: NSRect(x: 25, y: 0, width: 200, height: 25)); let defaultMonitorSelectButtom = NSButton(frame: NSRect(x: 25, y: 0, width: 200, height: 25))
defaultMonitorSelectButtom.title = firstDisplay == nil ? "Default" : "Set as default"; defaultMonitorSelectButtom.title = firstDisplay == nil ? "Default" : "Set as default"
defaultMonitorSelectButtom.bezelStyle = NSRoundRectBezelStyle; defaultMonitorSelectButtom.bezelStyle = NSRoundRectBezelStyle
defaultMonitorSelectButtom.isEnabled = firstDisplay != nil; defaultMonitorSelectButtom.isEnabled = firstDisplay != nil
defaultMonitorSelectButtom.tag = i; defaultMonitorSelectButtom.tag = i
defaultMonitorView.addSubview(defaultMonitorSelectButtom); defaultMonitorView.addSubview(defaultMonitorSelectButtom)
defaultMonitorItem.view = defaultMonitorView; defaultMonitorItem.view = defaultMonitorView
monitorSubMenu.addItem(brightnessItem); monitorSubMenu.addItem(brightnessItem)
monitorSubMenu.addItem(NSMenuItem.separator()); monitorSubMenu.addItem(NSMenuItem.separator())
monitorSubMenu.addItem(contrastItem); monitorSubMenu.addItem(contrastItem)
monitorSubMenu.addItem(NSMenuItem.separator()); monitorSubMenu.addItem(NSMenuItem.separator())
monitorSubMenu.addItem(volumeItem); monitorSubMenu.addItem(volumeItem)
monitorSubMenu.addItem(NSMenuItem.separator()); monitorSubMenu.addItem(NSMenuItem.separator())
monitorSubMenu.addItem(defaultMonitorItem); monitorSubMenu.addItem(defaultMonitorItem)
monitorMenuItem.title = "\(name)"; monitorMenuItem.title = "\(name)"
monitorMenuItem.submenu = monitorSubMenu; monitorMenuItem.submenu = monitorSubMenu
monitorItems.append(monitorMenuItem) monitorItems.append(monitorMenuItem)
statusMenu.insertItem(monitorMenuItem, at: i) statusMenu.insertItem(monitorMenuItem, at: i)
@ -248,49 +248,49 @@ class AppDelegate: NSObject, NSApplicationDelegate {
if (event.keyCode == 27 && if (event.keyCode == 27 &&
(event.modifierFlags.contains(NSEventModifierFlags.control)) && (event.modifierFlags.contains(NSEventModifierFlags.control)) &&
(event.modifierFlags.contains(NSEventModifierFlags.command))) { (event.modifierFlags.contains(NSEventModifierFlags.command))) {
let value = abs(self.prefs.integer(forKey: "-v-\(d.serial)") - 1); let value = abs(self.prefs.integer(forKey: "-v-\(d.serial)") - 1)
self.prefs.setValue(value, forKey: "-v-\(d.serial)"); self.prefs.setValue(value, forKey: "-v-\(d.serial)")
self.ddcctl(monitor: d.id, command: "-v", value: value); self.ddcctl(monitor: d.id, command: "-v", value: value)
} else if (event.keyCode == 24 && } else if (event.keyCode == 24 &&
(event.modifierFlags.contains(NSEventModifierFlags.control)) && (event.modifierFlags.contains(NSEventModifierFlags.control)) &&
(event.modifierFlags.contains(NSEventModifierFlags.command))) { (event.modifierFlags.contains(NSEventModifierFlags.command))) {
let value = abs(self.prefs.integer(forKey: "-v-\(d.serial)") + 1); let value = abs(self.prefs.integer(forKey: "-v-\(d.serial)") + 1)
self.prefs.setValue(value, forKey: "-v-\(d.serial)"); self.prefs.setValue(value, forKey: "-v-\(d.serial)")
self.ddcctl(monitor: d.id, command: "-v", value: value); self.ddcctl(monitor: d.id, command: "-v", value: value)
} else if (event.keyCode == 27 && } else if (event.keyCode == 27 &&
(event.modifierFlags.contains(NSEventModifierFlags.option)) && (event.modifierFlags.contains(NSEventModifierFlags.option)) &&
(event.modifierFlags.contains(NSEventModifierFlags.command))) { (event.modifierFlags.contains(NSEventModifierFlags.command))) {
let value = abs(self.prefs.integer(forKey: "-b-\(d.serial)") - 1); let value = abs(self.prefs.integer(forKey: "-b-\(d.serial)") - 1)
self.prefs.setValue(value, forKey: "-b-\(d.serial))"); self.prefs.setValue(value, forKey: "-b-\(d.serial))")
self.ddcctl(monitor: d.id, command: "-b", value: value); self.ddcctl(monitor: d.id, command: "-b", value: value)
} else if (event.keyCode == 24 && } else if (event.keyCode == 24 &&
(event.modifierFlags.contains(NSEventModifierFlags.option)) && (event.modifierFlags.contains(NSEventModifierFlags.option)) &&
(event.modifierFlags.contains(NSEventModifierFlags.command))) { (event.modifierFlags.contains(NSEventModifierFlags.command))) {
let value = abs(self.prefs.integer(forKey: "-b-\(d.serial)") + 1); let value = abs(self.prefs.integer(forKey: "-b-\(d.serial)") + 1)
self.prefs.setValue(value, forKey: "-b-\(d.serial)"); self.prefs.setValue(value, forKey: "-b-\(d.serial)")
self.ddcctl(monitor: d.id, command: "-b", value: value); self.ddcctl(monitor: d.id, command: "-b", value: value)
} }
}); })
} }
func acquirePrivileges() { func acquirePrivileges() {
let options : NSDictionary = [kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true] let options : NSDictionary = [kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true]
let accessibilityEnabled = AXIsProcessTrustedWithOptions(options); let accessibilityEnabled = AXIsProcessTrustedWithOptions(options)
if !accessibilityEnabled { if !accessibilityEnabled {
print("You need to enable the keylogger in the System Prefrences") print("You need to enable the keylogger in the System Prefrences")
} }
return; return
} }
func ddcctl(monitor: CGDirectDisplayID, command: String, value: Int) { func ddcctl(monitor: CGDirectDisplayID, command: String, value: Int) {