Skip to content

Commit 818c32b

Browse files
committed
Reload preset from menu
1 parent d15764d commit 818c32b

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

MTMR/AppDelegate.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
2626
// Insert code here to tear down your application
2727
}
2828

29-
@objc func testFn(_ sender: Any?) {
29+
@objc func openPrefereces(_ sender: Any?) {
3030
let task = Process()
3131
let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
3232
let presetPath = appSupportDirectory.appending("/items.json")
@@ -35,9 +35,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
3535
task.launch()
3636
}
3737

38+
@objc func updatePreset(_ sender: Any?) {
39+
TouchBarController.shared.createAndUpdatePreset()
40+
}
41+
3842
func createMenu() {
3943
let menu = NSMenu()
40-
menu.addItem(withTitle: "Preferences", action: #selector(testFn(_:)), keyEquivalent: ",")
44+
menu.addItem(withTitle: "Preferences", action: #selector(openPrefereces(_:)), keyEquivalent: ",")
45+
menu.addItem(withTitle: "Reload Preset", action: #selector(updatePreset(_:)), keyEquivalent: "r")
4146
menu.addItem(NSMenuItem.separator())
4247
menu.addItem(withTitle: "Quit", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")
4348
statusItem.menu = menu

MTMR/TouchBarController.swift

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,22 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
5555
self?.dismissTouchBar()
5656
}))
5757

58+
createAndUpdatePreset()
59+
}
60+
61+
func createAndUpdatePreset() {
62+
self.itemDefinitions = [:]
63+
self.items = [:]
64+
self.leftIdentifiers = []
65+
self.centerItems = []
66+
self.rightIdentifiers = []
67+
5868
loadItemDefinitions()
5969
createItems()
6070
centerItems = self.itemDefinitions.compactMap { (identifier, definition) -> NSTouchBarItem? in
6171
return definition.align == .center ? items[identifier] : nil
6272
}
63-
73+
6474
touchBar.delegate = self
6575
touchBar.defaultItemIdentifiers = self.leftIdentifiers + [.centerScrollArea] + self.rightIdentifiers
6676
self.presentTouchBar()

0 commit comments

Comments
 (0)