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

PrefUI // Layout optimization.

This commit is contained in:
ShikiSuen 2022-09-12 20:53:01 +08:00
parent deb968ca70
commit 8cae4d1c8c
6 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift
View File

@ -26,7 +26,7 @@ struct suiPrefPaneDevZone: View {
if mgrPrefs.appleLanguages[0].contains("zh-Han") { if mgrPrefs.appleLanguages[0].contains("zh-Han") {
return 480 return 480
} else { } else {
return 550 return 580
} }
} }
}() }()

2
Source/Modules/UIModules/PrefUI/suiPrefPaneDictionary.swift
View File

@ -39,7 +39,7 @@ struct suiPrefPaneDictionary: View {
if mgrPrefs.appleLanguages[0].contains("zh-Han") { if mgrPrefs.appleLanguages[0].contains("zh-Han") {
return 480 return 480
} else { } else {
return 550 return 580
} }
} }
}() }()

2
Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
View File

@ -55,7 +55,7 @@ struct suiPrefPaneExperience: View {
if mgrPrefs.appleLanguages[0].contains("zh-Han") { if mgrPrefs.appleLanguages[0].contains("zh-Han") {
return 480 return 480
} else { } else {
return 550 return 580
} }
} }
}() }()

2
Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
View File

@ -46,7 +46,7 @@ struct suiPrefPaneGeneral: View {
if mgrPrefs.appleLanguages[0].contains("zh-Han") { if mgrPrefs.appleLanguages[0].contains("zh-Han") {
return 480 return 480
} else { } else {
return 550 return 580
} }
} }
}() }()

88
Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
View File

@ -40,7 +40,7 @@ struct suiPrefPaneKeyboard: View {
if mgrPrefs.appleLanguages[0].contains("zh-Han") { if mgrPrefs.appleLanguages[0].contains("zh-Han") {
return 480 return 480
} else { } else {
return 550 return 580
} }
} }
}() }()
@ -231,48 +231,54 @@ struct suiPrefPaneKeyboard: View {
} }
} }
Preferences.Section(bottomDivider: true, label: { Text(LocalizedStringKey("Keyboard Shortcuts:")) }) { Preferences.Section(bottomDivider: true, label: { Text(LocalizedStringKey("Keyboard Shortcuts:")) }) {
Toggle( HStack(alignment: .top, spacing: NSFont.systemFontSize) {
LocalizedStringKey("Per-Char Select Mode"), VStack(alignment: .leading) {
isOn: $selUsingHotKeySCPC.onChange { Toggle(
mgrPrefs.usingHotKeySCPC = selUsingHotKeySCPC LocalizedStringKey("Per-Char Select Mode"),
isOn: $selUsingHotKeySCPC.onChange {
mgrPrefs.usingHotKeySCPC = selUsingHotKeySCPC
}
)
Toggle(
LocalizedStringKey("Per-Char Associated Phrases"),
isOn: $selUsingHotKeyAssociates.onChange {
mgrPrefs.usingHotKeyAssociates = selUsingHotKeyAssociates
}
)
Toggle(
LocalizedStringKey("CNS11643 Mode"),
isOn: $selUsingHotKeyCNS.onChange {
mgrPrefs.usingHotKeyCNS = selUsingHotKeyCNS
}
)
Toggle(
LocalizedStringKey("Force KangXi Writing"),
isOn: $selUsingHotKeyKangXi.onChange {
mgrPrefs.usingHotKeyKangXi = selUsingHotKeyKangXi
}
)
} }
) VStack(alignment: .leading) {
Toggle( Toggle(
LocalizedStringKey("Per-Char Associated Phrases"), LocalizedStringKey("JIS Shinjitai Output"),
isOn: $selUsingHotKeyAssociates.onChange { isOn: $selUsingHotKeyJIS.onChange {
mgrPrefs.usingHotKeyAssociates = selUsingHotKeyAssociates mgrPrefs.usingHotKeyJIS = selUsingHotKeyJIS
}
)
Toggle(
LocalizedStringKey("Half-Width Punctuation Mode"),
isOn: $selUsingHotKeyHalfWidthASCII.onChange {
mgrPrefs.usingHotKeyHalfWidthASCII = selUsingHotKeyHalfWidthASCII
}
)
Toggle(
LocalizedStringKey("Currency Numeral Output"),
isOn: $selUsingHotKeyCurrencyNumerals.onChange {
mgrPrefs.usingHotKeyCurrencyNumerals = selUsingHotKeyCurrencyNumerals
}
)
} }
) }
Toggle(
LocalizedStringKey("CNS11643 Mode"),
isOn: $selUsingHotKeyCNS.onChange {
mgrPrefs.usingHotKeyCNS = selUsingHotKeyCNS
}
)
Toggle(
LocalizedStringKey("Force KangXi Writing"),
isOn: $selUsingHotKeyKangXi.onChange {
mgrPrefs.usingHotKeyKangXi = selUsingHotKeyKangXi
}
)
Toggle(
LocalizedStringKey("JIS Shinjitai Output"),
isOn: $selUsingHotKeyJIS.onChange {
mgrPrefs.usingHotKeyJIS = selUsingHotKeyJIS
}
)
Toggle(
LocalizedStringKey("Half-Width Punctuation Mode"),
isOn: $selUsingHotKeyHalfWidthASCII.onChange {
mgrPrefs.usingHotKeyHalfWidthASCII = selUsingHotKeyHalfWidthASCII
}
)
Toggle(
LocalizedStringKey("Currency Numeral Output"),
isOn: $selUsingHotKeyCurrencyNumerals.onChange {
mgrPrefs.usingHotKeyCurrencyNumerals = selUsingHotKeyCurrencyNumerals
}
)
} }
} }
} }

4
Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21223" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21223"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>