floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the bugs in the preferences like typos.

This commit is contained in:
zonble 2022-01-14 20:31:39 +08:00
parent aa325f73aa
commit 7a5cb635e9
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Base.lproj/preferences.xib
View File

@ -121,7 +121,7 @@
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<binding destination="32" name="value" keyPath="values.EscToCleanInputBufferKey" id="atP-oI-qLL"/> <binding destination="32" name="value" keyPath="values.EscToCleanInputBuffer" id="tD5-7J-qTF"/>
</connections> </connections>
</button> </button>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="13"> <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="13">

12
Source/Preferences.swift
View File

@ -204,11 +204,11 @@ struct ComposingKeys {
// MARK: - // MARK: -
class Preferences: NSObject { class Preferences: NSObject {
@UserDefault(key: kKeyboardLayoutPreferenceKey, defaultValue: KeyboardLayout.standard) @UserDefault(key: kKeyboardLayoutPreferenceKey, defaultValue: 0)
@objc static var keyboardLayout: KeyboardLayout @objc static var keyboardLayout: Int
@objc static var keyboardLayoutName: String { @objc static var keyboardLayoutName: String {
self.keyboardLayout.name (KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.standard).name
} }
@UserDefault(key: kBasisKeyboardLayoutPreferenceKey, defaultValue: "com.apple.keylayout.US") @UserDefault(key: kBasisKeyboardLayoutPreferenceKey, defaultValue: "com.apple.keylayout.US")
@ -235,7 +235,7 @@ class Preferences: NSObject {
@UserDefault(key: kChooseCandidateUsingSpaceKey, defaultValue: true) @UserDefault(key: kChooseCandidateUsingSpaceKey, defaultValue: true)
@objc static var chooseCandidateUsingSpace: Bool @objc static var chooseCandidateUsingSpace: Bool
@UserDefault(key: kChineseConversionEnabledKey, defaultValue: true) @UserDefault(key: kChineseConversionEnabledKey, defaultValue: false)
@objc static var chineseConversionEnabled: Bool @objc static var chineseConversionEnabled: Bool
@objc static func toggleChineseConversionEnabled() -> Bool { @objc static func toggleChineseConversionEnabled() -> Bool {
@ -243,7 +243,7 @@ class Preferences: NSObject {
return chineseConversionEnabled return chineseConversionEnabled
} }
@UserDefault(key: kHalfWidthPunctuationEnabledKey, defaultValue: true) @UserDefault(key: kHalfWidthPunctuationEnabledKey, defaultValue: false)
@objc static var halfWidthPunctuationEnabled: Bool @objc static var halfWidthPunctuationEnabled: Bool
@objc static func toogleHalfWidthPunctuationEnabled() -> Bool { @objc static func toogleHalfWidthPunctuationEnabled() -> Bool {
@ -251,7 +251,7 @@ class Preferences: NSObject {
return halfWidthPunctuationEnabled; return halfWidthPunctuationEnabled;
} }
@UserDefault(key: kEscToCleanInputBufferKey, defaultValue: true) @UserDefault(key: kEscToCleanInputBufferKey, defaultValue: false)
@objc static var escToCleanInputBuffer: Bool @objc static var escToCleanInputBuffer: Bool
// MARK: Optional settings // MARK: Optional settings

1
Source/PreferencesWindowController.swift
View File

@ -125,6 +125,7 @@ import Carbon
basisKeyboardLayoutButton.select(chosenItem ?? usKeyboardLayoutItem) basisKeyboardLayoutButton.select(chosenItem ?? usKeyboardLayoutItem)
selectionKeyComboBox.usesDataSource = false selectionKeyComboBox.usesDataSource = false
selectionKeyComboBox.removeAllItems()
selectionKeyComboBox.addItems(withObjectValues: [Preferences.defaultKeys, "asdfghjkl", "asdfzxcvb"]) selectionKeyComboBox.addItems(withObjectValues: [Preferences.defaultKeys, "asdfghjkl", "asdfzxcvb"])
var candidateSelectionKeys = Preferences.candidateKeys ?? Preferences.defaultKeys var candidateSelectionKeys = Preferences.candidateKeys ?? Preferences.defaultKeys

2
Source/zh-Hant.lproj/preferences.xib
View File

@ -227,7 +227,7 @@
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<binding destination="32" name="value" keyPath="values.EscToCleanInputBufferKey" id="DyT-0S-5XE"/> <binding destination="32" name="value" keyPath="values.EscToCleanInputBuffer" id="Van-yb-Rvz"/>
</connections> </connections>
</button> </button>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="113"> <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="113">