From 4693358d7ecbf4e97eea24bb40ae97083722fdc0 Mon Sep 17 00:00:00 2001
From: bluejamesbond <bluejamesbond@users.noreply.github.com>
Date: Tue, 27 Sep 2016 22:02:53 -0700
Subject: [PATCH] Prepping default buttons

---
 MonitorControl.OSX/AppDelegate.swift | 26 +++++++++++++++++++++-----
 README.md                            |  2 +-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/MonitorControl.OSX/AppDelegate.swift b/MonitorControl.OSX/AppDelegate.swift
index 8ebf6d4..01248c6 100644
--- a/MonitorControl.OSX/AppDelegate.swift
+++ b/MonitorControl.OSX/AppDelegate.swift
@@ -69,7 +69,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             let brightnessItem = NSMenuItem();
             let contrastItem = NSMenuItem();
             let volumeItem = NSMenuItem();
-            
+            let defaultMonitorItem = NSMenuItem();
+
             let brightnessSlider = NSSlider(frame: NSRect(x: 20, y: 0, width: 200, height: 19));
             
             brightnessSlider.target = self;
@@ -100,6 +101,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             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 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 brightnessLabel = NSTextField(frame: NSRect(x: 20, y: 16, width: 130, height: 20))
             brightnessLabel.stringValue = "Brightness";
@@ -110,6 +112,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             brightnessLabelKeyCode.stringValue = "⇧⌘- / ⇧⌘+"
             brightnessLabelKeyCode.isBordered = false;
             brightnessLabelKeyCode.isBezeled = false;
+            brightnessLabelKeyCode.isHidden = i != 1;
             brightnessLabelKeyCode.alignment = NSTextAlignment.right
             
             let constrastLabel = NSTextField(frame: NSRect(x: 20, y: 16, width: 130, height: 20))
@@ -123,9 +126,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             volumeLabel.isBezeled = false;
             
             let volumeLabelKeyCode = NSTextField(frame: NSRect(x: 120, y: 19, width: 100, height: 20))
-            volumeLabelKeyCode.stringValue = "Ctrl⌘- / Ctrl⌘+"
+            volumeLabelKeyCode.stringValue = "⌥⌘- / ⌥⌘+"
             volumeLabelKeyCode.isBordered = false;
             volumeLabelKeyCode.isBezeled = false;
+            volumeLabelKeyCode.isHidden = i != 1;
             volumeLabelKeyCode.alignment = NSTextAlignment.right
             
             brightnesSliderView.addSubview(brightnessLabel)
@@ -143,12 +147,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             contrastItem.view = contrastSliderView;
             volumeItem.view = volumeSliderView;
             
+            let defaultMonitorSelectButtom = NSButton(frame: NSRect(x: 25, y: 0, width: 200, height: 25));
+            defaultMonitorSelectButtom.title = i == 1 ? "Default" : "Set as default";
+            defaultMonitorSelectButtom.bezelStyle = NSRoundRectBezelStyle;
+            defaultMonitorSelectButtom.isEnabled = i != 1;
+            defaultMonitorSelectButtom.tag = i;
+            
+            defaultMonitorView.addSubview(defaultMonitorSelectButtom);
+            
+            defaultMonitorItem.view = defaultMonitorView;
+            
             monitorSubMenu.addItem(brightnessItem);
             monitorSubMenu.addItem(NSMenuItem.separator());
             monitorSubMenu.addItem(contrastItem);
             monitorSubMenu.addItem(NSMenuItem.separator());
             monitorSubMenu.addItem(volumeItem);
-            
+            monitorSubMenu.addItem(NSMenuItem.separator());
+            monitorSubMenu.addItem(defaultMonitorItem);
+
             monitorMenuItem.title = "Monitor \(i)";
             monitorMenuItem.submenu = monitorSubMenu;
             
@@ -179,7 +195,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     
                     self.ddcctl(monitor: String(monitor), command: "-v", value: String(value));
                 } else if (event.keyCode == 27 &&
-                    (event.modifierFlags.contains(NSEventModifierFlags.shift)) &&
+                    (event.modifierFlags.contains(NSEventModifierFlags.option)) &&
                     (event.modifierFlags.contains(NSEventModifierFlags.command))) {
                     let monitor = 1;
                     let value = abs(self.prefs.integer(forKey: "-b-\(monitor)") - 1);
@@ -188,7 +204,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     
                     self.ddcctl(monitor: String(monitor), command: "-b", value: String(value));
                 } else if (event.keyCode == 24 &&
-                    (event.modifierFlags.contains(NSEventModifierFlags.shift)) &&
+                    (event.modifierFlags.contains(NSEventModifierFlags.option)) &&
                     (event.modifierFlags.contains(NSEventModifierFlags.command))) {
                     let monitor = 1;
                     let value = abs(self.prefs.integer(forKey: "-b-\(monitor)") + 1);
diff --git a/README.md b/README.md
index d4c9ac8..fd1d67d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # MonitorControl.OSX
 A menu let to control your monitor (brightness, contrast, volume)
 
-![image](https://cloud.githubusercontent.com/assets/376453/18861808/d5acb70e-843c-11e6-92f4-c7cbd5f10b90.png)
+![image](https://cloud.githubusercontent.com/assets/376453/18901240/1fbc7c82-84fe-11e6-87fe-0312d7923ef4.png)
 
 Compatible with most Dell monitors and LG including 27UD68