v1.3: Add Dock Presets submenu

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

Author: Kwpolska

CHANGELOG.md

@@ -3,6 +3,11 @@ Changelog
 
 More information, including binaries, can be found on GitHub in the [releases section](https://github.com/Kwpolska/DisplayMenu/releases).
 
+v1.3 (build 4)
+--------------
+
+Add *Dock Presets* submenu.
+
 v1.2 (build 3)
 --------------
 

Display Menu/AppDelegate.swift

@@ -41,6 +41,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     let statusMenu = NSMenu()
     let refreshItem = NSMenuItem(title: NSLocalizedString("Reload", comment: "Reload menu item"), action: #selector(acquireDisplayManager), keyEquivalent: "r")
     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: "")
+
+    override init() {
+        super.init()
+
+        refreshItem.keyEquivalentModifierMask = .control
+        statusMenu.delegate = self
+
+        statusItem.image = #imageLiteral(resourceName: "DMStatusReady")
+        statusItem.menu = statusMenu
+    }
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         do {
@@ -49,11 +60,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             alertAndQuit(NSLocalizedString("Failed to initialize display manager.", comment: "Alert title (display manager/config error)"), String(reflecting: error))
         }
 
-        refreshItem.keyEquivalentModifierMask = .control
-        statusMenu.delegate = self
-
-        statusItem.image = #imageLiteral(resourceName: "DMStatusReady")
-        statusItem.menu = statusMenu
     }
 
     func acquireDisplayManager() throws {
@@ -90,6 +96,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         Timer.scheduledTimer(timeInterval: TimeInterval(1.5), target: self, selector: #selector(_resetDMIcon), userInfo: nil, repeats: false)
     }
+
+    func applyDockPresetFromMenu(_ sender: NSMenuItem?) {
+        let dp = sender!.representedObject as! DockPreset
+        dp.apply(force: true)
+    }
 }
 
 extension AppDelegate: NSMenuDelegate {
@@ -101,7 +112,16 @@ extension AppDelegate: NSMenuDelegate {
             menu.addItem(item)
         }
 
+        let dpsubmenu = NSMenu()
+        for (name, dp) in displayManager!.dockPresets {
+            let item = NSMenuItem(title: name, action: #selector(applyDockPresetFromMenu), keyEquivalent: "")
+            item.representedObject = dp
+            dpsubmenu.addItem(item)
+        }
+
         menu.addItem(NSMenuItem.separator())
+        menu.addItem(dockPresetsItem)
+        dockPresetsItem.submenu = dpsubmenu
         menu.addItem(refreshItem)
         menu.addItem(quitItem)
     }

Display Menu/Base.lproj/Localizable.strings

@@ -7,6 +7,9 @@
 /* no settings alert description */
 "Place a settings file at %@ and try again." = "Place a settings file at %@ and try again.";
 
+/* Dock presets menu item */
+"Dock Presets" = "Dock Presets";
+
 /* Quit menu item */
 "Quit" = "Quit";
 

Display Menu/DisplayManager.swift

@@ -75,13 +75,15 @@ class DockPreset: CustomStringConvertible {
     }
 
     /// Apply a dock preset.
-    func apply() {
+    func apply(force: Bool = false) {
         let defaults = UserDefaults(suiteName: "com.apple.dock")
-        let tilesize_current = defaults?.integer(forKey: "tilesize")
-        let position_current = defaults?.string(forKey: "orientation")
+        if !force {
+            let tilesize_current = defaults?.integer(forKey: "tilesize")
+            let position_current = defaults?.string(forKey: "orientation")
 
-        if tilesize == tilesize_current && position.rawValue == position_current {
-            return // Don’t change the settings if it’s what we want already
+            if tilesize == tilesize_current && position.rawValue == position_current {
+                return // Don’t change the settings if it’s what we want already
+            }
         }
 
         defaults?.set(tilesize, forKey: "tilesize")

Display Menu/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.3</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

Display Menu/pl.lproj/Localizable.strings

@@ -7,6 +7,9 @@
 /* no settings alert description */
 "Place a settings file at %@ and try again." = "Utwórz plik z ustawieniami %@ i spróbuj ponownie.";
 
+/* Dock presets menu item */
+"Dock Presets" = "Ustawienia Docka";
+
 /* Quit menu item */
 "Quit" = "Zakończ";