diff --git a/Source/Modules/AppDelegate.swift b/Source/Modules/AppDelegate.swift index 69555761..3d09736e 100644 --- a/Source/Modules/AppDelegate.swift +++ b/Source/Modules/AppDelegate.swift @@ -152,6 +152,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, ctlNonModalAlertWindowDelega } } + // let vChewingKeyLayoutBundle = Bundle.init(path: URL(fileURLWithPath: Bundle.main.resourcePath ?? "").appendingPathComponent("vChewingKeyLayout.bundle").path) + @IBOutlet weak var window: NSWindow? private var ctlPrefWindowInstance: ctlPrefWindow? private var ctlAboutWindowInstance: ctlAboutWindow? // New About Window diff --git a/Source/Resources/KeyLayouts/vChewingKeyLayout.bundle/Contents/Info.plist b/Source/Resources/KeyLayouts/vChewingKeyLayout.bundle/Contents/Info.plist index 98fa6b2a..52159851 100644 --- a/Source/Resources/KeyLayouts/vChewingKeyLayout.bundle/Contents/Info.plist +++ b/Source/Resources/KeyLayouts/vChewingKeyLayout.bundle/Contents/Info.plist @@ -13,7 +13,7 @@ TICapsLockLanguageSwitchCapable TISInputSourceID - org.atelierInmu.vChewing.keyLayouts.zhuyindachen + org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyindachen TISIntendedLanguage zh-Hanb @@ -22,7 +22,7 @@ TICapsLockLanguageSwitchCapable TISInputSourceID - org.atelierInmu.vChewing.keyLayouts.zhuyineten + org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyineten TISIntendedLanguage zh-Hanb @@ -31,7 +31,7 @@ TICapsLockLanguageSwitchCapable TISInputSourceID - org.atelierInmu.vChewing.keyLayouts.zhuyinibm + org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyinibm TISIntendedLanguage zh-Hanb @@ -40,7 +40,7 @@ TICapsLockLanguageSwitchCapable TISInputSourceID - org.atelierInmu.vChewing.keyLayouts.zhuyinmitac + org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyinmitac TISIntendedLanguage zh-Hanb @@ -49,7 +49,7 @@ TICapsLockLanguageSwitchCapable TISInputSourceID - org.atelierInmu.vChewing.keyLayouts.zhuyinseigyou + org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyinseigyou TISIntendedLanguage zh-Hanb diff --git a/Source/WindowControllers/ctlPrefWindow.swift b/Source/WindowControllers/ctlPrefWindow.swift index d49f4d25..ebdd9695 100644 --- a/Source/WindowControllers/ctlPrefWindow.swift +++ b/Source/WindowControllers/ctlPrefWindow.swift @@ -84,6 +84,11 @@ extension RangeReplaceableCollection where Element: Hashable { menuItem_AppleZhuyinEten.representedObject = String("com.apple.keylayout.ZhuyinEten") basisKeyboardLayoutButton.menu?.addItem(menuItem_AppleZhuyinEten) + let menuItem_vChewingDachen = NSMenuItem() + menuItem_vChewingDachen.title = String(format: NSLocalizedString("vChewing Dachen (Not Finished Yet)", comment: "")) + menuItem_vChewingDachen.representedObject = String("org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyindachen") + basisKeyboardLayoutButton.menu?.addItem(menuItem_vChewingDachen) + let basisKeyboardLayoutID = Preferences.basisKeyboardLayout for source in list { @@ -149,6 +154,8 @@ extension RangeReplaceableCollection where Element: Hashable { chosenBaseKeyboardLayoutItem = menuItem_AppleZhuyinBopomofo case "com.apple.keylayout.ZhuyinEten": chosenBaseKeyboardLayoutItem = menuItem_AppleZhuyinEten + case "org.atelierInmu.keyboardlayout.vChewingKeyLayout.zhuyindachen": + chosenBaseKeyboardLayoutItem = menuItem_vChewingDachen default: break // nothing to do } diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index 941d5fd4..712d2254 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -1328,6 +1328,7 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1921; + DEVELOPMENT_ASSET_PATHS = Source/Resources/KeyLayouts/vChewingKeyLayout.bundle; DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -1392,6 +1393,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1921; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_ASSET_PATHS = Source/Resources/KeyLayouts/vChewingKeyLayout.bundle; DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES;