v1.6: preset ordering and .json open button

Signed-off-by: Chris Warrick <[email protected]>

Author: Kwpolska

CHANGELOG.md

@@ -3,6 +3,12 @@ Changelog
 
 More information, including binaries, can be found on GitHub in the [releases section](https://github.com/Kwpolska/DisplayMenu/releases).
 
+v1.6 (build 7)
+--------------
+
+* Add a menu option to open config file
+* Add a `presetOrder` option to JSON file
+
 v1.5 (build 6)
 --------------
 

Display Menu/AppDelegate.swift

@@ -40,9 +40,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
     let statusMenu = NSMenu()
     let refreshItem = NSMenuItem(title: NSLocalizedString("Reload", comment: "Reload menu item"), action: #selector(acquireDisplayManager), keyEquivalent: "r")
+    let openConfigItem = NSMenuItem(title: NSLocalizedString("Open Config File", comment: "Open Config File menu item"), action: #selector(openConfigFile), keyEquivalent: ",")
     let quitItem = NSMenuItem(title: NSLocalizedString("Quit", comment: "Quit menu item"), action: #selector(NSApp.terminate), keyEquivalent: "q")
     let dockPresetsItem = NSMenuItem(title: NSLocalizedString("Dock Presets", comment: "Dock Presets menu item"), action: nil, keyEquivalent: "")
-
+    var settingsURL: URL? = nil
     override init() {
         super.init()
 
@@ -66,13 +67,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let appsupport = try FileManager.default.url(for: .applicationSupportDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
         let appdir = appsupport.appendingPathComponent(Bundle.main.bundleIdentifier!, isDirectory: true)
         try FileManager.default.createDirectory(at: appdir, withIntermediateDirectories: true, attributes: nil)
-        let url = appdir.appendingPathComponent("DisplayMenu.json")
-        if FileManager.default.fileExists(atPath: url.path) {
-            displayManager = try DisplayManager(jsonPath: url)
+        settingsURL = appdir.appendingPathComponent("DisplayMenu.json")
+        if FileManager.default.fileExists(atPath: settingsURL!.path) {
+            displayManager = try DisplayManager(jsonPath: settingsURL!)
         } else {
             alertAndQuit(
                 NSLocalizedString("Settings file not found", comment: "no settings alert title"),
-                String.localizedStringWithFormat(NSLocalizedString("Place a settings file at %@ and try again.", comment: "no settings alert description"), url.path)
+                String.localizedStringWithFormat(NSLocalizedString("Place a settings file at %@ and try again.", comment: "no settings alert description"), settingsURL!.path)
             )
         }
     }
@@ -101,13 +102,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let dp = sender!.representedObject as! DockPreset
         dp.apply(force: true)
     }
+    
+    @objc func openConfigFile(_ sender: NSMenuItem?) {
+        NSWorkspace.shared.openFile(settingsURL!.path, withApplication: "TextEdit")
+    }
 }
 
 extension AppDelegate: NSMenuDelegate {
     func menuWillOpen(_ menu: NSMenu) {
         menu.removeAllItems()
-        for (name, preset) in displayManager!.presets {
-            let item = NSMenuItem(title: name, action: #selector(applyPresetFromMenu), keyEquivalent: preset.keyEquivalent)
+        for preset in displayManager!.presetOrder {
+            let item = NSMenuItem(title: preset.name, action: #selector(applyPresetFromMenu), keyEquivalent: preset.keyEquivalent)
             item.representedObject = preset
             menu.addItem(item)
         }
@@ -123,6 +128,7 @@ extension AppDelegate: NSMenuDelegate {
         menu.addItem(dockPresetsItem)
         dockPresetsItem.submenu = dpsubmenu
         menu.addItem(refreshItem)
+        menu.addItem(openConfigItem)
         menu.addItem(quitItem)
     }
 }

Display Menu/Base.lproj/Localizable.strings

@@ -23,4 +23,7 @@
 "The application will now quit." = "The application will now quit.";
 
 /* Alert title (display manager/config error) */
-"Failed to initialize display manager." = "Nie udało się zainicjalizować menadżera ekranów.";
+"Failed to initialize display manager." = "Failed to initialize display manager.";
+
+/* Open Config File menu item */
+"Open Config File" = "Open Config File";

Display Menu/DisplayManager.swift

@@ -226,22 +226,24 @@ class DisplaySetup: CustomStringConvertible {
 
 /// A display preset — displayed in the menu, consists of a Dock preset, display setups, and extra settings.
 class DisplayPreset: CustomStringConvertible {
+    var name: String
     var dockPreset: DockPreset
     /// Key that will be part of the keyboard shortcut (with ⌘, case-sensitive)
     var keyEquivalent: String = ""
     /// If true, the
     var allDisplaysPresent: Bool = true
     var displays: [DisplayIdentifierString: DisplaySetup] = [:]
 
-    init(dockPreset: DockPreset, keyEquivalent: String, allDisplaysPresent: Bool, displays: [DisplayIdentifierString: DisplaySetup]) {
+    init(name: String, dockPreset: DockPreset, keyEquivalent: String, allDisplaysPresent: Bool, displays: [DisplayIdentifierString: DisplaySetup]) {
+        self.name = name
         self.dockPreset = dockPreset
         self.keyEquivalent = keyEquivalent
         self.allDisplaysPresent = allDisplaysPresent
         self.displays = displays
     }
 
     var description: String {
-        return "Display Preset (\(dockPreset), \(keyEquivalent), \(allDisplaysPresent), \(displays))"
+        return "Display Preset \(name) (\(dockPreset), \(keyEquivalent), \(allDisplaysPresent), \(displays))"
     }
 }
 
@@ -381,11 +383,14 @@ class DisplayManager {
 
     var displays: [Display] = []
     var displaysByScreenID: [ScreenID: Display] = [:]
+    
+    var presetOrder: [DisplayPreset] = []
 
-    init(dockPresets: [String: DockPreset], displayProperties: [ScreenID: DisplayProperties], presets: [String: DisplayPreset]) {
+    init(dockPresets: [String: DockPreset], displayProperties: [ScreenID: DisplayProperties], presets: [String: DisplayPreset], presetOrder: [DisplayPreset]) {
         self.dockPresets = dockPresets
         self.displayProperties = displayProperties
         self.presets = presets
+        self.presetOrder = presetOrder
         findDisplays()
     }
 
@@ -420,14 +425,25 @@ class DisplayManager {
                 displaySetups[identifierString] = try DisplaySetup(setupString)
             }
             allp[name] = DisplayPreset(
+                name: name,
                 dockPreset: dockp[preset["dockPreset"] as! String]!,
                 keyEquivalent: preset["keyEquivalent"] as? String ?? "",
                 allDisplaysPresent: preset["allDisplaysPresent"] as? Bool ?? false,
                 displays: displaySetups
             )
         }
+        
+        var pio: [DisplayPreset] = []
+        if jsonDict["presetOrder"] != nil {
+            let jpio = jsonDict["presetOrder"] as! [String]
+            for i in jpio {
+                pio.append(allp[i]!)
+            }
+        } else {
+            pio.append(contentsOf: allp.values)
+        }
 
-        self.init(dockPresets: dockp, displayProperties: displayp, presets: allp)
+        self.init(dockPresets: dockp, displayProperties: displayp, presets: allp, presetOrder: pio)
     }
 
     convenience init(jsonPath: URL) throws {

Display Menu/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
+	<string>1.6</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

Display Menu/pl.lproj/Localizable.strings

@@ -23,4 +23,7 @@
 "The application will now quit." = "Program zostanie teraz zamknięty.";
 
 /* Alert title (display manager/config error) */
-"Failed to initialize display manager." = "Failed to initialize display manager.";
+"Failed to initialize display manager." = "Nie udało się zainicjalizować menadżera ekranów.";
+
+/* Open Config File menu item */
+"Open Config File" = "Otwórz Plik Konfiguracyjny";

DisplayMenu-sample.json

@@ -67,5 +67,6 @@
                 "External": "self 1920 1080 1x"
             }
         }
-    }
+    },
+    "presetOrder": ["Dual Screen", "MacBook Only", "MacBook Only (1440×900)", "External Only"]
 }