Skip to content

Commit

Permalink
fix(Main): ChooseToggleActionButton disabled bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Ji4n1ng committed May 5, 2019
1 parent 3d7acaf commit fef4e87
Showing 1 changed file with 4 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class GeneralPreferencesViewController: PreferencesViewController {
chooseToggleActionButton.removeAllItems()
[quickToggleTerminalMenuItem, quickToggleEditorMenuItem,
quickToggleCopyPathMenuItem].forEach {
$0.target = self
chooseToggleActionButton.menu?.addItem($0)
}
}
Expand Down Expand Up @@ -145,7 +146,6 @@ class GeneralPreferencesViewController: PreferencesViewController {
SMLoginItemSetEnabled(Constants.launcherAppIdentifier as CFString, isLaunch)
}


@IBAction func quickToggleButtonClicked(_ sender: NSButton) {
let quickToggle: BoolType = quickToggleButton.state == .on ? ._true : ._false
CoreManager.shared.quickToggle = quickToggle
Expand All @@ -156,16 +156,6 @@ class GeneralPreferencesViewController: PreferencesViewController {
logw("Quick Toggle set to \(sender.state.rawValue)")
}

// @IBAction func chooseToggleActionButtonClicked(_ sender: NSPopUpButton) {
// let itemTitles = sender.itemTitles
// let index = sender.indexOfSelectedItem
// let title = itemTitles[index]
//
// if let quickToggleType = QuickToggleType(rawValue: title) {
// CoreManager.shared.quickToggleType = quickToggleType
// }
// }

@IBAction func defaultTerminalButtonClicked(_ sender: NSPopUpButton) {
let itemTitles = sender.itemTitles
let index = sender.indexOfSelectedItem
Expand Down Expand Up @@ -194,17 +184,17 @@ class GeneralPreferencesViewController: PreferencesViewController {
}
}

@objc func quickToggleTerminalClicked() {
@objc func quickToggleTerminalClicked(_ sender: NSMenuItem) {
CoreManager.shared.quickToggleType = .openWithDefaultTerminal
chooseToggleActionButton.select(quickToggleTerminalMenuItem)
}

@objc func quickToggleEditorClicked() {
@objc func quickToggleEditorClicked(_ sender: NSMenuItem) {
CoreManager.shared.quickToggleType = .openWithDefaultEditor
chooseToggleActionButton.select(quickToggleEditorMenuItem)
}

@objc func quickToggleCopyPathClicked() {
@objc func quickToggleCopyPathClicked(_ sender: NSMenuItem) {
CoreManager.shared.quickToggleType = .copyPathToClipboard
chooseToggleActionButton.select(quickToggleCopyPathMenuItem)
}
Expand Down

0 comments on commit fef4e87

Please sign in to comment.