qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-25 23:02:35 +03:00
Code Issues Projects Releases Wiki Activity

Make it compile again

Browse Source
This commit is contained in:
Tae Won Ha 2020-01-27 18:34:00 +01:00
parent 1b9862742e
commit 663b216b70
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@ -5,7 +5,7 @@ github "ReactiveX/RxSwift" == 5.0.1
github "a2/MessagePack.swift" == 3.0.1
github "qvacua/CocoaFontAwesome" "master"
github "qvacua/CocoaMarkdown" "master"
github "qvacua/ShortcutRecorder" "temporary"
github "qvacua/ShortcutRecorder" "develop"
github "qvacua/Sparkle" == 1.21.3-qvacua
github "qvacua/swifter" "nonpublic"

2
Cartfile.resolved
View File

@ -7,7 +7,7 @@ github "elegantchaos/DictionaryCoding" "1.0.7"
github "eonil/FSEvents" "0.1.5"
github "qvacua/CocoaFontAwesome" "fc2a08babd676525ced68061b19ad8ff3dd1d0b3"
github "qvacua/CocoaMarkdown" "c58166490a71ad4d8466f7e7b9faf7cb0917c42f"
github "qvacua/ShortcutRecorder" "71baf522a1e57b5f130055e33dcd800687f6ea80"
github "qvacua/ShortcutRecorder" "c1079078db2d8e3c02c58578714fc36c0dfe4f78"
github "qvacua/Sparkle" "1.21.3-qvacua"
github "qvacua/swifter" "1905655ceedec5b5768f2089ceccf31621f6230a"
github "sindresorhus/github-markdown-css" "v3.0.1"

8
VimR/VimR/ShortcutsPref.swift
View File

@ -11,7 +11,7 @@ import ShortcutRecorder
class ShortcutsPref: PrefPane,
UiComponent,
NSOutlineViewDelegate,
SRRecorderControlDelegate {
RecorderControlDelegate {
typealias StateType = AppState
@ -51,8 +51,8 @@ class ShortcutsPref: PrefPane,
private let treeController = NSTreeController()
private let shortcutItemsRoot = ShortcutItem(title: "root", isLeaf: false, item: nil)
private let keyEqTransformer = SRKeyEquivalentTransformer()
private let keyEqModTransformer = SRKeyEquivalentModifierMaskTransformer()
private let keyEqTransformer = KeyEquivalentTransformer()
private let keyEqModTransformer = KeyEquivalentModifierMaskTransformer()
private let shortcutsUserDefaults = UserDefaults(suiteName: "com.qvacua.VimR.menuitems")
private let shortcutsDefaultsController: NSUserDefaultsController
@ -307,7 +307,7 @@ extension ShortcutsPref {
// MARK: - SRRecorderControlDelegate
extension ShortcutsPref {
func shortcutRecorderDidEndRecording(_ sender: SRRecorderControl!) {
func shortcutRecorderDidEndRecording(_ sender: RecorderControl!) {
self.treeController.rearrangeObjects()
}
}

8
VimR/VimR/ShortcutsTableSubviews.swift
View File

@ -36,7 +36,7 @@ class ShortcutTableCell: NSTableCellView {
}
}
func setDelegateOfRecorder(_ delegate: SRRecorderControlDelegate) {
func setDelegateOfRecorder(_ delegate: RecorderControlDelegate) {
self.shortcutRecorder.delegate = delegate
}
@ -67,8 +67,8 @@ class ShortcutTableCell: NSTableCellView {
recorder.allowsEscapeToCancelRecording = true
recorder.allowsDeleteToClearShortcutAndEndRecording = true
recorder.storesEmptyValueForNoShortcut = true
recorder.setAllowedModifierFlags(
[.command, .shift, .option, .control],
recorder.set(
allowedModifierFlags: [.command, .shift, .option, .control],
requiredModifierFlags: [],
allowsEmptyModifierFlags: false
)
@ -117,7 +117,7 @@ class ShortcutTableCell: NSTableCellView {
textField.autoPinEdge(toSuperviewEdge: .top, withInset: 3)
}
private let shortcutRecorder = SRRecorderControl(forAutoLayout: ())
private let shortcutRecorder = RecorderControl(forAutoLayout: ())
private let _textField = NSTextField(forAutoLayout: ())
required init?(coder: NSCoder) {