From 2ff3f0f0d0aaacb347b114f9f1f33a6a4335e667 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sat, 3 Dec 2022 20:58:37 +0800 Subject: [PATCH] PrefUI // Add phrase editor page. --- .../Modules/UIModules/PrefUI/CtlPrefUI.swift | 36 ++++++++++++ .../UIModules/PrefUI/VwrPrefPanePhrases.swift | 56 +++++++++++++++++++ vChewing.xcodeproj/project.pbxproj | 4 ++ 3 files changed, 96 insertions(+) create mode 100644 Source/Modules/UIModules/PrefUI/VwrPrefPanePhrases.swift diff --git a/Source/Modules/UIModules/PrefUI/CtlPrefUI.swift b/Source/Modules/UIModules/PrefUI/CtlPrefUI.swift index 54373048..28595a33 100644 --- a/Source/Modules/UIModules/PrefUI/CtlPrefUI.swift +++ b/Source/Modules/UIModules/PrefUI/CtlPrefUI.swift @@ -41,6 +41,16 @@ extension NSImage { } } + static var tabImagePhrases: NSImage! { + if #unavailable(macOS 11.0) { + return NSImage(named: "PrefToolbar-Phrases") + } else { + return NSImage( + systemSymbolName: "tablecells.badge.ellipsis", accessibilityDescription: "Phrases Preferences" + ) + } + } + static var tabImageCassette: NSImage! { if #unavailable(macOS 11.0) { return NSImage(named: "PrefToolbar-Cassette") @@ -102,6 +112,13 @@ class CtlPrefUI { ) { VwrPrefPaneDictionary() }, + SSPreferences.Pane( + identifier: SSPreferences.PaneIdentifier(rawValue: "Phrases"), + title: CtlPrefWindow.locPhrasesTabTitle, + toolbarIcon: .tabImagePhrases + ) { + VwrPrefPanePhrases() + }, SSPreferences.Pane( identifier: SSPreferences.PaneIdentifier(rawValue: "Cassette"), title: NSLocalizedString("Cassette", comment: ""), @@ -128,3 +145,22 @@ class CtlPrefUI { ) static let shared = CtlPrefUI() } + +// MARK: - Localization-Related Contents. + +extension CtlPrefWindow { + /// 由於用於頁籤標題的某些用語放在 localizable 資源內管理的話容易混亂，所以這裡單獨處理。 + static var locPhrasesTabTitle: String { + switch PrefMgr.shared.appleLanguages[0] { + case "ja": + return "辞書編集" + default: + if PrefMgr.shared.appleLanguages[0].contains("zh-Hans") { + return "语汇编辑" + } else if PrefMgr.shared.appleLanguages[0].contains("zh-Hant") { + return "語彙編輯" + } + return "Phrases" + } + } +} diff --git a/Source/Modules/UIModules/PrefUI/VwrPrefPanePhrases.swift b/Source/Modules/UIModules/PrefUI/VwrPrefPanePhrases.swift new file mode 100644 index 00000000..3782560b --- /dev/null +++ b/Source/Modules/UIModules/PrefUI/VwrPrefPanePhrases.swift @@ -0,0 +1,56 @@ +// (c) 2021 and onwards The vChewing Project (MIT-NTL License). +// ==================== +// This code is released under the MIT license (SPDX-License-Identifier: MIT) +// ... with NTL restriction stating that: +// No trademark license is granted to use the trade names, trademarks, service +// marks, or product names of Contributor, except as required to fulfill notice +// requirements defined in MIT License. + +import PhraseEditorUI +import SSPreferences +import Shared +import SwiftExtension +import SwiftUI + +@available(macOS 10.15, *) +struct VwrPrefPanePhrases: View { + private let contentMaxHeight: Double = 440 + private let contentWidth: Double = { + switch PrefMgr.shared.appleLanguages[0] { + case "ja": + return 520 + default: + if PrefMgr.shared.appleLanguages[0].contains("zh-Han") { + return 480 + } else { + return 580 + } + } + }() + + var isMontereyOrAbove: Bool = { + if #available(macOS 12.0, *) { + return true + } + return false + }() + + var body: some View { + ScrollView { + SSPreferences.Container(contentWidth: contentWidth) { + SSPreferences.Section(title: "", bottomDivider: true) { + VwrPhraseEditorUI(delegate: LMMgr.shared).frame(height: 395) + } + } + } + .frame(maxHeight: contentMaxHeight).fixedSize(horizontal: false, vertical: true) + .background(VisualEffectView(material: .sidebar, blendingMode: .behindWindow)) + } +} + +@available(macOS 11.0, *) +struct VwrPrefPanePhrases_Previews: PreviewProvider { + static var previews: some View { + VwrPrefPanePhrases() + } +} diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index b17012a4..85dcaad0 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 5B5C8ED828FC0EA9002C93A5 /* SSPreferences in Frameworks */ = {isa = PBXBuildFile; productRef = 5B5C8ED728FC0EA9002C93A5 /* SSPreferences */; }; 5B62A33D27AE7CC100A19448 /* CtlAboutWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B62A33C27AE7CC100A19448 /* CtlAboutWindow.swift */; }; 5B660A8628F64A8800E5E4F6 /* SymbolMenuDefaultData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B660A8528F64A8800E5E4F6 /* SymbolMenuDefaultData.swift */; }; + 5B69938C293B811F0057CB8E /* VwrPrefPanePhrases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B69938B293B811F0057CB8E /* VwrPrefPanePhrases.swift */; }; 5B6C141228A9D4B30098ADF8 /* SessionCtl_HandleEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6C141128A9D4B30098ADF8 /* SessionCtl_HandleEvent.swift */; }; 5B73FB5E27B2BE1300E9BF49 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5B73FB6027B2BE1300E9BF49 /* InfoPlist.strings */; }; 5B765F09293A253C00122315 /* PhraseEditorUI in Frameworks */ = {isa = PBXBuildFile; productRef = 5B765F08293A253C00122315 /* PhraseEditorUI */; }; @@ -234,6 +235,7 @@ 5B62A33C27AE7CC100A19448 /* CtlAboutWindow.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; indentWidth = 2; lineEnding = 0; path = CtlAboutWindow.swift; sourceTree = ""; tabWidth = 2; usesTabs = 0; }; 5B65B919284D0185007C558B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 5B660A8528F64A8800E5E4F6 /* SymbolMenuDefaultData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolMenuDefaultData.swift; sourceTree = ""; }; + 5B69938B293B811F0057CB8E /* VwrPrefPanePhrases.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VwrPrefPanePhrases.swift; sourceTree = ""; }; 5B6C141128A9D4B30098ADF8 /* SessionCtl_HandleEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionCtl_HandleEvent.swift; sourceTree = ""; }; 5B73FB5427B2BD6900E9BF49 /* PhraseEditor-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "PhraseEditor-Info.plist"; path = "UserPhraseEditor/PhraseEditor-Info.plist"; sourceTree = SOURCE_ROOT; }; 5B73FB5F27B2BE1300E9BF49 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -546,6 +548,7 @@ 5BA9FD0D27FEDB6B002DE248 /* VwrPrefPaneExperience.swift */, 5BA9FD0A27FEDB6B002DE248 /* VwrPrefPaneGeneral.swift */, 5BA9FD0B27FEDB6B002DE248 /* VwrPrefPaneKeyboard.swift */, + 5B69938B293B811F0057CB8E /* VwrPrefPanePhrases.swift */, ); path = PrefUI; sourceTree = ""; @@ -1181,6 +1184,7 @@ 5BF56F9A28C39D1800DD6839 /* IMEStateData.swift in Sources */, 5B21176C287539BB000443A9 /* SessionCtl_HandleStates.swift in Sources */, 5BE1F8A928F86AB5006C7FF5 /* InputHandler_HandleEvent.swift in Sources */, + 5B69938C293B811F0057CB8E /* VwrPrefPanePhrases.swift in Sources */, 5BAEFAD028012565001F42C9 /* LMMgr.swift in Sources */, 5B782EC4280C243C007276DE /* InputHandler_HandleCandidate.swift in Sources */, 5BA9FD0F27FEDB6B002DE248 /* VwrPrefPaneGeneral.swift in Sources */,