From a78e28e23210d63ca6fc7c63fb4c8cd906dc6073 Mon Sep 17 00:00:00 2001
From: Bofan Wang <bofan.wang@shopee.com>
Date: Sat, 9 Oct 2021 14:37:37 +0800
Subject: [PATCH 1/2] add opiton to set default input source

---
 SwitchKey.xcodeproj/project.pbxproj           |  4 +-
 .../xcshareddata/xcschemes/SwitchKey.xcscheme |  2 +-
 SwitchKey/AppDelegate.swift                   | 85 ++++++++++++++++---
 SwitchKey/Base.lproj/SwitchKey.xib            | 44 +++++++---
 4 files changed, 112 insertions(+), 23 deletions(-)

diff --git a/SwitchKey.xcodeproj/project.pbxproj b/SwitchKey.xcodeproj/project.pbxproj
index e2e991d..8cfd9b1 100644
--- a/SwitchKey.xcodeproj/project.pbxproj
+++ b/SwitchKey.xcodeproj/project.pbxproj
@@ -100,7 +100,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1020;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "Jinyu Li";
 				TargetAttributes = {
 					71FECF2922610BE600C51FD7 = {
@@ -196,6 +196,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -257,6 +258,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/SwitchKey.xcodeproj/xcshareddata/xcschemes/SwitchKey.xcscheme b/SwitchKey.xcodeproj/xcshareddata/xcschemes/SwitchKey.xcscheme
index 80fd0cb..2e079ce 100644
--- a/SwitchKey.xcodeproj/xcshareddata/xcschemes/SwitchKey.xcscheme
+++ b/SwitchKey.xcodeproj/xcshareddata/xcschemes/SwitchKey.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwitchKey/AppDelegate.swift b/SwitchKey/AppDelegate.swift
index 19628d8..688d4fb 100644
--- a/SwitchKey/AppDelegate.swift
+++ b/SwitchKey/AppDelegate.swift
@@ -16,6 +16,7 @@ extension Notification.Name {
 
 private let itemCellIdentifier = NSUserInterfaceItemIdentifier("item-cell")
 private let editCellIdentifier = NSUserInterfaceItemIdentifier("edit-cell")
+private let defaultCellIdentifier = NSUserInterfaceItemIdentifier("default-cell")
 
 private func applicationSwitchedCallback(_ axObserver: AXObserver, axElement: AXUIElement, notification: CFString, userData: UnsafeMutableRawPointer?) {
     if let userData = userData {
@@ -55,6 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
             conditionTableView.appDelegate = self
             conditionTableView.register(NSNib(nibNamed: "SwitchKey", bundle: nil), forIdentifier: itemCellIdentifier)
             conditionTableView.register(NSNib(nibNamed: "SwitchKey", bundle: nil), forIdentifier: editCellIdentifier)
+            conditionTableView.register(NSNib(nibNamed: "SwitchKey", bundle: nil), forIdentifier: defaultCellIdentifier)
         }
     }
 
@@ -62,6 +64,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
     private var currentPid:pid_t = getpid()
 
     private var conditionItems: [ConditionItem] = []
+    private var defaultCondition : ConditionItem = ConditionItem()
 
     private var statusBarItem: NSStatusItem!
     private var launchAtStartupItem: NSMenuItem!
@@ -116,6 +119,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
     fileprivate func applicationSwitched() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
             if let application = NSWorkspace.shared.frontmostApplication {
+                var unMatched = true
                 let switchedPid:pid_t = application.processIdentifier
                 if (switchedPid != self.currentPid && switchedPid != getpid()) {
                     for condition in self.conditionItems {
@@ -125,10 +129,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
                         if condition.applicationIdentifier == application.bundleIdentifier {
                             if let inputSource = InputSource.with(condition.inputSourceID) {
                                 inputSource.activate()
+                                unMatched = false
                             }
                             break
                         }
                     }
+                    if unMatched && self.defaultCondition.inputSourceID != "" && self.defaultCondition.enabled == true {
+                        if let inputSource = InputSource.with(self.defaultCondition.inputSourceID) {
+                            inputSource.activate()
+                        }
+                    }
                     self.currentPid = switchedPid
                 }
             }
@@ -186,7 +196,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
 
     func loadConditions() {
         if let conditions = UserDefaults.standard.array(forKey: "Conditions") as? [[String:Any]] {
+            defer {
+                conditionTableView.reloadData()
+            }
             for c in conditions {
+                if c["IsDefault"] != nil && c["IsDefault"] as! Bool == true {
+                    if let inputSource = InputSource.with(c["InputSourceID"] as! String) {
+                        defaultCondition.inputSourceID = inputSource.inputSourceID();
+                        defaultCondition.inputSourceIcon = inputSource.icon()
+                        if c["Enabled"] != nil {
+                            defaultCondition.enabled = c["Enabled"] as! Bool
+                        }
+                    }
+                    continue
+                }
                 let conditionItem = ConditionItem()
                 if let inputSource = InputSource.with(c["InputSourceID"] as! String) {
                     conditionItem.applicationIdentifier = c["ApplicationIdentifier"] as! String
@@ -217,8 +240,25 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
 
             conditions.append(c)
         }
+        var defaultC = [String:Any]()
+        defaultC["IsDefault"] = true
+        defaultC["InputSourceID"] = defaultCondition.inputSourceID
+        defaultC["Enabled"] = defaultCondition.enabled
+        conditions.append(defaultC)
+        
         UserDefaults.standard.set(conditions, forKey: "Conditions")
     }
+    
+    func setDefaultCondition() {
+        defer {
+            conditionTableView.reloadData()
+            saveConditions()
+        }
+        let inputSource = InputSource.current()
+        defaultCondition.inputSourceID = inputSource.inputSourceID()
+        defaultCondition.inputSourceIcon = inputSource.icon()
+        defaultCondition.enabled = true
+    }
 
     func addCondition() {
         if let currentApplication = NSWorkspace.shared.frontmostApplication {
@@ -259,16 +299,32 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
     }
 
     func removeCondition(row: Int) {
-        if row > 0 {
-            conditionItems.remove(at: row - 1)
+        if row > 2 {
+            conditionItems.remove(at: row - 3)
             conditionTableView.reloadData()
             saveConditions()
         }
     }
 
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
-        if row > 0 {
-            let item = conditionItems[row - 1]
+        if row == 0 {
+            return conditionTableView.makeView(withIdentifier: editCellIdentifier, owner: nil)
+        } else if row == 1 {
+            return conditionTableView.makeView(withIdentifier: defaultCellIdentifier, owner: nil)
+        } else if row == 2 {
+            let itemCell = conditionTableView.makeView(withIdentifier: itemCellIdentifier, owner: nil) as! ConditionCell
+            
+            let icon = defaultCondition.inputSourceIcon
+            itemCell.appName.stringValue = "Default"
+            itemCell.appIcon.image = NSImage()
+            
+            itemCell.inputSourceButton.image = icon
+            itemCell.inputSourceButton.image?.isTemplate = icon.canTemplate()
+            
+            itemCell.conditionEnabled.state = defaultCondition.enabled ? .on : .off
+            return itemCell
+        } else {
+            let item = conditionItems[row - 3]
             let itemCell = conditionTableView.makeView(withIdentifier: itemCellIdentifier, owner: nil) as! ConditionCell
             itemCell.appIcon.image = item.applicationIcon
             itemCell.appName.stringValue = item.applicationName
@@ -279,21 +335,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
             
             itemCell.conditionEnabled.state = item.enabled ? .on : .off
             return itemCell
-        } else {
-            return conditionTableView.makeView(withIdentifier: editCellIdentifier, owner: nil)
         }
     }
 
     func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any? {
-        if row > 0 {
-            return conditionItems[row - 1]
+        if row == 2 {
+            return defaultCondition
+        } else if row > 2 {
+            return conditionItems[row - 3]
         } else {
             return self
         }
     }
 
     func tableView(_ tableView: NSTableView, heightOfRow row: Int) -> CGFloat {
-        if row > 0 {
+        if row > 1 {
             return 64
         } else {
             return 24
@@ -302,12 +358,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
 
     func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
         let view = TableRowView()
-        view.highlight = row > 0
+        view.highlight = row > 1
         return view
     }
 
     func numberOfRows(in tableView: NSTableView) -> Int {
-        return conditionItems.count + 1
+        return conditionItems.count + 3
     }
 }
 
@@ -373,3 +429,10 @@ class EditCell: NSTableCellView {
         app.addCondition()
     }
 }
+
+class DefaultCell: NSTableCellView {
+    @IBAction func addItemClicked(_ sender: Any) {
+        let app = objectValue as! AppDelegate
+        app.setDefaultCondition()
+    }
+}
diff --git a/SwitchKey/Base.lproj/SwitchKey.xib b/SwitchKey/Base.lproj/SwitchKey.xib
index 48ab804..bc0a491 100644
--- a/SwitchKey/Base.lproj/SwitchKey.xib
+++ b/SwitchKey/Base.lproj/SwitchKey.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -21,7 +21,7 @@
         </customObject>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu id="lcZ-64-V4h">
-            <point key="canvasLocation" x="139" y="143"/>
+            <point key="canvasLocation" x="139" y="142.5"/>
         </menu>
         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="ycM-3L-97V">
             <rect key="frame" x="0.0" y="0.0" width="362" height="2"/>
@@ -37,9 +37,8 @@
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                         <tableColumns>
-                            <tableColumn width="357" minWidth="40" maxWidth="1000" id="Y12-MF-ZTz">
+                            <tableColumn width="319" minWidth="40" maxWidth="1000" id="Y12-MF-ZTz">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                    <font key="font" metaFont="menu" size="11"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                 </tableHeaderCell>
@@ -76,9 +75,9 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSApplicationIcon" id="pGI-gj-dvK"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="61R-Cm-pCP">
-                    <rect key="frame" x="62" y="24" width="68" height="16"/>
-                    <textFieldCell key="cell" lineBreakMode="clipping" title="AppName" id="AGL-f7-fn1">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61R-Cm-pCP">
+                    <rect key="frame" x="62" y="24" width="60" height="16"/>
+                    <textFieldCell key="cell" lineBreakMode="truncatingTail" title="AppName" id="AGL-f7-fn1">
                         <font key="font" metaFont="systemBold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -140,7 +139,7 @@
                     </constraints>
                     <buttonCell key="cell" type="roundRect" title="Add Current" bezelStyle="roundedRect" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XiT-Jr-Qlg">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="label" size="12"/>
+                        <font key="font" metaFont="cellTitle"/>
                         <connections>
                             <action selector="addItemClicked:" target="tGE-D6-w3H" id="1xs-Ii-GnG"/>
                         </connections>
@@ -152,7 +151,32 @@
                 <constraint firstItem="5k7-2A-D1v" firstAttribute="centerY" secondItem="tGE-D6-w3H" secondAttribute="centerY" id="MTe-2i-BMr"/>
                 <constraint firstItem="5k7-2A-D1v" firstAttribute="leading" secondItem="tGE-D6-w3H" secondAttribute="leading" constant="8" id="zMc-7U-kh1"/>
             </constraints>
-            <point key="canvasLocation" x="139.5" y="341.5"/>
+            <point key="canvasLocation" x="139.5" y="341"/>
+        </tableCellView>
+        <tableCellView identifier="default-cell" id="Vpw-z4-ZBh" customClass="DefaultCell" customModule="SwitchKey" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="109" height="20"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4vR-Dl-cUP">
+                    <rect key="frame" x="8" y="-1" width="93" height="21"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="20" id="bXh-9f-px7"/>
+                    </constraints>
+                    <buttonCell key="cell" type="roundRect" title="Set Default" bezelStyle="roundedRect" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9Ov-8E-4aN">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="cellTitle"/>
+                        <connections>
+                            <action selector="addItemClicked:" target="Vpw-z4-ZBh" id="ygz-2j-PkS"/>
+                        </connections>
+                    </buttonCell>
+                </button>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="4vR-Dl-cUP" secondAttribute="trailing" constant="8" id="810-Ae-KsP"/>
+                <constraint firstItem="4vR-Dl-cUP" firstAttribute="centerY" secondItem="Vpw-z4-ZBh" secondAttribute="centerY" id="Ir6-QI-nMh"/>
+                <constraint firstItem="4vR-Dl-cUP" firstAttribute="leading" secondItem="Vpw-z4-ZBh" secondAttribute="leading" constant="8" id="lGZ-Xa-ux1"/>
+            </constraints>
+            <point key="canvasLocation" x="139.5" y="417"/>
         </tableCellView>
     </objects>
     <resources>

From 40e3656dbbf4bd4f91001fd3ce1844453b4607a6 Mon Sep 17 00:00:00 2001
From: Bofan Wang <bofan.wang@shopee.com>
Date: Sat, 9 Oct 2021 22:10:34 +0800
Subject: [PATCH 2/2] fix layout

---
 SwitchKey/AppDelegate.swift        |  7 +++
 SwitchKey/Base.lproj/SwitchKey.xib | 69 +++++++++++++++---------------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/SwitchKey/AppDelegate.swift b/SwitchKey/AppDelegate.swift
index 688d4fb..41a8677 100644
--- a/SwitchKey/AppDelegate.swift
+++ b/SwitchKey/AppDelegate.swift
@@ -436,3 +436,10 @@ class DefaultCell: NSTableCellView {
         app.setDefaultCondition()
     }
 }
+
+extension String {
+subscript(to: Int) -> String {
+        let index = self.index(self.startIndex, offsetBy: to)
+        return String(self[..<index])
+    }
+}
diff --git a/SwitchKey/Base.lproj/SwitchKey.xib b/SwitchKey/Base.lproj/SwitchKey.xib
index bc0a491..a6aba99 100644
--- a/SwitchKey/Base.lproj/SwitchKey.xib
+++ b/SwitchKey/Base.lproj/SwitchKey.xib
@@ -21,23 +21,23 @@
         </customObject>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu id="lcZ-64-V4h">
-            <point key="canvasLocation" x="139" y="142.5"/>
+            <point key="canvasLocation" x="139" y="143"/>
         </menu>
-        <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="ycM-3L-97V">
-            <rect key="frame" x="0.0" y="0.0" width="362" height="2"/>
+        <scrollView autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="ycM-3L-97V">
+            <rect key="frame" x="0.0" y="0.0" width="368" height="184"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <clipView key="contentView" id="gGO-yu-YCr">
-                <rect key="frame" x="1" y="1" width="360" height="0.0"/>
-                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <rect key="frame" x="1" y="1" width="366" height="182"/>
+                <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="wpb-1K-Xeg" customClass="TableView" customModule="SwitchKey" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="360" height="0.0"/>
+                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="fullWidth" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="24" usesAutomaticRowHeights="YES" viewBased="YES" id="wpb-1K-Xeg" customClass="TableView" customModule="SwitchKey" customModuleProvider="target">
+                        <rect key="frame" x="0.0" y="0.0" width="366" height="182"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <size key="intercellSpacing" width="3" height="2"/>
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                         <tableColumns>
-                            <tableColumn width="319" minWidth="40" maxWidth="1000" id="Y12-MF-ZTz">
+                            <tableColumn width="354" minWidth="40" maxWidth="1000" id="Y12-MF-ZTz">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -54,18 +54,17 @@
                 </subviews>
             </clipView>
             <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="bzu-Fw-U6m">
-                <rect key="frame" x="1" y="119" width="223" height="15"/>
+                <rect key="frame" x="1" y="167" width="366" height="16"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
             <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="5LF-KM-I9F">
                 <rect key="frame" x="346" y="1" width="15" height="0.0"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <point key="canvasLocation" x="139" y="185"/>
+            <point key="canvasLocation" x="132" y="-33"/>
         </scrollView>
-        <tableCellView identifier="item-cell" id="mER-eV-t2b" customClass="ConditionCell" customModule="SwitchKey" customModuleProvider="target">
+        <tableCellView identifier="item-cell" translatesAutoresizingMaskIntoConstraints="NO" id="mER-eV-t2b" customClass="ConditionCell" customModule="SwitchKey" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="341" height="64"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="iRL-OQ-vsx">
                     <rect key="frame" x="8" y="8" width="48" height="48"/>
@@ -75,9 +74,9 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSApplicationIcon" id="pGI-gj-dvK"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61R-Cm-pCP">
-                    <rect key="frame" x="62" y="24" width="60" height="16"/>
-                    <textFieldCell key="cell" lineBreakMode="truncatingTail" title="AppName" id="AGL-f7-fn1">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="60" horizontalCompressionResistancePriority="20" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61R-Cm-pCP">
+                    <rect key="frame" x="62" y="24" width="200" height="16"/>
+                    <textFieldCell key="cell" lineBreakMode="truncatingTail" title="App Name" id="AGL-f7-fn1">
                         <font key="font" metaFont="systemBold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -117,7 +116,7 @@
                 <constraint firstAttribute="trailing" secondItem="Sco-0x-N6p" secondAttribute="trailing" constant="8" id="WyF-dT-jur"/>
                 <constraint firstItem="iRL-OQ-vsx" firstAttribute="top" secondItem="mER-eV-t2b" secondAttribute="top" constant="8" id="dqI-EQ-Zbm"/>
                 <constraint firstItem="iRL-OQ-vsx" firstAttribute="leading" secondItem="mER-eV-t2b" secondAttribute="leading" constant="8" id="hBs-Kh-ot1"/>
-                <constraint firstItem="p83-hg-Sms" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="61R-Cm-pCP" secondAttribute="trailing" constant="8" id="hCt-aE-IBe"/>
+                <constraint firstItem="p83-hg-Sms" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="61R-Cm-pCP" secondAttribute="trailing" constant="16" id="hCt-aE-IBe"/>
                 <constraint firstItem="Sco-0x-N6p" firstAttribute="centerY" secondItem="mER-eV-t2b" secondAttribute="centerY" id="kWw-59-5BW"/>
             </constraints>
             <connections>
@@ -126,16 +125,16 @@
                 <outlet property="conditionEnabled" destination="Sco-0x-N6p" id="9PL-8I-EEH"/>
                 <outlet property="inputSourceButton" destination="p83-hg-Sms" id="Ngo-JK-4MU"/>
             </connections>
-            <point key="canvasLocation" x="139.5" y="260"/>
+            <point key="canvasLocation" x="140" y="230"/>
         </tableCellView>
-        <tableCellView identifier="edit-cell" id="tGE-D6-w3H" customClass="EditCell" customModule="SwitchKey" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="109" height="20"/>
+        <tableCellView identifier="edit-cell" misplaced="YES" id="tGE-D6-w3H" customClass="EditCell" customModule="SwitchKey" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="341" height="42"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5k7-2A-D1v">
-                    <rect key="frame" x="8" y="-1" width="93" height="21"/>
+                    <rect key="frame" x="8" y="7" width="325" height="31"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="20" id="IDr-fh-azF"/>
+                        <constraint firstAttribute="height" constant="30" id="0sl-cE-5EX"/>
                     </constraints>
                     <buttonCell key="cell" type="roundRect" title="Add Current" bezelStyle="roundedRect" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XiT-Jr-Qlg">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -148,35 +147,37 @@
             </subviews>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="5k7-2A-D1v" secondAttribute="trailing" constant="8" id="7yE-mF-esi"/>
-                <constraint firstItem="5k7-2A-D1v" firstAttribute="centerY" secondItem="tGE-D6-w3H" secondAttribute="centerY" id="MTe-2i-BMr"/>
+                <constraint firstAttribute="bottom" secondItem="5k7-2A-D1v" secondAttribute="bottom" constant="8" id="akm-cV-9pM"/>
+                <constraint firstItem="5k7-2A-D1v" firstAttribute="top" secondItem="tGE-D6-w3H" secondAttribute="top" constant="8" id="lvR-yQ-29P"/>
                 <constraint firstItem="5k7-2A-D1v" firstAttribute="leading" secondItem="tGE-D6-w3H" secondAttribute="leading" constant="8" id="zMc-7U-kh1"/>
             </constraints>
-            <point key="canvasLocation" x="139.5" y="341"/>
+            <point key="canvasLocation" x="139.5" y="320"/>
         </tableCellView>
-        <tableCellView identifier="default-cell" id="Vpw-z4-ZBh" customClass="DefaultCell" customModule="SwitchKey" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="109" height="20"/>
+        <tableCellView identifier="default-cell" id="veh-uT-FUu" customClass="DefaultCell" customModule="SwitchKey" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="341" height="46"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4vR-Dl-cUP">
-                    <rect key="frame" x="8" y="-1" width="93" height="21"/>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="30X-lg-cGL">
+                    <rect key="frame" x="8" y="7" width="325" height="31"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="20" id="bXh-9f-px7"/>
+                        <constraint firstAttribute="height" constant="30" id="dHg-YZ-A38"/>
                     </constraints>
-                    <buttonCell key="cell" type="roundRect" title="Set Default" bezelStyle="roundedRect" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9Ov-8E-4aN">
+                    <buttonCell key="cell" type="roundRect" title="Set Default" bezelStyle="roundedRect" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="BQ6-az-O3U">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="cellTitle"/>
                         <connections>
-                            <action selector="addItemClicked:" target="Vpw-z4-ZBh" id="ygz-2j-PkS"/>
+                            <action selector="addItemClicked:" target="veh-uT-FUu" id="daM-86-HuU"/>
                         </connections>
                     </buttonCell>
                 </button>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="4vR-Dl-cUP" secondAttribute="trailing" constant="8" id="810-Ae-KsP"/>
-                <constraint firstItem="4vR-Dl-cUP" firstAttribute="centerY" secondItem="Vpw-z4-ZBh" secondAttribute="centerY" id="Ir6-QI-nMh"/>
-                <constraint firstItem="4vR-Dl-cUP" firstAttribute="leading" secondItem="Vpw-z4-ZBh" secondAttribute="leading" constant="8" id="lGZ-Xa-ux1"/>
+                <constraint firstItem="30X-lg-cGL" firstAttribute="top" secondItem="veh-uT-FUu" secondAttribute="top" constant="8" id="7QZ-lm-uEx"/>
+                <constraint firstAttribute="trailing" secondItem="30X-lg-cGL" secondAttribute="trailing" constant="8" id="9tp-tg-wNJ"/>
+                <constraint firstAttribute="bottom" secondItem="30X-lg-cGL" secondAttribute="bottom" constant="8" id="Dlo-CJ-s3m"/>
+                <constraint firstItem="30X-lg-cGL" firstAttribute="leading" secondItem="veh-uT-FUu" secondAttribute="leading" constant="8" id="Hdv-1r-BVX"/>
             </constraints>
-            <point key="canvasLocation" x="139.5" y="417"/>
+            <point key="canvasLocation" x="140" y="416"/>
         </tableCellView>
     </objects>
     <resources>