diff --git a/NvimView/DrawerDev/Info.plist b/NvimView/DrawerDev/Info.plist
index 64fa361f..e53f0f35 100644
--- a/NvimView/DrawerDev/Info.plist
+++ b/NvimView/DrawerDev/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleVersion
- 341
+ 342
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
NSHumanReadableCopyright
diff --git a/NvimView/DrawerPerf/Info.plist b/NvimView/DrawerPerf/Info.plist
index b365a2c8..5311ffd7 100644
--- a/NvimView/DrawerPerf/Info.plist
+++ b/NvimView/DrawerPerf/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleVersion
- 341
+ 342
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
NSHumanReadableCopyright
diff --git a/NvimView/MinimalNvimViewDemo/Info.plist b/NvimView/MinimalNvimViewDemo/Info.plist
index bb15315f..e7d26ce4 100644
--- a/NvimView/MinimalNvimViewDemo/Info.plist
+++ b/NvimView/MinimalNvimViewDemo/Info.plist
@@ -38,9 +38,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleVersion
- 341
+ 342
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
NSHumanReadableCopyright
diff --git a/NvimView/NvimServer/server.c b/NvimView/NvimServer/server.c
index 9052ef42..e4cd4f0c 100644
--- a/NvimView/NvimServer/server.c
+++ b/NvimView/NvimServer/server.c
@@ -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;
}
diff --git a/NvimView/NvimView.xcodeproj/project.pbxproj b/NvimView/NvimView.xcodeproj/project.pbxproj
index 86912c60..4ab9ba18 100644
--- a/NvimView/NvimView.xcodeproj/project.pbxproj
+++ b/NvimView/NvimView.xcodeproj/project.pbxproj
@@ -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;
diff --git a/NvimView/NvimView/Info.plist b/NvimView/NvimView/Info.plist
index 68cafc16..f9fc489f 100644
--- a/NvimView/NvimView/Info.plist
+++ b/NvimView/NvimView/Info.plist
@@ -15,9 +15,9 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleVersion
- 341
+ 342
NSHumanReadableCopyright
Copyright © 2017 Tae Won Ha. All rights reserved.
NSPrincipalClass
diff --git a/NvimView/NvimView/MessagePackCommons.swift b/NvimView/NvimView/MessagePackCommons.swift
index bf63e958..fe95fe8f 100644
--- a/NvimView/NvimView/MessagePackCommons.swift
+++ b/NvimView/NvimView/MessagePackCommons.swift
@@ -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
}
diff --git a/NvimView/NvimViewTests/Info.plist b/NvimView/NvimViewTests/Info.plist
index 13953ecc..be325661 100644
--- a/NvimView/NvimViewTests/Info.plist
+++ b/NvimView/NvimViewTests/Info.plist
@@ -15,8 +15,8 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleVersion
- 341
+ 342
diff --git a/RxPack/bin/generate_api_methods.py b/RxPack/bin/generate_api_methods.py
index 4137efe9..48db135d 100755
--- a/RxPack/bin/generate_api_methods.py
+++ b/RxPack/bin/generate_api_methods.py
@@ -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'
diff --git a/VimR/VimR.xcodeproj/project.pbxproj b/VimR/VimR.xcodeproj/project.pbxproj
index f8898bcf..8bb93b5b 100644
--- a/VimR/VimR.xcodeproj/project.pbxproj
+++ b/VimR/VimR.xcodeproj/project.pbxproj
@@ -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;
diff --git a/VimR/VimR/DefaultShortcuts.swift b/VimR/VimR/DefaultShortcuts.swift
index 4338d459..a32d30fb 100644
--- a/VimR/VimR/DefaultShortcuts.swift
+++ b/VimR/VimR/DefaultShortcuts.swift
@@ -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",
]
diff --git a/VimR/VimR/FileScanBaton.m b/VimR/VimR/FileScanBaton.m
index 5e150395..6cec1353 100644
--- a/VimR/VimR/FileScanBaton.m
+++ b/VimR/VimR/FileScanBaton.m
@@ -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;
}
diff --git a/VimR/VimR/FuzzySearchService.swift b/VimR/VimR/FuzzySearchService.swift
index 39922b49..e097e870 100644
--- a/VimR/VimR/FuzzySearchService.swift
+++ b/VimR/VimR/FuzzySearchService.swift
@@ -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)
diff --git a/VimR/VimR/Info.plist b/VimR/VimR/Info.plist
index abb93816..87cdb839 100644
--- a/VimR/VimR/Info.plist
+++ b/VimR/VimR/Info.plist
@@ -1224,7 +1224,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleSignature
????
CFBundleURLTypes
@@ -1241,7 +1241,7 @@
CFBundleVersion
- 341
+ 342
LSApplicationCategoryType
public.app-category.productivity
LSMinimumSystemVersion
diff --git a/VimR/VimR/MainWindow+Actions.swift b/VimR/VimR/MainWindow+Actions.swift
index 4e954d96..aa36d348 100644
--- a/VimR/VimR/MainWindow+Actions.swift
+++ b/VimR/VimR/MainWindow+Actions.swift
@@ -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
diff --git a/VimR/VimR/ShortcutsPref.swift b/VimR/VimR/ShortcutsPref.swift
index ede82b52..e4ca0fa2 100644
--- a/VimR/VimR/ShortcutsPref.swift
+++ b/VimR/VimR/ShortcutsPref.swift
@@ -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
diff --git a/VimR/VimRTests/Info.plist b/VimR/VimRTests/Info.plist
index 3e3fe5e5..e1e2bb8e 100644
--- a/VimR/VimRTests/Info.plist
+++ b/VimR/VimRTests/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- SNAPSHOT-341
+ SNAPSHOT-342
CFBundleSignature
????
CFBundleVersion
- 341
+ 342
diff --git a/appcast_snapshot.xml b/appcast_snapshot.xml
index 1379808a..dd4d254e 100644
--- a/appcast_snapshot.xml
+++ b/appcast_snapshot.xml
@@ -7,32 +7,23 @@
Most recent changes with links to updates for VimR.
en
-
- SNAPSHOT-341
+ SNAPSHOT-342
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.
-- Bugfix: The cursor is not drawn when a new window is opened.
-- Bugfix: Preview in the Appearance preferences is not dark mode compatible.
-- Dependencies updates:
-- httpswift/swifter@1.4.7
-- eonil/FSEvents@0.1.6
-- Quick/Nimble@8.0.5
-- sparkle-project/Sparkle@1.22.0
-
-
+- Set
gui_running
to true
(GH-476).
]]>
- https://github.com/qvacua/vimr/releases/tag/snapshot/341
+ https://github.com/qvacua/vimr/releases/tag/snapshot/342
- 2020-02-06T22:30:46.962132
+ 2020-02-08T03:39:29.770602
10.12.0
-
diff --git a/resources/release-notes.md b/resources/release-notes.md
index 38fc61c2..a084a149 100644
--- a/resources/release-notes.md
+++ b/resources/release-notes.md
@@ -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.