diff --git a/McBopomofo.xcodeproj/project.pbxproj b/McBopomofo.xcodeproj/project.pbxproj index 12c11cca..181a86b4 100644 --- a/McBopomofo.xcodeproj/project.pbxproj +++ b/McBopomofo.xcodeproj/project.pbxproj @@ -30,14 +30,12 @@ 6A187E2616004C5900466B2E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A187E2816004C5900466B2E /* MainMenu.xib */; }; 6A225A1F23679F2600F685C6 /* NotarizedArchives in Resources */ = {isa = PBXBuildFile; fileRef = 6A225A1E23679F2600F685C6 /* NotarizedArchives */; }; 6A225A232367A1D700F685C6 /* ArchiveUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A225A222367A1D700F685C6 /* ArchiveUtil.m */; }; + 6A2E40F6253A69DA00D1AE1D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */; }; + 6A2E40F9253A6AA000D1AE1D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */; }; 6A38BC1515FC117A00A8A51F /* data.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6A38BBF615FC117A00A8A51F /* data.txt */; }; 6A38BC1D15FC11C700A8A51F /* UpdateNotificationController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A38BC1F15FC11C700A8A51F /* UpdateNotificationController.xib */; }; 6A38BC2815FC158A00A8A51F /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A38BC2715FC158A00A8A51F /* InputMethodKit.framework */; }; 6A38BC2A15FC161000A8A51F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A38BC2915FC161000A8A51F /* Carbon.framework */; }; - 6A719D0415FC5FD200C8B8E3 /* McBopomofo.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 6A719D0315FC5FD200C8B8E3 /* McBopomofo.iconset */; }; - 6A719D0515FC5FD200C8B8E3 /* McBopomofo.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 6A719D0315FC5FD200C8B8E3 /* McBopomofo.iconset */; }; - 6AA67FEB15FC5B0D00B5A308 /* BopomofoTextMenu.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6AA67FE915FC5B0D00B5A308 /* BopomofoTextMenu.tiff */; }; - 6AA67FEC15FC5B0D00B5A308 /* BopomofoTextMenu@2x.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6AA67FEA15FC5B0D00B5A308 /* BopomofoTextMenu@2x.tiff */; }; 6ACA41CD15FC1D7500935EF6 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A0D4EA615FC0D2D00ABF4B3 /* Cocoa.framework */; }; 6ACA41F915FC1D9000935EF6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ACA41E915FC1D9000935EF6 /* AppDelegate.m */; }; 6ACA41FA15FC1D9000935EF6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6ACA41EA15FC1D9000935EF6 /* InfoPlist.strings */; }; @@ -160,6 +158,7 @@ 6A225A1E23679F2600F685C6 /* NotarizedArchives */ = {isa = PBXFileReference; lastKnownFileType = folder; path = NotarizedArchives; sourceTree = ""; }; 6A225A212367A1D700F685C6 /* ArchiveUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArchiveUtil.h; sourceTree = ""; }; 6A225A222367A1D700F685C6 /* ArchiveUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArchiveUtil.m; sourceTree = ""; }; + 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 6A38BBDE15FC117A00A8A51F /* 4_in_5.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 4_in_5.txt; sourceTree = ""; }; 6A38BBDF15FC117A00A8A51F /* 4_in_6.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 4_in_6.txt; sourceTree = ""; }; 6A38BBE015FC117A00A8A51F /* 5_in_6.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5_in_6.txt; sourceTree = ""; }; @@ -194,9 +193,6 @@ 6A38BC1E15FC11C700A8A51F /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/UpdateNotificationController.xib"; sourceTree = ""; }; 6A38BC2715FC158A00A8A51F /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/InputMethodKit.framework; sourceTree = DEVELOPER_DIR; }; 6A38BC2915FC161000A8A51F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = DEVELOPER_DIR; }; - 6A719D0315FC5FD200C8B8E3 /* McBopomofo.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = McBopomofo.iconset; sourceTree = ""; }; - 6AA67FE915FC5B0D00B5A308 /* BopomofoTextMenu.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = BopomofoTextMenu.tiff; sourceTree = ""; }; - 6AA67FEA15FC5B0D00B5A308 /* BopomofoTextMenu@2x.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "BopomofoTextMenu@2x.tiff"; sourceTree = ""; }; 6ACA41CB15FC1D7500935EF6 /* McBopomofoInstaller.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = McBopomofoInstaller.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6ACA41E815FC1D9000935EF6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/Installer/AppDelegate.h; sourceTree = SOURCE_ROOT; }; 6ACA41E915FC1D9000935EF6 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/Installer/AppDelegate.m; sourceTree = SOURCE_ROOT; }; @@ -313,11 +309,9 @@ 6A0D4EEE15FC0DA600ABF4B3 /* Images */ = { isa = PBXGroup; children = ( + 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */, 6A0D4EEF15FC0DA600ABF4B3 /* Bopomofo.tiff */, 6A0D4EF015FC0DA600ABF4B3 /* Bopomofo@2x.tiff */, - 6AA67FE915FC5B0D00B5A308 /* BopomofoTextMenu.tiff */, - 6AA67FEA15FC5B0D00B5A308 /* BopomofoTextMenu@2x.tiff */, - 6A719D0315FC5FD200C8B8E3 /* McBopomofo.iconset */, 6AE210B015FC63CC003659FE /* PlainBopomofo.tiff */, 6AE210B115FC63CC003659FE /* PlainBopomofo@2x.tiff */, ); @@ -579,10 +573,8 @@ 6A0D4F5315FC0EE100ABF4B3 /* preferences.xib in Resources */, 6A0D4F5715FC0EF900ABF4B3 /* InfoPlist.strings in Resources */, 6A0D4F5815FC0EF900ABF4B3 /* Localizable.strings in Resources */, + 6A2E40F6253A69DA00D1AE1D /* Images.xcassets in Resources */, 6A38BC1515FC117A00A8A51F /* data.txt in Resources */, - 6AA67FEB15FC5B0D00B5A308 /* BopomofoTextMenu.tiff in Resources */, - 6AA67FEC15FC5B0D00B5A308 /* BopomofoTextMenu@2x.tiff in Resources */, - 6A719D0415FC5FD200C8B8E3 /* McBopomofo.iconset in Resources */, 6AE210B215FC63CC003659FE /* PlainBopomofo.tiff in Resources */, 6AE210B315FC63CC003659FE /* PlainBopomofo@2x.tiff in Resources */, 6AD7CBC815FE555000691B5B /* data-plain-bpmf.txt in Resources */, @@ -595,12 +587,12 @@ buildActionMask = 2147483647; files = ( 6ACA420215FC1E5200935EF6 /* McBopomofo.app in Resources */, + 6A2E40F9253A6AA000D1AE1D /* Images.xcassets in Resources */, 6ACA41FA15FC1D9000935EF6 /* InfoPlist.strings in Resources */, 6A225A1F23679F2600F685C6 /* NotarizedArchives in Resources */, 6ACA41FB15FC1D9000935EF6 /* License.rtf in Resources */, 6ACA41FC15FC1D9000935EF6 /* Localizable.strings in Resources */, 6ACA41FD15FC1D9000935EF6 /* MainMenu.xib in Resources */, - 6A719D0515FC5FD200C8B8E3 /* McBopomofo.iconset in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -837,6 +829,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; @@ -887,6 +880,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; @@ -987,6 +981,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -1023,6 +1018,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; diff --git a/Source/Images/Bopomofo.tiff b/Source/Images/Bopomofo.tiff index 08c835c3..a1c29ed1 100644 Binary files a/Source/Images/Bopomofo.tiff and b/Source/Images/Bopomofo.tiff differ diff --git a/Source/Images/Bopomofo@2x.tiff b/Source/Images/Bopomofo@2x.tiff index 17900a1c..61adceeb 100644 Binary files a/Source/Images/Bopomofo@2x.tiff and b/Source/Images/Bopomofo@2x.tiff differ diff --git a/Source/Images/BopomofoTextMenu.tiff b/Source/Images/BopomofoTextMenu.tiff deleted file mode 100644 index 1b99e700..00000000 Binary files a/Source/Images/BopomofoTextMenu.tiff and /dev/null differ diff --git a/Source/Images/BopomofoTextMenu@2x.tiff b/Source/Images/BopomofoTextMenu@2x.tiff deleted file mode 100644 index ca6bf08f..00000000 Binary files a/Source/Images/BopomofoTextMenu@2x.tiff and /dev/null differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/1024X1024.png b/Source/Images/Images.xcassets/AppIcon.appiconset/1024X1024.png new file mode 100644 index 00000000..cffcacb2 Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/1024X1024.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/128X128.png b/Source/Images/Images.xcassets/AppIcon.appiconset/128X128.png new file mode 100644 index 00000000..1a599df9 Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/128X128.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/16X16.png b/Source/Images/Images.xcassets/AppIcon.appiconset/16X16.png new file mode 100644 index 00000000..58e99c3b Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/16X16.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/256X256.png b/Source/Images/Images.xcassets/AppIcon.appiconset/256X256.png new file mode 100644 index 00000000..77503fcd Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/256X256.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/32X32.png b/Source/Images/Images.xcassets/AppIcon.appiconset/32X32.png new file mode 100644 index 00000000..157177af Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/32X32.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/512X512.png b/Source/Images/Images.xcassets/AppIcon.appiconset/512X512.png new file mode 100644 index 00000000..350731f8 Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/512X512.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/64X64.png b/Source/Images/Images.xcassets/AppIcon.appiconset/64X64.png new file mode 100644 index 00000000..2b3d950b Binary files /dev/null and b/Source/Images/Images.xcassets/AppIcon.appiconset/64X64.png differ diff --git a/Source/Images/Images.xcassets/AppIcon.appiconset/Contents.json b/Source/Images/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..96ec4381 --- /dev/null +++ b/Source/Images/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "filename" : "16X16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "32X32.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "32X32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "64X64.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "128X128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "256X256.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "256X256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512X512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512X512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024X1024.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Source/Images/Images.xcassets/Contents.json b/Source/Images/Images.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/Source/Images/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Source/Images/McBopomofo.iconset/icon_128x128.png b/Source/Images/McBopomofo.iconset/icon_128x128.png deleted file mode 100644 index 941a1f6c..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_128x128.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_128x128@2x.png b/Source/Images/McBopomofo.iconset/icon_128x128@2x.png deleted file mode 100644 index efab7686..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_128x128@2x.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_16x16.png b/Source/Images/McBopomofo.iconset/icon_16x16.png deleted file mode 100644 index 90f87a85..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_16x16.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_16x16@2x.png b/Source/Images/McBopomofo.iconset/icon_16x16@2x.png deleted file mode 100644 index 025d6d00..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_16x16@2x.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_256x256.png b/Source/Images/McBopomofo.iconset/icon_256x256.png deleted file mode 100644 index efab7686..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_256x256.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_256x256@2x.png b/Source/Images/McBopomofo.iconset/icon_256x256@2x.png deleted file mode 100644 index 4628eaf5..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_256x256@2x.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_32x32.png b/Source/Images/McBopomofo.iconset/icon_32x32.png deleted file mode 100644 index 025d6d00..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_32x32.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_32x32@2x.png b/Source/Images/McBopomofo.iconset/icon_32x32@2x.png deleted file mode 100644 index 68750bd8..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_32x32@2x.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_512x512.png b/Source/Images/McBopomofo.iconset/icon_512x512.png deleted file mode 100644 index 4628eaf5..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_512x512.png and /dev/null differ diff --git a/Source/Images/McBopomofo.iconset/icon_512x512@2x.png b/Source/Images/McBopomofo.iconset/icon_512x512@2x.png deleted file mode 100644 index f816c2e2..00000000 Binary files a/Source/Images/McBopomofo.iconset/icon_512x512@2x.png and /dev/null differ diff --git a/Source/Images/PlainBopomofo.tiff b/Source/Images/PlainBopomofo.tiff index 2af4496e..2aee9334 100644 Binary files a/Source/Images/PlainBopomofo.tiff and b/Source/Images/PlainBopomofo.tiff differ diff --git a/Source/Images/PlainBopomofo@2x.tiff b/Source/Images/PlainBopomofo@2x.tiff index 9c0a24a8..af559d63 100644 Binary files a/Source/Images/PlainBopomofo@2x.tiff and b/Source/Images/PlainBopomofo@2x.tiff differ diff --git a/Source/Images/favicon.ico b/Source/Images/favicon.ico deleted file mode 100644 index 9f1ea001..00000000 Binary files a/Source/Images/favicon.ico and /dev/null differ diff --git a/Source/Images/favicon.png b/Source/Images/favicon.png deleted file mode 100644 index 0eed42be..00000000 Binary files a/Source/Images/favicon.png and /dev/null differ diff --git a/Source/Images/favicon.tiff b/Source/Images/favicon.tiff deleted file mode 100644 index 9b51cb8d..00000000 Binary files a/Source/Images/favicon.tiff and /dev/null differ diff --git a/Source/Installer/Installer-Info.plist b/Source/Installer/Installer-Info.plist index 971464f2..4feed9c0 100644 --- a/Source/Installer/Installer-Info.plist +++ b/Source/Installer/Installer-Info.plist @@ -6,8 +6,6 @@ en CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - McBopomofo.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/Source/McBopomofo-Info.plist b/Source/McBopomofo-Info.plist index 330780ae..173168d2 100644 --- a/Source/McBopomofo-Info.plist +++ b/Source/McBopomofo-Info.plist @@ -6,8 +6,6 @@ English CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - McBopomofo.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -30,12 +28,21 @@ TISDoubleSpaceSubstitution 。 + TISIntendedLanguage + zh-Hant tsInputModeAlternateMenuIconFileKey Bopomofo.tiff + tsInputModeCharacterRepertoireKey + + Hant + Han + tsInputModeDefaultStateKey tsInputModeIsVisibleKey + tsInputModeKeyEquivalentModifiersKey + 4608 tsInputModeMenuIconFileKey Bopomofo.tiff tsInputModePaletteIconFileKey @@ -44,26 +51,26 @@ tsInputModeScriptKey smTradChinese - TISIntendedLanguage - zh-Hant - tsInputModeCharacterRepertoireKey - - Hant - Han - - tsInputModeKeyEquivalentModifiersKey - 4608 org.openvanilla.inputmethod.McBopomofo.PlainBopomofo TISDoubleSpaceSubstitution 。 + TISIntendedLanguage + zh-Hant tsInputModeAlternateMenuIconFileKey PlainBopomofo.tiff + tsInputModeCharacterRepertoireKey + + Hant + Han + tsInputModeDefaultStateKey tsInputModeIsVisibleKey + tsInputModeKeyEquivalentModifiersKey + 4608 tsInputModeMenuIconFileKey PlainBopomofo.tiff tsInputModePaletteIconFileKey @@ -72,15 +79,6 @@ tsInputModeScriptKey smTradChinese - TISIntendedLanguage - zh-Hant - tsInputModeCharacterRepertoireKey - - Hant - Han - - tsInputModeKeyEquivalentModifiersKey - 4608 tsVisibleInputModeOrderedArrayKey @@ -129,6 +127,6 @@ Hans tsInputMethodIconFileKey - BopomofoTextMenu.tiff + Bopomofo.tiff