diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/PrefUITabs.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/PrefUITabs.swift index cb56fdbb..8c0df830 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/PrefUITabs.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/PrefUITabs.swift @@ -97,6 +97,7 @@ public extension PrefUITabs { } var icon: NSImage { + let note = "\(rawValue) Preferences" + " \(i18nTitle)" if #available(macOS 11.0, *) { let name: String = { switch self { @@ -120,10 +121,17 @@ public extension PrefUITabs { return "pc" } }() - let note = "\(self.rawValue) Preferences" return NSImage(systemSymbolName: name, accessibilityDescription: note) ?? NSImage() } let legacyName = "PrefToolbar-\(rawValue)" - return NSImage(named: legacyName) ?? NSImage() + let matchedImage = NSImage(named: legacyName) ?? NSImage() + let newImage = NSImage(size: matchedImage.size) + newImage.lockFocus() + let imageRect = NSRect(origin: .zero, size: matchedImage.size) + matchedImage.draw(in: imageRect, from: imageRect, operation: .sourceOver, fraction: 0.85) + newImage.unlockFocus() + newImage.isTemplate = true + newImage.accessibilityDescription = note + return newImage } } diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior.png index 9720266c..731ad38a 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior@2x.png index a4250297..97eadb8b 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Behavior.imageset/Behavior@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates.png index 3a354376..608bb033 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates@2x.png index 19f0ca05..68a54a98 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Candidates.imageset/Candidates@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette.png index 34dfc675..f9ad190a 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette@2x.png index caba7ee9..cc509df6 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Cassette.imageset/Cassette@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone.png index 226a0233..1101b3f4 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone@2x.png index 3983f2a1..2b44dfee 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-DevZone.imageset/DevZone@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary.png index f77b4f02..967d7872 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary@2x.png index 5f4a7907..0528dad0 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Dictionary.imageset/Dictionary@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Contents.json b/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Contents.json deleted file mode 100644 index 18f84fe1..00000000 --- a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "filename" : "Experiences.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Experiences@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Experiences.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Experiences.png deleted file mode 100644 index ce7dd387..00000000 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Experiences.png and /dev/null differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Experiences@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Experiences@2x.png deleted file mode 100644 index 4e21e4d1..00000000 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Experience.imageset/Experiences@2x.png and /dev/null differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General.png index f1429c9c..e82505a2 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General@2x.png index b379d1cd..17a578a4 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-General.imageset/General@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard.png index d566f1b5..04f0f548 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard@2x.png index 2619ca68..8770101e 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Keyboard.imageset/Keyboard@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output.png index b751d6e4..7a660c92 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output@2x.png index d2e41293..1c15870a 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Output.imageset/Output@2x.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases.png index 92ff7cdf..b439b70d 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases.png differ diff --git a/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases@2x.png b/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases@2x.png index 6daaea73..5b92b1c2 100644 Binary files a/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases@2x.png and b/Source/Resources/Images/Images.xcassets/PrefToolbar-Phrases.imageset/Phrases@2x.png differ