Skip to content

Shortcut (non-configurable) #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BTL00 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Shortcut (non-configurable) #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b6343
addition of command+control+space hotkey
BTL00 Nov 26, 2019
fe11f3d
readme update
BTL00 Nov 26, 2019
878457c
Update README.md
BTL00 Nov 26, 2019
99c9052
hotkey
BTL00 Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion MacAssistant/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Log
import AudioKit
import SwiftyUserDefaults
import Preferences
import HotKey

@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate, LoginSuccessDelegate {
Expand All @@ -22,12 +23,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, LoginSuccessDelegate {
var audioEngine: AudioEngine!
var streamCall: AssistCall!
let authenticator = Authenticator.instance

let hotKey = HotKey(key: .space, modifiers: [.command, .shift])
let sb = NSStoryboard(name: "Main", bundle: nil)
let assitantWindowControllerID = "AssistantWindowControllerID"
let loginWindowControllerID = "LoginWindowControllerID"
let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
lazy var awc = sb.instantiateController(withIdentifier: assitantWindowControllerID) as! AssistantWindowController
lazy var avc = sb.instantiateController(withIdentifier: "AssistantViewControllerID") as! AssistantViewController
lazy var lwc = sb.instantiateController(withIdentifier: loginWindowControllerID) as! LoginWindowController

lazy var preferencesWindowController = PreferencesWindowController(viewControllers: [
Expand All @@ -41,6 +43,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, LoginSuccessDelegate {
statusItem.image = #imageLiteral(resourceName: "statusIcon")
statusItem.action = #selector(toggleWindow)
showAppropriateWindow()
hotKey.keyDownHandler = {
self.showAppropriateWindow()
self.avc.onMicClicked();

}

// preferencesWindowController.showWindow()
}

Expand Down
1 change: 1 addition & 0 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ target 'MacAssistant' do
pod 'SwiftyUserDefaults', '4.0.0-alpha.1'
pod 'Preferences'
pod 'KeyHolder'
pod 'HotKey'
end