From 3bc26eae821670bde5b467674fbc875576affa26 Mon Sep 17 00:00:00 2001 From: Toxblh Date: Fri, 1 Jun 2018 10:49:06 +0100 Subject: [PATCH] Update menu loayout --- MTMR/AppDelegate.swift | 29 ++++++++++++++++++++++++----- README.md | 2 +- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/MTMR/AppDelegate.swift b/MTMR/AppDelegate.swift index 1c5bb13..547f58a 100644 --- a/MTMR/AppDelegate.swift +++ b/MTMR/AppDelegate.swift @@ -96,12 +96,31 @@ class AppDelegate: NSObject, NSApplicationDelegate { func createMenu() { let menu = NSMenu() + + let startAtLogin = NSMenuItem(title: "Start at login", action: #selector(toggleStartAtLogin(_:)), keyEquivalent: "L") + if (LaunchAtLoginController().launchAtLogin) { + startAtLogin.state = NSControl.StateValue.off + } else { + startAtLogin.state = NSControl.StateValue.on + } + + let hideControlStrip = NSMenuItem(title: "Hide Control Strip", action: #selector(toggleControlStrip(_:)), keyEquivalent: "T") + if (TouchBarController.shared.controlStripState) { + hideControlStrip.state = NSControl.StateValue.on + } else { + hideControlStrip.state = NSControl.StateValue.off + } + + let settingSeparator = NSMenuItem(title: "Settings", action: nil, keyEquivalent: "") + settingSeparator.isEnabled = false + menu.addItem(withTitle: "Preferences", action: #selector(openPreferences(_:)), keyEquivalent: ",") -// menu.addItem(withTitle: "Reload Preset", action: #selector(updatePreset(_:)), keyEquivalent: "r") - menu.addItem(withTitle: "Open Preset", action: #selector(openPreset(_:)), keyEquivalent: "O") - menu.addItem(withTitle: TouchBarController.shared.controlStripState ? "Hide Control Strip" : "Show Control Strip" , action: #selector(toggleControlStrip(_:)), keyEquivalent: "T") - menu.addItem(withTitle: "Toggle blackList current app" , action: #selector(toggleBlackListedApp(_:)), keyEquivalent: "B") - menu.addItem(withTitle: LaunchAtLoginController().launchAtLogin ? "Disable start at login" : "Enable start at login", action: #selector(toggleStartAtLogin(_:)), keyEquivalent: "L") + menu.addItem(withTitle: "Open preset", action: #selector(openPreset(_:)), keyEquivalent: "O") + menu.addItem(NSMenuItem.separator()) + menu.addItem(settingSeparator) + menu.addItem(hideControlStrip) + menu.addItem(withTitle: "Toggle current app in blacklist" , action: #selector(toggleBlackListedApp(_:)), keyEquivalent: "B") + menu.addItem(startAtLogin) menu.addItem(NSMenuItem.separator()) menu.addItem(withTitle: "Quit", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q") statusItem.menu = menu diff --git a/README.md b/README.md index 8c56bb2..d6d5ee3 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT ``` ## Groups -```js +```js "type": "group", "align": "center", "bordered": true,