mirror of
https://github.com/qvacua/vimr.git
synced 2024-12-24 22:33:52 +03:00
Merge remote-tracking branch 'origin/develop' into update-neovim
This commit is contained in:
commit
6538823330
@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
@ -38,9 +38,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
@ -379,7 +379,7 @@ static const char *cfstr2cstr(CFStringRef cfstr, bool *free_bytes) {
|
||||
}
|
||||
|
||||
*free_bytes = true;
|
||||
result[out_len] = NULL;
|
||||
result[out_len] = '\0';
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -1148,7 +1148,7 @@
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 341;
|
||||
CURRENT_PROJECT_VERSION = 342;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
@ -1211,7 +1211,7 @@
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 341;
|
||||
CURRENT_PROJECT_VERSION = 342;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
@ -1241,7 +1241,7 @@
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
DEFINES_MODULE = YES;
|
||||
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||
DYLIB_CURRENT_VERSION = 341;
|
||||
DYLIB_CURRENT_VERSION = 342;
|
||||
DYLIB_INSTALL_NAME_BASE = "@rpath";
|
||||
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
|
||||
FRAMEWORK_VERSION = A;
|
||||
@ -1263,7 +1263,7 @@
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
DEFINES_MODULE = YES;
|
||||
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||
DYLIB_CURRENT_VERSION = 341;
|
||||
DYLIB_CURRENT_VERSION = 342;
|
||||
DYLIB_INSTALL_NAME_BASE = "@rpath";
|
||||
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
|
||||
FRAMEWORK_VERSION = A;
|
||||
|
@ -15,9 +15,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
|
@ -9,7 +9,7 @@ import MessagePack
|
||||
extension MessagePackValue {
|
||||
|
||||
var intValue: Int? {
|
||||
guard let i64 = self.integerValue else {
|
||||
guard let i64 = self.int64Value else {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -15,8 +15,8 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@ -139,7 +139,7 @@ extension RxNeovimApi.Buffer {
|
||||
return nil
|
||||
}
|
||||
|
||||
guard let handle = (try? unpack(data))?.value.integerValue else {
|
||||
guard let handle = (try? unpack(data))?.value.int64Value else {
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -158,7 +158,7 @@ extension RxNeovimApi.Window {
|
||||
return nil
|
||||
}
|
||||
|
||||
guard let handle = (try? unpack(data))?.value.integerValue else {
|
||||
guard let handle = (try? unpack(data))?.value.int64Value else {
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -177,7 +177,7 @@ extension RxNeovimApi.Tabpage {
|
||||
return nil
|
||||
}
|
||||
|
||||
guard let handle = (try? unpack(data))?.value.integerValue else {
|
||||
guard let handle = (try? unpack(data))?.value.int64Value else {
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -279,7 +279,7 @@ def msgpack_to_swift(msgpack_value_name, type):
|
||||
return f'{msgpack_value_name}.boolValue'
|
||||
|
||||
if type == 'Int':
|
||||
return f'({msgpack_value_name}.integerValue == nil ? nil : Int({msgpack_value_name}.integerValue!))'
|
||||
return f'({msgpack_value_name}.int64Value == nil ? nil : Int({msgpack_value_name}.int64Value!))'
|
||||
|
||||
if type == 'Float':
|
||||
return f'{msgpack_value_name}.floatValue'
|
||||
|
@ -1921,7 +1921,7 @@
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 341;
|
||||
CURRENT_PROJECT_VERSION = 342;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
@ -1981,7 +1981,7 @@
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 341;
|
||||
CURRENT_PROJECT_VERSION = 342;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
|
@ -35,176 +35,41 @@ let defaultShortcuts: [String: Shortcut?] = [
|
||||
"com.qvacua.vimr.menuitems.view.font.bigger": Shortcut(keyEquivalent: "⌘+"),
|
||||
"com.qvacua.vimr.menuitems.view.font.reset-to-default-size": Shortcut(keyEquivalent: "⌘0"),
|
||||
"com.qvacua.vimr.menuitems.view.font.smaller": Shortcut(keyEquivalent: "⌘-"),
|
||||
"com.qvacua.vimr.menuitems.window.bring-all-to-front": Shortcut(keyEquivalent: ""),
|
||||
"com.qvacua.vimr.menuitems.window.bring-all-to-front": Shortcut(keyEquivalent: ""),
|
||||
"com.qvacua.vimr.menuitems.window.minimize": Shortcut(keyEquivalent: "⌘M"),
|
||||
"com.qvacua.vimr.menuitems.window.zoom": Shortcut(keyEquivalent: ""),
|
||||
]
|
||||
|
||||
let legacyDefaultShortcuts: [String: [String: Any]] = [
|
||||
"com.qvacua.vimr.menuitems.edit.copy": [
|
||||
SRShortcutCharacters: "c",
|
||||
SRShortcutCharactersIgnoringModifiers: "c",
|
||||
SRShortcutKeyCode: 8,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.edit.cut": [
|
||||
SRShortcutCharacters: "x",
|
||||
SRShortcutCharactersIgnoringModifiers: "x",
|
||||
SRShortcutKeyCode: 7,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.edit.delete": [String: Any](),
|
||||
"com.qvacua.vimr.menuitems.edit.paste": [
|
||||
SRShortcutCharacters: "v",
|
||||
SRShortcutCharactersIgnoringModifiers: "v",
|
||||
SRShortcutKeyCode: 9,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.edit.redo": [
|
||||
SRShortcutCharacters: "z",
|
||||
SRShortcutCharactersIgnoringModifiers: "Z",
|
||||
SRShortcutKeyCode: 6,
|
||||
SRShortcutModifierFlagsKey: 1179914,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.edit.select-all": [
|
||||
SRShortcutCharacters: "a",
|
||||
SRShortcutCharactersIgnoringModifiers: "a",
|
||||
SRShortcutKeyCode: 0,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.edit.undo": [
|
||||
SRShortcutCharacters: "z",
|
||||
SRShortcutCharactersIgnoringModifiers: "z",
|
||||
SRShortcutKeyCode: 6,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.close": [
|
||||
SRShortcutCharacters: "w",
|
||||
SRShortcutCharactersIgnoringModifiers: "w",
|
||||
SRShortcutKeyCode: 13,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.close-window": [
|
||||
SRShortcutCharacters: "w",
|
||||
SRShortcutCharactersIgnoringModifiers: "W",
|
||||
SRShortcutKeyCode: 13,
|
||||
SRShortcutModifierFlagsKey: 1179914,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.new": [
|
||||
SRShortcutCharacters: "n",
|
||||
SRShortcutCharactersIgnoringModifiers: "n",
|
||||
SRShortcutKeyCode: 45,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.new-tab": [
|
||||
SRShortcutCharacters: "t",
|
||||
SRShortcutCharactersIgnoringModifiers: "t",
|
||||
SRShortcutKeyCode: 17,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.open-in-new-window": [
|
||||
SRShortcutCharacters: "ø",
|
||||
SRShortcutCharactersIgnoringModifiers: "o",
|
||||
SRShortcutKeyCode: 31,
|
||||
SRShortcutModifierFlagsKey: 1573160,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.open-quickly": [
|
||||
SRShortcutCharacters: "o",
|
||||
SRShortcutCharactersIgnoringModifiers: "O",
|
||||
SRShortcutKeyCode: 31,
|
||||
SRShortcutModifierFlagsKey: 1179914,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.open": [
|
||||
SRShortcutCharacters: "o",
|
||||
SRShortcutCharactersIgnoringModifiers: "o",
|
||||
SRShortcutKeyCode: 31,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.save-as": [
|
||||
SRShortcutCharacters: "s",
|
||||
SRShortcutCharactersIgnoringModifiers: "S",
|
||||
SRShortcutKeyCode: 1,
|
||||
SRShortcutModifierFlagsKey: 1179914,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.file.save": [
|
||||
SRShortcutCharacters: "s",
|
||||
SRShortcutCharactersIgnoringModifiers: "s",
|
||||
SRShortcutKeyCode: 1,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.help.vimr-help": [String: Any](),
|
||||
"com.qvacua.vimr.menuitems.tools.focus-neovim-view": [
|
||||
SRShortcutCharacters: ".",
|
||||
SRShortcutCharactersIgnoringModifiers: ".",
|
||||
SRShortcutKeyCode: 47,
|
||||
SRShortcutModifierFlagsKey: 1048576,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-all-tools": [
|
||||
SRShortcutCharacters: "\\",
|
||||
SRShortcutCharactersIgnoringModifiers: "\\",
|
||||
SRShortcutKeyCode: 42,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-file-browser": [
|
||||
SRShortcutCharacters: "1",
|
||||
SRShortcutCharactersIgnoringModifiers: "1",
|
||||
SRShortcutKeyCode: 18,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-buffer-list": [
|
||||
SRShortcutCharacters: "1",
|
||||
SRShortcutCharactersIgnoringModifiers: "2",
|
||||
SRShortcutKeyCode: 19,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-markdown-preview": [
|
||||
SRShortcutCharacters: "1",
|
||||
SRShortcutCharactersIgnoringModifiers: "3",
|
||||
SRShortcutKeyCode: 20,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-html-preview": [
|
||||
SRShortcutCharacters: "1",
|
||||
SRShortcutCharactersIgnoringModifiers: "4",
|
||||
SRShortcutKeyCode: 21,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-tool-buttons": [
|
||||
SRShortcutCharacters: "\\",
|
||||
SRShortcutCharactersIgnoringModifiers: "|",
|
||||
SRShortcutKeyCode: 42,
|
||||
SRShortcutModifierFlagsKey: 1179914,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.view.enter-full-screen": [
|
||||
SRShortcutCharacters: "\006",
|
||||
SRShortcutCharactersIgnoringModifiers: "f",
|
||||
SRShortcutKeyCode: 3,
|
||||
SRShortcutModifierFlagsKey: 1319176,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.view.font.bigger": [
|
||||
SRShortcutCharacters: "=",
|
||||
SRShortcutCharactersIgnoringModifiers: "=",
|
||||
SRShortcutKeyCode: 24,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.view.font.reset-to-default-size": [
|
||||
SRShortcutCharacters: "0",
|
||||
SRShortcutCharactersIgnoringModifiers: "0",
|
||||
SRShortcutKeyCode: 29,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.view.font.smaller": [
|
||||
SRShortcutCharacters: "-",
|
||||
SRShortcutCharactersIgnoringModifiers: "-",
|
||||
SRShortcutKeyCode: 27,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.window.bring-all-to-front": [String: Any](),
|
||||
"com.qvacua.vimr.menuitems.window.minimize": [
|
||||
SRShortcutCharacters: "m",
|
||||
SRShortcutCharactersIgnoringModifiers: "m",
|
||||
SRShortcutKeyCode: 46,
|
||||
SRShortcutModifierFlagsKey: 1048840,
|
||||
],
|
||||
"com.qvacua.vimr.menuitems.window.zoom": [String: Any](),
|
||||
let legacyDefaultShortcuts = [
|
||||
"com.qvacua.vimr.menuitems.edit.copy",
|
||||
"com.qvacua.vimr.menuitems.edit.cut",
|
||||
"com.qvacua.vimr.menuitems.edit.delete",
|
||||
"com.qvacua.vimr.menuitems.edit.paste",
|
||||
"com.qvacua.vimr.menuitems.edit.redo",
|
||||
"com.qvacua.vimr.menuitems.edit.select-all",
|
||||
"com.qvacua.vimr.menuitems.edit.undo",
|
||||
"com.qvacua.vimr.menuitems.file.close",
|
||||
"com.qvacua.vimr.menuitems.file.close-window",
|
||||
"com.qvacua.vimr.menuitems.file.new",
|
||||
"com.qvacua.vimr.menuitems.file.new-tab",
|
||||
"com.qvacua.vimr.menuitems.file.open-in-new-window",
|
||||
"com.qvacua.vimr.menuitems.file.open-quickly",
|
||||
"com.qvacua.vimr.menuitems.file.open",
|
||||
"com.qvacua.vimr.menuitems.file.save-as",
|
||||
"com.qvacua.vimr.menuitems.file.save",
|
||||
"com.qvacua.vimr.menuitems.help.vimr-help",
|
||||
"com.qvacua.vimr.menuitems.tools.focus-neovim-view",
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-all-tools",
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-file-browser",
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-buffer-list",
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-markdown-preview",
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-html-preview",
|
||||
"com.qvacua.vimr.menuitems.tools.toggle-tool-buttons",
|
||||
"com.qvacua.vimr.menuitems.view.enter-full-screen",
|
||||
"com.qvacua.vimr.menuitems.view.font.bigger",
|
||||
"com.qvacua.vimr.menuitems.view.font.reset-to-default-size",
|
||||
"com.qvacua.vimr.menuitems.view.font.smaller",
|
||||
"com.qvacua.vimr.menuitems.window.bring-all-to-front",
|
||||
"com.qvacua.vimr.menuitems.window.minimize",
|
||||
"com.qvacua.vimr.menuitems.window.zoom",
|
||||
]
|
||||
|
@ -167,7 +167,7 @@ static const char *cfstr_to_cstr_copy(CFStringRef cfstr) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
result[out_len] = NULL;
|
||||
result[out_len] = '\0';
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -424,7 +424,7 @@ class FuzzySearchService {
|
||||
do {
|
||||
let result = try moc.fetch(req)
|
||||
Swift.print("Files with needsScanChildren = true:")
|
||||
result.forEach { Swift.print("\t\($0.url)") }
|
||||
result.forEach { Swift.print("\t\(String(describing: $0.url))") }
|
||||
Swift.print("--- \(result.count)")
|
||||
} catch {
|
||||
Swift.print(error)
|
||||
|
@ -1224,7 +1224,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
@ -1241,7 +1241,7 @@
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.productivity</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
@ -31,7 +31,7 @@ extension MainWindow {
|
||||
case .toggleTools:
|
||||
guard params.count == 1 else { return }
|
||||
|
||||
let param = params[0].integerValue
|
||||
let param = params[0].int64Value
|
||||
|
||||
if params.isEmpty || param == 0 {
|
||||
self.toggleAllTools(self)
|
||||
@ -44,7 +44,7 @@ extension MainWindow {
|
||||
case .toggleToolButtons:
|
||||
guard params.count == 1 else { return }
|
||||
|
||||
let param = params[0].integerValue
|
||||
let param = params[0].int64Value
|
||||
|
||||
if params.isEmpty || param == 0 {
|
||||
self.toggleToolButtons(self)
|
||||
@ -60,7 +60,7 @@ extension MainWindow {
|
||||
case .setFont:
|
||||
guard params.count == 2 else { return }
|
||||
guard let fontName = params[0].stringValue,
|
||||
let fontSize = params[1].integerValue,
|
||||
let fontSize = params[1].int64Value,
|
||||
let font = NSFont(name: fontName, size: fontSize.cgf)
|
||||
else {
|
||||
return
|
||||
|
@ -29,7 +29,7 @@ class ShortcutsPref: PrefPane,
|
||||
|
||||
super.init(frame: .zero)
|
||||
|
||||
if let version = self.shortcutsUserDefaults?.integer(forKey: "version"),
|
||||
if let version = self.shortcutsUserDefaults?.integer(forKey: defaultsVersionKey),
|
||||
version > defaultsVersion {
|
||||
let alert = NSAlert()
|
||||
alert.alertStyle = .warning
|
||||
@ -76,7 +76,7 @@ class ShortcutsPref: PrefPane,
|
||||
return
|
||||
}
|
||||
|
||||
legacyDefaultShortcuts.keys.forEach { id in
|
||||
legacyDefaultShortcuts.forEach { id in
|
||||
let shortcut: Shortcut?
|
||||
if let dict = self.shortcutsUserDefaults?.value(forKey: id) as? [String: Any] {
|
||||
shortcut = Shortcut(dictionary: dict)
|
||||
@ -244,10 +244,13 @@ extension ShortcutsPref {
|
||||
alert.beginSheetModal(for: window, completionHandler: { response in
|
||||
guard response == .alertSecondButtonReturn else { return }
|
||||
self.traverseMenuItems { identifier, _ in
|
||||
self.shortcutsDefaultsController.setValue(
|
||||
legacyDefaultShortcuts[identifier],
|
||||
forKeyPath: "values.\(identifier)"
|
||||
)
|
||||
let shortcut = defaultShortcuts[identifier] ?? Shortcut(keyEquivalent: "")
|
||||
let valueToWrite = ValueTransformer
|
||||
.keyedUnarchiveFromDataTransformer
|
||||
.reverseTransformedValue(shortcut)
|
||||
|
||||
self.shortcutsDefaultsController.setValue(valueToWrite, forKeyPath: "values.\(identifier)")
|
||||
self.treeController.rearrangeObjects()
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -264,10 +267,7 @@ extension ShortcutsPref {
|
||||
return true
|
||||
}
|
||||
|
||||
func outlineView(
|
||||
_ outlineView: NSOutlineView,
|
||||
rowViewForItem item: Any
|
||||
) -> NSTableRowView? {
|
||||
func outlineView(_ outlineView: NSOutlineView, rowViewForItem item: Any) -> NSTableRowView? {
|
||||
let view = self.shortcutList.makeView(
|
||||
withIdentifier: NSUserInterfaceItemIdentifier("shortcut-row-view"),
|
||||
owner: self
|
||||
@ -276,11 +276,7 @@ extension ShortcutsPref {
|
||||
return view
|
||||
}
|
||||
|
||||
func outlineView(
|
||||
_: NSOutlineView,
|
||||
viewFor tableColumn: NSTableColumn?,
|
||||
item: Any
|
||||
) -> NSView? {
|
||||
func outlineView(_: NSOutlineView, viewFor tableColumn: NSTableColumn?, item: Any) -> NSView? {
|
||||
let cellView = self.shortcutList.makeView(
|
||||
withIdentifier: NSUserInterfaceItemIdentifier("shortcut-cell-view"),
|
||||
owner: self
|
||||
|
@ -15,10 +15,10 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>SNAPSHOT-341</string>
|
||||
<string>SNAPSHOT-342</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>341</string>
|
||||
<string>342</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@ -7,32 +7,23 @@
|
||||
<description>Most recent changes with links to updates for VimR.</description>
|
||||
<language>en</language>
|
||||
<item>
|
||||
<title>SNAPSHOT-341</title>
|
||||
<title>SNAPSHOT-342</title>
|
||||
<description><![CDATA[
|
||||
<p>We updated the library ShortcutRecorder to the latest version. By doing so, we store the shortcuts in a different format than before. This means that after you launched this version, old versions will not be compatible with the stored shortcuts. To delete the stored shortcuts, you can use <code>defaults delete com.qvacua.VimR.menuitems</code> in Terminal.</p>
|
||||
<ul>
|
||||
<li>Show only font family names of monospace fonts.</li>
|
||||
<li>Bugfix: The cursor is not drawn when a new window is opened.</li>
|
||||
<li>Bugfix: Preview in the Appearance preferences is not dark mode compatible.</li>
|
||||
<li>Dependencies updates:<ul>
|
||||
<li>httpswift/swifter@1.4.7</li>
|
||||
<li>eonil/FSEvents@0.1.6</li>
|
||||
<li>Quick/Nimble@8.0.5</li>
|
||||
<li>sparkle-project/Sparkle@1.22.0</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Set <code>gui_running</code> to <code>true</code> (GH-476).</li>
|
||||
</ul>
|
||||
]]></description>
|
||||
<releaseNotesLink>
|
||||
https://github.com/qvacua/vimr/releases/tag/snapshot/341
|
||||
https://github.com/qvacua/vimr/releases/tag/snapshot/342
|
||||
</releaseNotesLink>
|
||||
<pubDate>2020-02-06T22:30:46.962132</pubDate>
|
||||
<pubDate>2020-02-08T03:39:29.770602</pubDate>
|
||||
<minimumSystemVersion>10.12.0</minimumSystemVersion>
|
||||
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/341/VimR-SNAPSHOT-341.tar.bz2"
|
||||
sparkle:version="341"
|
||||
sparkle:shortVersionString="SNAPSHOT-341"
|
||||
sparkle:dsaSignature="MC0CFC9wDJUIc+uimMn5Xo0dF0UbLgymAhUA3RuHGJslCvKF0QTHYBXp7N+v+6I="
|
||||
length="14802198"
|
||||
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/342/VimR-SNAPSHOT-342.tar.bz2"
|
||||
sparkle:version="342"
|
||||
sparkle:shortVersionString="SNAPSHOT-342"
|
||||
sparkle:dsaSignature="MC0CFC6fmPesrYBNaAyy1XVhyyzfMlOHAhUAxzeFDLvTn4EheH5Y2hPFPWExIGI="
|
||||
length="14813486"
|
||||
type="application/octet-stream"/>
|
||||
</item>
|
||||
</channel>
|
||||
|
@ -3,6 +3,7 @@
|
||||
We updated the library ShortcutRecorder to the latest version. By doing so, we store the shortcuts in a different format than before. This means that after you launched this version, old versions will not be compatible with the stored shortcuts. To delete the stored shortcuts, you can use `defaults delete com.qvacua.VimR.menuitems` in Terminal.
|
||||
|
||||
* Show only font family names of monospace fonts.
|
||||
* Set `gui_running` to `true` (GH-476).
|
||||
* Bugfix: The cursor is not drawn when a new window is opened.
|
||||
* Bugfix: Preview in the Appearance preferences is not dark mode compatible.
|
||||
* Bugfix: Shortcut buttons are not dark mode compatible.
|
||||
|
Loading…
Reference in New Issue
Block a user