Case-insensitive sorting

macmade · macmade · commit baa24185c5cb · 2022-10-26T11:46:55.000+02:00
diff --git a/Hot/Classes/ApplicationDelegate.swift b/Hot/Classes/ApplicationDelegate.swift
@@ -354,7 +354,7 @@ class ApplicationDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate
         self.sensorViewControllers = controllers
         self.sensorsMenu.items     = items.sorted
         {
-            $0.title.compare( $1.title, options: .numeric, range: nil, locale: nil ) == .orderedAscending
+            $0.title.compare( $1.title, options: [ .numeric, .caseInsensitive ], range: nil, locale: nil ) == .orderedAscending
         }
     }
 
diff --git a/Hot/Classes/SelectSensorsWindowController.swift b/Hot/Classes/SelectSensorsWindowController.swift
@@ -55,7 +55,7 @@ public class SelectSensorsWindowController: NSWindowController, NSTableViewDeleg
 
         self.arrayController.sortDescriptors =
             [
-                NSSortDescriptor( key: "name", ascending: true ),
+                NSSortDescriptor( key: "name", ascending: true, selector: #selector( NSString.localizedCaseInsensitiveCompare( _: ) ) ),
             ]
 
         self.windowOpenObserver = NotificationCenter.default.addObserver( forName: NSWindow.didBecomeKeyNotification, object: self.window, queue: nil )

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ class ApplicationDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate`
`354`	`354`	`self.sensorViewControllers = controllers`
`355`	`355`	`self.sensorsMenu.items = items.sorted`
`356`	`356`	`{`
`357`		`- $0.title.compare( $1.title, options: .numeric, range: nil, locale: nil ) == .orderedAscending`
	`357`	`+ $0.title.compare( $1.title, options: [ .numeric, .caseInsensitive ], range: nil, locale: nil ) == .orderedAscending`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class SelectSensorsWindowController: NSWindowController, NSTableViewDeleg`
`55`	`55`
`56`	`56`	`self.arrayController.sortDescriptors =`
`57`	`57`	`[`
`58`		`- NSSortDescriptor( key: "name", ascending: true ),`
	`58`	`+ NSSortDescriptor( key: "name", ascending: true, selector: #selector( NSString.localizedCaseInsensitiveCompare( _: ) ) ),`
`59`	`59`	`]`
`60`	`60`
`61`	`61`	`self.windowOpenObserver = NotificationCenter.default.addObserver( forName: NSWindow.didBecomeKeyNotification, object: self.window, queue: nil )`