@@ -19,11 +19,11 @@ class PrefsViewController: NSViewController {
1919 @IBOutlet weak var tableViewGroups : NSTableView !
2020
2121 @IBAction func buttonCheckConnection( _ sender: NSButton ) {
22- checkConnection ( )
22+ connect ( )
2323 }
2424
2525 var prefs = Preferences ( )
26- var groups = [ String : HaEntity] ( )
26+ var groups = [ HaEntity] ( )
2727 var menuItems = [ PrefMenuItem] ( )
2828 private var dragDropType = NSPasteboard . PasteboardType ( rawValue: " private.table-row " )
2929
@@ -36,18 +36,19 @@ class PrefsViewController: NSViewController {
3636 tableViewGroups. dataSource = self
3737 tableViewGroups. registerForDraggedTypes ( [ dragDropType] )
3838 tableViewGroups. target = self
39- tableViewGroups. doubleAction = #selector( tableViewGroupsDoubleClick ( _: ) )
39+ // tableViewGroups.doubleAction = #selector(tableViewGroupsDoubleClick(_:))
4040
41- checkConnection ( )
41+ connect ( )
4242 }
4343
4444 override func viewWillDisappear( ) {
4545 saveNewPrefs ( )
46+ saveNewMenuItems ( )
4647 NSApp . stopModal ( )
4748 super. viewWillDisappear ( )
4849 }
4950
50- func checkConnection ( ) {
51+ func connect ( ) {
5152 saveNewPrefs ( )
5253
5354 self . menuItems. removeAll ( )
@@ -59,11 +60,7 @@ class PrefsViewController: NSViewController {
5960 DispatchQueue . main. async {
6061 self . textfieldStatus. stringValue = " OK "
6162
62- let groupEntities = self . haService. filterEntities ( entityDomain: EntityDomains . groupDomain. rawValue)
63-
64- for groupEntity in groupEntities {
65- self . groups [ groupEntity. entityId] = groupEntity
66- }
63+ self . groups = self . haService. filterEntities ( entityDomain: EntityDomains . groupDomain. rawValue) . reversed ( )
6764
6865 let menuItemsWithFriendlyNames = self . prefs. menuItemsWithFriendlyNames ( groups: self . groups)
6966
@@ -78,6 +75,9 @@ class PrefsViewController: NSViewController {
7875
7976 case . failure( let haServiceApiError) :
8077 DispatchQueue . main. async {
78+ self . menuItems. removeAll ( )
79+ self . tableViewGroups. reloadData ( )
80+
8181 switch haServiceApiError {
8282 case . URLMissing:
8383 self . textfieldStatus. stringValue = " Server URL missing "
@@ -103,39 +103,31 @@ class PrefsViewController: NSViewController {
103103 func showExistingPrefs( ) {
104104 textfieldServer. stringValue = prefs. server
105105 textfieldToken. stringValue = prefs. token
106- // buttonLights.state = (prefs.domainLights == true ? .on : .off)
107- // buttonSwitches.state = (prefs.domainSwitches == true ? .on : .off)
108- // buttonAutomations.state = (prefs.domainAutomations == true ? .on : .off)
109- // buttonInputBooleans.state = (prefs.domainInputBooleans == true ? .on : .off)
110- // buttonInputSelects.state = (prefs.domainInputSelects == true ? .on : .off)
111- // textfieldGroup.stringValue = prefs.groupList
112106 buttonLogin. state = ( prefs. launch == true ? . on : . off)
113107 }
114108
115109 func saveNewPrefs( ) {
116110 prefs. server = textfieldServer. stringValue
117111 prefs. token = textfieldToken. stringValue
118- // prefs.domainLights = (buttonLights.state == .on)
119- // prefs.domainSwitches = (buttonSwitches.state == .on)
120- // prefs.domainAutomations = (buttonAutomations.state == .on)
121- // prefs.domainInputBooleans = (buttonInputBooleans.state == .on)
122- // prefs.domainInputSelects = (buttonInputSelects.state == .on)
123- // prefs.groupList = textfieldGroup.stringValue
124112 prefs. launch = ( buttonLogin. state == . on)
125113
126114 NotificationCenter . default. post ( name: Notification . Name ( rawValue: " PrefsChanged " ) ,
127115 object: nil )
128116 }
129117
130- @objc func tableViewGroupsDoubleClick( _ sender: AnyObject ) {
131-
132- guard tableViewGroups. selectedRow >= 0 else {
133- return
134- }
135-
136- let item = self . menuItems [ tableViewGroups. selectedRow]
118+ func saveNewMenuItems( ) {
119+ prefs. menuItems = menuItems
137120 }
138121
122+ // @objc func tableViewGroupsDoubleClick(_ sender:AnyObject) {
123+ //
124+ // guard tableViewGroups.selectedRow >= 0 else {
125+ // return
126+ // }
127+ //
128+ // let item = self.menuItems[tableViewGroups.selectedRow]
129+ // }
130+
139131}
140132
141133extension PrefsViewController : NSTableViewDelegate , NSTableViewDataSource {
@@ -144,9 +136,9 @@ extension PrefsViewController: NSTableViewDelegate, NSTableViewDataSource {
144136 return self . menuItems. count
145137 }
146138
147- // fileprivate enum TableColumns {
148- // static let GroupName = NSUserInterfaceItemIdentifier("GroupName")
149- // }
139+ // fileprivate enum TableColumns {
140+ // static let GroupName = NSUserInterfaceItemIdentifier("GroupName")
141+ // }
150142
151143 private func tableView( _ tableView: NSTableView , typeSelectStringFor tableColumn: NSTableColumn ? , row: Int ) -> PrefMenuItem ? {
152144 return self . menuItems [ row]
@@ -166,7 +158,7 @@ extension PrefsViewController: NSTableViewDelegate, NSTableViewDataSource {
166158
167159 if tableColumn == tableView. tableColumns [ 1 ] {
168160 let item = self . menuItems [ row]
169- return item. friendlyName!
161+ return item. friendlyName
170162 }
171163
172164 if tableColumn == tableView. tableColumns [ 2 ] {
@@ -225,23 +217,18 @@ extension PrefsViewController: NSTableViewDelegate, NSTableViewDataSource {
225217 }
226218 }
227219
228- var oldIndexOffset = 0
229- var newIndexOffset = 0
230220
231- // For simplicity, the code below uses `tableView.moveRowAtIndex` to move rows around directly.
232- // You may want to move rows in your content array and then call `tableView.reloadData()` instead.
233- tableView. beginUpdates ( )
234- for oldIndex in oldIndexes {
235- if oldIndex < row {
236- tableView. moveRow ( at: oldIndex + oldIndexOffset, to: row - 1 )
237- oldIndexOffset -= 1
238- } else {
239- tableView. moveRow ( at: oldIndex, to: row + newIndexOffset)
240- newIndexOffset += 1
241- }
221+ let oldIndex = oldIndexes [ 0 ]
222+ let element = menuItems. remove ( at: oldIndexes [ 0 ] )
223+
224+ if oldIndex < row {
225+ self . menuItems. insert ( element, at: row - 1 )
226+ }
227+ else {
228+ self . menuItems. insert ( element, at: row)
242229 }
243- tableView. endUpdates ( )
244230
231+ tableView. reloadData ( )
245232 return true
246233 }
247234
0 commit comments