menu: fix CFBundleName and multiple about windows (#17)

fcitx-contrib · Jan 12, 2024 · 51c8bc3 · 51c8bc3
1 parent 678cce7
commit 51c8bc3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 build
 *.dmg
 *.tar.bz2
+.cache
diff --git a/dmg/Base.lproj b/dmg/Base.lproj
@@ -0,0 +1 @@
+en.lproj
diff --git a/dmg/CMakeLists.txt b/dmg/CMakeLists.txt
@@ -2,6 +2,18 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/fcitx.icns"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
 )
 
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Base.lproj"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
+)
+
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/en.lproj"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
 )
+
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zh-Hans.lproj"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
+)
+
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zh-Hant.lproj"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
+)
diff --git a/dmg/zh-Hans.lproj/InfoPlist.strings b/dmg/zh-Hans.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+CFBundleName = "小企鹅";
+CFBundleDisplayName = "小企鹅";
+org.fcitx.inputmethod.fcitx5 = "小企鹅";
diff --git a/dmg/zh-Hant.lproj/InfoPlist.strings b/dmg/zh-Hant.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+CFBundleName = "小企鵝";
+CFBundleDisplayName = "小企鵝";
+org.fcitx.inputmethod.fcitx5 = "小企鵝";
diff --git a/src/config/menu.swift b/src/config/menu.swift
@@ -1,7 +1,12 @@
-import Foundation
+import Cocoa
 
 extension FcitxInputController {
+  static var fcitxAbout: NSWindowController?
+
   @objc func about(_: Any? = nil) {
-    FcitxAbout().showWindow(nil)
+    if FcitxInputController.fcitxAbout == nil {
+      FcitxInputController.fcitxAbout = FcitxAbout()
+    }
+    FcitxInputController.fcitxAbout!.showWindow(nil)
   }
 }